changed names of select and traypopup, interface for 0.2 ready

git-svn-id: https://recordmydesktop.svn.sourceforge.net/svnroot/recordmydesktop/trunk@53 f606c939-3180-4ac9-a4b8-4b8779d57d0a

5 files changed, 123 insertions, 11 deletions

diff --git a/gtk-recordmydesktop/rmdPrefsWidget.py b/gtk-recordmydesktop/rmdPrefsWidget.py
index 6d40ae6..6ca4b3f 100644
--- a/gtk-recordmydesktop/rmdPrefsWidget.py
+++ b/gtk-recordmydesktop/rmdPrefsWidget.py
@@ -36,10 +36,13 @@ import os
 
 
 class prefsWidget(object):
-    labelStrings=[_('Frames Per Second'),_('Sound Recording'),_('Startup Delay(secs)')]
+    labelStrings=[_('Frames Per Second'),_('Sound Recording'),_('Startup Delay(secs)'),
+                    _('Channels'),_('Frequency'),_('Device'),_('Video Quality'),_('Sound Quality'),
+                    _('Display'),_('Mouse Cursor'),_('Full shots at every frame'),_('MIT-Shm extension'),
+                    _('Drop Frames(encoder)'),_('Shared Threshold'),_('Quick Subsampling')]
     mouseStrings=[_('Normal'),_('White'),_('Black'),_('None')]
     stateStrings=[_('Enabled'),_('Disabled')]
-    tabStrings=[_('Basic'),_('Sound'),_('Encoding'),_('Misc')]
+    tabStrings=[_('Basic'),_('Sound'),_('Encoding'),_('Advanced')]
     
     def destroy(self,Event=None):
         self.values[0]=self.fpsSpinButton.get_value_as_int()
@@ -47,6 +50,19 @@ class prefsWidget(object):
         self.values[2]=self.soundComboBox.get_active()
         self.values[3]=self.fullComboBox.get_active()
         self.values[4]=self.pathEntry.get_text()
+        #self.values[5]=self.are
+        self.values[6]=self.delaySpinButton.get_value_as_int()
+        self.values[7]=self.channelsSpinButton.get_value_as_int()
+        self.values[8]=self.freqSpinButton.get_value_as_int()
+        self.values[9]=self.deviceEntry.get_text().replace(' ','')
+        self.values[10]=self.vidqSpinButton.get_value_as_int()
+        self.values[11]=self.soundqSpinButton.get_value_as_int()
+        self.values[12]=self.displayEntry.get_text().replace(' ','')
+        self.values[13]=self.sharedComboBox.get_active()
+        self.values[14]=self.frdropComboBox.get_active()
+        self.values[15]=self.thresSpinButton.get_value_as_int()
+        self.values[16]=self.quickComboBox.get_active()
+        
         self.window.destroy()
         self.optionsOpen[0]=0
 
@@ -75,7 +91,7 @@ class prefsWidget(object):
         self.boxes={}
         self.labelbox={}
         for i in range(4):
-            self.labelbox[i]=gtk.VBox(homogeneous=True, spacing=10)
+            self.labelbox[i]=gtk.VBox(homogeneous=False, spacing=20)
         self.notebook = gtk.Notebook()
 
 #basic page
@@ -103,10 +119,10 @@ class prefsWidget(object):
             self.boxes[i]=gtk.HBox(homogeneous=False, spacing=0)
             self.boxes[i].pack_start(self.labels[i],expand=False,fill=False)
             self.labels[i].show()
-            self.labelbox[0].pack_start(self.boxes[i])
+            self.labelbox[0].pack_start(self.boxes[i],expand=False,fill=False)
 
         self.boxes[3]=gtk.HBox(homogeneous=False, spacing=20)
-        self.labelbox[0].pack_start(self.boxes[3])                       
+        self.labelbox[0].pack_start(self.boxes[3],expand=False,fill=False)                       
         placeholder2=gtk.Label("")
         placeholder2.show()
         self.labelbox[0].pack_start(placeholder2)
@@ -128,20 +144,115 @@ class prefsWidget(object):
         for i in range(5):
             self.boxes[i].show()
 #sound page
+        for i in xrange(3,6):
+            self.labels[i]=gtk.Label(self.labelStrings[i])
+            self.labels[i].set_justify(gtk.JUSTIFY_LEFT)
+            self.boxes[i+5]=gtk.HBox(homogeneous=False, spacing=0)
+            self.boxes[i+5].pack_start(self.labels[i],expand=False,fill=False)
+            self.labels[i].show()
+            #self.boxes[i+5].show()
+            self.labelbox[1].pack_start(self.boxes[i+5],expand=False,fill=False)
+        self.channelsAdjustment=gtk.Adjustment(value=self.values[7], lower=1,upper=2, step_incr=1, page_incr=1, page_size=1)
+        self.channelsSpinButton= gtk.SpinButton(self.channelsAdjustment, climb_rate=0.5, digits=0)
+        self.boxes[8].pack_end(self.channelsSpinButton,expand=False,fill=False)
+        self.channelsSpinButton.show()
+        self.boxes[8].show()
+        
+        self.freqAdjustment=gtk.Adjustment(value=self.values[8], lower=0,upper=44100, step_incr=1, page_incr=100, page_size=0)
+        self.freqSpinButton= gtk.SpinButton(self.freqAdjustment, climb_rate=0.5, digits=0)
+        self.boxes[9].pack_end(self.freqSpinButton,expand=False,fill=False)
+        self.freqSpinButton.show()
+        self.boxes[9].show()
+        
+        self.deviceEntry= gtk.Entry(max=0)
+        self.deviceEntry.set_text(self.values[9])
+        self.boxes[10].pack_end(self.deviceEntry,expand=False,fill=False)
+        self.deviceEntry.show()
+        self.boxes[10].show()
+        
+        
 #encoding page        
+        for i in xrange(6,8):
+            self.labels[i]=gtk.Label(self.labelStrings[i])
+            self.labels[i].set_justify(gtk.JUSTIFY_LEFT)
+            self.boxes[i+5]=gtk.HBox(homogeneous=False, spacing=0)
+            self.boxes[i+5].pack_start(self.labels[i],expand=False,fill=False)
+            self.labels[i].show()
+            #self.boxes[i+5].show()
+            self.labelbox[2].pack_start(self.boxes[i+5],expand=False,fill=False)
+        self.vidqAdjustment=gtk.Adjustment(value=self.values[10], lower=0,upper=63, step_incr=1, page_incr=1, page_size=1)
+        self.vidqSpinButton= gtk.SpinButton(self.vidqAdjustment, climb_rate=0.5, digits=0)
+        self.boxes[11].pack_end(self.vidqSpinButton,expand=False,fill=False)
+        self.vidqSpinButton.show()
+        self.boxes[11].show()
+        self.soundqAdjustment=gtk.Adjustment(value=self.values[11], lower=-1,upper=10, step_incr=1, page_incr=1, page_size=1)
+        self.soundqSpinButton= gtk.SpinButton(self.soundqAdjustment, climb_rate=0.5, digits=0)
+        self.boxes[12].pack_end(self.soundqSpinButton,expand=False,fill=False)
+        self.soundqSpinButton.show()
+        self.boxes[12].show()
+
 #misc page
+        for i in xrange(8,15):
+            self.labels[i]=gtk.Label(self.labelStrings[i])
+            self.labels[i].set_justify(gtk.JUSTIFY_LEFT)
+            self.boxes[i+5]=gtk.HBox(homogeneous=False, spacing=0)
+            self.boxes[i+5].pack_start(self.labels[i],expand=False,fill=False)
+            self.labels[i].show()
+            #self.boxes[i+5].show()
+            self.labelbox[3].pack_start(self.boxes[i+5],expand=False,fill=False)
+        self.displayEntry= gtk.Entry(max=0)
+        self.displayEntry.set_text(self.values[12])
+        self.boxes[13].pack_end(self.displayEntry,expand=False,fill=False)
+        self.displayEntry.show()
+        self.boxes[13].show()
 
         self.mouseComboBox = gtk.combo_box_new_text()
         for i in range(4):
             self.mouseComboBox.append_text(self.mouseStrings[i])
-        self.mouseComboBox.set_active(self.values[0])
+        self.mouseComboBox.set_active(self.values[1])
+        self.boxes[14].pack_end(self.mouseComboBox,expand=False,fill=False)
+        self.mouseComboBox.show()
+        self.boxes[14].show()
         
         self.fullComboBox = gtk.combo_box_new_text()
         for i in range(2):
             self.fullComboBox.append_text(self.stateStrings[i])
         self.fullComboBox.set_active(self.values[3])
+        self.boxes[15].pack_end(self.fullComboBox,expand=False,fill=False)
+        self.fullComboBox.show()
+        self.boxes[15].show()
+        
+        self.sharedComboBox = gtk.combo_box_new_text()
+        for i in range(2):
+            self.sharedComboBox.append_text(self.stateStrings[i])
+        self.sharedComboBox.set_active(self.values[13])
+        self.boxes[16].pack_end(self.sharedComboBox,expand=False,fill=False)
+        self.sharedComboBox.show()
+        self.boxes[16].show()
         
         
+        self.frdropComboBox = gtk.combo_box_new_text()
+        for i in range(2):
+            self.frdropComboBox.append_text(self.stateStrings[i])
+        self.frdropComboBox.set_active(self.values[14])
+        self.boxes[17].pack_end(self.frdropComboBox,expand=False,fill=False)
+        self.frdropComboBox.show()
+        self.boxes[17].show()
+        
+        self.thresAdjustment=gtk.Adjustment(value=self.values[15], lower=0,upper=100, step_incr=1, page_incr=5, page_size=1)
+        self.thresSpinButton= gtk.SpinButton(self.thresAdjustment, climb_rate=0.5, digits=0)
+        self.boxes[18].pack_end(self.thresSpinButton,expand=False,fill=False)
+        self.thresSpinButton.show()
+        self.boxes[18].show()
+
+        self.quickComboBox = gtk.combo_box_new_text()
+        for i in range(2):
+            self.quickComboBox.append_text(self.stateStrings[i])
+        self.quickComboBox.set_active(self.values[16])
+        self.boxes[19].pack_end(self.quickComboBox,expand=False,fill=False)
+        self.quickComboBox.show()
+        self.boxes[19].show()        
+        
 #append and show        
         for i in range(4):
             self.notebook.append_page(self.labelbox[i],gtk.Label(self.tabStrings[i]))
diff --git a/gtk-recordmydesktop/istanbulSelect.py b/gtk-recordmydesktop/rmdSelect.py
index a88be50..a88be50 100644
--- a/gtk-recordmydesktop/istanbulSelect.py
+++ b/gtk-recordmydesktop/rmdSelect.py
diff --git a/gtk-recordmydesktop/rmdTrayIcon.py b/gtk-recordmydesktop/rmdTrayIcon.py
index 0df7dd4..4358b7c 100644
--- a/gtk-recordmydesktop/rmdTrayIcon.py
+++ b/gtk-recordmydesktop/rmdTrayIcon.py
@@ -30,8 +30,8 @@ pygtk.require('2.0')
 import gtk
 
 import egg.trayicon
-import istanbulSelect as isel
-import istanbulTrayPopup as iTP
+import rmdSelect as isel
+import rmdTrayPopup as iTP
 import os
 
 #values struct:
@@ -56,7 +56,8 @@ import os
 
 
 class trayIcon(object):
-    values=[15,0,0,1,os.path.join(os.getenv('HOME'),'out.ogg'),[-1,-1,-1,-1],0]
+    values=[15,0,0,1,os.path.join(os.getenv('HOME'),'out.ogg'),[-1,-1,-1,-1],0,
+            1,22050,'hw:0,0',63,10,"$DISPLAY",0,1,75,1]
     event_box = gtk.EventBox() 
     state=0#0 stopped,1 recording,2 paused
     rmdPid=None
diff --git a/gtk-recordmydesktop/istanbulTrayPopup.py b/gtk-recordmydesktop/rmdTrayPopup.py
index 2ce7efd..7df1c87 100644
--- a/gtk-recordmydesktop/istanbulTrayPopup.py
+++ b/gtk-recordmydesktop/rmdTrayPopup.py
@@ -23,7 +23,7 @@
 import gtk
 import locale, gettext
 _ = gettext.gettext
-import istanbulSelect as iSel
+import rmdSelect as iSel
 import rmdPrefsWidget as pW
 
 class TrayPopupMenu:
diff --git a/gtk-recordmydesktop/setup.py b/gtk-recordmydesktop/setup.py
index 626d422..46ba2dd 100644
--- a/gtk-recordmydesktop/setup.py
+++ b/gtk-recordmydesktop/setup.py
@@ -7,7 +7,7 @@ author_email='johnvarouhakis@gmail.com',
 description='A pyGTK frontend for recordMyDesktop',
 license='GNU GENERAL PUBLIC LICENSE Version 2',
 name='gtk-recordMyDesktop',version='0.2' ,
-py_modules=['rmdPrefsWidget','rmdTrayIcon','istanbulSelect','istanbulTrayPopup'],
+py_modules=['rmdPrefsWidget','rmdTrayIcon','rmdSelect','rmdTrayPopup'],
 scripts=['gtk-recordMyDesktop'],
 data_files=[('/usr/share/applications/',['gtk-recordmydesktop.desktop']),
             ('/usr/share/pixmaps/',['gtk-recordmydesktop.png'])],