[Quickrip-cvs] quickrip/gtk gtkmain.py,1.6,1.7 gtkprogress.py,1.3,1.4 gtksettings.py,1.4,1.5

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

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

Modified Files:
	gtkmain.py gtkprogress.py gtksettings.py 
Log Message:
Few updates. Working on scan button.

Index: gtkmain.py
===================================================================
RCS file: /cvsroot/quickrip/quickrip/gtk/gtkmain.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** gtkmain.py	4 Aug 2003 04:48:16 -0000	1.6
--- gtkmain.py	4 Aug 2003 05:49:16 -0000	1.7
***************
*** 8,11 ****
--- 8,12 ----
  try:
  	import pygtk
+ 	import sys, os, re
  	pygtk.require("2.0")
  	import gtk, gobject
***************
*** 26,29 ****
--- 27,31 ----
  	del deleteme
  	import pygtk
+ 	import sys, os, re
  	pygtk.require("2.0")
  	import gtk, gobject
***************
*** 35,49 ****
  	gnome.init("quickrip", "1.0")
  
! class GTKMain:
  	def rip(self, widget, data=None):
  		print "Rip"
  		self.dialogProgress.window.show_all()
! 		
  	def scan(self, widget, data=None):
! 		print "Scan"
! #		node = self.tree.insert_node(None, None, [ "sample", "two", "three", "four" ]) 
! 		self.buttonRip.show()
! 		self.miRip.show()
! 		
  	def configure(self, widget, data=None):
  		self.dialogSettings.window.show_all()
--- 37,62 ----
  	gnome.init("quickrip", "1.0")
  
! import dvd
! from dvd import *
! 
! import config   
! 
! __app__ = config.app
! __author__ = config.author
! __version__ = config.version
! __date__ = config.date
! __copyright__ = config.copyright
! __license__ = config.license
! 
! 
! class GTKMain(DVD):
  	def rip(self, widget, data=None):
  		print "Rip"
  		self.dialogProgress.window.show_all()
! 
  	def scan(self, widget, data=None):
! 		print "Scan gui"
! 		self.scanDVD()
! 
  	def configure(self, widget, data=None):
  		self.dialogSettings.window.show_all()
***************
*** 104,121 ****
  #		model.set_value(i, 2, "third")
  #		model.set_value(i, 3, "forth")
! 		i = model.insert_before(None, None)
  		str2 = { "4" : "5", "6" : "seven" }
  		model.set_value(i, 0, str2["4"])
  		model.set_value(i, 1, str2["6"])
- 
- 	def create_gtk_list(self):
- 		scrolled_window = gtk.ScrolledWindow()
- 		scrolled_window.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
- 		model = gtk.TreeStore(4)
- 		model.set_column_types(4, gobject.TYPE_STRING)
- 		view = gtk.TreeView(model)
- 		scrolled_window.add_with_viewport(view)
- 		view.show()
- 		return scrolled_window
  		
  	def __init__(self):
--- 117,124 ----
  #		model.set_value(i, 2, "third")
  #		model.set_value(i, 3, "forth")
! 		i = model.append(i, None)
  		str2 = { "4" : "5", "6" : "seven" }
  		model.set_value(i, 0, str2["4"])
  		model.set_value(i, 1, str2["6"])
  		
  	def __init__(self):
***************
*** 141,147 ****
  
  		self.window.show_all()
! 		self.buttonRip.hide()
! 		self.miRip.hide()
! 		
  	def browse(self, widget, data=None):
  		self.filesel = gtk.FileSelection()
--- 144,159 ----
  
  		self.window.show_all()
! 		self.hideRip()
! 
! 		DVD.__init__(self)
! 		self.app = __app__
! 		self.DVD_DEVICE = "/dev/dvd"
! #		self.outputDir.setText(self.config['outputdir'])
! #		self.outdir = self.config['outputdir']
! 		self.config['mplayer'] = "/usr/bin/mplayer"
! 		self.config['mencoder'] = "/usr/bin/mencoder"
! 		self.config['tcprobe'] = "/usr/bin/tcprobe"
! 		self.config['dvd_device'] = "/dev/cdroms/cdrom1"
! 
  	def browse(self, widget, data=None):
  		self.filesel = gtk.FileSelection()
***************
*** 158,165 ****
  		self.textOutputFile.set_buffer(textbuf)
  		self.filesel.hide()
! 		
  	def main(self):
  		gtk.main()
  		
  if __name__ == "__main__":
  	app = GTKMain()
--- 170,221 ----
  		self.textOutputFile.set_buffer(textbuf)
  		self.filesel.hide()
! 	
! 	def showRip(self):
! 		self.buttonRip.show()
! 		self.miRip.show()
! 	
! 	def hideRip(self):
! 		self.buttonRip.hide()
! 		self.miRip.hide()
! 
  	def main(self):
  		gtk.main()
  		
+ 		
+ ################################# HOOKS
+ 	def int_startScanning(self):
+ 		print "start scanning backend"
+ 		self.hideRip()
+ 
+ 	def int_noTracks(self):
+ 		print "no tracks 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_dispTrack(self, track):
+ 		print "display track"
+ 
+ 	def int_finishScanning(self):
+ 		print "finish scanning"
+ 		self.showRip()
+ 
+ 	def int_startRipping(self):
+ 		print "start rip"
+ 
+ 	def int_newTrack(self, name, number, total, vbr):
+ 		print "new track"
+ 
+ 	def int_newPass(self, passtype):
+ 		print "new pass"
+ 
+ 	def int_updateProgress(self, perc, tpass):
+ 		print "update progress"
+ 
+ 	def int_finishRipping(self):
+ 		print "finish ripping"
+ 
  if __name__ == "__main__":
  	app = GTKMain()

Index: gtkprogress.py
===================================================================
RCS file: /cvsroot/quickrip/quickrip/gtk/gtkprogress.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** gtkprogress.py	4 Aug 2003 01:18:10 -0000	1.3
--- gtkprogress.py	4 Aug 2003 05:49:16 -0000	1.4
***************
*** 49,51 ****
  	app = GTKProgress()
  	app.main()
- 
--- 49,50 ----

Index: gtksettings.py
===================================================================
RCS file: /cvsroot/quickrip/quickrip/gtk/gtksettings.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** gtksettings.py	4 Aug 2003 01:18:10 -0000	1.4
--- gtksettings.py	4 Aug 2003 05:49:16 -0000	1.5
***************
*** 54,56 ****
  	app = GTKSettings()
  	app.main()
- 
--- 54,55 ----