Porting to GTK+3

devede.py

@@ -22,10 +22,8 @@
 
 import sys
 import os
-import pygtk # for testing GTK version number
-pygtk.require ('2.0')
-import gtk
-import gobject
+from gi.repository import Gtk
+from gi.repository import GObject
 import subprocess
 import locale
 import gettext
@@ -75,8 +73,8 @@
 	#Note also before python 2.3 you need the following if
 	#you need translations from non python code (glibc,libglade etc.)
 	#there are other access points to this function
-	#gtk.glade.bindtextdomain("devede","/usr/share/locale")
-	#arbol=gtk.Builder("/usr/share/devede/devede.glade",domain="devede")
+	#Gtk.glade.bindtextdomain("devede","/usr/share/locale")
+	#arbol=Gtk.Builder("/usr/share/devede/devede.glade",domain="devede")
 	# append the directories where we install the devede's own modules
 
 	share_locale="/usr/share/locale"
@@ -94,8 +92,8 @@
 	#Note also before python 2.3 you need the following if
 	#you need translations from non python code (glibc,libglade etc.)
 	#there are other access points to this function
-	#gtk.glade.bindtextdomain("devede","/usr/share/locale")
-	#arbol=gtk.Builder("/usr/local/share/devede/devede.glade",domain="devede")
+	#Gtk.glade.bindtextdomain("devede","/usr/share/locale")
+	#arbol=Gtk.Builder("/usr/local/share/devede/devede.glade",domain="devede")
 
 	share_locale="/usr/share/locale" # Are you sure?
 	# if the files aren't at /usr, try with /usr/local
@@ -113,8 +111,8 @@
 	#Note also before python 2.3 you need the following if
 	#you need translations from non python code (glibc,libglade etc.)
 	#there are other access points to this function
-	#gtk.glade.bindtextdomain("devede","/usr/share/locale")
-	#arbol=gtk.Builder("./devede.glade",domain="devede")
+	#Gtk.glade.bindtextdomain("devede","/usr/share/locale")
+	#arbol=Gtk.Builder("./devede.glade",domain="devede")
 
 	# if the files aren't at /usr/local, try with ./
 	share_locale="./po/"
@@ -145,9 +143,9 @@
 #   Note also before python 2.3 you need the following if
 #   you need translations from non python code (glibc,libglade etc.)
 #   there are other access points to this function
-#gtk.glade.bindtextdomain("devede",share_locale)
+#Gtk.glade.bindtextdomain("devede",share_locale)
 
-arbol=gtk.Builder()
+arbol=Gtk.Builder()
 arbol.set_translation_domain("devede")
 
 #   To actually call the gettext translation functions
@@ -389,7 +387,7 @@ def get_cores():
 
 def program_exit(widget):
 
-	gtk.main_quit()
+	Gtk.main_quit()
 
 
 if errors!="":
@@ -411,7 +409,7 @@ def program_exit(widget):
 else:
 	new_file=devede_disctype.disctype(global_vars)
 
-gtk.main()
+Gtk.main()
 print "Saving configuration"
 devede_other.save_config(global_vars)
 print "Exiting"

devede_convert.py

@@ -34,9 +34,9 @@
 import shutil
 import glob
 import posixpath
-import gtk
+from gi.repository import Gtk
 import devede_other
-import gobject
+from gi.repository import GObject
 import cairo
 import dbus
 
@@ -71,7 +71,7 @@ def cancel_clicked(self,widget,temp=False):
 
 		self.runner.cancel()
 		self.runner.wait_end()
-		gobject.source_remove(self.timer)
+		GObject.source_remove(self.timer)
 		self.window.hide()
 		self.window.destroy()
 		newtree=devede_other.create_tree(self,"waborted_dialog",self.gladefile,False)
@@ -283,7 +283,7 @@ def preview(self,filefolder):
 
 		self.eraser=devede_delete.delete_files(self.filename,self.filefolder)
 		self.erase_temp=True
-		self.timer=gobject.timeout_add(250,self.time_callback)
+		self.timer=GObject.timeout_add(250,self.time_callback)
 		self.window.show()
 		return
 
@@ -443,7 +443,7 @@ def create_disc(self):
 		self.queue.append(["END"])
 		self.seconds=0
 		self.total_done=0.0
-		self.timer=gobject.timeout_add(250,self.time_callback)
+		self.timer=GObject.timeout_add(250,self.time_callback)
 		self.window.show()
 		return True
 
@@ -543,8 +543,8 @@ def time_callback(self):
 				w.hide()
 				if ret!=-6:
 					break
-				while gtk.events_pending():	
-					gtk.main_iteration()
+				while Gtk.events_pending():	
+					Gtk.main_iteration()
 			w.destroy()
 			os.remove(fname)
 			return False
@@ -596,7 +596,7 @@ def show_final_time(self):
 					failure=True
 
 			if (failure==False):
-				gtk.main_quit()
+				Gtk.main_quit()
 
 		newtree=devede_other.create_tree(self,"wend_dialog",self.gladefile,False)
 		label=newtree.get_object("elapsed")

devede_dialogs.py

@@ -19,9 +19,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import pygtk # for testing GTK version number
-pygtk.require ('2.0')
-import gtk
+from gi.repository import Gtk
 import devede_other
 
 class show_error:
@@ -144,14 +142,42 @@ def run(self):
 
 class show_about:
 
-	def __init__(self,gladefile):
+	def __init__(self,parent):
 
 		""" Shows the About dialog """
-
-		self.newtree=devede_other.create_tree(self,"aboutdialog1",gladefile,False)
-		window=self.newtree.get_object("aboutdialog1")
-		window.show()
+		window=Gtk.AboutDialog.new()
+		window.set_transient_for(parent)
+		window.set_destroy_with_parent(True)
+		window.set_logo_icon_name("devede")
+		window.set_program_name("DeVeDe")
+		window.set_version("3.22.0beta1")
+		window.set_website("http://www.rastersoft.com/programas/devede.html")
+		window.set_license_type(Gtk.License.GPL_3_0)
+		window.set_authors([
+			"Sergio Costas <raster@rastersoft.com>",
+			"Peter Gill <peter.m.gill@gmail.com> (Win32 parts)",
+			"Gustavo Sanchez <sancheztabo@gmail.com>"])
+		window.set_copyright("(C) 2006-2012 Raster Software Vigo, Peter Gill and Gustavo Sanchez")
+		window.set_translator_credits("""Alex
+Arnaud Leroy
+Daniel Nylander
+Hagen Hoepfner
+Henrik Kristiansen
+Holger Wansing
+Joan Farrerons
+Joel Calado
+Jose Sun
+Jozef Riha
+Lars-Erik Aunevik Labori
+Laszlo Csordas
+Marco de Freitas
+Martin &#x160;&#xED;n
+Maurizio Daniele
+Maxim Winckelmans
+Miguel Bouzada
+Patrick Monnerat
+Qla
+V. Fotiadis
+&#x5927;&#x5B9D;""")
 		window.run()
-		window.hide()
 		window.destroy()
-		window=None

devede_disctype.py

@@ -19,9 +19,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import pygtk # for testing GTK version number
-pygtk.require ('2.0')
-import gtk
+from gi.repository import Gtk
 import devede_main
 import devede_dialogs
 import os
@@ -60,7 +58,7 @@ def ask_cancel(self):
 		print "Retorno: ",
 		print retval
 		if retval==-5:
-			gtk.main_quit()
+			Gtk.main_quit()
 			return False
 		return True
 

devede_dvdmenu.py

@@ -19,9 +19,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import pygtk # for testing GTK version number
-pygtk.require ('2.0')
-import gtk
+from gi.repository import Gtk
 import cairo
 import os
 
@@ -49,15 +47,15 @@ def __init__(self,gladefile,structure,global_vars,callback):
 			menu_filename=os.path.join(global_vars["path"],"backgrounds","default_bg.png")
 		w=self.tree.get_object("menu_bg_file")
 		w.set_filename(menu_filename)
-		filter=gtk.FileFilter()
+		filter=Gtk.FileFilter()
 		filter.add_mime_type("image/*")
 		filter.set_name("Pictures")
 		w.add_filter(filter)
 
 		self.preview_x=200
 		self.preview_y=200
 		self.sf_final=cairo.ImageSurface(cairo.FORMAT_ARGB32,self.preview_x,self.preview_y)
-		self.preview=gtk.DrawingArea()
+		self.preview=Gtk.DrawingArea()
 		self.preview.set_size_request(self.preview_x,self.preview_y)
 		self.preview.connect("expose-event",self.repaint_preview)
 		w.set_preview_widget(self.preview)
@@ -67,7 +65,7 @@ def __init__(self,gladefile,structure,global_vars,callback):
 		self.adding_sound=True
 		w=self.tree.get_object("menu_sound")
 		print "filtro"
-		filter2=gtk.FileFilter()
+		filter2=Gtk.FileFilter()
 		filter2.add_mime_type("audio/mpeg")
 		filter2.add_mime_type("audio/x-wav")
 		filter2.add_mime_type("application/ogg")
@@ -83,24 +81,24 @@ def __init__(self,gladefile,structure,global_vars,callback):
 
 		w=self.tree.get_object("unselected_color")
 		color=global_vars["menu_font_color"]
-		c1=gtk.gdk.Color(color[0],color[1],color[2])
+		c1=Gdk.Color(color[0],color[1],color[2])
 		w.set_color(c1)
 		w.set_alpha(color[3])
 
 		w=self.tree.get_object("selected_color")
 		color=global_vars["menu_selc_color"]
-		c1=gtk.gdk.Color(color[0],color[1],color[2])
+		c1=Gdk.Color(color[0],color[1],color[2])
 		w.set_color(c1)
 
 		w=self.tree.get_object("shadow_color")
 		color=global_vars["menu_shadow_color"]
-		c1=gtk.gdk.Color(color[0],color[1],color[2])
+		c1=Gdk.Color(color[0],color[1],color[2])
 		w.set_color(c1)
 		w.set_alpha(color[3])
 
 		w=self.tree.get_object("bg_color")
 		color=global_vars["menu_bgcolor"]
-		c1=gtk.gdk.Color(color[0],color[1],color[2])
+		c1=Gdk.Color(color[0],color[1],color[2])
 		w.set_color(c1)
 		w.set_alpha(color[3])
 
@@ -131,13 +129,13 @@ def __init__(self,gladefile,structure,global_vars,callback):
 
 		w=self.tree.get_object("menu_title_color")
 		color=global_vars["menu_title_color"]
-		c1=gtk.gdk.Color(color[0],color[1],color[2])
+		c1=Gdk.Color(color[0],color[1],color[2])
 		w.set_color(c1)
 		w.set_alpha(color[3])
 
 		w=self.tree.get_object("menu_title_shadow")
 		color=global_vars["menu_title_shadow"]
-		c1=gtk.gdk.Color(color[0],color[1],color[2])
+		c1=Gdk.Color(color[0],color[1],color[2])
 		w.set_color(c1)
 		w.set_alpha(color[3])
 
@@ -174,14 +172,14 @@ def on_menu_bg_file_update_preview(self,widget,filename2=None):
 
 			print "Using "+str(filename)+" as menu background"
 
-			pixbuf = gtk.gdk.pixbuf_new_from_file(filename)
+			pixbuf = GdkPixbuf.Pixbuf.new_from_file(filename)
 			x = pixbuf.get_width()
 			y = pixbuf.get_height()
 
 			sf_base = cairo.ImageSurface(0,x,y)
 
 			ct = cairo.Context(sf_base)
-			ct2 = gtk.gdk.CairoContext(ct)
+			ct2 = Gdk.CairoContext(ct)
 
 			ct2.set_source_pixbuf(pixbuf,0,0)
 			ct2.paint()

devede_help.py

@@ -22,7 +22,7 @@
 
 import os
 import sys
-import gtk
+from gi.repository import Gtk
 import devede_dialogs
 
 import devede_executor
@@ -34,6 +34,6 @@ def __init__(self,gladefile,installpath,filename):
 
 		file="file://"+os.path.join(installpath,"html",filename)	
 
-		retval = gtk.show_uri(None,file,gtk.gdk.CURRENT_TIME)
+		retval = Gtk.show_uri(None,file,Gdk.CURRENT_TIME)
 		if retval==False:
 			msg=devede_dialogs.show_error(gladefile,_("Can't open the help files."))

devede_loadsave.py

@@ -19,9 +19,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import pygtk # for testing GTK version number
-pygtk.require ('2.0')
-import gtk
+from gi.repository import Gtk
 import pickle
 import os
 
@@ -55,7 +53,7 @@ def load(self,file_name):
 			tree=devede_other.create_tree(self,"wloadconfig",self.gladefile,False)
 			window = tree.get_object("wloadconfig")
 
-			filter = gtk.FileFilter()
+			filter = Gtk.FileFilter()
 			filter.add_pattern("*.devede")
 			filter.set_name(".devede")
 			window.add_filter(filter)
@@ -260,7 +258,7 @@ def save(self,mode):
 			tree=devede_other.create_tree(self,"wsaveconfig",self.gladefile,False)
 			saveconfig=tree.get_object("wsaveconfig")
 
-			filter=gtk.FileFilter()
+			filter=Gtk.FileFilter()
 			filter.add_pattern("*.devede")
 			filter.set_name(".devede")
 			saveconfig=tree.get_object("wsaveconfig")