Merge pull request #1653 from FreeRDP/ref_main

Add search toggle
FreeRDP · May 28, 2018 · c58143f · c58143f
2 parents 91ab95d + c2c23e8
commit c58143f
Show file tree

Hide file tree

Showing 3 changed files with 789 additions and 756 deletions.
diff --git a/data/ui/remmina_main.glade b/data/ui/remmina_main.glade
@@ -223,6 +223,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     <property name="inline_completion">True</property>
     <property name="inline_selection">True</property>
   </object>
+  <object class="GtkImage" id="find_toggle_image">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="stock">gtk-find</property>
+  </object>
   <object class="GtkImage" id="image_new">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -256,6 +261,20 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             <signal name="clicked" handler="remmina_main_on_action_connections_new" swapped="no"/>
           </object>
         </child>
+        <child>
+          <object class="GtkToggleButton" id="search_toggle">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">False</property>
+            <property name="tooltip_text" translatable="yes">Show search bar</property>
+            <property name="image">find_toggle_image</property>
+            <property name="active">True</property>
+            <signal name="toggled" handler="remmina_main_on_search_toggle" swapped="no"/>
+          </object>
+          <packing>
+            <property name="position">2</property>
+          </packing>
+        </child>
         <child>
           <object class="GtkMenuButton" id="menu_header_button">
             <property name="visible">True</property>
@@ -289,7 +308,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
-          <object class="GtkSearchBar">
+          <object class="GtkSearchBar" id="search_bar">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="search_mode_enabled">True</property>