[Quickrip-cvs] quickrip/gtk gtkmain.py,1.17,1.18 gtkprogress.py,1.5,1.6 gtksettings.py,1.10,1.11

[<te...@us...>]

Update of /cvsroot/quickrip/quickrip/gtk
In directory sc8-pr-cvs1:/tmp/cvs-serv26040/gtk

Modified Files:
	gtkmain.py gtkprogress.py gtksettings.py 
Log Message:
More minor CLI changes;
Gtk files changed here and there to make them work properly with 
quickrip, so you can do:
./quickrip.py -g
And launch the Gtk UI. Also fixed little bits of code to work with the 
info scanDVD sends back.


Index: gtkmain.py
===================================================================
RCS file: /cvsroot/quickrip/quickrip/gtk/gtkmain.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** gtkmain.py	6 Aug 2003 15:04:52 -0000	1.17
--- gtkmain.py	6 Aug 2003 16:18:02 -0000	1.18
***************
*** 35,45 ****
  	#gnome.init("quickrip", "1.0")
  
- import base
  from base import *
  import config   
  import gtkerrorbox
  from gtkerrorbox import *
- import commandthread
- from commandthread import *
  
  __app__ = config.app
--- 35,42 ----
***************
*** 218,222 ****
  		self.oldtrack = None
  		gtk.threads_init()
! 		xml = gtk.glade.XML('glade/gtkmain.glade')
  		self.window = xml.get_widget('window')
  		self.buttonScan = xml.get_widget('buttonScan')
--- 215,219 ----
  		self.oldtrack = None
  		gtk.threads_init()
! 		xml = gtk.glade.XML('gtk/glade/gtkmain.glade')
  		self.window = xml.get_widget('window')
  		self.buttonScan = xml.get_widget('buttonScan')
***************
*** 445,452 ****
  		msg = GTKErrorBox("Sorry!", "No DVD Video Titles were found!")
  
! 	def int_dispDVD(self):
  		print "Found %s titles" % (self.numtitles)
- 		print "Found audio languages %s" % (self.alangs)
- 		print "Found subtitle languages %s" % (self.slangs)
  
  	def int_dispTitle(self, track):
--- 442,447 ----
  		msg = GTKErrorBox("Sorry!", "No DVD Video Titles were found!")
  
! 	def int_dispDVD(self, numtitles):
  		print "Found %s titles" % (self.numtitles)
  
  	def int_dispTitle(self, track):
***************
*** 508,509 ****
--- 503,508 ----
  	app = GTKMain()
  	app.main()
+ 
+ def main():
+ 	app = GTKMain()
+ 	app.main()
\ No newline at end of file

Index: gtkprogress.py
===================================================================
RCS file: /cvsroot/quickrip/quickrip/gtk/gtkprogress.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** gtkprogress.py	6 Aug 2003 10:58:40 -0000	1.5
--- gtkprogress.py	6 Aug 2003 16:18:02 -0000	1.6
***************
*** 40,44 ****
  		
  	def __init__(self):
! 		xml = gtk.glade.XML('glade/gtkprogress.glade')
  		self.window = xml.get_widget('window')
  
--- 40,44 ----
  		
  	def __init__(self):
! 		xml = gtk.glade.XML('gtk/glade/gtkprogress.glade')
  		self.window = xml.get_widget('window')
  

Index: gtksettings.py
===================================================================
RCS file: /cvsroot/quickrip/quickrip/gtk/gtksettings.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** gtksettings.py	6 Aug 2003 10:58:40 -0000	1.10
--- gtksettings.py	6 Aug 2003 16:18:02 -0000	1.11
***************
*** 114,118 ****
  
  	def __init__(self, parent):
! 		xml = gtk.glade.XML('glade/gtksettings.glade')
  		self.parent = parent
  		self.window = xml.get_widget('window')
--- 114,118 ----
  
  	def __init__(self, parent):
! 		xml = gtk.glade.XML('gtk/glade/gtksettings.glade')
  		self.parent = parent
  		self.window = xml.get_widget('window')