[gnome-clocks/zbrown/world-clocks] alarm: changes from review

[Zander <zbrown src gnome org>]

commit 188227dfc8930312e25c995a183cf6538a01a3c3
Author: Zander Brown <zbrown gnome org>
Date:   Tue Jan 28 20:23:49 2020 +0000

    alarm: changes from review

 data/css/gnome-clocks.css |   4 ++
 data/ui/alarmrow.ui       | 148 +++++++++++++++++++++-------------------------
 src/alarm.vala            |  20 -------
 3 files changed, 72 insertions(+), 100 deletions(-)
---
diff --git a/data/css/gnome-clocks.css b/data/css/gnome-clocks.css
index d9919a7..1cfb799 100644
--- a/data/css/gnome-clocks.css
+++ b/data/css/gnome-clocks.css
@@ -56,6 +56,10 @@ row.snoozing {
     border-radius: 6px;
 }
 
+.alarm-repeat {
+    font-size: 9pt;
+}
+
 .clocks-ampm-toggle-button {
     font-size: 18pt;
 }
diff --git a/data/ui/alarmrow.ui b/data/ui/alarmrow.ui
index b4a87d5..dfa45b9 100644
--- a/data/ui/alarmrow.ui
+++ b/data/ui/alarmrow.ui
@@ -14,10 +14,9 @@
         <property name="valign">center</property>
         <property name="margin_left">12</property>
         <property name="margin_right">12</property>
-        <property name="margin_top">6</property>
-        <property name="margin_bottom">6</property>
+        <property name="margin_top">12</property>
+        <property name="margin_bottom">12</property>
         <property name="hexpand">True</property>
-        <property name="row_spacing">6</property>
         <property name="column_spacing">12</property>
         <child>
           <object class="GtkSwitch" id="toggle">
@@ -28,76 +27,8 @@
           </object>
           <packing>
             <property name="left_attach">1</property>
-            <property name="top_attach">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkRevealer" id="title_reveal">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="transition_type">slide-up</property>
-            <child>
-              <object class="GtkLabel" id="title">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="hexpand">True</property>
-                <property name="label">Name</property>
-                <property name="ellipsize">end</property>
-                <property name="xalign">0</property>
-                <attributes>
-                  <attribute name="font-features" value="tnum=1"/>
-                </attributes>
-                <style>
-                  <class name="alarm-name"/>
-                </style>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="left_attach">0</property>
             <property name="top_attach">0</property>
-            <property name="width">2</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="time">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="hexpand">True</property>
-            <property name="label">12:34</property>
-            <property name="xalign">0</property>
-            <style>
-              <class name="alarm-time"/>
-            </style>
-          </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkRevealer" id="repeats_reveal">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <child>
-              <object class="GtkLabel" id="repeats">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="hexpand">True</property>
-                <property name="tooltip_text" translatable="yes">Repeats</property>
-                <property name="ellipsize">end</property>
-                <property name="xalign">0</property>
-                <style>
-                  <class name="dim-label"/>
-                  <class name="alarm-repeate"/>
-                </style>
-              </object>
-            </child>
-          </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
-            <property name="width">2</property>
+            <property name="height">3</property>
           </packing>
         </child>
         <child>
@@ -134,7 +65,8 @@
           </object>
           <packing>
             <property name="left_attach">3</property>
-            <property name="top_attach">1</property>
+            <property name="top_attach">0</property>
+            <property name="height">3</property>
           </packing>
         </child>
         <child>
@@ -159,20 +91,76 @@
           </object>
           <packing>
             <property name="left_attach">4</property>
-            <property name="top_attach">1</property>
+            <property name="top_attach">0</property>
+            <property name="height">3</property>
           </packing>
         </child>
         <child>
-          <placeholder/>
-        </child>
-        <child>
-          <placeholder/>
+          <object class="GtkRevealer" id="repeats_reveal">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <child>
+              <object class="GtkLabel" id="repeats">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="tooltip_text" translatable="yes">Repeats</property>
+                <property name="hexpand">True</property>
+                <property name="ellipsize">end</property>
+                <property name="xalign">0</property>
+                <style>
+                  <class name="dim-label"/>
+                  <class name="alarm-repeat"/>
+                </style>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">2</property>
+          </packing>
         </child>
         <child>
-          <placeholder/>
+          <object class="GtkLabel" id="time">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
+            <property name="label">12:34</property>
+            <property name="xalign">0</property>
+            <style>
+              <class name="alarm-time"/>
+            </style>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">1</property>
+          </packing>
         </child>
         <child>
-          <placeholder/>
+          <object class="GtkRevealer" id="title_reveal">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="transition_type">slide-up</property>
+            <child>
+              <object class="GtkLabel" id="title">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="hexpand">True</property>
+                <property name="label">Name</property>
+                <property name="ellipsize">end</property>
+                <property name="xalign">0</property>
+                <attributes>
+                  <attribute name="font-features" value="tnum=1"/>
+                </attributes>
+                <style>
+                  <class name="alarm-name"/>
+                </style>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">0</property>
+          </packing>
         </child>
       </object>
     </child>
diff --git a/src/alarm.vala b/src/alarm.vala
index 5db4f4c..9e49558 100644
--- a/src/alarm.vala
+++ b/src/alarm.vala
@@ -926,26 +926,6 @@ public class Face : Gtk.Stack, Clocks.Clock {
         });
         dialog.show ();
     }
-
-    public void activate_select () {
-        view_mode = SELECTION;
-    }
-
-    public void activate_select_cancel () {
-        view_mode = NORMAL;
-    }
-
-    public void activate_select_all () {
-        // content_view.select_all ();
-    }
-
-    public void activate_select_none () {
-        // content_view.unselect_all ();
-    }
-
-    public bool escape_pressed () {
-        return /*content_view.escape_pressed ();*/ false;
-    }
 }
 
 } // namespace Alarm