Remmina main improvements to gain space and reduce callbacks

1 files changed, 42 insertions, 87 deletions

diff --git a/data/ui/remmina_main.glade b/data/ui/remmina_main.glade
index 6e4c5e631..3a985438a 100644
--- a/data/ui/remmina_main.glade
+++ b/data/ui/remmina_main.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1
+<!-- Generated with glade 3.22.1 
 
 Remmina - The GTK+ Remmina Remote Desktop Client
 Copyright (C) Antenore Gatta & Giovanni Panozzo 2014-2019
@@ -32,17 +32,27 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
   <object class="GtkImage" id="find_toggle_image">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="icon_name">edit-find</property>
+    <property name="icon_name">edit-find-symbolic</property>
+  </object>
+  <object class="GtkImage" id="image_make_default">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">emblem-default-symbolic</property>
   </object>
   <object class="GtkImage" id="image_new">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="icon_name">document-new</property>
+    <property name="icon_name">document-new-symbolic</property>
+  </object>
+  <object class="GtkImage" id="ustat_toggle_image">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="icon_name">mail-send-receive-symbolic</property>
   </object>
   <object class="GtkImage" id="view_toggle_icon">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="icon_name">view-list</property>
+    <property name="icon_name">view-list-symbolic</property>
     <property name="use_fallback">True</property>
   </object>
   <object class="GtkWindow" id="RemminaMain">
@@ -126,6 +136,34 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             <property name="position">2</property>
           </packing>
         </child>
+        <child>
+          <object class="GtkToggleButton" id="ustats_toggle">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <property name="tooltip_text" translatable="yes">Do you allow Remmina to send periodic anonymous usage statistics to its developers?</property>
+            <property name="image">ustat_toggle_image</property>
+            <signal name="toggled" handler="remmina_main_on_click_ustat_toggle" swapped="no"/>
+          </object>
+          <packing>
+            <property name="pack_type">end</property>
+            <property name="position">3</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButton" id="button_make_default">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="receives_default">True</property>
+            <property name="tooltip_text" translatable="yes">Set Remmina as the default Remote Desktop Client</property>
+            <property name="action_name">main.default</property>
+            <property name="image">image_make_default</property>
+          </object>
+          <packing>
+            <property name="pack_type">end</property>
+            <property name="position">4</property>
+          </packing>
+        </child>
       </object>
     </child>
     <child>
@@ -586,89 +624,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             <property name="position">3</property>
           </packing>
         </child>
-        <child>
-          <object class="GtkBox" id="box_ustat">
-            <property name="can_focus">False</property>
-            <property name="orientation">vertical</property>
-            <child>
-              <object class="GtkSeparator" id="ustat_separator">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkBox" id="box_ustat_inner">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="margin_top">4</property>
-                <property name="margin_bottom">4</property>
-                <property name="spacing">10</property>
-                <child>
-                  <object class="GtkLabel" id="ustat_label">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">start</property>
-                    <property name="label" translatable="yes">Do you allow Remmina to send periodic anonymous usage statistics to its developers?</property>
-                    <property name="single_line_mode">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">True</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" id="ustat_no">
-                    <property name="label" translatable="yes">No</property>
-                    <property name="width_request">60</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="valign">center</property>
-                    <signal name="clicked" handler="remmina_main_on_click_ustat_no" swapped="no"/>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" id="ustat_yes">
-                    <property name="label" translatable="yes">Yes</property>
-                    <property name="width_request">70</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="valign">center</property>
-                    <signal name="clicked" handler="remmina_main_on_click_ustat_yes" swapped="no"/>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="padding">3</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">4</property>
-          </packing>
-        </child>
       </object>
     </child>
   </object>