[Quickrip-cvs] quickrip/gtk gtkmain.py,1.8,1.9 gtksettings.py,1.6,1.7

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

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

Modified Files:
	gtkmain.py gtksettings.py 
Log Message:
Browse buttons working in gtk settings dialog.

Index: gtkmain.py
===================================================================
RCS file: /cvsroot/quickrip/quickrip/gtk/gtkmain.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** gtkmain.py	5 Aug 2003 01:57:27 -0000	1.8
--- gtkmain.py	5 Aug 2003 05:27:38 -0000	1.9
***************
*** 63,73 ****
  	def configure(self, widget, data=None):
  		self.dialogSettings.window.show_all()
! 		print "Configure"
! 		
  	def quit(self, widget, data=None):
- 		print "quit"
  		gtk.main_quit()
  		return gtk.FALSE
! 		
  	def about(self, widget, data=None):
  		print "about"
--- 63,71 ----
  	def configure(self, widget, data=None):
  		self.dialogSettings.window.show_all()
! 
  	def quit(self, widget, data=None):
  		gtk.main_quit()
  		return gtk.FALSE
! 
  	def about(self, widget, data=None):
  		print "about"

Index: gtksettings.py
===================================================================
RCS file: /cvsroot/quickrip/quickrip/gtk/gtksettings.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** gtksettings.py	5 Aug 2003 01:57:27 -0000	1.6
--- gtksettings.py	5 Aug 2003 05:27:38 -0000	1.7
***************
*** 12,15 ****
--- 12,16 ----
  	import gtk
  	import gtk.glade
+ 	from time import *
  except:
  	print "Couldn't load PyGTK module! Check it's installed properly."
***************
*** 30,41 ****
  
  	def quit(self, widget, data=None):
! 		print "close settigns - add some validation here"
! 		self.changeSettings()
! 		self.window.hide()
  		return gtk.TRUE
! 		
  	def validate(self):
! 		dvd = wtvDVD.get_text()
! 		
  	def changeSettings(self):
  		#programs
--- 31,47 ----
  
  	def quit(self, widget, data=None):
! 		if self.validate() == "true":
! 			self.window.hide()
! 		else:
! 			print "Invalid Settings!"
  		return gtk.TRUE
! 
  	def validate(self):
! 		print "add some settings validation here"
! #		dvd = wtvDVD.get_text()
! #		return "false"
! 		self.changeSettings()
! 		return "true"
! 
  	def changeSettings(self):
  		#programs
***************
*** 68,74 ****
  
  		self.parent.writeSettings(self.parent.homefile)
  
! 	def page(self, widget):
! 		print "page"
  
  	def __init__(self, parent):
--- 74,102 ----
  
  		self.parent.writeSettings(self.parent.homefile)
+ 		
+ 	def accept(self, widget, data=None):
+ 		(textbox, dialog) = data
+ 		textbox.set_text(dialog.get_filename())
+ 		dialog.destroy()
+ 		
+ 	def findGeneric(self, title, widget):
+ 		dialog = gtk.FileSelection(title)
+ 		dialog.ok_button.connect("clicked", self.accept, (widget, dialog))
+ 		dialog.cancel_button.connect("clicked", lambda w: dialog.destroy())
+ 		dialog.set_filename(widget.get_text())
+ 		dialog.show()
  
! 	def findLog(self, widget, data=None):
! 		self.findGeneric("Log File Destination", self.wteLog)
! 	def findTcprobe(self, widget, data=None):
! 		self.findGeneric("Location of TCProbe", self.wteTcprobe)
! 	def findDVD(self, widget, data=None):
! 		self.findGeneric("Location of DVD Device", self.wteDVD)
! 	def findOutput(self, widget, data=None):
! 		self.findGeneric("Select Destination Directory", self.wteOutput)
! 	def findMplayer(self, widget, data=None):
! 		self.findGeneric("Location of MPlayer", self.wteMplayer)
! 	def findMencoder(self, widget, data=None):
! 		self.findGeneric("Location of MEncoder", self.wteMencoder)
  
  	def __init__(self, parent):
***************
*** 93,105 ****
  
  		xml.signal_autoconnect( {'on_window_delete_event': self.quit} )
! 		xml.signal_autoconnect( {'on_dvddevice_clicked': self.quit} )
! 		xml.signal_autoconnect( {'on_output_clicked': self.quit} )
! 		xml.signal_autoconnect( {'on_mplayer_clicked': self.quit} )
! 		xml.signal_autoconnect( {'on_mencoder_clicked': self.quit} )
! 		xml.signal_autoconnect( {'on_tcprobe_clicked': self.quit} )
! 		xml.signal_autoconnect( {'on_log_clicked': self.quit} )
! #		xml.signal_autoconnect( {'on_change_page': self.page} )
! 
! #		self.window.show_all()
  
  	def main(self):
--- 121,130 ----
  
  		xml.signal_autoconnect( {'on_window_delete_event': self.quit} )
! 		xml.signal_autoconnect( {'on_dvddevice_clicked': self.findDVD} )
! 		xml.signal_autoconnect( {'on_output_clicked': self.findOutput} )
! 		xml.signal_autoconnect( {'on_mplayer_clicked': self.findMplayer} )
! 		xml.signal_autoconnect( {'on_mencoder_clicked': self.findMencoder} )
! 		xml.signal_autoconnect( {'on_tcprobe_clicked': self.findTcprobe} )
! 		xml.signal_autoconnect( {'on_log_clicked': self.findLog} )
  
  	def main(self):