applications/gnome-control-center
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

datetime: Port to AdwSwitchRow

Browse source
This commit is contained in:
Hari Rana 2024-01-16 19:42:12 -05:00 • committed by Felipe Borges
parent a9f431bdbd
commit 4e63a7df59
2 changed files with 22 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
panels/system/datetime/cc-datetime-page.c
View file

@ -84,8 +84,7 @@ struct _CcDateTimePage
GSettings *filechooser_settings; GSettings *filechooser_settings;
GDesktopClockFormat clock_format; GDesktopClockFormat clock_format;
AdwActionRow *auto_datetime_row; AdwActionRow *auto_datetime_row;
AdwActionRow *auto_timezone_row; AdwSwitchRow *auto_timezone_row;
GtkSwitch *auto_timezone_switch;
AdwActionRow *datetime_row; AdwActionRow *datetime_row;
GtkWindow *datetime_dialog; GtkWindow *datetime_dialog;
GtkLabel *datetime_label; GtkLabel *datetime_label;
@ -93,11 +92,10 @@ struct _CcDateTimePage
GtkToggleButton *twentyfour_format_button; GtkToggleButton *twentyfour_format_button;
GtkToggleButton *ampm_format_button; GtkToggleButton *ampm_format_button;
GtkSpinButton *h_spinbutton; GtkSpinButton *h_spinbutton;
GtkWidget *weekday_row; AdwSwitchRow *weekday_row;
GtkWidget *weekday_switch; AdwSwitchRow *date_row;
GtkWidget *date_switch; AdwSwitchRow *seconds_row;
GtkWidget *seconds_switch; AdwSwitchRow *week_numbers_row;
GtkWidget *week_numbers_switch;
GtkLockButton *lock_button; GtkLockButton *lock_button;
GtkListBox *date_box; GtkListBox *date_box;
GtkSingleSelection *month_model; GtkSingleSelection *month_model;
@ -531,7 +529,7 @@ on_permission_changed (CcDateTimePage *self)
location_allowed = g_settings_get_boolean (self->location_settings, LOCATION_ENABLED); location_allowed = g_settings_get_boolean (self->location_settings, LOCATION_ENABLED);
tz_allowed = (self->tz_permission != NULL && g_permission_get_allowed (self->tz_permission)); tz_allowed = (self->tz_permission != NULL && g_permission_get_allowed (self->tz_permission));
using_ntp = gtk_switch_get_active (self->network_time_switch); using_ntp = gtk_switch_get_active (self->network_time_switch);
auto_timezone = gtk_switch_get_active (self->auto_timezone_switch); auto_timezone = adw_switch_row_get_active (self->auto_timezone_row);
/* All the widgets but the lock button and the 24h setting */ /* All the widgets but the lock button and the 24h setting */
gtk_widget_set_sensitive (GTK_WIDGET (self->auto_datetime_row), allowed); gtk_widget_set_sensitive (GTK_WIDGET (self->auto_datetime_row), allowed);
@ -812,7 +810,7 @@ cc_date_time_page_class_init (CcDateTimePageClass *klass)
gtk_widget_class_bind_template_child (widget_class, CcDateTimePage, auto_datetime_row); gtk_widget_class_bind_template_child (widget_class, CcDateTimePage, auto_datetime_row);
gtk_widget_class_bind_template_child (widget_class, CcDateTimePage, auto_timezone_row); gtk_widget_class_bind_template_child (widget_class, CcDateTimePage, auto_timezone_row);
gtk_widget_class_bind_template_child (widget_class, CcDateTimePage, auto_timezone_switch); gtk_widget_class_bind_template_child (widget_class, CcDateTimePage, auto_timezone_row);
gtk_widget_class_bind_template_child (widget_class, CcDateTimePage, date_box); gtk_widget_class_bind_template_child (widget_class, CcDateTimePage, date_box);
gtk_widget_class_bind_template_child (widget_class, CcDateTimePage, datetime_row); gtk_widget_class_bind_template_child (widget_class, CcDateTimePage, datetime_row);
gtk_widget_class_bind_template_child (widget_class, CcDateTimePage, datetime_dialog); gtk_widget_class_bind_template_child (widget_class, CcDateTimePage, datetime_dialog);
@ -820,10 +818,10 @@ cc_date_time_page_class_init (CcDateTimePageClass *klass)
gtk_widget_class_bind_template_child (widget_class, CcDateTimePage, day_spin_row); gtk_widget_class_bind_template_child (widget_class, CcDateTimePage, day_spin_row);
gtk_widget_class_bind_template_child (widget_class, CcDateTimePage, twentyfour_format_button); gtk_widget_class_bind_template_child (widget_class, CcDateTimePage, twentyfour_format_button);
gtk_widget_class_bind_template_child (widget_class, CcDateTimePage, ampm_format_button); gtk_widget_class_bind_template_child (widget_class, CcDateTimePage, ampm_format_button);
gtk_widget_class_bind_template_child (widget_class, CcDateTimePage, weekday_switch); gtk_widget_class_bind_template_child (widget_class, CcDateTimePage, weekday_row);
gtk_widget_class_bind_template_child (widget_class, CcDateTimePage, date_switch); gtk_widget_class_bind_template_child (widget_class, CcDateTimePage, date_row);
gtk_widget_class_bind_template_child (widget_class, CcDateTimePage, seconds_switch); gtk_widget_class_bind_template_child (widget_class, CcDateTimePage, seconds_row);
gtk_widget_class_bind_template_child (widget_class, CcDateTimePage, week_numbers_switch); gtk_widget_class_bind_template_child (widget_class, CcDateTimePage, week_numbers_row);
gtk_widget_class_bind_template_child (widget_class, CcDateTimePage, lock_button); gtk_widget_class_bind_template_child (widget_class, CcDateTimePage, lock_button);
gtk_widget_class_bind_template_child (widget_class, CcDateTimePage, month_model); gtk_widget_class_bind_template_child (widget_class, CcDateTimePage, month_model);
gtk_widget_class_bind_template_child (widget_class, CcDateTimePage, month_popover); gtk_widget_class_bind_template_child (widget_class, CcDateTimePage, month_popover);
@ -913,7 +911,7 @@ cc_date_time_page_init (CcDateTimePage *self)
gtk_widget_set_visible (GTK_WIDGET (self->auto_datetime_row), is_ntp_available (self)); gtk_widget_set_visible (GTK_WIDGET (self->auto_datetime_row), is_ntp_available (self));
/* Timezone settings */ /* Timezone settings */
g_object_bind_property_full (self->auto_timezone_switch, "active", g_object_bind_property_full (self->auto_timezone_row, "active",
self->timezone_row, "sensitive", self->timezone_row, "sensitive",
G_BINDING_SYNC_CREATE, G_BINDING_SYNC_CREATE,
(GBindingTransformFunc) tz_switch_to_row_transform_func, (GBindingTransformFunc) tz_switch_to_row_transform_func,
@ -921,7 +919,7 @@ cc_date_time_page_init (CcDateTimePage *self)
self->datetime_settings = g_settings_new (DATETIME_SCHEMA); self->datetime_settings = g_settings_new (DATETIME_SCHEMA);
g_settings_bind (self->datetime_settings, AUTO_TIMEZONE_KEY, g_settings_bind (self->datetime_settings, AUTO_TIMEZONE_KEY,
self->auto_timezone_switch, "active", self->auto_timezone_row, "active",
G_SETTINGS_BIND_DEFAULT); G_SETTINGS_BIND_DEFAULT);
/* Clock settings */ /* Clock settings */
@ -937,22 +935,22 @@ cc_date_time_page_init (CcDateTimePage *self)
/* setup top bar clock setting switches */ /* setup top bar clock setting switches */
g_settings_bind (self->clock_settings, CLOCK_SHOW_WEEKDAY_KEY, g_settings_bind (self->clock_settings, CLOCK_SHOW_WEEKDAY_KEY,
self->weekday_switch, "active", self->weekday_row, "active",
G_SETTINGS_BIND_DEFAULT); G_SETTINGS_BIND_DEFAULT);
g_settings_bind (self->clock_settings, CLOCK_SHOW_DATE_KEY, g_settings_bind (self->clock_settings, CLOCK_SHOW_DATE_KEY,
self->date_switch, "active", self->date_row, "active",
G_SETTINGS_BIND_DEFAULT); G_SETTINGS_BIND_DEFAULT);
g_settings_bind (self->clock_settings, CLOCK_SHOW_SECONDS_KEY, g_settings_bind (self->clock_settings, CLOCK_SHOW_SECONDS_KEY,
self->seconds_switch, "active", self->seconds_row, "active",
G_SETTINGS_BIND_DEFAULT); G_SETTINGS_BIND_DEFAULT);
/* Calendar settings */ /* Calendar settings */
self->calendar_settings = g_settings_new (CALENDAR_SCHEMA); self->calendar_settings = g_settings_new (CALENDAR_SCHEMA);
g_settings_bind (self->calendar_settings, CALENDAR_SHOW_WEEK_NUMBERS_KEY, g_settings_bind (self->calendar_settings, CALENDAR_SHOW_WEEK_NUMBERS_KEY,
self->week_numbers_switch, "active", self->week_numbers_row, "active",
G_SETTINGS_BIND_DEFAULT); G_SETTINGS_BIND_DEFAULT);
update_time (self); update_time (self);

40
panels/system/datetime/cc-datetime-page.ui
View file

@ -170,16 +170,10 @@
<child> <child>
<object class="AdwPreferencesGroup"> <object class="AdwPreferencesGroup">
<child> <child>
<object class="AdwActionRow" id="auto_timezone_row"> <object class="AdwSwitchRow" id="auto_timezone_row">
<property name="title" translatable="yes">Automatic Time _Zone</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="subtitle" translatable="yes">Requires location services enabled and internet access</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="activatable_widget">auto_timezone_switch</property>
<child>
<object class="GtkSwitch" id="auto_timezone_switch">
<property name="valign">center</property>
</object>
</child>
</object> </object>
</child> </child>
<child> <child>
@ -244,52 +238,28 @@
<property name="title" translatable="yes">Clock &amp;amp; Calendar</property> <property name="title" translatable="yes">Clock &amp;amp; Calendar</property>
<property name="description" translatable="yes">Control how the time and date is shown in the top bar</property> <property name="description" translatable="yes">Control how the time and date is shown in the top bar</property>
<child> <child>
<object class="AdwActionRow"> <object class="AdwSwitchRow" id="weekday_row">
<property name="title" translatable="yes">_Week Day</property> <property name="title" translatable="yes">_Week Day</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="activatable_widget">weekday_switch</property>
<child>
<object class="GtkSwitch" id="weekday_switch">
<property name="valign">center</property>
</object>
</child>
</object> </object>
</child> </child>
<child> <child>
<object class="AdwActionRow"> <object class="AdwSwitchRow" id="date_row">
<property name="title" translatable="yes">D_ate</property> <property name="title" translatable="yes">D_ate</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="activatable_widget">date_switch</property>
<child>
<object class="GtkSwitch" id="date_switch">
<property name="valign">center</property>
</object>
</child>
</object> </object>
</child> </child>
<child> <child>
<object class="AdwActionRow"> <object class="AdwSwitchRow" id="seconds_row">
<property name="title" translatable="yes">_Seconds</property> <property name="title" translatable="yes">_Seconds</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="activatable_widget">seconds_switch</property>
<child>
<object class="GtkSwitch" id="seconds_switch">
<property name="valign">center</property>
</object>
</child>
</object> </object>
</child> </child>
<child> <child>
<object class="AdwActionRow"> <object class="AdwSwitchRow" id="week_numbers_row">
<property name="title" translatable="yes">Week _Numbers</property> <property name="title" translatable="yes">Week _Numbers</property>
<property name="subtitle" translatable="yes">Shown in the dropdown calendar</property> <property name="subtitle" translatable="yes">Shown in the dropdown calendar</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="activatable_widget">week_numbers_switch</property>
<child>
<object class="GtkSwitch" id="week_numbers_switch">
<property name="valign">center</property>
</object>
</child>
</object> </object>
</child> </child>
</object> </object>