Merge branch 'Edit-preferences-ui' into 'master'

Edit preferences UI

See merge request Remmina/Remmina!2491

1 files changed, 37 insertions, 13 deletions

diff --git a/data/ui/remmina_preferences.glade b/data/ui/remmina_preferences.glade
index ffee835c0..49dfa7daf 100644
--- a/data/ui/remmina_preferences.glade
+++ b/data/ui/remmina_preferences.glade
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.38.2 -->
+<!-- Generated with glade 3.40.0 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="RemminaPrefDialog">
@@ -468,6 +468,24 @@
                         <property name="width">2</property>
                       </packing>
                     </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
                   </object>
                 </child>
               </object>
@@ -478,8 +496,8 @@
           <object class="GtkLabel" id="label_tab_options">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
-            <property name="halign">end</property>
-            <property name="label" translatable="yes">Options</property>
+            <property name="halign">start</property>
+            <property name="label" translatable="yes">General</property>
           </object>
           <packing>
             <property name="menu-label">options</property>
@@ -496,7 +514,7 @@
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
                 <child>
-                  <!-- n-columns=3 n-rows=9 -->
+                  <!-- n-columns=3 n-rows=10 -->
                   <object class="GtkGrid" id="grid_appearance">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
@@ -778,6 +796,12 @@ It changes the background colour of connection names in the Remmina connection t
                     <child>
                       <placeholder/>
                     </child>
+                    <child>
+                      <placeholder/>
+                    </child>
+                    <child>
+                      <placeholder/>
+                    </child>
                   </object>
                 </child>
               </object>
@@ -791,7 +815,7 @@ It changes the background colour of connection names in the Remmina connection t
           <object class="GtkLabel" id="label_tab_appearance">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
-            <property name="halign">end</property>
+            <property name="halign">start</property>
             <property name="label" translatable="yes">Appearance</property>
           </object>
           <packing>
@@ -904,7 +928,7 @@ It changes the background colour of connection names in the Remmina connection t
           <object class="GtkLabel" id="label_tab_applet">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
-            <property name="halign">end</property>
+            <property name="halign">start</property>
             <property name="label" translatable="yes">Applet</property>
           </object>
           <packing>
@@ -1336,7 +1360,7 @@ It changes the background colour of connection names in the Remmina connection t
           <object class="GtkLabel" id="label_tab_keyboard">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
-            <property name="halign">end</property>
+            <property name="halign">start</property>
             <property name="label" translatable="yes">Keyboard</property>
           </object>
           <packing>
@@ -1581,7 +1605,7 @@ It changes the background colour of connection names in the Remmina connection t
           <object class="GtkLabel" id="label_tab_ssh">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
-            <property name="halign">end</property>
+            <property name="halign">start</property>
             <property name="label" translatable="yes">SSH options</property>
           </object>
           <packing>
@@ -1601,7 +1625,7 @@ It changes the background colour of connection names in the Remmina connection t
                 <property name="can-focus">False</property>
                 <property name="tooltip-text" translatable="yes">Time in seconds before Remmina will lock the session and asks for a password again. Default: 300 Seconds.</property>
                 <child>
-                  <!-- n-columns=2 n-rows=7 -->
+                  <!-- n-columns=2 n-rows=8 -->
                   <object class="GtkGrid">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
@@ -1716,7 +1740,7 @@ It changes the background colour of connection names in the Remmina connection t
                         <property name="top-attach">4</property>
                       </packing>
                     </child>
-                   <child>
+                    <child>
                       <object class="GtkSwitch" id="switch_security_lock_connect">
                         <property name="visible">True</property>
                         <property name="can-focus">True</property>
@@ -1744,7 +1768,7 @@ It changes the background colour of connection names in the Remmina connection t
                         <property name="top-attach">3</property>
                       </packing>
                     </child>
-                   <child>
+                    <child>
                       <object class="GtkSwitch" id="switch_security_lock_view_passwords">
                         <property name="visible">True</property>
                         <property name="can-focus">True</property>
@@ -1867,7 +1891,7 @@ Except the "Weak" method, all the others are recommended, "Keystore" is the defa
           <object class="GtkLabel" id="label_tab_security">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
-            <property name="halign">end</property>
+            <property name="halign">start</property>
             <property name="label" translatable="yes">Security</property>
           </object>
           <packing>
@@ -2661,7 +2685,7 @@ Except the "Weak" method, all the others are recommended, "Keystore" is the defa
           <object class="GtkLabel" id="label_tab_terminal">
             <property name="visible">True</property>
             <property name="can-focus">False</property>
-            <property name="halign">end</property>
+            <property name="halign">start</property>
             <property name="label" translatable="yes">Terminal</property>
           </object>
           <packing>