From 5a736c9df8ab040804ce8c52a1fb95b23a6a581b Mon Sep 17 00:00:00 2001
From: "Paul W. Frields" <stickster@gmail.com>
Date: Sat, 10 Sep 2011 14:28:02 -0400
Subject: Set up prefs dialog to modify settings

---
 pulsecaster/data/pulsecaster.ui | 25 +++++++++++++++++++++----
 pulsecaster/ui.py               | 20 ++++++++++++++++++++
 2 files changed, 41 insertions(+), 4 deletions(-)

diff --git a/pulsecaster/data/pulsecaster.ui b/pulsecaster/data/pulsecaster.ui
index cad63a9..422c1af 100644
--- a/pulsecaster/data/pulsecaster.ui
+++ b/pulsecaster/data/pulsecaster.ui
@@ -36,11 +36,10 @@
   <object class="GtkDialog" id="adv_dialog">
     <property name="can_focus">False</property>
     <property name="border_width">5</property>
-    <property name="type">popup</property>
     <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
-    <property name="type_hint">dialog</property>
+    <property name="type_hint">normal</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox3">
         <property name="can_focus">False</property>
@@ -120,6 +119,7 @@
 file with compression. This is the right option
 for most people.&lt;/i&gt;&lt;/small&gt;</property>
                         <property name="use_markup">True</property>
+                        <property name="wrap">True</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -174,6 +174,7 @@ for most people.&lt;/i&gt;&lt;/small&gt;</property>
 without compression. Use this option to
 mix and encode audio yourself.&lt;/i&gt;&lt;/small&gt;</property>
                         <property name="use_markup">True</property>
+                        <property name="wrap">True</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -235,6 +236,21 @@ mix and encode audio yourself.&lt;/i&gt;&lt;/small&gt;</property>
                 <property name="secondary">True</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkButton" id="adv_button">
+                <property name="label">gtk-preferences</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
             <child>
               <object class="GtkButton" id="close_button">
                 <property name="label">gtk-close</property>
@@ -249,7 +265,7 @@ mix and encode audio yourself.&lt;/i&gt;&lt;/small&gt;</property>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
                 <property name="padding">5</property>
-                <property name="position">1</property>
+                <property name="position">2</property>
               </packing>
             </child>
             <child>
@@ -266,7 +282,7 @@ mix and encode audio yourself.&lt;/i&gt;&lt;/small&gt;</property>
                 <property name="fill">False</property>
                 <property name="padding">5</property>
                 <property name="pack_type">end</property>
-                <property name="position">2</property>
+                <property name="position">3</property>
               </packing>
             </child>
           </object>
@@ -399,6 +415,7 @@ mix and encode audio yourself.&lt;/i&gt;&lt;/small&gt;</property>
     </child>
     <action-widgets>
       <action-widget response="0">about_button</action-widget>
+      <action-widget response="0">adv_button</action-widget>
       <action-widget response="0">close_button</action-widget>
       <action-widget response="0">record_button</action-widget>
     </action-widgets>
diff --git a/pulsecaster/ui.py b/pulsecaster/ui.py
index ea534db..5ac77f6 100644
--- a/pulsecaster/ui.py
+++ b/pulsecaster/ui.py
@@ -124,6 +124,8 @@ class PulseCasterUI:
         self.main.connect('delete_event', self.on_close)
         self.about_button = self.builder.get_object('about_button')
         self.about_button.connect('clicked', self.showAbout)
+        self.adv_button = self.builder.get_object('adv_button')
+        self.adv_button.connect('clicked', self.showAdv)
         self.close = self.builder.get_object('close_button')
         self.close.connect('clicked', self.on_close)
         self.record = self.builder.get_object('record_button')
@@ -134,6 +136,8 @@ class PulseCasterUI:
         self.main.set_icon_list([self.logo])
         # Advanced dialog basics
         self.adv = self.builder.get_object('adv_dialog')
+        self.adv.set_icon_list([self.logo])
+        self.adv.set_title(NAME)
         self.adv.connect('delete_event', self.hideAdv)
         self.adv.connect('response', self.hideAdv)
         self.adv_stdlabel1 = self.builder.get_object('adv_stdlabel1')
@@ -147,6 +151,10 @@ class PulseCasterUI:
         lbl = _('Save each voice as a separate audio file without compression. Use this option to mix and encode audio yourself.')
         self.adv_explabel2.set_label('<small><i>' + lbl + '</i></small>')
         # TODO: Add bits to set radio buttons and make them work
+        self.vorbis_button = self.builder.get_object('vorbis_button')
+        self.vorbis_button.connect('clicked', self.set_standard)
+        self.flac_button = self.builder.get_object('flac_button')
+        self.flac_button.connect('clicked', self.set_expert)
         # About dialog basics
         self.about = self.builder.get_object('about_dialog')
         self.about.connect('delete_event', self.hideAbout)
@@ -330,11 +338,23 @@ class PulseCasterUI:
         self.about.hide()
 
     def showAdv(self, *args):
+        if self.gconfig.expert is True:
+            self.flac_button.set_active(True)
+        else:
+            self.vorbis_button.set_active(True)
         self.adv.show()
 
     def hideAdv(self, *args):
         self.adv.hide()
 
+    def set_standard(self, *args):
+        self.gconfig.client.set_bool(self.gconfig.dirbase + '/expert',
+                                     False)
+
+    def set_expert(self, *args):
+        self.gconfig.client.set_bool(self.gconfig.dirbase + '/expert',
+                                     True)
+
     def showFileChooser(self, *args):
         self.file_chooser = Gtk.FileChooserDialog(title=_('Save your recording'),
                                                   action=Gtk.FileChooserAction.SAVE,
-- 
cgit