[gnome-control-center] datetime: Use content style for listbox
- From: Robert Ancell <rancell src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-control-center] datetime: Use content style for listbox
- Date: Wed, 19 May 2021 03:31:09 +0000 (UTC)
commit ea821e5c3a6c3666dfe6e9f2d008aa0e9f7dfe87
Author: Mohammed Sadiq <sadiq sadiqpk org>
Date: Tue May 11 18:06:01 2021 +0530
datetime: Use content style for listbox
panels/datetime/cc-datetime-panel.c | 1 -
panels/datetime/cc-datetime-panel.ui | 179 ++++++++++++++++-------------------
2 files changed, 82 insertions(+), 98 deletions(-)
---
diff --git a/panels/datetime/cc-datetime-panel.c b/panels/datetime/cc-datetime-panel.c
index 4e7b3ee00..c1a84770a 100644
--- a/panels/datetime/cc-datetime-panel.c
+++ b/panels/datetime/cc-datetime-panel.c
@@ -869,7 +869,6 @@ static void
setup_listbox (CcDateTimePanel *self,
GtkWidget *listbox)
{
- gtk_list_box_set_header_func (GTK_LIST_BOX (listbox), cc_list_box_update_header_func, NULL, NULL);
self->listboxes = g_list_append (self->listboxes, listbox);
self->listboxes_reverse = g_list_prepend (self->listboxes_reverse, listbox);
}
diff --git a/panels/datetime/cc-datetime-panel.ui b/panels/datetime/cc-datetime-panel.ui
index b792a263d..bfe5b235f 100644
--- a/panels/datetime/cc-datetime-panel.ui
+++ b/panels/datetime/cc-datetime-panel.ui
@@ -167,7 +167,7 @@
<property name="selection-mode">none</property>
<signal name="row-activated" handler="date_box_row_activated_cb" swapped="yes"/>
<style>
- <class name="frame"/>
+ <class name="content"/>
</style>
<!-- Year row -->
@@ -359,54 +359,49 @@
<property name="orientation">vertical</property>
<property name="spacing">32</property>
<child>
- <object class="GtkFrame" id="datetime_frame">
+ <object class="GtkListBox" id="listbox2">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">in</property>
+ <property name="can_focus">True</property>
+ <property name="selection_mode">none</property>
+ <signal name="row-activated" handler="list_box_row_activated" object="CcDateTimePanel"
swapped="no"/>
+ <signal name="keynav-failed" handler="keynav_failed" object="CcDateTimePanel"
swapped="no"/>
+ <style>
+ <class name="content"/>
+ </style>
<child>
- <object class="GtkListBox" id="listbox2">
+ <object class="HdyActionRow" id="auto_datetime_row">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="selection_mode">none</property>
- <signal name="row-activated" handler="list_box_row_activated"
object="CcDateTimePanel" swapped="no"/>
- <signal name="keynav-failed" handler="keynav_failed" object="CcDateTimePanel"
swapped="no"/>
+ <property name="title" translatable="yes">Automatic _Date & Time</property>
+ <property name="subtitle" translatable="yes">Requires internet access</property>
+ <property name="use_underline">True</property>
<child>
- <object class="HdyActionRow" id="auto_datetime_row">
+ <object class="GtkSwitch" id="network_time_switch">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="title" translatable="yes">Automatic _Date & Time</property>
- <property name="subtitle" translatable="yes">Requires internet access</property>
- <property name="use_underline">True</property>
- <child>
- <object class="GtkSwitch" id="network_time_switch">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="valign">center</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="valign">center</property>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
+ </object>
+ </child>
+ <child>
+ <object class="HdyActionRow" id="datetime_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="title" translatable="yes">Date & _Time</property>
+ <property name="use_underline">True</property>
+ <property name="activatable">True</property>
<child>
- <object class="HdyActionRow" id="datetime_button">
+ <object class="GtkLabel" id="datetime_label">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="title" translatable="yes">Date & _Time</property>
- <property name="use_underline">True</property>
- <property name="activatable">True</property>
- <child>
- <object class="GtkLabel" id="datetime_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label">20 June 2012, 6:45 AM</property>
- </object>
- </child>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label">20 June 2012, 6:45 AM</property>
</object>
</child>
</object>
@@ -419,50 +414,45 @@
</packing>
</child>
<child>
- <object class="GtkFrame" id="timezone_frame">
+ <object class="GtkListBox" id="listbox1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">in</property>
+ <property name="can_focus">True</property>
+ <property name="selection_mode">none</property>
+ <signal name="row-activated" handler="list_box_row_activated" object="CcDateTimePanel"
swapped="no"/>
+ <signal name="keynav-failed" handler="keynav_failed" object="CcDateTimePanel"
swapped="no"/>
+ <style>
+ <class name="content"/>
+ </style>
<child>
- <object class="GtkListBox" id="listbox1">
+ <object class="HdyActionRow" id="auto_timezone_row">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="selection_mode">none</property>
- <signal name="row-activated" handler="list_box_row_activated"
object="CcDateTimePanel" swapped="no"/>
- <signal name="keynav-failed" handler="keynav_failed" object="CcDateTimePanel"
swapped="no"/>
+ <property name="title" translatable="yes">Automatic Time _Zone</property>
+ <property name="subtitle" translatable="yes">Requires location services enabled and
internet access</property>
+ <property name="use_underline">True</property>
<child>
- <object class="HdyActionRow" id="auto_timezone_row">
+ <object class="GtkSwitch" id="auto_timezone_switch">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="title" translatable="yes">Automatic Time _Zone</property>
- <property name="subtitle" translatable="yes">Requires location services enabled
and internet access</property>
- <property name="use_underline">True</property>
- <child>
- <object class="GtkSwitch" id="auto_timezone_switch">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="valign">center</property>
- </object>
- </child>
+ <property name="valign">center</property>
</object>
</child>
+ </object>
+ </child>
+ <child>
+ <object class="HdyActionRow" id="timezone_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="title" translatable="yes">Time Z_one</property>
+ <property name="use_underline">True</property>
+ <property name="activatable">True</property>
<child>
- <object class="HdyActionRow" id="timezone_button">
+ <object class="GtkLabel" id="timezone_label">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="title" translatable="yes">Time Z_one</property>
- <property name="use_underline">True</property>
- <property name="activatable">True</property>
- <child>
- <object class="GtkLabel" id="timezone_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="ellipsize">end</property>
- <property name="xalign">0</property>
- <property name="label">GMT+1 (London, United Kingdom)</property>
- </object>
- </child>
+ <property name="can_focus">False</property>
+ <property name="ellipsize">end</property>
+ <property name="xalign">0</property>
+ <property name="label">GMT+1 (London, United Kingdom)</property>
</object>
</child>
</object>
@@ -475,36 +465,31 @@
</packing>
</child>
<child>
- <object class="GtkFrame" id="timeformat_frame">
+ <object class="GtkListBox" id="listbox3">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">in</property>
+ <property name="can_focus">True</property>
+ <property name="selection_mode">none</property>
+ <signal name="row-activated" handler="list_box_row_activated" object="CcDateTimePanel"
swapped="no"/>
+ <signal name="keynav-failed" handler="keynav_failed" object="CcDateTimePanel"
swapped="no"/>
+ <style>
+ <class name="content"/>
+ </style>
<child>
- <object class="GtkListBox" id="listbox3">
+ <object class="HdyActionRow" id="timeformat_row">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="selection_mode">none</property>
- <signal name="row-activated" handler="list_box_row_activated"
object="CcDateTimePanel" swapped="no"/>
- <signal name="keynav-failed" handler="keynav_failed" object="CcDateTimePanel"
swapped="no"/>
+ <property name="title" translatable="yes">Time _Format</property>
+ <property name="use_underline">True</property>
<child>
- <object class="HdyActionRow" id="timeformat_row">
+ <object class="GtkComboBoxText" id="format_combobox">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="title" translatable="yes">Time _Format</property>
- <property name="use_underline">True</property>
- <child>
- <object class="GtkComboBoxText" id="format_combobox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">center</property>
- <signal name="notify::active-id" handler="change_clock_settings"
object="CcDateTimePanel" swapped="no"/>
- <items>
- <item id="24h" translatable="yes">24-hour</item>
- <item id="12h" translatable="yes">AM / PM</item>
- </items>
- </object>
- </child>
+ <property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <signal name="notify::active-id" handler="change_clock_settings"
object="CcDateTimePanel" swapped="no"/>
+ <items>
+ <item id="24h" translatable="yes">24-hour</item>
+ <item id="12h" translatable="yes">AM / PM</item>
+ </items>
</object>
</child>
</object>
@@ -518,8 +503,8 @@
</child>
</object>
</child>
- </object>
- </child>
+ </object>
+ </child>
</object>
</child>
</template>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
