quickrip-cvs

[<iwa...@us...>]

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

Modified Files:
	gtkmain.py gtkprogress.py gtksettings.py 
Log Message:
Touch ups to gtk stuff.

Index: gtkmain.py
===================================================================
RCS file: /cvsroot/quickrip/quickrip/gtk/gtkmain.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** gtkmain.py	6 Aug 2003 16:18:02 -0000	1.18
--- gtkmain.py	7 Aug 2003 06:56:58 -0000	1.19
***************
*** 11,20 ****
  	pygtk.require("2.0")
  	import gtk, gobject
- #	import gnome.ui
- 	import gtksettings, gtkprogress
- 	from gtksettings import *
- 	from gtkprogress import *
  	import gtk.glade
! 	#gnome.init("quickrip", "1.0")
  except:
  	print "Couldn't load some required modules!"
--- 11,16 ----
  	pygtk.require("2.0")
  	import gtk, gobject
  	import gtk.glade
! 	import ConfigParser
  except:
  	print "Couldn't load some required modules!"
***************
*** 28,42 ****
  	pygtk.require("2.0")
  	import gtk, gobject
- #	import gnome.ui
- 	import gtksettings, gtkprogress
- 	from gtksettings import *
- 	from gtkprogress import *
  	import gtk.glade
! 	#gnome.init("quickrip", "1.0")
  
! from base import *
  import config   
  import gtkerrorbox
- from gtkerrorbox import *
  
  __app__ = config.app
--- 24,35 ----
  	pygtk.require("2.0")
  	import gtk, gobject
  	import gtk.glade
! 	import ConfigParser
  
! import base
! import gtksettings
! import gtkprogress
  import config   
  import gtkerrorbox
  
  __app__ = config.app
***************
*** 48,52 ****
  
  
! class GTKMain(QuickRip):
  	def rip(self, widget, data=None):
  		print "Rip"
--- 41,45 ----
  
  
! class GTKMain(base.QuickRip):
  	def rip(self, widget, data=None):
  		print "Rip"
***************
*** 74,78 ****
  
  	def about(self, widget, data=None):
! 		box = GTKErrorBox("About Quickrip",
  		"A quick dvd ripper.\nSee the homepage at quickrip.sf.net.\nVersion " + config.version)
  
--- 67,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)
  
***************
*** 170,177 ****
  	def slideVideo(self, widget, data=None):
  		self.lVideo.set_text(str(int(widget.get_adjustment().value)))
! 		track = self.model.get_value(self.modelIter, 5)
! 		adj = widget.get_adjustment()
! 		track['vbr'] = int(adj.value)
! 		self.updateSize()
  
  	def slideAudio(self, widget, data=None):
--- 163,173 ----
  	def slideVideo(self, widget, data=None):
  		self.lVideo.set_text(str(int(widget.get_adjustment().value)))
! 		try:
! 			track = self.model.get_value(self.modelIter, 5)
! 			adj = widget.get_adjustment()
! 			track['vbr'] = int(adj.value)
! 			self.updateSize()
! 		except:
! 			return	# dvd not scanned yet
  
  	def slideAudio(self, widget, data=None):
***************
*** 184,190 ****
  			ival = (ival + 32) - (ival % 32)
  			self.lAudio.set_text(str(ival))
! 		track = self.model.get_value(self.modelIter, 5)
! 		track['abr'] = ival
! 		self.updateSize()
  		
  	def languageSelect(self, widget, data=None):
--- 180,189 ----
  			ival = (ival + 32) - (ival % 32)
  			self.lAudio.set_text(str(ival))
! 		try:
! 			track = self.model.get_value(self.modelIter, 5)
! 			track['abr'] = ival
! 			self.updateSize()
! 		except:
! 			return #dvd not scanned yet
  		
  	def languageSelect(self, widget, data=None):
***************
*** 211,219 ****
  				track['slang'] = short
  				return
  
  	def __init__(self):
  		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')
--- 210,230 ----
  				track['slang'] = short
  				return
+ 				
+ 	def loadGladeFile(self, title):
+ 		try:
+ 			xml = gtk.glade.XML("glade/" + title + ".glade")
+ 		except:
+ 			try:
+ 				xml = gtk.glade.XML("gtk/glade/" + title + ".glade")
+ 			except:
+ 				gtkerrorbox.GTKErrorBox("Error!", "Couldn't load " + title + 
+ 													".glade file")
+ 				self.quit()
+ 		return xml
  
  	def __init__(self):
  		self.oldtrack = None
  		gtk.threads_init()
! 		xml = self.loadGladeFile("gtkmain")
  		self.window = xml.get_widget('window')
  		self.buttonScan = xml.get_widget('buttonScan')
***************
*** 245,250 ****
  
  		self.initTree()
! 		self.dialogSettings = GTKSettings(self)
! 		self.dialogProgress = GTKProgress()
  
  		self.window.show_all()
--- 256,261 ----
  
  		self.initTree()
! 		self.dialogSettings = gtksettings.GTKSettings(self)
! 		self.dialogProgress = gtkprogress.GTKProgress()
  
  		self.window.show_all()
***************
*** 437,444 ****
  		
  	def int_configError(self, config):
! 		msg = GTKErrorBox("Error!", "Config couldn't autodetect: " + config)
  
  	def int_noTitles(self):
! 		msg = GTKErrorBox("Sorry!", "No DVD Video Titles were found!")
  
  	def int_dispDVD(self, numtitles):
--- 448,455 ----
  		
  	def int_configError(self, config):
! 		msg = gtkerrorbox.GTKErrorBox("Error!", "Config couldn't autodetect: " + config)
  
  	def int_noTitles(self):
! 		msg = gtkerrorbox.GTKErrorBox("Sorry!", "No DVD Video Titles were found!")
  
  	def int_dispDVD(self, numtitles):
***************
*** 506,508 ****
  def main():
  	app = GTKMain()
! 	app.main()
\ No newline at end of file
--- 517,519 ----
  def main():
  	app = GTKMain()
! 	app.main()

Index: gtkprogress.py
===================================================================
RCS file: /cvsroot/quickrip/quickrip/gtk/gtkprogress.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** gtkprogress.py	6 Aug 2003 16:18:02 -0000	1.6
--- gtkprogress.py	7 Aug 2003 06:56:58 -0000	1.7
***************
*** 30,44 ****
  	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
! 		
  	def __init__(self):
! 		xml = gtk.glade.XML('gtk/glade/gtkprogress.glade')
  		self.window = xml.get_widget('window')
  
--- 30,56 ----
  	import gtk.glade
  
! import gtkerrorbox
  
  class GTKProgress:
  
  	def quit(self, widget, data=None):
! 		error = gtkerrorbox.GTKErrorBox("Warning!", "Are you sure you want to stop the current task?")
  		self.window.hide()
  		return gtk.TRUE
! 
! 	def loadGladeFile(self, title):
! 		try:
! 			xml = gtk.glade.XML("glade/" + title + ".glade")
! 		except:
! 			try:
! 				xml = gtk.glade.XML("gtk/glade/" + title + ".glade")
! 			except:
! 				gtkerrorbox.GTKErrorBox("Error!", "Couldn't load " + title + 
! 													".glade file")
! 				self.quit()
! 		return xml
! 
  	def __init__(self):
! 		xml = self.loadGladeFile('gtkprogress')
  		self.window = xml.get_widget('window')
  

Index: gtksettings.py
===================================================================
RCS file: /cvsroot/quickrip/quickrip/gtk/gtksettings.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** gtksettings.py	6 Aug 2003 16:18:02 -0000	1.11
--- gtksettings.py	7 Aug 2003 06:56:58 -0000	1.12
***************
*** 18,22 ****
  	import gtk
  	import gtk.glade
! 	from time import *
  except:
  	print "Couldn't load PyGTK module! Check it's installed properly."
--- 18,22 ----
  	import gtk
  	import gtk.glade
! 	import time
  except:
  	print "Couldn't load PyGTK module! Check it's installed properly."
***************
*** 35,39 ****
  	
  import gtkerrorbox
- from gtkerrorbox import *
  
  class GTKSettings:
--- 35,38 ----
***************
*** 113,118 ****
  		self.findGeneric("Location of OGMMerge", self.wteOgmmerge)
  
  	def __init__(self, parent):
! 		xml = gtk.glade.XML('gtk/glade/gtksettings.glade')
  		self.parent = parent
  		self.window = xml.get_widget('window')
--- 112,129 ----
  		self.findGeneric("Location of OGMMerge", self.wteOgmmerge)
  
+ 	def loadGladeFile(self, title):
+ 		try:
+ 			xml = gtk.glade.XML("glade/" + title + ".glade")
+ 		except:
+ 			try:
+ 				xml = gtk.glade.XML("gtk/glade/" + title + ".glade")
+ 			except:
+ 				gtkerrorbox.GTKErrorBox("Error!", "Couldn't load " + title + 
+ 													".glade file")
+ 				self.quit()
+ 		return xml
+ 
  	def __init__(self, parent):
! 		xml = self.loadGladeFile('gtksettings')
  		self.parent = parent
  		self.window = xml.get_widget('window')