[Quickrip-cvs] quickrip/gtk gtkerrorbox.py,1.1,1.2 gtkmain.py,1.21,1.22

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

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

Modified Files:
	gtkerrorbox.py gtkmain.py 
Log Message:
A few minor fiddles to get the error box to load.
N.B: When scanDVD() fails, I get lots and lots of error boxes, not one!


Index: gtkerrorbox.py
===================================================================
RCS file: /cvsroot/quickrip/quickrip/gtk/gtkerrorbox.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** gtkerrorbox.py	5 Aug 2003 06:31:55 -0000	1.1
--- gtkerrorbox.py	8 Aug 2003 21:43:37 -0000	1.2
***************
*** 33,37 ****
  	def __init__(self, title, message, parent=None):
  		label = gtk.Label(message)
! 		xml = gtk.glade.XML('glade/gtkerrorbox.glade')
  		self.window = xml.get_widget('window')
  		self.window.set_title(title)
--- 33,37 ----
  	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)

Index: gtkmain.py
===================================================================
RCS file: /cvsroot/quickrip/quickrip/gtk/gtkmain.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** gtkmain.py	8 Aug 2003 07:08:41 -0000	1.21
--- gtkmain.py	8 Aug 2003 21:43:37 -0000	1.22
***************
*** 215,222 ****
  	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 + 
--- 215,222 ----
  	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 + 
***************
*** 468,471 ****
--- 468,472 ----
  		self.dialogProgress.setStatus("Scanning titles", 0)
  
+ 
  	def ui_dispTitle(self, track):
  		gtk.threads_enter()
***************
*** 478,481 ****
--- 479,483 ----
  		gtk.threads_leave()
  
+ 
  	def ui_finishScanning(self):
  		gtk.threads_enter()
***************
*** 528,534 ****
  		self.showRip()
  
! if __name__ == "__main__":
! 	app = GTKMain()
! 	app.main()
  
  def main():
--- 530,536 ----
  		self.showRip()
  
! # if __name__ == "__main__":
! # 	app = GTKMain()
! # 	app.main()
  
  def main():