Update of /cvsroot/quickrip/quickrip/gtk
In directory sc8-pr-cvs1:/tmp/cvs-serv10712/gtk
Modified Files:
gtkerrorbox.py gtkmain.py gtkprogress.py
Log Message:
Spawned bash threads now each share the same lock. Scanning large number of titles on dvds seems to work better now.
Index: gtkerrorbox.py
===================================================================
RCS file: /cvsroot/quickrip/quickrip/gtk/gtkerrorbox.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** gtkerrorbox.py 8 Aug 2003 21:43:37 -0000 1.2
--- gtkerrorbox.py 9 Aug 2003 02:02:34 -0000 1.3
***************
*** 31,37 ****
return gtk.FALSE
def __init__(self, title, message, parent=None):
label = gtk.Label(message)
! xml = gtk.glade.XML('gtk/glade/gtkerrorbox.glade')
self.window = xml.get_widget('window')
self.window.set_title(title)
--- 31,49 ----
return gtk.FALSE
+ def loadGladeFile(self, title):
+ try:
+ xml = gtk.glade.XML("".join(["glade/", title, ".glade"]))
+ except:
+ try:
+ xml = gtk.glade.XML("".join(["gtk/glade/", title, ".glade"]))
+ except:
+ gtkerrorbox.GTKErrorBox("Error!", "Couldn't load " + title +
+ ".glade file")
+ self.quit()
+ return xml
+
def __init__(self, title, message, parent=None):
label = gtk.Label(message)
! xml = self.loadGladeFile("gtkerrorbox")
self.window = xml.get_widget('window')
self.window.set_title(title)
Index: gtkmain.py
===================================================================
RCS file: /cvsroot/quickrip/quickrip/gtk/gtkmain.py,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** gtkmain.py 8 Aug 2003 21:43:37 -0000 1.22
--- gtkmain.py 9 Aug 2003 02:02:34 -0000 1.23
***************
*** 66,70 ****
def about(self, widget, data=None):
box = gtkerrorbox.GTKErrorBox("About Quickrip",
! "A quick dvd ripper.\nSee the homepage at quickrip.sf.net.\nVersion " + config.version)
def manual(self, widget, data=None):
--- 66,71 ----
def about(self, widget, data=None):
box = gtkerrorbox.GTKErrorBox("About Quickrip",
! "A quick dvd ripper.\nSee the homepage at quickrip.sf.net.\nVersion " \
! + config.version)
def manual(self, widget, data=None):
***************
*** 72,76 ****
def toggle(self, togglerenderer, row_num):
! print "toggled " + row_num
mod = self.tree.get_model()
i = mod.get_iter(row_num)
--- 73,77 ----
def toggle(self, togglerenderer, row_num):
! # print "toggled " + row_num
mod = self.tree.get_model()
i = mod.get_iter(row_num)
***************
*** 444,447 ****
--- 445,449 ----
"killall -9 python ."
+ self.dialogProgress.setStatus("Starting Scanning...", 0)
model = gtk.TreeStore( gobject.TYPE_STRING, #track title
gobject.TYPE_STRING, #track length
***************
*** 455,470 ****
self.model = model
self.modelIter = None
- self.dialogProgress.setStatus("Starting Scanning...", 0)
self.titleIncr = 0
def ui_configError(self, config):
msg = gtkerrorbox.GTKErrorBox("Error!", "Config couldn't autodetect: " + config)
def ui_noTitles(self):
msg = gtkerrorbox.GTKErrorBox("Sorry!", "No DVD Video Titles were found!")
def ui_dispDVD(self, numtitles):
print "Found %s titles" % (self.numtitles)
self.dialogProgress.setStatus("Scanning titles", 0)
--- 457,477 ----
self.model = model
self.modelIter = None
self.titleIncr = 0
def ui_configError(self, config):
+ gtk.threads_enter()
msg = gtkerrorbox.GTKErrorBox("Error!", "Config couldn't autodetect: " + config)
+ gtk.threads_leave()
def ui_noTitles(self):
+ gtk.threads_enter()
msg = gtkerrorbox.GTKErrorBox("Sorry!", "No DVD Video Titles were found!")
+ gtk.threads_leave()
def ui_dispDVD(self, numtitles):
+ gtk.threads_enter()
print "Found %s titles" % (self.numtitles)
self.dialogProgress.setStatus("Scanning titles", 0)
+ gtk.threads_leave()
***************
*** 496,501 ****
if track['time'] >= 3600:
length += str(track['time'] / 3600) + ":"
! if track['time'] >= 60:
length += str((track['time'] % 3600) / 60) + ":"
length += str(track['time'] % 60)
--- 503,516 ----
if track['time'] >= 3600:
length += str(track['time'] / 3600) + ":"
! if ((track['time'] % 3600) / 60) < 10:
! length += "0"
! length += str((track['time'] % 3600) / 60)
! length += ":"
! if (track['time'] % 60) < 10:
! length += "0"
! elif track['time'] >= 60:
length += str((track['time'] % 3600) / 60) + ":"
+ if (track['time'] % 60) < 10:
+ length += "0"
length += str(track['time'] % 60)
***************
*** 530,536 ****
self.showRip()
! # if __name__ == "__main__":
! # app = GTKMain()
! # app.main()
def main():
--- 545,551 ----
self.showRip()
! if __name__ == "__main__":
! app = GTKMain()
! app.main()
def main():
Index: gtkprogress.py
===================================================================
RCS file: /cvsroot/quickrip/quickrip/gtk/gtkprogress.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** gtkprogress.py 8 Aug 2003 07:08:41 -0000 1.8
--- gtkprogress.py 9 Aug 2003 02:02:34 -0000 1.9
***************
*** 65,69 ****
if mins != 0:
text += str(mins) + " mins "
! self.lTime.set_text(text + str(secs) + " sec(s)")
def __init__(self, bars=1):
--- 65,72 ----
if mins != 0:
text += str(mins) + " mins "
! text += str(secs) + " sec"
! if secs > 1:
! text += "s"
! self.lTime.set_text(text)
def __init__(self, bars=1):
|
