diff --git a/devede.py b/devede.py
index 693e936..730be13 100755
--- a/devede.py
+++ b/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"
diff --git a/devede_convert.py b/devede_convert.py
index 42790a8..1f4790f 100755
--- a/devede_convert.py
+++ b/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")
diff --git a/devede_dialogs.py b/devede_dialogs.py
index 3f487b2..96f69d4 100755
--- a/devede_dialogs.py
+++ b/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 .
-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 ",
+ "Peter Gill (Win32 parts)",
+ "Gustavo Sanchez "])
+ 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 Šín
+Maurizio Daniele
+Maxim Winckelmans
+Miguel Bouzada
+Patrick Monnerat
+Qla
+V. Fotiadis
+大宝""")
window.run()
- window.hide()
window.destroy()
- window=None
diff --git a/devede_disctype.py b/devede_disctype.py
index 8b125b4..8d6fa0c 100755
--- a/devede_disctype.py
+++ b/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 .
-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
diff --git a/devede_dvdmenu.py b/devede_dvdmenu.py
index 71620c3..6d0fe6e 100755
--- a/devede_dvdmenu.py
+++ b/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 .
-import pygtk # for testing GTK version number
-pygtk.require ('2.0')
-import gtk
+from gi.repository import Gtk
import cairo
import os
@@ -49,7 +47,7 @@ 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)
@@ -57,7 +55,7 @@ def __init__(self,gladefile,structure,global_vars,callback):
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()
diff --git a/devede_help.py b/devede_help.py
index b898422..8ca28d3 100755
--- a/devede_help.py
+++ b/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."))
diff --git a/devede_loadsave.py b/devede_loadsave.py
index 685d6d1..a0700d7 100755
--- a/devede_loadsave.py
+++ b/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 .
-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")
diff --git a/devede_main.py b/devede_main.py
index ef3296f..f44b5bc 100755
--- a/devede_main.py
+++ b/devede_main.py
@@ -19,10 +19,8 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see .
-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 os
import sys
@@ -55,8 +53,8 @@ def __init__(self,global_vars,callback):
self.global_vars["main_window"]=self.window
- self.list_titles=gtk.TreeStore(gobject.TYPE_PYOBJECT,gobject.TYPE_STRING)
- self.list_chapters=gtk.TreeStore(gobject.TYPE_PYOBJECT,gobject.TYPE_STRING)
+ self.list_titles=Gtk.TreeStore(GObject.TYPE_PYOBJECT,GObject.TYPE_STRING)
+ self.list_chapters=Gtk.TreeStore(GObject.TYPE_PYOBJECT,GObject.TYPE_STRING)
ltitles=self.tree.get_object("ltitles")
lchapters=self.tree.get_object("lchapters")
@@ -64,12 +62,12 @@ def __init__(self,global_vars,callback):
ltitles.set_model(self.list_titles)
lchapters.set_model(self.list_chapters)
- renderertitles=gtk.CellRendererText()
- columntitles = gtk.TreeViewColumn("Title", renderertitles, text=1)
+ renderertitles=Gtk.CellRendererText()
+ columntitles = Gtk.TreeViewColumn("Title", renderertitles, text=1)
ltitles.append_column(columntitles)
- rendererchapters=gtk.CellRendererText()
- columnchapters = gtk.TreeViewColumn("Title", rendererchapters, text=1)
+ rendererchapters=Gtk.CellRendererText()
+ columnchapters = Gtk.TreeViewColumn("Title", rendererchapters, text=1)
lchapters.append_column(columnchapters)
#ltitles.connect("button_release_event",self.on_titleclick)
@@ -94,7 +92,7 @@ def __init__(self,global_vars,callback):
def motion_cb(self,wid, context, x, y, time):
- context.drag_status(gtk.gdk.ACTION_COPY, time)
+ context.drag_status(Gdk.DragAction.COPY, time)
return True
@@ -364,7 +362,7 @@ def on_main_cancel_clicked(self,widget):
retval=window.run()
window=None
if retval==-5:
- gtk.main_quit()
+ Gtk.main_quit()
return
@@ -657,7 +655,7 @@ def on_menuoptions_clicked(self,widget):
def on_devede_about_activate(self,widget):
- window=devede_dialogs.show_about(self.gladefile)
+ window=devede_dialogs.show_about(self.window)
window=None
diff --git a/devede_newfiles.py b/devede_newfiles.py
index 670fbf6..520ddd1 100755
--- a/devede_newfiles.py
+++ b/devede_newfiles.py
@@ -22,10 +22,8 @@
import os
import stat
-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 sys
import gc
import copy
@@ -434,7 +432,7 @@ class file_properties(newfile):
of each video file """
def motion_cb(self,wid, context, x, y, time):
- context.drag_status(gtk.gdk.ACTION_COPY, time)
+ context.drag_status(Gdk.DragAction.COPY, time)
return True
def drop_cb(self, wid, context, x, y, time):
@@ -461,7 +459,7 @@ def __init__(self,global_vars,title,chapter,structure,callback_refresh):
self.tree=devede_other.create_tree(self,"wfile",self.gladefile)
self.window=self.tree.get_object("wfile")
self.window.show()
- self.window.drag_dest_set(0,[],0)
+ self.Gtk.drag_dest_set(window, 0,[],0)
self.window.connect('drag_drop', self.drop_cb)
self.window.connect('drag_motion', self.motion_cb)
@@ -479,25 +477,25 @@ def __init__(self,global_vars,title,chapter,structure,callback_refresh):
# second: filename
# third: codepage
- self.sub_model=gtk.ListStore(gobject.TYPE_INT, gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING)
+ self.sub_model=Gtk.ListStore(GObject.TYPE_INT, GObject.TYPE_STRING, GObject.TYPE_STRING, GObject.TYPE_STRING)
self.sub_tree=self.tree.get_object("sub_treeview")
self.sub_tree.set_model(self.sub_model)
- render1=gtk.CellRendererText()
- column1=gtk.TreeViewColumn(_("Subtitle"),render1,text=1)
+ render1=Gtk.CellRendererText()
+ column1=Gtk.TreeViewColumn(_("Subtitle"),render1,text=1)
self.sub_tree.append_column(column1)
- render2=gtk.CellRendererText()
- column2=gtk.TreeViewColumn(_("Codepage"),render2,text=2)
+ render2=Gtk.CellRendererText()
+ column2=Gtk.TreeViewColumn(_("Codepage"),render2,text=2)
self.sub_tree.append_column(column2)
- render3=gtk.CellRendererText()
- column3=gtk.TreeViewColumn(_("Language"),render3,text=3)
+ render3=Gtk.CellRendererText()
+ column3=Gtk.TreeViewColumn(_("Language"),render3,text=3)
self.sub_tree.append_column(column3)
# Model and view for audio tracks
- self.audio_model=gtk.ListStore(gobject.TYPE_STRING)
+ self.audio_model=Gtk.ListStore(GObject.TYPE_STRING)
self.audio_view=self.tree.get_object("audiotrack")
self.audio_view.set_model(self.audio_model)
- audiorender=gtk.CellRendererText()
+ audiorender=Gtk.CellRendererText()
self.audio_view.pack_start(audiorender,True)
self.audio_view.add_attribute(audiorender,"text",0)
@@ -562,14 +560,14 @@ def __init__(self,global_vars,title,chapter,structure,callback_refresh):
w.set_current_folder(self.global_vars["filmpath"])
w=self.tree.get_object("moviefile")
- self.file_filter_videos=gtk.FileFilter()
+ self.file_filter_videos=Gtk.FileFilter()
self.file_filter_videos.set_name(_("Video files"))
if (sys.platform!="win32") and (sys.platform!="win64"):
self.file_filter_videos.add_mime_type("video/*")
self.file_filter_videos.add_pattern("*.rmvb")
else:
- self.file_filter_videos.add_custom(gtk.FILE_FILTER_FILENAME|gtk.FILE_FILTER_DISPLAY_NAME, self.custom_video_filter)
- self.file_filter_all=gtk.FileFilter()
+ self.file_filter_videos.add_custom(Gtk.FILE_FILTER_FILENAME|Gtk.FILE_FILTER_DISPLAY_NAME, self.custom_video_filter)
+ self.file_filter_all=Gtk.FileFilter()
self.file_filter_all.set_name(_("All files"))
self.file_filter_all.add_pattern("*")
print "Anado filtro"
diff --git a/devede_other.py b/devede_other.py
index 415215c..016c30f 100755
--- a/devede_other.py
+++ b/devede_other.py
@@ -30,7 +30,7 @@
import sys
import shutil
import cairo
-import gtk
+from gi.repository import Gtk
import struct
import devede_executor
@@ -719,7 +719,7 @@ def get_picture_type(filename):
def create_tree(sobject,filename,builderpath="",autoconnect=True):
- tree=gtk.Builder()
+ tree=Gtk.Builder()
tree.set_translation_domain("devede")
filename=os.path.join(builderpath,filename+".ui")
print "Creating window "+filename
diff --git a/devede_settings.py b/devede_settings.py
index 328af4a..c4f2642 100755
--- a/devede_settings.py
+++ b/devede_settings.py
@@ -18,10 +18,8 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see .
-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 os
import sys
diff --git a/devede_title_properties.py b/devede_title_properties.py
index 69dc1fc..8b863e4 100755
--- a/devede_title_properties.py
+++ b/devede_title_properties.py
@@ -19,9 +19,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see .
-import pygtk # for testing GTK version number
-pygtk.require ('2.0')
-import gtk
+from gi.repository import Gtk
import devede_other
import devede_dialogs
diff --git a/devede_xml_menu.py b/devede_xml_menu.py
index a26a196..8f3b0c0 100755
--- a/devede_xml_menu.py
+++ b/devede_xml_menu.py
@@ -19,7 +19,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see .
-import gtk
+from gi.repository import Gtk
import cairo
import time
import sys
@@ -754,14 +754,14 @@ def create_menu_bg(self,counter,element,paint_bg=0,preview=False):
if paint_bg==0:
try:
print "Uso "+str(self.menu_bg)
- extra_pixbuf = gtk.gdk.pixbuf_new_from_file(self.menu_bg)
+ extra_pixbuf = GdkPixbuf.Pixbuf.new_from_file(self.menu_bg)
extra_x = extra_pixbuf.get_width()
extra_y = extra_pixbuf.get_height()
sf_base = cairo.ImageSurface(0,extra_x,extra_y)
extra_ct = cairo.Context(sf_base)
- extra_ct2 = gtk.gdk.CairoContext(extra_ct)
+ extra_ct2 = Gdk.CairoContext(extra_ct)
extra_ct2.set_source_pixbuf(extra_pixbuf,0,0)
extra_ct2.paint()
diff --git a/interface/aboutdialog1.ui b/interface/aboutdialog1.ui
deleted file mode 100644
index 6c2acb4..0000000
--- a/interface/aboutdialog1.ui
+++ /dev/null
@@ -1,75 +0,0 @@
-
-
-
-
-
-
diff --git a/interface/add_subtitle.ui b/interface/add_subtitle.ui
index 8a84aa5..62d21c6 100644
--- a/interface/add_subtitle.ui
+++ b/interface/add_subtitle.ui
@@ -10,7 +10,6 @@
400
devede.svg
dialog
- False