From 370745e06cc894a1a59e45d1ff058c6e0b5eeead Mon Sep 17 00:00:00 2001
From: "Paul W. Frields" <stickster@gmail.com>
Date: Fri, 12 Oct 2012 22:17:44 -0400
Subject: Remove remaining strings in ui file

---
 TODO                            |  2 --
 pulsecaster/data/pulsecaster.ui | 42 +++++++++++++----------------------------
 2 files changed, 13 insertions(+), 31 deletions(-)

diff --git a/TODO b/TODO
index ba6f17b..b4c12d7 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,4 @@
 TODO:
-* Remove strings from gtkBuilder .ui file and move to Python code
-  (Removes need for special pybabel treatment)
 * Volume leveling on user's behalf
 	* Set recording volume for both sources to reasonable level (75%?)
 	* Normalize each to something like -0.1dB
diff --git a/pulsecaster/data/pulsecaster.ui b/pulsecaster/data/pulsecaster.ui
index 422c1af..cb5b96a 100644
--- a/pulsecaster/data/pulsecaster.ui
+++ b/pulsecaster/data/pulsecaster.ui
@@ -58,7 +58,6 @@
                 <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>
@@ -86,7 +85,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="xalign">0</property>
                 <property name="active">True</property>
                 <property name="draw_indicator">True</property>
@@ -101,7 +99,6 @@
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
                         <property name="ypad">1</property>
-                        <property name="label" translatable="yes">Standard settings</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -115,9 +112,6 @@
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
                         <property name="xpad">10</property>
-                        <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;Save the conversation as a single audio
-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>
@@ -141,7 +135,6 @@ for most people.&lt;/i&gt;&lt;/small&gt;</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">False</property>
-                <property name="use_action_appearance">False</property>
                 <property name="xalign">0</property>
                 <property name="active">True</property>
                 <property name="draw_indicator">True</property>
@@ -156,7 +149,6 @@ for most people.&lt;/i&gt;&lt;/small&gt;</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
-                        <property name="label" translatable="yes">Expert settings</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -170,9 +162,6 @@ for most people.&lt;/i&gt;&lt;/small&gt;</property>
                         <property name="can_focus">False</property>
                         <property name="xalign">0</property>
                         <property name="xpad">10</property>
-                        <property name="label" translatable="yes">&lt;small&gt;&lt;i&gt;Save each voice as a separate audio file,
-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>
@@ -226,7 +215,6 @@ mix and encode audio yourself.&lt;/i&gt;&lt;/small&gt;</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>
@@ -242,7 +230,6 @@ mix and encode audio yourself.&lt;/i&gt;&lt;/small&gt;</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>
@@ -257,7 +244,6 @@ mix and encode audio yourself.&lt;/i&gt;&lt;/small&gt;</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>
                 <signal name="clicked" handler="gtk_main_quit" swapped="no"/>
               </object>
@@ -274,7 +260,6 @@ mix and encode audio yourself.&lt;/i&gt;&lt;/small&gt;</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>
@@ -363,6 +348,18 @@ mix and encode audio yourself.&lt;/i&gt;&lt;/small&gt;</property>
                 <property name="n_columns">3</property>
                 <property name="column_spacing">5</property>
                 <property name="row_spacing">5</property>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
+                <child>
+                  <placeholder/>
+                </child>
                 <child>
                   <object class="GtkLabel" id="label3">
                     <property name="visible">True</property>
@@ -385,18 +382,6 @@ mix and encode audio yourself.&lt;/i&gt;&lt;/small&gt;</property>
                     <property name="bottom_attach">2</property>
                   </packing>
                 </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
               </object>
               <packing>
                 <property name="expand">True</property>
@@ -503,8 +488,8 @@ mix and encode audio yourself.&lt;/i&gt;&lt;/small&gt;</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">False</property>
-            <property name="use_action_appearance">False</property>
             <property name="use_underline">True</property>
+            <property name="xalign">0.5</property>
             <property name="draw_indicator">True</property>
           </object>
           <packing>
@@ -526,7 +511,6 @@ mix and encode audio yourself.&lt;/i&gt;&lt;/small&gt;</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_underline">True</property>
               </object>
               <packing>
-- 
cgit