messenger-gtk

commit 965c55597da500e54c9cba061888ea4774fc056a
parent 9b67d565baf5ce0f555cb38abdda22696cbfe778
Author: TheJackiMonster <thejackimonster@gmail.com>
Date:   Sat, 27 Nov 2021 13:51:18 +0100

Some UI changes to settings and picker

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>

Diffstat:
M
resources/ui/picker.ui
 | 
2
+-
M
resources/ui/settings.ui
 | 
186
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------

2 files changed, 157 insertions(+), 31 deletions(-)
diff --git a/resources/ui/picker.ui b/resources/ui/picker.ui
@@ -42,11 +42,11 @@ Author: Tobias Frisch
                 <property name="visible">True</property>
                 <property name="can-focus">True</property>
                 <property name="vscrollbar-policy">never</property>
-                <property name="shadow-type">in</property>
                 <child>
                   <object class="GtkViewport">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
+                    <property name="shadow-type">none</property>
                     <child>
                       <object class="HdyViewSwitcherBar" id="emoji_switcher_bar">
                         <property name="visible">True</property>
diff --git a/resources/ui/settings.ui b/resources/ui/settings.ui
@@ -88,12 +88,33 @@ Author: Tobias Frisch
                 <property name="can-focus">True</property>
                 <property name="title" translatable="yes">Start on login</property>
                 <child>
-                  <object class="GtkCheckButton">
-                    <property name="label" translatable="yes">Start on login</property>
+                  <object class="GtkBox">
                     <property name="visible">True</property>
-                    <property name="can-focus">True</property>
-                    <property name="receives-default">False</property>
-                    <property name="draw-indicator">True</property>
+                    <property name="can-focus">False</property>
+                    <child>
+                      <object class="GtkLabel">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="label" translatable="yes">Start on login</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkSwitch">
+                        <property name="visible">True</property>
+                        <property name="can-focus">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="pack-type">end</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
                     <style>
                       <class name="settings-entry"/>
                     </style>
@@ -107,12 +128,33 @@ Author: Tobias Frisch
                 <property name="can-focus">True</property>
                 <property name="title" translatable="yes">Run in background</property>
                 <child>
-                  <object class="GtkCheckButton">
-                    <property name="label" translatable="yes">Run in background</property>
+                  <object class="GtkBox">
                     <property name="visible">True</property>
-                    <property name="can-focus">True</property>
-                    <property name="receives-default">False</property>
-                    <property name="draw-indicator">True</property>
+                    <property name="can-focus">False</property>
+                    <child>
+                      <object class="GtkLabel">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="label" translatable="yes">Run in background</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkSwitch">
+                        <property name="visible">True</property>
+                        <property name="can-focus">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="pack-type">end</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
                     <style>
                       <class name="settings-entry"/>
                     </style>
@@ -141,12 +183,33 @@ Author: Tobias Frisch
                 <property name="can-focus">False</property>
                 <property name="title" translatable="yes">Enable notifications</property>
                 <child>
-                  <object class="GtkCheckButton">
-                    <property name="label" translatable="yes">Enable notifications</property>
+                  <object class="GtkBox">
                     <property name="visible">True</property>
-                    <property name="can-focus">True</property>
-                    <property name="receives-default">False</property>
-                    <property name="draw-indicator">True</property>
+                    <property name="can-focus">False</property>
+                    <child>
+                      <object class="GtkLabel">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="label" translatable="yes">Enable notifications</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkSwitch">
+                        <property name="visible">True</property>
+                        <property name="can-focus">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="pack-type">end</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
                     <style>
                       <class name="settings-entry"/>
                     </style>
@@ -160,12 +223,33 @@ Author: Tobias Frisch
                 <property name="can-focus">True</property>
                 <property name="title" translatable="yes">Play notification sounds</property>
                 <child>
-                  <object class="GtkCheckButton">
-                    <property name="label" translatable="yes">Play notification sounds</property>
+                  <object class="GtkBox">
                     <property name="visible">True</property>
-                    <property name="can-focus">True</property>
-                    <property name="receives-default">False</property>
-                    <property name="draw-indicator">True</property>
+                    <property name="can-focus">False</property>
+                    <child>
+                      <object class="GtkLabel">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="label" translatable="yes">Play notification sounds</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkSwitch">
+                        <property name="visible">True</property>
+                        <property name="can-focus">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="pack-type">end</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
                     <style>
                       <class name="settings-entry"/>
                     </style>
@@ -217,12 +301,33 @@ Author: Tobias Frisch
                 <property name="can-focus">True</property>
                 <property name="title" translatable="yes">Send read receipts</property>
                 <child>
-                  <object class="GtkCheckButton">
-                    <property name="label" translatable="yes">Send read receipts</property>
+                  <object class="GtkBox">
                     <property name="visible">True</property>
-                    <property name="can-focus">True</property>
-                    <property name="receives-default">False</property>
-                    <property name="draw-indicator">True</property>
+                    <property name="can-focus">False</property>
+                    <child>
+                      <object class="GtkLabel">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="label" translatable="yes">Send read receipts</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkSwitch">
+                        <property name="visible">True</property>
+                        <property name="can-focus">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="pack-type">end</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
                     <style>
                       <class name="settings-entry"/>
                     </style>
@@ -236,12 +341,33 @@ Author: Tobias Frisch
                 <property name="can-focus">True</property>
                 <property name="title" translatable="yes">Show whispering</property>
                 <child>
-                  <object class="GtkCheckButton">
-                    <property name="label" translatable="yes">Show whispering</property>
+                  <object class="GtkBox">
                     <property name="visible">True</property>
-                    <property name="can-focus">True</property>
-                    <property name="receives-default">False</property>
-                    <property name="draw-indicator">True</property>
+                    <property name="can-focus">False</property>
+                    <child>
+                      <object class="GtkLabel">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="label" translatable="yes">Show whispering</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkSwitch">
+                        <property name="visible">True</property>
+                        <property name="can-focus">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="pack-type">end</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
                     <style>
                       <class name="settings-entry"/>
                     </style>