X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=data%2Fgonvert.glade;h=d3c809bb73d9def504069242370825cde5787a3e;hb=36b1db68928ff23d646e11798eb807c53010cb6a;hp=08b43de6f55e16ad7a61799ff7589052442c8d60;hpb=c6254c63599998c35b86ea3120df974e5e854b46;p=gonvert

diff --git a/data/gonvert.glade b/data/gonvert.glade
index 08b43de..d3c809b 100644
--- a/data/gonvert.glade
+++ b/data/gonvert.glade
@@ -3,7 +3,6 @@
   <!-- interface-requires gtk+ 2.16 -->
   <!-- interface-naming-policy toplevel-contextual -->
   <widget class="GtkWindow" id="mainWindow">
-    <property name="visible">True</property>
     <property name="title" translatable="yes">Gonvert</property>
     <child>
       <widget class="GtkVBox" id="mainLayout">
@@ -23,7 +22,6 @@
                         <property name="visible">True</property>
                         <property name="label" translatable="yes">_Exit</property>
                         <property name="use_underline">True</property>
-                        <signal name="activate" handler="on_exit_menu_activate"/>
                         <accelerator key="q" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                       </widget>
                     </child>
@@ -32,28 +30,19 @@
               </widget>
             </child>
             <child>
-              <widget class="GtkMenuItem" id="toolsMenuItem">
+              <widget class="GtkMenuItem" id="editMenuItem">
                 <property name="visible">True</property>
-                <property name="label" translatable="yes">_Tools</property>
+                <property name="label" translatable="yes">_Edit</property>
                 <property name="use_underline">True</property>
                 <child>
-                  <widget class="GtkMenu" id="toolsMenu">
-                    <child>
-                      <widget class="GtkCheckMenuItem" id="editShortListMenuItem">
-                        <property name="visible">True</property>
-                        <property name="tooltip" translatable="yes">Show shortlist selections</property>
-                        <property name="label" translatable="yes">_Edit shortlist</property>
-                        <property name="use_underline">True</property>
-                        <signal name="activate" handler="on_editShortListMenuItem_activate"/>
-                      </widget>
-                    </child>
+                  <widget class="GtkMenu" id="menu1">
+                    <property name="visible">True</property>
                     <child>
-                      <widget class="GtkMenuItem" id="clearSelectionMenuItem">
+                      <widget class="GtkImageMenuItem" id="searchMenuItem">
+                        <property name="label">gtk-find</property>
                         <property name="visible">True</property>
-                        <property name="tooltip" translatable="yes">Clear saved selections</property>
-                        <property name="label" translatable="yes">_Clear selections</property>
                         <property name="use_underline">True</property>
-                        <signal name="activate" handler="on_clearSelectionMenuItem_activate"/>
+                        <property name="use_stock">True</property>
                       </widget>
                     </child>
                   </widget>
@@ -72,7 +61,6 @@
                         <property name="visible">True</property>
                         <property name="label" translatable="yes">_About</property>
                         <property name="use_underline">True</property>
-                        <signal name="activate" handler="on_aboutMenuItem_activate"/>
                       </widget>
                     </child>
                   </widget>
@@ -103,7 +91,6 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="headers_visible">False</property>
-                    <signal name="cursor_changed" handler="on_categoryView_select_row"/>
                   </widget>
                 </child>
               </widget>
@@ -147,7 +134,6 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="invisible_char">&#x25CF;</property>
-                        <signal name="changed" handler="on_unitValue_changed"/>
                       </widget>
                       <packing>
                         <property name="position">1</property>
@@ -190,7 +176,6 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="invisible_char">&#x25CF;</property>
-                        <signal name="changed" handler="on_previousUnitValue_changed"/>
                       </widget>
                       <packing>
                         <property name="position">1</property>
@@ -225,12 +210,25 @@
                         <property name="can_focus">True</property>
                         <property name="hscrollbar_policy">never</property>
                         <property name="vscrollbar_policy">automatic</property>
-                        <property name="shadow_type">in</property>
                         <child>
-                          <widget class="GtkTreeView" id="unitsView">
+                          <widget class="GtkViewport" id="maemo5HackViewport">
                             <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <signal name="cursor_changed" handler="on_unitsView_cursor_changed"/>
+                            <property name="resize_mode">queue</property>
+                            <child>
+                              <widget class="GtkVBox" id="maemo5HackVBox">
+                                <property name="visible">True</property>
+                                <property name="orientation">vertical</property>
+                                <child>
+                                  <widget class="GtkTreeView" id="unitsView">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                              </widget>
+                            </child>
                           </widget>
                         </child>
                       </widget>
@@ -273,32 +271,30 @@
                   <widget class="GtkHBox" id="searchLayout">
                     <property name="visible">True</property>
                     <child>
-                      <widget class="GtkEntry" id="findEntry">
+                      <widget class="GtkButton" id="findButton">
+                        <property name="label" translatable="yes">gtk-find</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="tooltip" translatable="yes">Enter unit to find here</property>
-                        <property name="invisible_char">&#x25CF;</property>
-                        <signal name="changed" handler="on_findEntry_changed"/>
-                        <signal name="activate" handler="on_findEntry_activated"/>
+                        <property name="receives_default">True</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                        <accelerator key="F6" signal="clicked"/>
                       </widget>
                       <packing>
                         <property name="expand">False</property>
+                        <property name="fill">False</property>
                         <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkButton" id="findButton">
-                        <property name="label" translatable="yes">Find</property>
+                      <widget class="GtkEntry" id="findEntry">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="use_underline">True</property>
-                        <signal name="clicked" handler="on_findButton_clicked"/>
-                        <accelerator key="F6" signal="clicked"/>
+                        <property name="tooltip" translatable="yes">Enter unit to find here</property>
+                        <property name="invisible_char">&#x25CF;</property>
                       </widget>
                       <packing>
                         <property name="expand">False</property>
-                        <property name="fill">False</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
@@ -315,36 +311,25 @@
                       </packing>
                     </child>
                     <child>
-                      <widget class="GtkVSeparator" id="vseparator1">
+                      <widget class="GtkButton" id="closeSearchButton">
                         <property name="visible">True</property>
-                        <property name="orientation">vertical</property>
-                      </widget>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">3</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <widget class="GtkCheckButton" id="shortlistcheck">
-                        <property name="label" translatable="yes">Shortlist</property>
                         <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="draw_indicator">True</property>
-                        <signal name="toggled" handler="on_shortlistcheck_toggled"/>
+                        <property name="receives_default">True</property>
+                        <child>
+                          <widget class="GtkImage" id="image1">
+                            <property name="visible">True</property>
+                            <property name="stock">gtk-close</property>
+                            <property name="icon-size">1</property>
+                          </widget>
+                        </child>
                       </widget>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="pack_type">end</property>
-                        <property name="position">4</property>
+                        <property name="position">3</property>
                       </packing>
                     </child>
                   </widget>
                   <packing>
                     <property name="expand">False</property>
-                    <property name="fill">False</property>
                     <property name="position">4</property>
                   </packing>
                 </child>