Update of /cvsroot/quickrip/quickrip/gtk
In directory sc8-pr-cvs1:/tmp/cvs-serv26504
Modified Files:
gtkmain.py gtkprogress.py gtksettings.py
Log Message:
minor touchups in base.py, see lines 248 and 253. Also, a new module commandthread has been submitted for use in base.py. Minor updates elsewhere.
Index: gtkmain.py
===================================================================
RCS file: /cvsroot/quickrip/quickrip/gtk/gtkmain.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** gtkmain.py 6 Aug 2003 08:33:57 -0000 1.15
--- gtkmain.py 6 Aug 2003 10:58:40 -0000 1.16
***************
*** 40,43 ****
--- 40,45 ----
import gtkerrorbox
from gtkerrorbox import *
+ import commandthread
+ from commandthread import *
__app__ = config.app
***************
*** 58,63 ****
--- 60,72 ----
self.hideRip()
self.hideScan()
+ self.dialogProgress.window.present()
+ # cmd = CommandThread("sleep 2; ls /bin", self.results)
+ # cmd.start()
self.scanDVD()
+ def results(self, stdout):
+ print "my: " + stdout
+ self.showRip()
+
def configure(self, widget, data=None):
self.dialogSettings.window.show_all()
***************
*** 208,211 ****
--- 217,221 ----
def __init__(self):
self.oldtrack = None
+ gtk.threads_init()
xml = gtk.glade.XML('glade/gtkmain.glade')
self.window = xml.get_widget('window')
***************
*** 472,475 ****
--- 482,486 ----
self.showRip()
self.showScan()
+ self.dialogProgress.window.hide()
# for i in range(1, int(self.numtitles) + 1):
# print "title add " + str(i)
Index: gtkprogress.py
===================================================================
RCS file: /cvsroot/quickrip/quickrip/gtk/gtkprogress.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** gtkprogress.py 4 Aug 2003 05:49:16 -0000 1.4
--- gtkprogress.py 6 Aug 2003 10:58:40 -0000 1.5
***************
*** 8,11 ****
--- 8,14 ----
#cancel button (that stops the ripping and closes the dialogue)
+ #all encodings have one pass for audio
+ #all videos can have one or two passes
+ #ogg has an extra merge passes
try:
import pygtk
***************
*** 26,34 ****
import gtk
import gtk.glade
!
class GTKProgress:
def quit(self, widget, data=None):
! print "close progress"
self.window.hide()
return gtk.TRUE
--- 29,39 ----
import gtk
import gtk.glade
!
! from gtkerrorbox import *
!
class GTKProgress:
def quit(self, widget, data=None):
! error = GTKErrorBox("Warning!", "Are you sure you want to stop the current task?")
self.window.hide()
return gtk.TRUE
***************
*** 40,50 ****
xml.signal_autoconnect( {'on_window_delete_event': self.quit} )
xml.signal_autoconnect( {'on_buttonCancel_clicked': self.quit} )
-
- # self.window.show_all()
-
- def main(self):
- gtk.main()
-
- if __name__ == "__main__":
- app = GTKProgress()
- app.main()
--- 45,46 ----
Index: gtksettings.py
===================================================================
RCS file: /cvsroot/quickrip/quickrip/gtk/gtksettings.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** gtksettings.py 6 Aug 2003 00:33:48 -0000 1.9
--- gtksettings.py 6 Aug 2003 10:58:40 -0000 1.10
***************
*** 7,10 ****
--- 7,16 ----
#mencoder - deinterlacing, aspect ratio, etc
+
+ #all formats have a one pass for audio...
+ #all video formats have one or two pass options
+ #SVCD is 1 audio 1 video only
+ #ogg adds an extra pass for merge
+
try:
import pygtk
|
