diff options
| author | Adrien Plazas <kekun.plazas@laposte.net> | 2019-01-14 15:30:27 +0100 |
|---|---|---|
| committer | Georges Basile Stavracas Neto <georges.stavracas@gmail.com> | 2019-01-29 10:28:28 +0000 |
| commit | fd0b45d6c3fdc0c08c6c6651f37abc7ff6400fa2 (patch) | |
| tree | 37b98aa1ed3c9b151c3e85fd83be17ddd1f45569 | |
| parent | 91af270cce29aae01eb749c91daca3141fc5e496 (diff) | |
| download | gnome-control-center-fd0b45d6c3fdc0c08c6c6651f37abc7ff6400fa2.tar.gz | |
datetime: Use a scrolled window and a column
This better allows to handle short windows and better handle the
available width.
| -rw-r--r-- | panels/datetime/cc-datetime-panel.ui | 616 |
1 files changed, 316 insertions, 300 deletions
diff --git a/panels/datetime/cc-datetime-panel.ui b/panels/datetime/cc-datetime-panel.ui index 80a98bc98..8901cb6c3 100644 --- a/panels/datetime/cc-datetime-panel.ui +++ b/panels/datetime/cc-datetime-panel.ui @@ -273,362 +273,377 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkBox"> + <object class="GtkScrolledWindow"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_start">134</property> - <property name="margin_end">134</property> - <property name="margin_top">32</property> - <property name="margin_bottom">32</property> - <property name="orientation">vertical</property> - <property name="spacing">32</property> + <property name="can-focus">False</property> + <property name="hscrollbar-policy">never</property> <child> - <object class="GtkFrame" id="frame"> + <object class="HdyColumn"> <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="maximum_width">600</property> + <property name="linear_growth_width">400</property> + <property name="margin_top">32</property> + <property name="margin_bottom">32</property> + <property name="margin_start">12</property> + <property name="margin_end">12</property> + <child> - <object class="GtkListBox" id="listbox1"> + <object class="GtkBox"> <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="can_focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">32</property> <child> - <object class="GtkListBoxRow" id="auto_datetime_row"> + <object class="GtkFrame" id="frame"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> + <property name="label_xalign">0</property> + <property name="shadow_type">in</property> <child> - <object class="GtkBox" id="box2"> + <object class="GtkListBox" id="listbox1"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">50</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"/> <child> - <object class="GtkBox" id="box2a"> + <object class="GtkListBoxRow" id="auto_datetime_row"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_start">20</property> - <property name="margin_end">20</property> - <property name="margin_top">12</property> - <property name="margin_bottom">12</property> - <property name="spacing">2</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkLabel" id="network_time_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Automatic _Date & Time</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">network_time_switch</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> + <property name="can_focus">True</property> <child> - <object class="GtkLabel" id="network_time_comment"> + <object class="GtkBox" id="box2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Requires internet access</property> - <style> - <class name="dim-label"/> - </style> - <attributes> - <attribute name="scale" value="0.88"/> - </attributes> + <property name="spacing">50</property> + <child> + <object class="GtkBox" id="box2a"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_start">20</property> + <property name="margin_end">20</property> + <property name="margin_top">12</property> + <property name="margin_bottom">12</property> + <property name="spacing">2</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkLabel" id="network_time_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Automatic _Date & Time</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">network_time_switch</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="network_time_comment"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Requires internet access</property> + <style> + <class name="dim-label"/> + </style> + <attributes> + <attribute name="scale" value="0.88"/> + </attributes> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkSwitch" id="network_time_switch"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="margin_start">20</property> + <property name="margin_end">20</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> </child> </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> </child> <child> - <object class="GtkSwitch" id="network_time_switch"> + <object class="GtkListBoxRow" id="auto_timezone_row"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="margin_start">20</property> - <property name="margin_end">20</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> - </child> - <child> - <object class="GtkListBoxRow" id="auto_timezone_row"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <child> - <object class="GtkBox" id="box3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">50</property> - <child> - <object class="GtkBox" id="box3a"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_start">20</property> - <property name="margin_end">20</property> - <property name="margin_top">12</property> - <property name="margin_bottom">12</property> - <property name="spacing">2</property> - <property name="orientation">vertical</property> <child> - <object class="GtkLabel" id="auto_timezone_label"> + <object class="GtkBox" id="box3"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Automatic Time _Zone</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">auto_timezone_switch</property> + <property name="spacing">50</property> + <child> + <object class="GtkBox" id="box3a"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_start">20</property> + <property name="margin_end">20</property> + <property name="margin_top">12</property> + <property name="margin_bottom">12</property> + <property name="spacing">2</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkLabel" id="auto_timezone_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Automatic Time _Zone</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">auto_timezone_switch</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="auto_timezone_comment"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Requires location services enabled and internet access</property> + <style> + <class name="dim-label"/> + </style> + <attributes> + <attribute name="scale" value="0.88"/> + </attributes> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkSwitch" id="auto_timezone_switch"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="margin_start">20</property> + <property name="margin_end">20</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> </child> + </object> + </child> + <child> + <object class="GtkListBoxRow" id="datetime_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> <child> - <object class="GtkLabel" id="auto_timezone_comment"> + <object class="GtkBox" id="box4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Requires location services enabled and internet access</property> - <style> - <class name="dim-label"/> - </style> - <attributes> - <attribute name="scale" value="0.88"/> - </attributes> + <property name="spacing">50</property> + <child> + <object class="GtkLabel" id="datetime_label1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_start">20</property> + <property name="margin_end">20</property> + <property name="margin_top">6</property> + <property name="margin_bottom">6</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Date & _Time</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="datetime_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_start">20</property> + <property name="margin_end">20</property> + <property name="margin_top">6</property> + <property name="margin_bottom">6</property> + <property name="xalign">0</property> + <property name="label">20 June 2012, 6:45 AM</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> </child> </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> </child> <child> - <object class="GtkSwitch" id="auto_timezone_switch"> + <object class="GtkListBoxRow" id="timezone_button"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="valign">center</property> - <property name="margin_start">20</property> - <property name="margin_end">20</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> - </child> - <child> - <object class="GtkListBoxRow" id="datetime_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <child> - <object class="GtkBox" id="box4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">50</property> - <child> - <object class="GtkLabel" id="datetime_label1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_start">20</property> - <property name="margin_end">20</property> - <property name="margin_top">6</property> - <property name="margin_bottom">6</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Date & _Time</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="datetime_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_start">20</property> - <property name="margin_end">20</property> - <property name="margin_top">6</property> - <property name="margin_bottom">6</property> - <property name="xalign">0</property> - <property name="label">20 June 2012, 6:45 AM</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> - </child> - <child> - <object class="GtkListBoxRow" id="timezone_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <child> - <object class="GtkBox" id="box5"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">50</property> - <child> - <object class="GtkLabel" id="timezone_label1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_start">20</property> - <property name="margin_end">20</property> - <property name="margin_top">6</property> - <property name="margin_bottom">6</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Time Z_one</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="timezone_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_start">20</property> - <property name="margin_end">20</property> - <property name="margin_top">6</property> - <property name="margin_bottom">6</property> - <property name="xalign">0</property> - <property name="label">GMT+1 (London, United Kingdom)</property> + <child> + <object class="GtkBox" id="box5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">50</property> + <child> + <object class="GtkLabel" id="timezone_label1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_start">20</property> + <property name="margin_end">20</property> + <property name="margin_top">6</property> + <property name="margin_bottom">6</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Time Z_one</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="timezone_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_start">20</property> + <property name="margin_end">20</property> + <property name="margin_top">6</property> + <property name="margin_bottom">6</property> + <property name="xalign">0</property> + <property name="label">GMT+1 (London, United Kingdom)</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + </child> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> </child> </object> </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> </child> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkFrame" id="timeformat_frame"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">in</property> - <child> - <object class="GtkListBox" id="listbox2"> - <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"/> <child> - <object class="GtkListBoxRow" id="timeformat_row"> + <object class="GtkFrame" id="timeformat_frame"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> + <property name="label_xalign">0</property> + <property name="shadow_type">in</property> <child> - <object class="GtkBox" id="box1"> + <object class="GtkListBox" id="listbox2"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">50</property> - <child> - <object class="GtkLabel" id="format_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_start">20</property> - <property name="margin_end">20</property> - <property name="margin_top">6</property> - <property name="margin_bottom">6</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Time _Format</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">format_combobox</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> + <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"/> <child> - <object class="GtkComboBoxText" id="format_combobox"> + <object class="GtkListBoxRow" id="timeformat_row"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="valign">center</property> - <property name="margin_start">20</property> - <property name="margin_end">20</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> + <property name="can_focus">True</property> + <child> + <object class="GtkBox" id="box1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">50</property> + <child> + <object class="GtkLabel" id="format_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_start">20</property> + <property name="margin_end">20</property> + <property name="margin_top">6</property> + <property name="margin_bottom">6</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Time _Format</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">format_combobox</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="format_combobox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="margin_start">20</property> + <property name="margin_end">20</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> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + </child> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> </child> </object> </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> </object> </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> + </object> + </child> </object> </child> </template> @@ -643,3 +658,4 @@ </widgets> </object> </interface> + |