Debian Codegraph @

debian/patches/python3

raw
1 commit 2ae7324066aceb00302848f26c52d86a260b0999
2 Author: sam <[email protected]>
3 Date: Sun Feb 16 00:39:05 2020 +0100
4
5 Migrate editor to gtk3/python3
6
7 diff --git a/new-editor/cb-editor b/new-editor/cb-editor
8 index 2cd5625..f0f19ed 100644
9 --- a/new-editor/cb-editor
10 +++ b/new-editor/cb-editor
11 @@ -1,11 +1,15 @@
12 -import gtk, gobject, re
13 +import gi
14 +gi.require_version('Gtk', '3.0')
15 +from gi.repository import Gtk
16 +from gi.repository import GObject
17 +import re
18 from cb_itemtypes import *
19 from cbmenu import *
20 from cbutil import TabButton, CommandText
21 from lxml import etree
22 from xdg import BaseDirectory
23 import os,re
24 -import ConfigParser
25 +import configparser
26 import shlex
27
28 try:
29 @@ -13,53 +17,53 @@ try:
30 except ImportError:
31 dbus = None
32
33 -class CBEditor(gtk.Window):
34 +class CBEditor(Gtk.Window):
35 def __init__(self):
36 - gtk.Window.__init__(self)
37 + GObject.GObject.__init__(self)
38 self.set_title("Compiz Boxmenu Editor")
39 self.set_icon_name('cbmenu')
40 self.set_border_width(5)
41 self.set_size_request(600, 400)
42 - self.vbox=gtk.VBox(False, 2)
43 - self.connect('destroy', gtk.main_quit)
44 - hbox_main=gtk.HPaned()
45 + self.vbox=Gtk.VBox(False, 2)
46 + self.connect('destroy', Gtk.main_quit)
47 + hbox_main=Gtk.HPaned()
48
49 - toolbar=gtk.Toolbar()
50 + toolbar=Gtk.Toolbar()
51
52 - new_button = gtk.MenuToolButton(gtk.STOCK_NEW)
53 + new_button = Gtk.MenuToolButton(Gtk.STOCK_NEW)
54 new_button.set_menu(self.make_new_menu())
55 new_button.connect('clicked', self.new_item_dialog)
56 new_button.set_tooltip_text("Create a new menu file or menu item")
57
58 - #edit_button = gtk.ToolButton(gtk.STOCK_EDIT) # necessary?
59 + #edit_button = Gtk.ToolButton(Gtk.STOCK_EDIT) # necessary?
60
61 - save_button = gtk.MenuToolButton(gtk.STOCK_SAVE)
62 + save_button = Gtk.MenuToolButton(Gtk.STOCK_SAVE)
63 save_button.set_menu(self.make_save_menu())
64 save_button.connect('clicked', self.save_one)
65 save_button.set_tooltip_text("Save the current menu")
66
67 - generate_button = gtk.ToolButton(gtk.STOCK_CONVERT)
68 + generate_button = Gtk.ToolButton(Gtk.STOCK_CONVERT)
69 generate_button.connect('clicked', self.generated_item) #need to import other menus
70 generate_button.set_tooltip_text('Generate menu entries from a pipemenu script')
71
72 - delete_button = gtk.MenuToolButton(gtk.STOCK_DELETE)
73 + delete_button = Gtk.MenuToolButton(Gtk.STOCK_DELETE)
74 delete_button.set_menu(self.make_delete_menu())
75 delete_button.connect('clicked', self.delete_item)
76 delete_button.set_tooltip_text('Delete the current menu item')
77
78 - reload_button = gtk.ToolButton(gtk.STOCK_REFRESH)
79 + reload_button = Gtk.ToolButton(Gtk.STOCK_REFRESH)
80 reload_button.connect('clicked', self.reload_menu)
81 reload_button.set_tooltip_text('Reload the daemon')
82
83 - #settings_button = gtk.ToolButton(gtk.STOCK_PREFERENCES)
84 + #settings_button = Gtk.ToolButton(Gtk.STOCK_PREFERENCES)
85 #settings_button.connect('clicked', self.show_settings)
86
87 - about_button = gtk.ToolButton(gtk.STOCK_ABOUT)
88 + about_button = Gtk.ToolButton(Gtk.STOCK_ABOUT)
89 about_button.connect('clicked', self.show_about_dialog)
90 about_button.set_tooltip_text('Show some information about this program')
91
92 - sep=gtk.SeparatorToolItem()
93 - sep2=gtk.SeparatorToolItem()
94 + sep=Gtk.SeparatorToolItem()
95 + sep2=Gtk.SeparatorToolItem()
96 sep.set_draw(False)
97 sep.set_expand(True)
98 sep2.set_draw(False)
99 @@ -77,66 +81,66 @@ class CBEditor(gtk.Window):
100 #toolbar.insert(settings_button, 8)
101 toolbar.insert(about_button, 7)
102
103 - self.vbox.pack_start(toolbar, expand=False)
104 + self.vbox.pack_start(toolbar, expand=False, fill=True, padding=0)
105
106 - listview=gtk.TreeView()
107 + listview=Gtk.TreeView()
108 self.list_menus()
109 listview.set_model(self.menu_list)
110 listview.connect('row-activated',self.open_menu_file)
111 - scrolled=gtk.ScrolledWindow()
112 + scrolled=Gtk.ScrolledWindow()
113 scrolled.add(listview)
114
115 - scrolled.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
116 + scrolled.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
117 scrolled.set_size_request(150,-1)
118
119 hbox_main.add(scrolled)
120
121 - cached = gtk.TreeViewColumn('Cached?')
122 + cached = Gtk.TreeViewColumn('Cached?')
123 listview.append_column(cached)
124 - cell = gtk.CellRendererToggle()
125 + cell = Gtk.CellRendererToggle()
126 cell.set_activatable(True)
127 cell.connect('toggled', self.update_cache)
128 - cached.pack_start(cell)
129 + cached.pack_start(cell, expand=True) #, True, 0)
130 cached.add_attribute(cell, "active", 0)
131
132 - name = gtk.TreeViewColumn('Menu')
133 + name = Gtk.TreeViewColumn('Menu')
134 listview.append_column(name)
135 - cell = gtk.CellRendererText()
136 - name.pack_start(cell)
137 + cell = Gtk.CellRendererText()
138 + name.pack_start(cell, expand=True) #, True, 0)
139 name.add_attribute(cell,"text", 1)
140
141 - self.tabs=gtk.Notebook()
142 + self.tabs=Gtk.Notebook()
143 self.tabs.set_size_request(340,240)
144 self.tabs.set_scrollable(True)
145 self.tabs.connect('switch-page', self.get_current_menu)
146 hbox_main.add(self.tabs)
147 self.tabs.set_show_tabs(True)
148 - self.tabs.set_tab_pos(gtk.POS_TOP)
149 + self.tabs.set_tab_pos(Gtk.PositionType.TOP)
150
151 - #self.hbox_item=gtk.HBox(False, 2)
152 + #self.hbox_item=Gtk.HBox(False, 2)
153
154 - self.vbox.pack_start(hbox_main)
155 + self.vbox.pack_start(hbox_main, expand=True, fill=True, padding=0)
156 #self.vbox.pack_end(self.hbox_item, expand=False, fill=False)
157 self.add(self.vbox)
158 self.show_all()
159
160 def make_new_menu(self):
161 - new_menu=gtk.Menu()
162 + new_menu=Gtk.Menu()
163 for i in elementlist:
164 - new_item = gtk.ImageMenuItem(i, gtk.STOCK_NEW)
165 + new_item = Gtk.ImageMenuItem(i, Gtk.STOCK_NEW)
166 new_item.connect('activate', self.make_new_item, i)
167 new_menu.append(new_item)
168 new_menu.show_all()
169 return new_menu
170
171 def make_delete_menu(self):
172 - delete_menu=gtk.Menu()
173 + delete_menu=Gtk.Menu()
174
175 - delete_item=gtk.ImageMenuItem("Current Item")
176 + delete_item=Gtk.ImageMenuItem("Current Item")
177 delete_item.connect('activate', self.delete_item)
178 delete_menu.append(delete_item)
179
180 - delete_item=gtk.ImageMenuItem("Current Menu")
181 + delete_item=Gtk.ImageMenuItem("Current Menu")
182 delete_item.connect('activate', self.delete_menu)
183 delete_menu.append(delete_item)
184
185 @@ -144,13 +148,13 @@ class CBEditor(gtk.Window):
186 return delete_menu
187
188 def make_save_menu(self):
189 - save_menu=gtk.Menu()
190 + save_menu=Gtk.Menu()
191
192 - save_item=gtk.ImageMenuItem("Current Menu")
193 + save_item=Gtk.ImageMenuItem("Current Menu")
194 save_item.connect('activate', self.save_one)
195 save_menu.append(save_item)
196
197 - save_item=gtk.ImageMenuItem("All")
198 + save_item=Gtk.ImageMenuItem("All")
199 save_item.connect('activate', self.save_all)
200 save_menu.append(save_item)
201
202 @@ -158,13 +162,13 @@ class CBEditor(gtk.Window):
203 return save_menu
204
205 def delete_menu(self, widget):
206 - dialog = gtk.MessageDialog(self, gtk.DIALOG_MODAL, gtk.MESSAGE_WARNING, \
207 - gtk.BUTTONS_NONE, \
208 + dialog = Gtk.MessageDialog(self, Gtk.DialogFlags.MODAL, Gtk.MessageType.WARNING, \
209 + Gtk.ButtonsType.NONE, \
210 "Are you sure you want to delete the current menu? You cannot recover it after you do this!")
211 - dialog.add_buttons(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, gtk.STOCK_DELETE, gtk.RESPONSE_ACCEPT)
212 + dialog.add_buttons(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL, Gtk.STOCK_DELETE, Gtk.ResponseType.ACCEPT)
213 response = dialog.run()
214 dialog.destroy()
215 - if response == gtk.RESPONSE_ACCEPT:
216 + if response == Gtk.ResponseType.ACCEPT:
217 idx=self.tabs.get_current_page()
218 menu=self.tabs.get_nth_page(idx)
219 for i in self.menu_list:
220 @@ -202,36 +206,36 @@ class CBEditor(gtk.Window):
221 self.make_new_item(widget, element.attrib['type'].title(), nd=element, parent=pt)
222
223 def new_item_dialog(self, widget):
224 - dialog=gtk.Dialog('New Item', self,gtk.DIALOG_MODAL, \
225 - buttons=(gtk.STOCK_OK, gtk.RESPONSE_ACCEPT, gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT))
226 + dialog=Gtk.Dialog('New Item', self,Gtk.DialogFlags.MODAL, \
227 + buttons=(Gtk.STOCK_OK, Gtk.ResponseType.ACCEPT, Gtk.STOCK_CANCEL, Gtk.ResponseType.REJECT))
228 dialog.set_size_request(250, 250)
229
230 dialog.props.border_width = 6
231 dialog.vbox.props.spacing = 6
232 dialog.set_has_separator(False)
233
234 - model = gtk.ListStore(str)
235 + model = Gtk.ListStore(str)
236 for el in elementlist:
237 model.append([el])
238
239 - treeview = gtk.TreeView(model)
240 - column = gtk.TreeViewColumn(None, gtk.CellRendererText(), text=0)
241 + treeview = Gtk.TreeView(model)
242 + column = Gtk.TreeViewColumn(None, Gtk.CellRendererText(), text=0)
243 treeview.set_headers_visible(False)
244 treeview.append_column(column)
245
246 treeview.connect('row-activated', self.on_row_activated)
247
248 - scroll = gtk.ScrolledWindow()
249 + scroll = Gtk.ScrolledWindow()
250 scroll.add(treeview)
251 - scroll.props.hscrollbar_policy = gtk.POLICY_NEVER
252 - scroll.props.vscrollbar_policy = gtk.POLICY_AUTOMATIC
253 - dialog.vbox.pack_start(scroll, True, True)
254 + scroll.props.hscrollbar_policy = Gtk.PolicyType.NEVER
255 + scroll.props.vscrollbar_policy = Gtk.PolicyType.AUTOMATIC
256 + dialog.vbox.pack_start(scroll, expand=True, fill=True, padding=0)
257
258 dialog.action_area.props.border_width = 0
259
260 dialog.show_all()
261
262 - if dialog.run() == gtk.RESPONSE_ACCEPT:
263 + if dialog.run() == Gtk.ResponseType.ACCEPT:
264 m, r = treeview.get_selection().get_selected()
265 if r:
266 elementname = m[r][0]
267 @@ -242,17 +246,17 @@ class CBEditor(gtk.Window):
268 dialog.destroy()
269
270 def on_row_activated(self, treeview, path, view_column):
271 - self.response(gtk.RESPONSE_ACCEPT)
272 + self.response(Gtk.ResponseType.ACCEPT)
273
274 def generated_item(self, widget):
275 - dialog=gtk.Dialog("Add generated items from pipemenu", self, gtk.DIALOG_MODAL, \
276 - buttons=(gtk.STOCK_OK, gtk.RESPONSE_ACCEPT, gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT))
277 + dialog=Gtk.Dialog("Add generated items from pipemenu", self, Gtk.DialogFlags.MODAL, \
278 + buttons=(Gtk.STOCK_OK, Gtk.ResponseType.ACCEPT, Gtk.STOCK_CANCEL, Gtk.ResponseType.REJECT))
279 input=CommandText(label_text="Command", mode="Pipe Menu" , alternate_mode="Pipe Menu")
280 dialog.vbox.add(input)
281 dialog.vbox.show_all()
282 input.combobox.hide()
283 response=dialog.run()
284 - if response==gtk.RESPONSE_ACCEPT:
285 + if response==Gtk.ResponseType.ACCEPT:
286 process=subprocess.Popen(shlex.split(os.path.expanduser(input.entry.props.text)), \
287 stdout=subprocess.PIPE)
288 try:
289 @@ -262,9 +266,9 @@ class CBEditor(gtk.Window):
290 self.recursive_generate(widget, dummy_menu)
291 dialog.destroy()
292 except etree.XMLSyntaxError as e:
293 - message = gtk.MessageDialog(parent=self, flags=0,
294 - type=gtk.MESSAGE_ERROR,
295 - buttons=gtk.BUTTONS_OK, message_format=None)
296 + message = Gtk.MessageDialog(parent=self, flags=0,
297 + type=Gtk.MessageType.ERROR,
298 + buttons=Gtk.ButtonsType.OK, message_format=None)
299 msg = ("{}\n\nClick the gear icon in the dialog to check"
300 " pipe output.").format(e.msg)
301 message.set_markup(msg)
302 @@ -308,18 +312,18 @@ class CBEditor(gtk.Window):
303 else:
304 new_row=model.append(parent, row=(element,))
305 parentelement.node.append(element.node)
306 - print "New %s created" % element_type
307 + print("New %s created" % element_type)
308 return new_row
309 else:
310 menu_path=BaseDirectory.xdg_config_home + "/compiz/boxmenu"
311 - dialog=gtk.Dialog("Add a new file", self, gtk.DIALOG_MODAL, \
312 - buttons=(gtk.STOCK_OK, gtk.RESPONSE_ACCEPT, gtk.STOCK_CANCEL, gtk.RESPONSE_REJECT))
313 - input=gtk.Entry()
314 - dialog.vbox.add(gtk.Label("Name of the new menu to be created, with .xml at the end:"))
315 + dialog=Gtk.Dialog("Add a new file", self, Gtk.DialogFlags.MODAL, \
316 + buttons=(Gtk.STOCK_OK, Gtk.ResponseType.ACCEPT, Gtk.STOCK_CANCEL, Gtk.ResponseType.REJECT))
317 + input=Gtk.Entry()
318 + dialog.vbox.add(Gtk.Label("Name of the new menu to be created, with .xml at the end:"))
319 dialog.vbox.add(input)
320 dialog.vbox.show_all()
321 response=dialog.run()
322 - if response != gtk.RESPONSE_ACCEPT or \
323 + if response != Gtk.ResponseType.ACCEPT or \
324 input.props.text == "" or \
325 not input.props.text.endswith(".xml"):
326 dialog.destroy()
327 @@ -330,7 +334,7 @@ class CBEditor(gtk.Window):
328 f.close()
329 self.menu_list.append([False,input.props.text, path])
330 dialog.destroy()
331 - print "New %s created" % element_type
332 + print("New %s created" % element_type)
333
334 def save_one(self, widget):
335 idx=self.tabs.get_current_page()
336 @@ -343,7 +347,7 @@ class CBEditor(gtk.Window):
337 label.label.set_text(current_text.replace("*",""))
338
339 def save_all(self, widget):
340 - for i in xrange(self.tabs.get_n_pages()):
341 + for i in range(self.tabs.get_n_pages()):
342 widget=self.tabs.get_nth_page(i)
343 widget.write_menu()
344 label=self.tabs.get_tab_label(widget)
345 @@ -351,7 +355,7 @@ class CBEditor(gtk.Window):
346 label.label.set_text(current_text.replace("*",""))
347
348 def get_current_menu(self, notebook, page, page_num):
349 - for i in xrange(self.tabs.get_n_pages()):
350 + for i in range(self.tabs.get_n_pages()):
351 widget=self.tabs.get_nth_page(i)
352 if hasattr(widget, 'currently_editing'):
353 if i != page_num:
354 @@ -368,9 +372,9 @@ class CBEditor(gtk.Window):
355 label.set_text("*"+label.get_text())
356
357 def get_edit_panel(self, treeview, path, view_column, menufile):
358 - self.vbox.pack_end(menufile.currently_editing, expand=False)
359 + self.vbox.pack_end(menufile.currently_editing, False, True, 0)
360 page_num=self.tabs.get_current_page()
361 - for i in xrange(self.tabs.get_n_pages()):
362 + for i in range(self.tabs.get_n_pages()):
363 widget=self.tabs.get_nth_page(i)
364 if hasattr(widget, 'currently_editing'):
365 if i != page_num:
366 @@ -382,7 +386,7 @@ class CBEditor(gtk.Window):
367 self.get_edit_panel(None, None, None, menufile)
368
369 def open_menu_file(self,treeview, path, view_column):
370 - for i in xrange(self.tabs.get_n_pages()):
371 + for i in range(self.tabs.get_n_pages()):
372 widget=self.tabs.get_nth_page(i)
373 if self.menu_list[path[0]][2] == widget.filename:
374 return
375 @@ -402,9 +406,9 @@ class CBEditor(gtk.Window):
376 pagenum = self.tabs.page_num(menufile)
377 menu=self.tabs.get_nth_page(pagenum)
378 if re.match("\*",widget.get_text()):
379 - warning = gtk.MessageDialog(self, gtk.DIALOG_MODAL, gtk.MESSAGE_INFO, gtk.BUTTONS_NONE, 'Close %s with unsaved changes?' % os.path.basename(menu.filename))
380 - warning.add_buttons(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, gtk.STOCK_OK, gtk.RESPONSE_ACCEPT)
381 - if warning.run() != gtk.RESPONSE_ACCEPT:
382 + warning = Gtk.MessageDialog(self, Gtk.DialogFlags.MODAL, Gtk.MessageType.INFO, Gtk.ButtonsType.NONE, 'Close %s with unsaved changes?' % os.path.basename(menu.filename))
383 + warning.add_buttons(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL, Gtk.STOCK_OK, Gtk.ResponseType.ACCEPT)
384 + if warning.run() != Gtk.ResponseType.ACCEPT:
385 warning.destroy()
386 return
387 warning.destroy()
388 @@ -419,7 +423,7 @@ class CBEditor(gtk.Window):
389 j=0
390 for i in self.menu_list:
391 if i[1] == "menu.xml":
392 - print "Compiz Boxmenu caches menu.xml by default"
393 + print("Compiz Boxmenu caches menu.xml by default")
394 continue
395 if i[0]:
396 parser.set("Files", "file_%s" % j, i[2])
397 @@ -435,7 +439,7 @@ class CBEditor(gtk.Window):
398 return
399
400 def show_about_dialog(self, widget):
401 - dialog=gtk.AboutDialog()
402 + dialog=Gtk.AboutDialog()
403 dialog.set_name("Compiz Boxmenu Editor")
404 dialog.set_version("1.1.6")
405 dialog.set_authors(["ShadowKyogre","crdlb"])
406 @@ -450,9 +454,9 @@ class CBEditor(gtk.Window):
407 return False
408
409 def list_menus(self):
410 - self.menu_list=gtk.ListStore(gobject.TYPE_BOOLEAN, \
411 - gobject.TYPE_STRING, \
412 - gobject.TYPE_STRING)
413 + self.menu_list=Gtk.ListStore(GObject.TYPE_BOOLEAN, \
414 + GObject.TYPE_STRING, \
415 + GObject.TYPE_STRING)
416 menu_path=BaseDirectory.xdg_config_home + "/compiz/boxmenu"
417 for checking in os.listdir(menu_path):
418 path="%s/%s" %(menu_path, checking)
419 @@ -480,7 +484,7 @@ if __name__ == '__main__':
420 copyfile(starting_file, menu_path+"/menu.xml")
421 try:
422 cache_file=menu_path+"/precache.ini"
423 - parser=ConfigParser.SafeConfigParser()
424 + parser=configparser.SafeConfigParser()
425 parser.readfp(open(cache_file))
426 cache=parser.items("Files")
427 allnotcache=False
428 @@ -490,4 +494,4 @@ if __name__ == '__main__':
429 'Desktops List','Viewports List', 'Recent Documents',
430 'Reload', 'Menu File']
431 CBEditor()
432 - gtk.main()
433 + Gtk.main()
434 diff --git a/new-editor/cb_itemtypes.py b/new-editor/cb_itemtypes.py
435 index 9443126..fca9ed8 100644
436 --- a/new-editor/cb_itemtypes.py
437 +++ b/new-editor/cb_itemtypes.py
438 @@ -1,4 +1,4 @@
439 -import gtk
440 +from gi.repository import Gtk
441 from lxml import etree
442 from cbutil import *
443
444 @@ -124,7 +124,7 @@ class Launcher(Item):
445
446 retlist.append(widget)
447
448 - widget = gtk.CheckButton("Cache output of pipe")
449 + widget = Gtk.CheckButton("Cache output of pipe")
450 widget.props.active = commandnode is not None and commandnode.attrib.get('mode2') == 'pipe' and commandnode.attrib.get('cache') == 'true'
451 widget.connect('toggled', self.on_cached_changed)
452 retlist.append(widget)
453 @@ -143,7 +143,7 @@ class Launcher(Item):
454
455 def on_name_mode_changed(self, widget, text):
456 namenode = self.node.find('name')
457 - print text
458 + print(text)
459 if text == "Execute":
460 if namenode is None:
461 namenode = etree.SubElement(self.node, 'name')
462 @@ -205,12 +205,12 @@ class Windowlist(Item):
463 icons = []
464 retlist = []
465
466 - widget = gtk.CheckButton("Show windows only on current viewport")
467 + widget = Gtk.CheckButton("Show windows only on current viewport")
468 widget.props.active = self.get_thisvp()
469 widget.connect('toggled', self.on_thisvp_changed)
470 retlist.append(widget)
471
472 - widget = gtk.CheckButton("Show only minimized windows")
473 + widget = Gtk.CheckButton("Show only minimized windows")
474 widget.props.active = self.get_minionly()
475 widget.connect('toggled', self.on_minionly_changed)
476 retlist.append(widget)
477 @@ -314,7 +314,7 @@ class Viewportlist(Item):
478 retlist = []
479 icons = []
480
481 - widget = gtk.CheckButton("Wrap Viewports")
482 + widget = Gtk.CheckButton("Wrap Viewports")
483 widget.props.active = self.get_wrap()
484 widget.connect('toggled', self.on_wrap_changed)
485 retlist.append(widget)
486 @@ -518,13 +518,13 @@ class Documents(Item):
487 def get_options(self):
488 retlist = []
489 icons = []
490 - sgroup = gtk.SizeGroup(gtk.SIZE_GROUP_HORIZONTAL)
491 + sgroup = Gtk.SizeGroup(Gtk.SizeGroupMode.HORIZONTAL)
492
493 - label = gtk.Label()
494 + label = Gtk.Label()
495 label.set_alignment(0, 0.5)
496 sgroup.add_widget(label)
497 label.set_markup('<b>Open method:</b>')
498 - widget = gtk.Entry()
499 + widget = Gtk.Entry()
500 commandnode = self.node.find('command')
501 if commandnode is not None:
502 command = commandnode.text
503 @@ -534,9 +534,9 @@ class Documents(Item):
504 widget.set_tooltip_text('If you need a more complicated command, type in that command and %f, which will tell compiz-boxmenu where to place the file name.')
505 widget.connect('changed', self.on_subnode_changed, 'command')
506
507 - hbox = gtk.HBox()
508 - hbox.pack_start(label)
509 - hbox.pack_start(widget, True, True)
510 + hbox = Gtk.HBox()
511 + hbox.pack_start(label, expand=True, fill=True, padding=0)
512 + hbox.pack_start(widget, expand=True, fill=True, padding=0)
513 retlist.append(hbox)
514
515 iconnode = self.node.find('icon')
516 @@ -556,11 +556,11 @@ class Documents(Item):
517
518 icons.append(widget)
519
520 - label = gtk.Label()
521 + label = Gtk.Label()
522 label.set_alignment(0, 0.5)
523 sgroup.add_widget(label)
524 label.set_markup('<b>Days from today:</b>')
525 - widget = gtk.Entry()
526 + widget = Gtk.Entry()
527
528 agenode = self.node.find('age')
529 if agenode is not None:
530 @@ -570,16 +570,16 @@ class Documents(Item):
531 widget.props.text = age
532 widget.connect('changed', self.on_subnode_changed, 'age')
533
534 - hbox = gtk.HBox()
535 - hbox.pack_start(label)
536 - hbox.pack_start(widget, True, True)
537 + hbox = Gtk.HBox()
538 + hbox.pack_start(label, expand=True, fill=True, padding=0)
539 + hbox.pack_start(widget, expand=True, fill=True, padding=0)
540 retlist.append(hbox)
541
542 - label = gtk.Label()
543 + label = Gtk.Label()
544 label.set_alignment(0, 0.5)
545 sgroup.add_widget(label)
546 label.set_markup('<b>Items to display:</b>')
547 - widget = gtk.Entry()
548 + widget = Gtk.Entry()
549
550 quantitynode = self.node.find('quantity')
551 if quantitynode is not None:
552 @@ -589,18 +589,18 @@ class Documents(Item):
553 widget.props.text = quantity
554 widget.connect('changed', self.on_subnode_changed, 'quantity')
555
556 - hbox = gtk.HBox()
557 - hbox.pack_start(label)
558 - hbox.pack_start(widget, True, True)
559 + hbox = Gtk.HBox()
560 + hbox.pack_start(label, expand=True, fill=True, padding=0)
561 + hbox.pack_start(widget, expand=True, fill=True, padding=0)
562 retlist.append(hbox)
563
564 sortnode = self.node.find('sort')
565
566 - label = gtk.Label()
567 + label = Gtk.Label()
568 label.set_alignment(0, 0.5)
569 sgroup.add_widget(label)
570 label.set_markup('<b>Sort mode:</b>')
571 - widget = gtk.combo_box_new_text()
572 + widget = Gtk.ComboBoxText()
573 widget.append_text('None')
574 widget.append_text('Most Used')
575 widget.append_text('Least Used')
576 @@ -614,9 +614,9 @@ class Documents(Item):
577 widget.set_active(-1)
578 widget.connect('changed', self.on_sort_mode_changed)
579
580 - hbox = gtk.HBox()
581 - hbox.pack_start(label)
582 - hbox.pack_start(widget, True, True)
583 + hbox = Gtk.HBox()
584 + hbox.pack_start(label, expand=True, fill=True, padding=0)
585 + hbox.pack_start(widget, expand=True, fill=True, padding=0)
586 retlist.append(hbox)
587
588 return icons,retlist
589 @@ -650,7 +650,7 @@ class Documents(Item):
590 sortnode = self.node.find('sort')
591 sorttype = widget.get_active_text()
592 if sorttype != 'None':
593 - print sorttype
594 + print(sorttype)
595 if sortnode is None:
596 sortnode = etree.SubElement(self.node, 'sort')
597 if sorttype == 'Most Used':
598 diff --git a/new-editor/cbmenu.py b/new-editor/cbmenu.py
599 index 0fd3b98..ba0a310 100644
600 --- a/new-editor/cbmenu.py
601 +++ b/new-editor/cbmenu.py
602 @@ -1,58 +1,59 @@
603 -import gtk
604 +from gi.repository import Gtk
605 +from gi.repository import Gdk
606 import os
607 -import glib
608 +from gi.repository import GLib
609 from xdg import BaseDirectory
610 import re #This is to autoset file mode for *.desktop icons
611 -import ConfigParser
612 +import configparser
613 from lxml import etree
614 from cb_itemtypes import *
615
616 #test lines:
617 #import cbmenu,cb_itemtypes
618 -#import gtk
619 +#from gi.repository import Gtk
620 #blah=cbmenu.MenuFile("/home/shadowkyogre/.config/compiz/boxmenu/menu.xml")
621 -#blurg=gtk.Window()
622 +#blurg=Gtk.Window()
623 #blurg.add(blah)
624 #blurg.show_all()
625
626 -class MenuFile(gtk.ScrolledWindow):
627 +class MenuFile(Gtk.ScrolledWindow):
628
629 def __init__(self,filename):
630 - gtk.ScrolledWindow.__init__(self)
631 + GObject.GObject.__init__(self)
632
633 - self.model = gtk.TreeStore(object)
634 + self.model = Gtk.TreeStore(object)
635 self.add_menu_file(filename)
636 self.filename=filename
637
638 - self.props.hscrollbar_policy = gtk.POLICY_AUTOMATIC #because you really might want to read some of the stuff hanging off
639 - self.props.vscrollbar_policy = gtk.POLICY_AUTOMATIC
640 - self.treeview = gtk.TreeView(self.model)
641 + self.props.hscrollbar_policy = Gtk.PolicyType.AUTOMATIC #because you really might want to read some of the stuff hanging off
642 + self.props.vscrollbar_policy = Gtk.PolicyType.AUTOMATIC
643 + self.treeview = Gtk.TreeView(self.model)
644 self.treeview.set_reorderable(True)
645 - cell = gtk.CellRendererText()
646 - elements = gtk.TreeViewColumn('Item', cell)
647 + cell = Gtk.CellRendererText()
648 + elements = Gtk.TreeViewColumn('Item', cell)
649 elements.set_cell_data_func(cell, self.get_type)
650 self.treeview.append_column(elements)
651
652 - name = gtk.TreeViewColumn('Name')
653 + name = Gtk.TreeViewColumn('Name')
654
655 - cell = gtk.CellRendererPixbuf()
656 - name.pack_start(cell, False)
657 + cell = Gtk.CellRendererPixbuf()
658 + name.pack_start(cell, expand=False)
659 name.set_cell_data_func(cell, self.get_icon)
660
661 - cell = gtk.CellRendererText()
662 - name.pack_start(cell)
663 + cell = Gtk.CellRendererText()
664 + name.pack_start(cell, expand=True) #, True, 0)
665 name.set_cell_data_func(cell, self.get_name)
666
667 self.treeview.append_column(name)
668 self.add(self.treeview)
669 targets = [
670 - ('deskmenu-element', gtk.TARGET_SAME_WIDGET, 0),
671 - #('deskmenu-element', gtk.TARGET_SAME_APP, 0),
672 - #('deskmenu-element', gtk.TREE_VIEW_ITEM, 0),
673 + ('deskmenu-element', Gtk.TargetFlags.SAME_WIDGET, 0),
674 + #('deskmenu-element', Gtk.TargetFlags.SAME_APP, 0),
675 + #('deskmenu-element', Gtk.TREE_VIEW_ITEM, 0),
676 ('text/uri-list', 0, 1),
677 ]
678 - self.treeview.enable_model_drag_source(gtk.gdk.BUTTON1_MASK, targets, gtk.gdk.ACTION_DEFAULT|gtk.gdk.ACTION_MOVE)
679 - self.treeview.enable_model_drag_dest(targets, gtk.gdk.ACTION_MOVE)
680 + self.treeview.enable_model_drag_source(Gdk.ModifierType.BUTTON1_MASK, targets, Gdk.DragAction.DEFAULT|Gdk.DragAction.MOVE)
681 + self.treeview.enable_model_drag_dest(targets, Gdk.DragAction.MOVE)
682
683 self.treeview.connect('drag-data-get', self.on_drag_data_get)
684 self.treeview.connect('drag-data-received', self.on_drag_data_received)
685 @@ -65,11 +66,11 @@ class MenuFile(gtk.ScrolledWindow):
686 self.selection = self.treeview.get_selection()
687 self.selection.connect('changed', self.on_selection_changed)
688
689 - self.popup = gtk.Menu()
690 - self.edit_menu = gtk.ImageMenuItem(stock_id=gtk.STOCK_EDIT)
691 + self.popup = Gtk.Menu()
692 + self.edit_menu = Gtk.MenuItem.new_with_mnemonic("_EDIT")
693 self.edit_menu.connect('activate', self.on_edit_clicked)
694 self.popup.append(self.edit_menu)
695 - self.delete_menu = gtk.ImageMenuItem(stock_id=gtk.STOCK_DELETE)
696 + self.delete_menu = Gtk.MenuItem.new_with_mnemonic("_DELETE")
697 self.delete_menu.connect('activate', self.on_delete_clicked)
698 self.popup.append(self.delete_menu)
699 self.popup.show_all()
700 @@ -87,29 +88,29 @@ class MenuFile(gtk.ScrolledWindow):
701 if item.node.tag == 'menu':
702 self.add_menu(item, iter)
703
704 - def get_name(self, column, cell, model, iter):
705 + def get_name(self, column, cell, model, iter, face):
706 name = model.get_value(iter, 0).get_name()
707 if name is None:
708 name = ''
709 cell.set_property('text', name)
710
711 - def get_type(self, column, cell, model, iter):
712 + def get_type(self, column, cell, model, iter, face):
713 typ = model.get_value(iter, 0).get_type()
714 if typ is None:
715 typ = ''
716 cell.set_property('text', typ)
717
718 - def get_icon(self, column, cell, model, iter):
719 + def get_icon(self, column, cell, model, iter, face):
720 icon = model.get_value(iter, 0).get_icon()
721 icon_mode = model.get_value(iter, 0).get_icon_mode()
722 #somehow does not set icon until selection change with things that don't have icons originally!
723 if icon is not None:
724 if icon_mode is not None:
725 - w = gtk.icon_size_lookup(gtk.ICON_SIZE_MENU)
726 + w = Gtk.icon_size_lookup(Gtk.IconSize.MENU)
727 try:
728 - cell.set_property('pixbuf', gtk.gdk.pixbuf_new_from_file_at_size(os.path.expanduser(icon), w[0], w[0]))
729 + cell.set_property('pixbuf', GdkPixbuf.Pixbuf.new_from_file_at_size(os.path.expanduser(icon), w[0], w[0]))
730 cell.set_property('icon-name', None) #possibly reduntant safety measure
731 - except glib.GError:
732 + except GLib.GError:
733 cell.set_property('icon-name', None)
734 cell.set_property('pixbuf', None)
735 else:
736 @@ -135,11 +136,11 @@ class MenuFile(gtk.ScrolledWindow):
737 current = model[row][0].node
738
739 if current.tag == 'menu' and len(current):
740 - warning = gtk.MessageDialog(self.get_toplevel(), \
741 - gtk.DIALOG_MODAL, gtk.MESSAGE_INFO, gtk.BUTTONS_NONE, \
742 + warning = Gtk.MessageDialog(self.get_toplevel(), \
743 + Gtk.DialogFlags.MODAL, Gtk.MessageType.INFO, Gtk.ButtonsType.NONE, \
744 'Delete menu element with %s children?' %len(current))
745 - warning.add_buttons(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, gtk.STOCK_DELETE, gtk.RESPONSE_ACCEPT)
746 - if warning.run() != gtk.RESPONSE_ACCEPT:
747 + warning.add_buttons(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL, Gtk.STOCK_DELETE, Gtk.ResponseType.ACCEPT)
748 + if warning.run() != Gtk.ResponseType.ACCEPT:
749 warning.destroy()
750 return
751 warning.destroy()
752 @@ -183,17 +184,17 @@ class MenuFile(gtk.ScrolledWindow):
753 return
754
755 dest = model[path][0]
756 - if context.action == gtk.gdk.ACTION_MOVE:
757 + if context.action == Gdk.DragAction.MOVE:
758 source.node.getparent().remove(source.node)
759
760 - if dest.node.tag == 'menu' and position in (gtk.TREE_VIEW_DROP_INTO_OR_BEFORE,
761 - gtk.TREE_VIEW_DROP_INTO_OR_AFTER):
762 + if dest.node.tag == 'menu' and position in (Gtk.TreeViewDropPosition.INTO_OR_BEFORE,
763 + Gtk.TreeViewDropPosition.INTO_OR_AFTER):
764 dest.node.append(source.node)
765 fiter = model.append(diter, row=(source,))
766 else:
767 i = dest.node.getparent().index(dest.node)
768 - if position in (gtk.TREE_VIEW_DROP_INTO_OR_BEFORE,
769 - gtk.TREE_VIEW_DROP_BEFORE):
770 + if position in (Gtk.TreeViewDropPosition.INTO_OR_BEFORE,
771 + Gtk.TreeViewDropPosition.BEFORE):
772 dest.node.getparent().insert(i, source.node)
773 fiter = model.insert_before(None, diter, row=(source,))
774 else:
775 @@ -205,17 +206,17 @@ class MenuFile(gtk.ScrolledWindow):
776 while citer is not None:
777 model.append(fiter, row=(model[citer][0],))
778 citer = model.iter_next(citer)
779 - if context.action == gtk.gdk.ACTION_MOVE:
780 + if context.action == Gdk.DragAction.MOVE:
781 context.finish(True, True, etime)
782
783 elif selection.type == 'text/uri-list':
784 - print selection.data, drop_info
785 + print(selection.data, drop_info)
786 #uri = selection.data.replace('file:///', '/').replace("%20"," ").replace("\x00","").strip()
787 uris = selection.data.replace('file:///', '/').strip('\r\n\x00').split()
788 launchers = []
789 for uri in uris:
790 uri=uri.replace("%20", " ")
791 - entry = ConfigParser.ConfigParser()
792 + entry = configparser.ConfigParser()
793 entry.read(uri)
794 launcher = Launcher()
795 launcher.name = etree.SubElement(launcher.node, 'name')
796 @@ -227,7 +228,7 @@ class MenuFile(gtk.ScrolledWindow):
797 launcher.icon.attrib['mode1'] = 'file'
798 launcher.icon.text = entry.get('Desktop Entry', 'Icon')
799 launcher.command.text = entry.get('Desktop Entry', 'Exec').split('%')[0]
800 - except ConfigParser.Error:
801 + except configparser.Error:
802 return
803 launchers.append(launcher)
804 if drop_info:
805 @@ -235,16 +236,16 @@ class MenuFile(gtk.ScrolledWindow):
806 dest = model[path][0]
807 diter = model.get_iter(path)
808 #print(dest.node, dest.node.getroot())
809 - if dest.node.tag == 'menu' and position in (gtk.TREE_VIEW_DROP_INTO_OR_BEFORE,
810 - gtk.TREE_VIEW_DROP_INTO_OR_AFTER):
811 + if dest.node.tag == 'menu' and position in (Gtk.TreeViewDropPosition.INTO_OR_BEFORE,
812 + Gtk.TreeViewDropPosition.INTO_OR_AFTER):
813 for launcher in launchers:
814 dest.node.append(launcher.node)
815 fiter = model.append(diter, row=(launcher,))
816 else:
817 i = dest.node.getparent().index(dest.node)
818 for launcher in launchers:
819 - if position in (gtk.TREE_VIEW_DROP_INTO_OR_BEFORE,
820 - gtk.TREE_VIEW_DROP_BEFORE):
821 + if position in (Gtk.TreeViewDropPosition.INTO_OR_BEFORE,
822 + Gtk.TreeViewDropPosition.BEFORE):
823 dest.node.getparent().insert(i, launcher.node)
824 fiter = model.insert_before(None, diter, row=(launcher,))
825 else:
826 @@ -252,7 +253,7 @@ class MenuFile(gtk.ScrolledWindow):
827 fiter = model.insert_after(None, diter, row=(launcher,))
828 diter = fiter
829 i+=1
830 - if context.action == gtk.gdk.ACTION_MOVE:
831 + if context.action == Gdk.DragAction.MOVE:
832 context.finish(True, True, etime)
833 else:
834 for launcher in launchers:
835 @@ -315,15 +316,15 @@ class MenuFile(gtk.ScrolledWindow):
836 self.indent(self.menu.node)
837 self.menufile.write(open(self.filename, 'w'))
838
839 -class EditItemPanel(gtk.HBox):
840 +class EditItemPanel(Gtk.HBox):
841
842 def __init__(self, model=None, row=None, element=None):
843 - gtk.HBox.__init__(self)
844 - self.vbox_image_grid=gtk.VBox(False, 2)
845 - self.vbox_other_options=gtk.VBox(False, 2)
846 + GObject.GObject.__init__(self)
847 + self.vbox_image_grid=Gtk.VBox(False, 2)
848 + self.vbox_other_options=Gtk.VBox(False, 2)
849
850 - self.pack_start(self.vbox_image_grid)
851 - self.pack_end(self.vbox_other_options)
852 + self.pack_start(self.vbox_image_grid, expand=True, fill=True, padding=0)
853 + self.pack_end(self.vbox_other_options, expand=True, fill=True, padding=0)
854
855 self.props.spacing = 6
856
857 @@ -338,9 +339,9 @@ class EditItemPanel(gtk.HBox):
858 icons,widgets=element.get_options()
859
860 for icon in icons:
861 - self.vbox_image_grid.pack_start(icon, fill=False)
862 + self.vbox_image_grid.pack_start(icon, expand=True, fill=True, padding=0)
863
864 for widget in widgets:
865 - self.vbox_other_options.pack_start(widget, fill=False)
866 + self.vbox_other_options.pack_start(widget, expand=True, fill=True, padding=0)
867
868 self.show_all()
869 diff --git a/new-editor/cbutil.py b/new-editor/cbutil.py
870 index 2be7fd0..2ea71ec 100644
871 --- a/new-editor/cbutil.py
872 +++ b/new-editor/cbutil.py
873 @@ -1,67 +1,67 @@
874 import os, gtk, glib
875 from pyicon_browser import *
876 -import gobject
877 +from gi.repository import GObject
878 import subprocess
879 import shlex
880 import os
881
882 -class TabButton(gtk.HBox):
883 +class TabButton(Gtk.HBox):
884 def __init__(self, text):
885 - gtk.HBox.__init__(self)
886 + GObject.GObject.__init__(self)
887 #http://www.eurion.net/python-snippets/snippet/Notebook%20close%20button.html
888 - self.label = gtk.Label(text)
889 - self.pack_start(self.label)
890 + self.label = Gtk.Label(label=text)
891 + self.pack_start(self.label, expand=True, fill=True, padding=0)
892
893 #get a stock close button image
894 - close_image = gtk.image_new_from_stock(gtk.STOCK_CLOSE, gtk.ICON_SIZE_MENU)
895 - image_w, image_h = gtk.icon_size_lookup(gtk.ICON_SIZE_MENU)
896 + close_image = Gtk.Image.new_from_stock(Gtk.STOCK_CLOSE, Gtk.IconSize.MENU)
897 + b_val, image_w, image_h = Gtk.icon_size_lookup(Gtk.IconSize.MENU)
898
899 #make the close button
900 - self.btn = gtk.Button()
901 - self.btn.set_relief(gtk.RELIEF_NONE)
902 + self.btn = Gtk.Button()
903 + self.btn.set_relief(Gtk.ReliefStyle.NONE)
904 self.btn.set_focus_on_click(False)
905 self.btn.add(close_image)
906 - self.pack_start(self.btn, False, False)
907 + self.pack_start(self.btn, expand=False, fill=False, padding=0)
908
909 #this reduces the size of the button
910 - style = gtk.RcStyle()
911 - style.xthickness = 0
912 - style.ythickness = 0
913 - self.btn.modify_style(style)
914 + #style = Gtk.RcStyle()
915 + #style.xthickness = 0
916 + #style.ythickness = 0
917 + #self.btn.modify_style(style)
918
919 self.show_all()
920
921 #test code
922 #from cbutil import *
923 -#import gtk
924 -#d=gtk.Dialog()
925 +#from gi.repository import Gtk
926 +#d=Gtk.Dialog()
927 #d.vbox.add(CommandText())
928 #d.run()
929
930 -class CommandText(gtk.HBox):
931 +class CommandText(Gtk.HBox):
932 def __init__(self, label_text="Name", mode="Normal", text="", alternate_mode="Execute"):
933 - gtk.HBox.__init__(self)
934 + GObject.GObject.__init__(self)
935
936 - label=gtk.Label(label_text)
937 + label=Gtk.Label(label=label_text)
938
939 - self.entry=gtk.Entry()
940 + self.entry=Gtk.Entry()
941 self.entry.props.text=text
942
943 - self.button=gtk.Button()
944 - image=gtk.image_new_from_icon_name("gtk-execute",gtk.ICON_SIZE_LARGE_TOOLBAR)
945 + self.button=Gtk.Button()
946 + image=Gtk.Image.new_from_icon_name("gtk-execute",Gtk.IconSize.LARGE_TOOLBAR)
947 self.button.set_image(image)
948 #known bug
949 self.button.set_tooltip_markup("See the output this command generates")
950
951 - self.combobox=gtk.combo_box_new_text()
952 + self.combobox=Gtk.ComboBoxText()
953 self.combobox.append_text("Normal")
954 self.combobox.append_text(alternate_mode)
955 self.combobox.props.active = mode != "Normal"
956
957 - self.pack_start(label,expand=False)
958 - self.pack_start(self.entry)
959 - self.pack_end(self.button,expand=False)
960 - self.pack_end(self.combobox)
961 + self.pack_start(label,expand=False,fill=True,padding=0)
962 + self.pack_start(self.entry, True, True, 0)
963 + self.pack_end(self.button,expand=False,fill=True,padding=0)
964 + self.pack_end(self.combobox, True, True, 0)
965
966 self.combobox.connect('changed', self._emit_mode_signal)
967 self.entry.connect('changed', self._emit_text_signal)
968 @@ -76,7 +76,7 @@ class CommandText(gtk.HBox):
969 self.button.props.sensitive=1
970
971 if alternate_mode != "Execute" or get_mode != "Normal":
972 - completion = gtk.EntryCompletion()
973 + completion = Gtk.EntryCompletion()
974 self.entry.set_completion(completion)
975 completion.set_model(POSSIBILITY_STORE)
976 completion.set_text_column(0)
977 @@ -87,7 +87,7 @@ class CommandText(gtk.HBox):
978 self.entry.set_completion(None)
979 self.button.props.sensitive=0
980 else:
981 - completion = gtk.EntryCompletion()
982 + completion = Gtk.EntryCompletion()
983 self.entry.set_completion(completion)
984 completion.set_model(POSSIBILITY_STORE)
985 completion.set_text_column(0)
986 @@ -98,9 +98,9 @@ class CommandText(gtk.HBox):
987 self.emit('text-changed', widget.props.text)
988
989 def _preview_text(self, widget):
990 - print "Generating preview, please wait..."
991 - buffer=gtk.TextBuffer()
992 - buffer_errors=gtk.TextBuffer()
993 + print("Generating preview, please wait...")
994 + buffer=Gtk.TextBuffer()
995 + buffer_errors=Gtk.TextBuffer()
996 full_text=' '.join(['/usr/bin/env',os.path.expanduser(self.entry.props.text)])
997 cmd=subprocess.Popen(shlex.split(full_text),stdout=subprocess.PIPE, stderr=subprocess.PIPE)
998 text,errors=cmd.communicate()
999 @@ -114,20 +114,20 @@ class CommandText(gtk.HBox):
1000 else:
1001 buffer_errors.set_text("")
1002
1003 - dialog=gtk.Dialog(title="Preview of %s" %(self.entry.props.text), \
1004 - buttons=(gtk.STOCK_OK, gtk.RESPONSE_ACCEPT))
1005 + dialog=Gtk.Dialog(title="Preview of %s" %(self.entry.props.text), \
1006 + buttons=(Gtk.STOCK_OK, Gtk.ResponseType.ACCEPT))
1007
1008 - tabs=gtk.Notebook()
1009 + tabs=Gtk.Notebook()
1010 tabs.set_scrollable(True)
1011
1012 - scrolled=gtk.ScrolledWindow()
1013 - scrolled.add(gtk.TextView(buffer))
1014 + scrolled=Gtk.ScrolledWindow()
1015 + scrolled.add(Gtk.TextView(buffer))
1016
1017 - scrolled_errors=gtk.ScrolledWindow()
1018 - scrolled_errors.add(gtk.TextView(buffer_errors))
1019 + scrolled_errors=Gtk.ScrolledWindow()
1020 + scrolled_errors.add(Gtk.TextView(buffer_errors))
1021
1022 - tabs.append_page(scrolled, gtk.Label("Output"))
1023 - tabs.append_page(scrolled_errors, gtk.Label("Errors"))
1024 + tabs.append_page(scrolled, Gtk.Label(label="Output"))
1025 + tabs.append_page(scrolled_errors, Gtk.Label(label="Errors"))
1026
1027 dialog.vbox.add(tabs)
1028 dialog.show_all()
1029 @@ -136,58 +136,58 @@ class CommandText(gtk.HBox):
1030
1031 #test code
1032 #from cbutil import *
1033 -#import gtk
1034 -#d=gtk.Dialog()
1035 +#from gi.repository import Gtk
1036 +#d=Gtk.Dialog()
1037 #d.vbox.add(IconSelector())
1038 #d.run()
1039
1040 -class IconSelector(gtk.HBox):
1041 +class IconSelector(Gtk.HBox):
1042 def __init__(self, label_text="Icon", mode="Normal", text=""):
1043 - gtk.HBox.__init__(self)
1044 + GObject.GObject.__init__(self)
1045
1046 - label=gtk.Label(label_text)
1047 + label=Gtk.Label(label=label_text)
1048 self.text=text
1049
1050 - self.combobox=gtk.combo_box_new_text()
1051 + self.combobox=Gtk.ComboBoxText()
1052 self.combobox.append_text("Normal")
1053 self.combobox.append_text("File path")
1054 self.combobox.props.active = mode != "Normal"
1055 - self.button=gtk.Button()
1056 - self.image=gtk.Image()
1057 + self.button=Gtk.Button()
1058 + self.image=Gtk.Image()
1059
1060 - self.pack_start(label, expand=False)
1061 - self.pack_start(self.button,expand=False)
1062 - self.pack_end(self.combobox, expand=True)
1063 + self.pack_start(label, False, True, 0)
1064 + self.pack_start(self.button,expand=False,fill=True,padding=0)
1065 + self.pack_end(self.combobox, True, True, 0)
1066 self.button.set_image(self.image)
1067
1068 self.combobox.connect('changed', self._emit_mode_signal)
1069 self.button.connect('pressed', self._emit_text_signal)
1070
1071 if mode == "File path":
1072 - size=gtk.icon_size_lookup(gtk.ICON_SIZE_LARGE_TOOLBAR)[0]
1073 + size=Gtk.icon_size_lookup(Gtk.IconSize.LARGE_TOOLBAR)[0]
1074 try:
1075 - pixbuf=gtk.gdk.pixbuf_new_from_file_at_size(os.path.expanduser(self.text), size, size)
1076 + pixbuf=GdkPixbuf.Pixbuf.new_from_file_at_size(os.path.expanduser(self.text), size, size)
1077 self.image.set_from_pixbuf(pixbuf)
1078 - except glib.GError:
1079 + except GLib.GError:
1080 self.image.set_from_pixbuf(None)
1081 - print "Couldn't set icon from file: %s" %(self.text)
1082 + print("Couldn't set icon from file: %s" %(self.text))
1083 else:
1084 - self.image.set_from_icon_name(self.text,gtk.ICON_SIZE_LARGE_TOOLBAR)
1085 + self.image.set_from_icon_name(self.text,Gtk.IconSize.LARGE_TOOLBAR)
1086 self.button.set_tooltip_text(self.text)
1087
1088 self.show_all()
1089
1090 def _change_image(self, mode):
1091 if mode == "File path":
1092 - size=gtk.icon_size_lookup(gtk.ICON_SIZE_LARGE_TOOLBAR)[0]
1093 + size=Gtk.icon_size_lookup(Gtk.IconSize.LARGE_TOOLBAR)[0]
1094 try:
1095 - pixbuf=gtk.gdk.pixbuf_new_from_file_at_size(os.path.expanduser(self.text), size, size)
1096 + pixbuf=GdkPixbuf.Pixbuf.new_from_file_at_size(os.path.expanduser(self.text), size, size)
1097 self.image.set_from_pixbuf(pixbuf)
1098 - except glib.GError:
1099 + except GLib.GError:
1100 self.image.set_from_pixbuf(None)
1101 - print "Couldn't set icon from file: %s" %(self.text)
1102 + print("Couldn't set icon from file: %s" %(self.text))
1103 else:
1104 - self.image.set_from_icon_name(self.text,gtk.ICON_SIZE_LARGE_TOOLBAR)
1105 + self.image.set_from_icon_name(self.text,Gtk.IconSize.LARGE_TOOLBAR)
1106 self.emit('image-changed', mode)
1107
1108 def _emit_mode_signal(self, widget):
1109 @@ -201,14 +201,14 @@ class IconSelector(gtk.HBox):
1110 dialog=IcoBrowse()
1111 dialog.set_defaults(self.text)
1112 response = dialog.run()
1113 - if response == gtk.RESPONSE_ACCEPT:
1114 + if response == Gtk.ResponseType.ACCEPT:
1115 text=dialog.get_icon_name(None)
1116 dialog.destroy()
1117 else:
1118 - btns=(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, gtk.STOCK_OPEN, gtk.RESPONSE_ACCEPT)
1119 - dialog=gtk.FileChooserDialog(title="Select Icon", buttons=btns)
1120 + btns=(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL, Gtk.STOCK_OPEN, Gtk.ResponseType.ACCEPT)
1121 + dialog=Gtk.FileChooserDialog(title="Select Icon", buttons=btns)
1122 dialog.set_filename(text)
1123 - filter = gtk.FileFilter()
1124 + filter = Gtk.FileFilter()
1125 filter.set_name("Images")
1126 filter.add_mime_type("image/png")
1127 filter.add_mime_type("image/jpeg")
1128 @@ -220,7 +220,7 @@ class IconSelector(gtk.HBox):
1129 filter.add_pattern("*.xpm")
1130 dialog.add_filter(filter)
1131 response = dialog.run()
1132 - if response == gtk.RESPONSE_ACCEPT:
1133 + if response == Gtk.ResponseType.ACCEPT:
1134 text=dialog.get_filename()
1135 dialog.destroy()
1136 if text != self.text and (text != "" and text != None):
1137 @@ -230,27 +230,27 @@ class IconSelector(gtk.HBox):
1138 self.emit('text-changed', text)
1139
1140 def set_up():
1141 - gobject.type_register(CommandText)
1142 - gobject.type_register(IconSelector)
1143 + GObject.type_register(CommandText)
1144 + GObject.type_register(IconSelector)
1145
1146 - gobject.signal_new("text-changed", CommandText, gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, (gobject.TYPE_STRING,))
1147 - gobject.signal_new("mode-changed", CommandText, gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, (gobject.TYPE_STRING,))
1148 + GObject.signal_new("text-changed", CommandText, GObject.SignalFlags.RUN_FIRST, None, (GObject.TYPE_STRING,))
1149 + GObject.signal_new("mode-changed", CommandText, GObject.SignalFlags.RUN_FIRST, None, (GObject.TYPE_STRING,))
1150
1151 - gobject.signal_new("image-changed", IconSelector, gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, (gobject.TYPE_STRING,))
1152 - gobject.signal_new("text-changed", IconSelector, gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, (gobject.TYPE_STRING,))
1153 - gobject.signal_new("mode-changed", IconSelector, gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, (gobject.TYPE_STRING,))
1154 + GObject.signal_new("image-changed", IconSelector, GObject.SignalFlags.RUN_FIRST, None, (GObject.TYPE_STRING,))
1155 + GObject.signal_new("text-changed", IconSelector, GObject.SignalFlags.RUN_FIRST, None, (GObject.TYPE_STRING,))
1156 + GObject.signal_new("mode-changed", IconSelector, GObject.SignalFlags.RUN_FIRST, None, (GObject.TYPE_STRING,))
1157
1158 def completion_setup():
1159 - print "Setting up command auto completion for best experience"
1160 + print("Setting up command auto completion for best experience")
1161 for i in os.path.expandvars("$PATH").split(":"):
1162 if os.path.exists(i):
1163 - print "Looking in %s" %i
1164 + print("Looking in %s" %i)
1165 for j in os.listdir(i):
1166 path="%s/%s" %(i,j)
1167 if not os.path.isdir(path) and \
1168 os.access(path, os.X_OK):
1169 POSSIBILITY_STORE.append([j])
1170
1171 -POSSIBILITY_STORE = gtk.ListStore(str)
1172 +POSSIBILITY_STORE = Gtk.ListStore(str)
1173 set_up()
1174 completion_setup()
1175 diff --git a/new-editor/pyicon_browser.py b/new-editor/pyicon_browser.py
1176 index 556c15b..14951e6 100644
1177 --- a/new-editor/pyicon_browser.py
1178 +++ b/new-editor/pyicon_browser.py
1179 @@ -1,39 +1,43 @@
1180 -import gtk, gobject, re
1181 -from glib import GError
1182 +from gi.repository import Gtk
1183 +from gi.repository import GdkPixbuf
1184 +from gi.repository import GObject
1185 +import re
1186 +from gi.repository import GLib
1187 +#from GLib import GError
1188 from sys import stderr
1189
1190 #http://developer.gnome.org/pygtk/2.22/class-gtkicontheme.html#method-gtkicontheme--list-contexts
1191
1192 -class IcoBrowse(gtk.Dialog):
1193 +class IcoBrowse(Gtk.Dialog):
1194 def __init__(self, message="", default_text='', modal=True):
1195 - gtk.Dialog.__init__(self)
1196 - self.add_buttons(gtk.STOCK_CANCEL, gtk.RESPONSE_CLOSE,
1197 - gtk.STOCK_OK, gtk.RESPONSE_ACCEPT)
1198 + GObject.GObject.__init__(self)
1199 + self.add_buttons(Gtk.STOCK_CANCEL, Gtk.ResponseType.CLOSE,
1200 + Gtk.STOCK_OK, Gtk.ResponseType.ACCEPT)
1201 #self.set_title("Icon search")
1202 if modal:
1203 self.set_modal(True)
1204 self.set_border_width(5)
1205 self.set_size_request(400, 300)
1206 - self.combobox=gtk.combo_box_new_text()
1207 + self.combobox=Gtk.ComboBoxText()
1208 self.combobox.set_size_request(200, 20)
1209 - hbox=gtk.HBox(False,2)
1210 + hbox=Gtk.HBox(False,2)
1211
1212 #format: actual icon, name, context
1213 - #self.model=gtk.ListStore(gtk.gdk.Pixbuf, gobject.TYPE_STRING, gobject.TYPE_STRING)
1214 + #self.model=Gtk.ListStore(GdkPixbuf.Pixbuf, GObject.TYPE_STRING, GObject.TYPE_STRING)
1215 #self.modelfilter=self.model.filter_new()
1216 self.modelfilter=ICON_STORE.filter_new()
1217 - self.iconview=gtk.IconView()
1218 + self.iconview=Gtk.IconView()
1219 self.iconview.set_model(self.modelfilter)
1220 self.iconview.set_pixbuf_column(0)
1221 self.iconview.set_text_column(1)
1222 - self.iconview.set_selection_mode(gtk.SELECTION_SINGLE)
1223 + self.iconview.set_selection_mode(Gtk.SelectionMode.SINGLE)
1224 self.iconview.set_item_width(72)
1225 self.iconview.set_size_request(200, 220)
1226 - defaulttheme=gtk.icon_theme_get_default()
1227 + defaulttheme=Gtk.IconTheme.get_default()
1228 self.combobox.connect('changed', self.category_changed)
1229 - self.refine=gtk.Entry()
1230 + self.refine=Gtk.Entry()
1231 self.refine.connect('changed', self.category_changed)
1232 - self.refine.set_icon_from_stock(gtk.ENTRY_ICON_SECONDARY, gtk.STOCK_FIND)
1233 + self.refine.set_icon_from_stock(Gtk.EntryIconPosition.SECONDARY, Gtk.STOCK_FIND)
1234 self.refine.set_size_request(200, 30)
1235 self.modelfilter.set_visible_func(self.search_icons)
1236 #catted_icons=[]
1237 @@ -44,19 +48,19 @@ class IcoBrowse(gtk.Dialog):
1238 #for i in current:
1239 # try:
1240 # self.model.append([defaulttheme.load_icon(i, 32,
1241 - # gtk.ICON_LOOKUP_USE_BUILTIN),
1242 + # Gtk.IconLookupFlags.USE_BUILTIN),
1243 # i,c])
1244 # except GError as err: stderr.write('Error loading "%s": %s\n' % (i, err.args[0]))
1245 #other=list(set(defaulttheme.list_icons())-(set(catted_icons)))
1246 #for i in other:
1247 # self.model.append([defaulttheme.load_icon(i, 32,
1248 - # gtk.ICON_LOOKUP_USE_BUILTIN),
1249 + # Gtk.IconLookupFlags.USE_BUILTIN),
1250 # i,"Other"])
1251 self.combobox.prepend_text("Other")
1252 - scrolled = gtk.ScrolledWindow()
1253 + scrolled = Gtk.ScrolledWindow()
1254 scrolled.add(self.iconview)
1255 - scrolled.props.hscrollbar_policy = gtk.POLICY_NEVER
1256 - scrolled.props.vscrollbar_policy = gtk.POLICY_AUTOMATIC
1257 + scrolled.props.hscrollbar_policy = Gtk.PolicyType.NEVER
1258 + scrolled.props.vscrollbar_policy = Gtk.PolicyType.AUTOMATIC
1259 hbox.add(self.combobox)
1260 hbox.add(self.refine)
1261 self.vbox.add(hbox)
1262 @@ -70,12 +74,12 @@ class IcoBrowse(gtk.Dialog):
1263 def set_defaults(self, icon_name):
1264 if icon_name != "" and icon_name != None:
1265 cmodel = self.combobox.get_model()
1266 - for i in xrange(len(ICON_STORE)):
1267 + for i in range(len(ICON_STORE)):
1268 if ICON_STORE[i][1] == icon_name:
1269 self.refine.props.text=icon_name
1270 - for j in xrange(len(cmodel)):
1271 + for j in range(len(cmodel)):
1272 if ICON_STORE[i][2] == cmodel[j][0]:
1273 - print cmodel[j]
1274 + print(cmodel[j])
1275 self.combobox.set_active(j)
1276 break
1277 break
1278 @@ -88,7 +92,7 @@ class IcoBrowse(gtk.Dialog):
1279 def category_changed(self, widget):
1280 self.modelfilter.refilter()
1281
1282 - def search_icons(self, tree, iter):
1283 + def search_icons(self, tree, iter, face):
1284 search_term = self.combobox.get_active_text()
1285 search_term2 = self.refine.props.text
1286 if ICON_STORE.get_value(iter, 2) == search_term:
1287 @@ -99,33 +103,33 @@ class IcoBrowse(gtk.Dialog):
1288 return False
1289
1290 def set_up():
1291 - print "Preloading icons"
1292 - defaulttheme=gtk.icon_theme_get_default()
1293 + print("Preloading icons")
1294 + defaulttheme=Gtk.IconTheme.get_default()
1295 catted_icons=set()
1296 for c in defaulttheme.list_contexts():
1297 current=defaulttheme.list_icons(context=c)
1298 catted_icons=catted_icons.union(set(current))
1299 - print "Found {} icons in {}".format(len(current),c)
1300 + print("Found {} icons in {}".format(len(current),c))
1301 #self.combobox.append_text(c)
1302 for i in current:
1303 try:
1304 ICON_STORE.append([defaulttheme.load_icon(i, 32,
1305 - gtk.ICON_LOOKUP_USE_BUILTIN),
1306 + Gtk.IconLookupFlags.USE_BUILTIN),
1307 i,c])
1308 except GError as err: stderr.write('Error loading "%s": %s\n' % (i, err.args[0]))
1309 other=list(set(defaulttheme.list_icons())-catted_icons)
1310 - print "Placing misc. icons in Other"
1311 + print("Placing misc. icons in Other")
1312 for i in other:
1313 ICON_STORE.append([defaulttheme.load_icon(i, 32,
1314 - gtk.ICON_LOOKUP_USE_BUILTIN),
1315 + Gtk.IconLookupFlags.USE_BUILTIN),
1316 i,"Other"])
1317
1318
1319 -ICON_STORE=gtk.ListStore(gtk.gdk.Pixbuf, gobject.TYPE_STRING, gobject.TYPE_STRING)
1320 +ICON_STORE=Gtk.ListStore(GdkPixbuf.Pixbuf, GObject.TYPE_STRING, GObject.TYPE_STRING)
1321 set_up()
1322
1323 if __name__ == '__main__':
1324 icobrowse = IcoBrowse()
1325 - icobrowse.connect('destroy', gtk.main_quit)
1326 + icobrowse.connect('destroy', Gtk.main_quit)
1327 icobrowse.run()
1328 - gtk.main()
1329 + Gtk.main()