--- gonvert 2016-08-29 10:29:38.000000000 -0400 +++ gonvert 2020-08-02 16:50:19.176472292 -0400 @@ -1,10 +1,10 @@ -#!/usr/bin/python +#!/usr/bin/python2 # -*- coding: UTF8 -*- version = "0.2.39" # keep version information here on third line since Makefile reads it. import pygtk pygtk.require('2.0') -import gtk,gobject,gtk.glade,gtk.gdk +import gtk,gobject,gtk.gdk import shelve,pickle from math import * import string,os,sys,glob,os.path,gettext @@ -856,11 +856,11 @@ os.mkdir(home+'/.gonvert') -#check to see if glade file is in current directory (user must be running from download untar directory) -if os.path.exists('gonvert.glade'): +#check to see if GtkBuilder file is in current directory (user must be running from download untar directory) +if os.path.exists('gonvert.ui'): homepath='' pixmapspath='pixmaps/' -elif os.path.exists('/usr/local/share/gonvert/gonvert.glade'): +elif os.path.exists('/usr/local/share/gonvert/gonvert.ui'): homepath='/usr/local/share/gonvert/' pixmapspath='/usr/local/share/pixmaps/' else: @@ -872,10 +872,11 @@ pixmapspath=homepath +'/../pixmaps/' #print pixmapspath #debug -gladefile=homepath+'gonvert.glade' +uifile=homepath+'gonvert.ui' -widgets = gtk.glade.XML(gladefile) -app1 = widgets.get_widget('app1') +widgets = gtk.Builder() +widgets.add_from_file(uifile) +app1 = widgets.get_object('app1') #Restore window size from previously saved settings if it exists and is valid. if os.path.exists(home+'/.gonvert/window.dat'): @@ -938,13 +939,13 @@ } -widgets.signal_autoconnect (dic); +widgets.connect_signals (dic); def change_menu_label(labelname,newtext): - item_label = widgets.get_widget(labelname).get_children()[0] + item_label = widgets.get_object(labelname).get_children()[0] item_label.set_text(newtext) def change_label(labelname,newtext): - item_label = widgets.get_widget(labelname) + item_label = widgets.get_object(labelname) item_label.set_text(newtext) change_menu_label('file1',_('File')) @@ -957,31 +958,31 @@ #change_menu_label('find_button',_('Find')) -cat_clist = widgets.get_widget('cat_clist' ) +cat_clist = widgets.get_object('cat_clist' ) -clist1 = widgets.get_widget('clist1') +clist1 = widgets.get_object('clist1') clist1_selection=clist1.get_selection() -entry1 = widgets.get_widget('entry1') -entry2 = widgets.get_widget('entry2') -entry3 = widgets.get_widget('entry3') -entry4 = widgets.get_widget('entry4') -about_box = widgets.get_widget('about_box') -messagebox = widgets.get_widget('msgbox') -messageboxtext = widgets.get_widget('msgboxtext') +entry1 = widgets.get_object('entry1') +entry2 = widgets.get_object('entry2') +entry3 = widgets.get_object('entry3') +entry4 = widgets.get_object('entry4') +about_box = widgets.get_object('about_box') +messagebox = widgets.get_object('msgbox') +messageboxtext = widgets.get_object('msgboxtext') -about_image = widgets.get_widget('about_image') +about_image = widgets.get_object('about_image') about_image.set_from_file(pixmapspath +'gonvert.png') -versionlabel = widgets.get_widget('versionlabel') +versionlabel = widgets.get_object('versionlabel') versionlabel.set_text(version) -label1 =widgets.get_widget('label1') -label2 =widgets.get_widget('label2') +label1 =widgets.get_object('label1') +label2 =widgets.get_object('label2') -text1 = widgets.get_widget('text1' ) +text1 = widgets.get_object('text1' ) -find_entry = widgets.get_widget('find_entry') -find_label = widgets.get_widget('find_label') +find_entry = widgets.get_object('find_entry') +find_label = widgets.get_object('find_label') @@ -3321,7 +3322,7 @@ print bookmarks ToolTips=gtk.Tooltips() -#find_button = widgets.get_widget('find_button') +#find_button = widgets.get_object('find_button') #ToolTips.set_tip(find_button,_(u'Find unit (F6)')) #Restore selections from previously saved settings if it exists and is valid. --- Makefile 2016-08-29 10:29:38.000000000 -0400 +++ Makefile 2020-08-02 17:16:26.565556264 -0400 @@ -15,7 +15,7 @@ install: install -D -m0755 gonvert $(DESTDIR)$(bindir)/gonvert - install -D -m0644 gonvert.glade $(DESTDIR)$(datadir)/gonvert/gonvert.glade + install -D -m0644 gonvert.ui $(DESTDIR)$(datadir)/gonvert/gonvert.ui install -D -m0644 $(NAME).appdata.xml $(DESTDIR)$(datadir)/appdata/$(NAME).appdata.xml install -d -m0755 $(DESTDIR)$(datadir)/pixmaps/ install -m0644 pixmaps/*.png $(DESTDIR)$(datadir)/pixmaps/ @@ -25,7 +25,7 @@ install_pl: install -D -m0755 gonvert $(DESTDIR)$(bindir)/gonvert - install -D -m0644 gonvert.glade $(DESTDIR)$(datadir)/gonvert/gonvert.glade + install -D -m0644 gonvert.ui $(DESTDIR)$(datadir)/gonvert/gonvert.ui install -d -m0755 $(DESTDIR)$(datadir)/pixmaps/ install -m0644 pixmaps/*.png $(DESTDIR)$(datadir)/pixmaps/ install -D -m0644 gonvert.desktop $(DESTDIR)$(datadir)/gnome/apps/Utilities/gonvert.desktop @@ -60,7 +60,7 @@ cp -R i18n $(NAME)-$(VERSION) cp -R doc $(NAME)-$(VERSION) cp $(NAME) $(NAME)-$(VERSION) - cp $(NAME).glade $(NAME)-$(VERSION) + cp $(NAME).ui $(NAME)-$(VERSION) cp $(NAME).spec $(NAME)-$(VERSION) cp $(NAME).desktop $(NAME)-$(VERSION) cp $(NAME).appdata.xml $(NAME)-$(VERSION) @@ -79,7 +79,7 @@ pub: #For authors use only if test -f "$(NAME)"; then cp $(NAME) ~/web/unihedron/projects/gonvert/downloads/$(NAME).pyw; fi - if test -f "$(NAME).glade"; then cp $(NAME).glade ~/web/unihedron/projects/gonvert/downloads; fi + if test -f "$(NAME).ui"; then cp $(NAME).ui ~/web/unihedron/projects/gonvert/downloads; fi if test -f "$(NAME)-$(VERSION).tar.gz"; then mv -f $(NAME)-$(VERSION).tar.gz ~/web/unihedron/projects/gonvert/downloads; fi if test -f "doc/CHANGELOG"; then cp -f doc/CHANGELOG ~/web/unihedron/projects/gonvert/CHANGELOG; fi