Menu
▾
▴
[Quickrip-cvs] quickrip/gtk gtkmain.py,1.1,1.2 gtkprogress.py,1.1,1.2 gtksettings.py,1.2,1.3
|
From: <iwa...@us...> - 2003-08-04 01:07:03
|
Update of /cvsroot/quickrip/quickrip/gtk
In directory sc8-pr-cvs1:/tmp/cvs-serv21580
Modified Files:
gtkmain.py gtkprogress.py gtksettings.py
Log Message:
Added new glade files for main and progress. Python scrips also updated to reflect the changes and work with the glade files.
Index: gtkmain.py
===================================================================
RCS file: /cvsroot/quickrip/quickrip/gtk/gtkmain.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** gtkmain.py 30 Jul 2003 11:07:11 -0000 1.1
--- gtkmain.py 4 Aug 2003 01:06:55 -0000 1.2
***************
*** 13,16 ****
--- 13,17 ----
from gtksettings import *
from gtkprogress import *
+ import gtk.glade
except:
print "Couldn't load PyGTK module! Check it's installed properly."
***************
*** 28,32 ****
from gtksettings import *
from gtkprogress import *
!
class GTKMain:
--- 29,33 ----
from gtksettings import *
from gtkprogress import *
! import gtk.glade
class GTKMain:
***************
*** 37,40 ****
--- 38,42 ----
def scan(self, widget, data=None):
print "Scan"
+ self.buttonRip.show()
def configure(self, widget, data=None):
***************
*** 78,193 ****
return scrolled_window
! def build_menus(self):
! self.menuBar = gtk.MenuBar()
!
! self.menuFile = gtk.Menu()
! self.miFile = gtk.MenuItem("File")
! self.miFile.set_submenu(self.menuFile)
! self.menuBar.append(self.miFile)
!
! self.miScan = gtk.MenuItem("Scan")
! self.menuFile.append(self.miScan)
! self.miRip = gtk.MenuItem("Rip")
! self.menuFile.append(self.miRip)
! self.miQuit = gtk.MenuItem("Quit")
! self.menuFile.append(self.miQuit)
!
!
! self.menuOptions = gtk.Menu()
! self.miOptions = gtk.MenuItem("Options")
! self.miOptions.set_submenu(self.menuOptions)
! self.menuBar.append(self.miOptions)
!
! self.miPreferences = gtk.MenuItem("Configure")
! self.menuOptions.append(self.miPreferences)
!
!
! self.menuHelp = gtk.Menu()
! self.miHelp = gtk.MenuItem("Help")
! self.miHelp.set_submenu(self.menuHelp)
! self.menuBar.append(self.miHelp)
! self.miManual = gtk.MenuItem("Manual")
! self.menuHelp.append(self.miManual)
! self.miAbout = gtk.MenuItem("About")
! self.menuHelp.append(self.miAbout)
!
- self.miQuit.connect_object("activate", self.quit, None)
- self.miRip.connect_object("activate", self.rip, None)
- self.miScan.connect_object("activate", self.scan, None)
- self.miPreferences.connect_object("activate", self.configure, None)
- self.miAbout.connect_object("activate", self.about, None)
- self.miManual.connect_object("activate", self.manual, None)
-
- def __init__(self):
- self.window = gtk.Window(gtk.WINDOW_TOPLEVEL)
- self.window.connect("delete_event", self.quit)
- self.window.set_title("QuickRip")
- self.window.set_size_request(500, 480)
self.dialogSettings = GTKSettings()
self.dialogProgress = GTKProgress()
-
- self.boxMain = gtk.VBox(gtk.FALSE, 10)
- self.boxClient = gtk.HBox(gtk.TRUE, 10)
- self.frameTrackSettings = gtk.Frame("Track Settings")
- self.tableTrackSettings = gtk.Table(2, 4, gtk.TRUE)
- self.frameTrackSettings.add(self.tableTrackSettings)
-
- audlist = [ "64 kbps", "96 kbps", "112 kbps", "128 kbps", "160 kbps", "192 kbps", "224 kbps", "256 kbps", "320 kbps"]
- self.comboAudioBitrate = gtk.Combo()
- self.comboAudioBitrate.set_popdown_strings(audlist)
- self.tableTrackSettings.attach(gtk.Label("Target File Size:"), 0, 1, 0, 1)
- self.tableTrackSettings.attach(gtk.Label("Video Bitrate:"), 0, 1, 1, 2)
- self.tableTrackSettings.attach(gtk.Label("Audio Bitrate:"), 2, 3, 0, 1)
- self.tableTrackSettings.attach(self.comboAudioBitrate, 3, 4, 0, 1)
-
- self.frameOutputSettings = gtk.Frame("Output Settings:")
- self.tableOutputSettings = gtk.Table(2, 6, gtk.TRUE)
- self.frameOutputSettings.add(self.tableOutputSettings)
-
- vollist = [ "0", "+1", "+2", "+3", "+4", "+5", "+6", "+7", "+8", "+9", "+10" ]
- self.textOutputFile = gtk.TextView()
- self.comboLanguage = gtk.Combo()
- self.comboSubtitles = gtk.Combo()
- self.comboVolume = gtk.Combo()
- self.comboVolume.set_popdown_strings(vollist)
- self.widgetBrowse = gtk.Button("Browse")
- self.tableOutputSettings.attach(gtk.Label("Language:"), 0, 1, 0, 1)
- self.tableOutputSettings.attach(self.comboLanguage, 1, 2, 0, 1)
- self.tableOutputSettings.attach(gtk.Label("Subtitles:"), 2, 3, 0, 1)
- self.tableOutputSettings.attach(self.comboSubtitles, 3, 4, 0, 1)
- self.tableOutputSettings.attach(gtk.Label("Volume:"), 4, 5, 0, 1)
- self.tableOutputSettings.attach(self.comboVolume, 5, 6, 0, 1)
- self.tableOutputSettings.attach(gtk.Label("Target File:"), 0, 1, 1, 2)
- self.tableOutputSettings.attach(self.textOutputFile, 1, 5, 1, 2) #, GTK_FILL|GTK_ATTACH, 0)
- self.tableOutputSettings.attach(self.widgetBrowse, 5, 6, 1, 2)
-
- self.tracklist = self.create_gtk_list()
-
- self.build_menus()
-
- #################### event mapping
- self.widgetScan = gtk.Button("Scan")
- self.widgetRip = gtk.Button("Rip")
-
- self.widgetRip.connect("clicked", self.rip, None)
- self.widgetScan.connect("clicked", self.scan, None)
- self.widgetBrowse.connect("clicked", self.browse, None)
- ##################### packing and arrangements of widgets
- self.window.add(self.boxMain)
-
- self.boxMain.pack_start(self.menuBar, gtk.FALSE, gtk.FALSE, 0)
- self.boxMain.pack_start(self.tracklist, gtk.TRUE, gtk.TRUE, 0)
- self.boxMain.pack_start(self.frameTrackSettings)
- self.boxMain.pack_start(self.frameOutputSettings)
- self.boxMain.pack_end(self.boxClient, gtk.TRUE, gtk.TRUE, 0)
-
- self.boxClient.pack_start(self.widgetScan, gtk.TRUE, gtk.TRUE, 0)
- self.boxClient.pack_start(self.widgetRip, gtk.TRUE, gtk.TRUE, 0)
-
- ################################# Showing of objects
self.window.show_all()
def browse(self, widget, data=None):
--- 80,103 ----
return scrolled_window
! def __init__(self):
! xml = gtk.glade.XML('glade/gtkmain.glade')
! self.window = xml.get_widget('window')
! self.buttonScan = xml.get_widget('buttonScan')
! self.buttonRip = xml.get_widget('buttonRip')
! xml.signal_autoconnect( {'on_window_delete_event': self.quit} )
! xml.signal_autoconnect( {'on_preferences_activate': self.configure} )
! xml.signal_autoconnect( {'on_scan_activate': self.scan} )
! xml.signal_autoconnect( {'on_rip_activate': self.rip} )
! xml.signal_autoconnect( {'on_about_activate': self.about} )
! xml.signal_autoconnect( {'on_scan_clicked': self.scan} )
! xml.signal_autoconnect( {'on_rip_clicked': self.rip} )
! xml.signal_autoconnect( {'on_quit_activate': self.quit} )
self.dialogSettings = GTKSettings()
self.dialogProgress = GTKProgress()
self.window.show_all()
+ self.buttonRip.hide()
def browse(self, widget, data=None):
***************
*** 209,213 ****
gtk.main()
! def main():
app = GTKMain()
app.main()
--- 119,123 ----
gtk.main()
! if __name__ == "__main__":
app = GTKMain()
app.main()
Index: gtkprogress.py
===================================================================
RCS file: /cvsroot/quickrip/quickrip/gtk/gtkprogress.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** gtkprogress.py 30 Jul 2003 11:07:11 -0000 1.1
--- gtkprogress.py 4 Aug 2003 01:06:55 -0000 1.2
***************
*** 12,15 ****
--- 12,16 ----
pygtk.require("2.0")
import gtk
+ import gtk.glade
except:
print "Couldn't load PyGTK module! Check it's installed properly."
***************
*** 24,27 ****
--- 25,29 ----
pygtk.require("2.0")
import gtk
+ import gtk.glade
class GTKProgress:
***************
*** 33,67 ****
def __init__(self):
! self.window = gtk.Window(gtk.WINDOW_TOPLEVEL)
! self.window.set_title("Rip in progress . . .")
! self.window.set_resizable(gtk.FALSE)
! self.window.set_border_width(5)
! self.window.set_size_request(300, 100)
!
! self.boxMain = gtk.VBox(gtk.FALSE, 0)
! self.boxClient = gtk.HBox(gtk.FALSE, 0)
!
! self.label = gtk.Label("Status, 1/5, etc")
! self.widgetCancel = gtk.Button("Cancel")
!
! self.progressBar = gtk.ProgressBar()
! self.progressBar.set_text("Some percent")
!
! #################### event mapping
! self.window.connect("delete_event", self.quit)
! self.widgetCancel.connect("clicked", self.quit, None)
!
! ##################### packing and arrangements of widgets
! self.window.add(self.boxMain)
!
! self.boxMain.pack_start(self.progressBar)
! self.boxMain.pack_end(self.boxClient, gtk.TRUE, gtk.TRUE, 0)
! self.boxClient.pack_start(self.label, gtk.FALSE, gtk.FALSE, 0)
! self.boxClient.pack_end(self.widgetCancel, gtk.FALSE, gtk.FALSE, 0)
! ################################# Showing of objects
!
! # self.window.show_all()
def main(self):
--- 35,45 ----
def __init__(self):
! xml = gtk.glade.XML('glade/gtkprogress.glade')
! self.window = xml.get_widget('window')
! xml.signal_autoconnect( {'on_window_delete_event': self.quit} )
! xml.signal_autoconnect( {'on_buttonCancel_clicked': self.quit} )
! self.window.show_all()
def main(self):
***************
*** 71,76 ****
app = GTKProgress()
app.main()
-
-
-
--- 49,51 ----
Index: gtksettings.py
===================================================================
RCS file: /cvsroot/quickrip/quickrip/gtk/gtksettings.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** gtksettings.py 3 Aug 2003 23:50:02 -0000 1.2
--- gtksettings.py 4 Aug 2003 01:06:55 -0000 1.3
***************
*** 46,50 ****
xml.signal_autoconnect( {'on_log_clicked': self.quit} )
! self.window.show_all()
def main(self):
--- 46,50 ----
xml.signal_autoconnect( {'on_log_clicked': self.quit} )
! # self.window.show_all()
def main(self):
***************
*** 54,56 ****
app = GTKSettings()
app.main()
!
--- 54,56 ----
app = GTKSettings()
app.main()
!
|
