Commit 8a8e53ab authored by Allan Day's avatar Allan Day Committed by Rui Matos
Browse files

Standardize vertical spacing of panels

Ensure that the vertical spacing inside each panel is similar.
This makes the transition between each panel smoother and makes
the control center feel more cohesive.

Settings panels are given 32px above and below their content
and 32px vertical space between major sections. 12px space is
placed below headings.

Bluetooth, displays and printers are not addressed.

https://bugzilla.gnome.org/show_bug.cgi?id=786384
parent c7fea889
......@@ -787,7 +787,10 @@
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<property name="margin">24</property>
<property name="margin_top">32</property>
<property name="margin_bottom">32</property>
<property name="margin_left">24</property>
<property name="margin_right">24</property>
<property name="hexpand">True</property>
<child>
<object class="GtkBox" id="hbox3">
......
......@@ -262,10 +262,10 @@
<property name="can_focus">False</property>
<property name="margin_start">134</property>
<property name="margin_end">134</property>
<property name="margin_top">24</property>
<property name="margin_bottom">24</property>
<property name="margin_top">32</property>
<property name="margin_bottom">32</property>
<property name="orientation">vertical</property>
<property name="spacing">24</property>
<property name="spacing">32</property>
<child>
<object class="GtkFrame" id="frame">
<property name="visible">True</property>
......
......@@ -5,7 +5,10 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="expand">True</property>
<property name="margin">24</property>
<property name="margin_top">32</property>
<property name="margin_bottom">32</property>
<property name="margin_left">24</property>
<property name="margin_right">24</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
......
......@@ -5,7 +5,10 @@
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="expand">True</property>
<property name="margin">24</property>
<property name="margin_top">32</property>
<property name="margin_bottom">32</property>
<property name="margin_left">24</property>
<property name="margin_right">24</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
......@@ -15,7 +18,7 @@
<object class="GtkBox" id="media_preferences_vbox3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">10</property>
<property name="spacing">18</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkBox" id="media_handling_vbox">
......@@ -35,11 +38,13 @@
<object class="GtkLabel" id="label42">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">center</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Select how media should be handled</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
<property name="margin_bottom">12</property>
<style>
<class name="dim-label"/>
</style>
</object>
<packing>
<property name="expand">False</property>
......@@ -51,7 +56,7 @@
<object class="GtkBox" id="vbox52">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<property name="spacing">18</property>
<property name="margin-start">12</property>
<property name="orientation">vertical</property>
<child>
......@@ -60,7 +65,7 @@
<property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="column-spacing">6</property>
<property name="row-spacing">6</property>
<property name="row-spacing">12</property>
<child>
<object class="GtkLabel" id="label44">
<property name="visible">True</property>
......
......@@ -47,7 +47,10 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="margin">18</property>
<property name="margin_top">32</property>
<property name="margin_bottom">32</property>
<property name="margin_left">18</property>
<property name="margin_right">18</property>
<property name="spacing">12</property>
<property name="halign">center</property>
<child>
......
......@@ -26,16 +26,15 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">center</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="margin_top">32</property>
<property name="margin_bottom">32</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkFrame" id="general-frame">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="shadow_type">in</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="margin_bottom">32</property>
<property name="label_yalign">0.45</property>
<property name="shadow_type">none</property>
<child type="label">
......@@ -44,6 +43,7 @@
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">General</property>
<property name="margin_bottom">12</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
......@@ -52,9 +52,7 @@
<child>
<object class="GtkFrame" id="general-frame-listbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">6</property>
<property name="margin_bottom">6</property>
<property name="can_focus">False</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkListBox" id="general-listbox">
......@@ -168,16 +166,16 @@
<object class="GtkFrame" id="mouse-frame">
<property name="visible">False</property>
<property name="can_focus">False</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="shadow_type">none</property>
<property name="label_yalign">0.45</property>
<property name="margin_bottom">32</property>
<child type="label">
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Mouse</property>
<property name="margin_bottom">12</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
......@@ -187,8 +185,6 @@
<object class="GtkFrame" id="mouse-frame-listbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">6</property>
<property name="margin_bottom">6</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkListBox" id="mouse-listbox">
......@@ -335,8 +331,6 @@
<object class="GtkFrame" id="touchpad-frame">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">12</property>
<property name="margin_bottom">12</property>
<property name="shadow_type">none</property>
<property name="label_yalign">0.45</property>
<child type="label">
......@@ -345,6 +339,7 @@
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Touchpad</property>
<property name="margin_bottom">12</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
......@@ -354,8 +349,6 @@
<object class="GtkFrame" id="touchpad-frame-listbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">6</property>
<property name="margin_bottom">12</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkBox" id="touchpad-box">
......
......@@ -61,7 +61,10 @@
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="spacing">12</property>
<property name="margin">18</property>
<property name="margin_top">32</property>
<property name="margin_bottom">32</property>
<property name="margin_left">18</property>
<property name="margin_right">18</property>
<property name="orientation">vertical</property>
<!-- Each GtkBox below will contain GtkStacks from the NetDevices -->
......
......@@ -21,7 +21,6 @@
<property name="valign">center</property>
<property name="orientation">vertical</property>
<property name="margin">18</property>
<property name="spacing">18</property>
<child type="center">
<object class="GtkImage">
<property name="visible">True</property>
......@@ -77,8 +76,7 @@
<child>
<object class="GtkGrid">
<property name="visible">True</property>
<property name="border-width">24</property>
<property name="row-spacing">18</property>
<property name="border-width">32</property>
<!-- Empty boxes to enforce 1/3 width for the main widgets -->
<child>
......@@ -109,6 +107,7 @@
<object class="GtkFrame" id="rfkill_widget">
<property name="visible">True</property>
<property name="vexpand">False</property>
<property name="margin_bottom">32</property>
<child>
<object class="GtkListBox">
<property name="visible">True</property>
......@@ -194,6 +193,7 @@
<property name="visible">True</property>
<property name="label" translatable="yes">Visible Networks</property>
<property name="xalign">0.0</property>
<property name="margin_bottom">12</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
......
......@@ -41,15 +41,14 @@
<object class="GtkBox" id="ccnotify-main-box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin">24</property>
<property name="margin">32</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<property name="hexpand">True</property>
<child>
<object class="GtkFrame" id="ccnotify-switchbox-frame">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_bottom">12</property>
<property name="margin_bottom">32</property>
<property name="hexpand">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">in</property>
......@@ -177,7 +176,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="margin_start">3</property>
<property name="margin_bottom">12</property>
<property name="label" translatable="yes" comments="List of applications.">Applications</property>
<attributes>
<attribute name="weight" value="bold"/>
......
......@@ -79,7 +79,7 @@
<property name="margin_start">32</property>
<property name="margin_end">32</property>
<property name="margin_top">32</property>
<property name="margin_bottom">22</property>
<property name="margin_bottom">32</property>
<property name="hexpand">True</property>
<property name="width-request">300</property>
......@@ -123,7 +123,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Connect to your data in the cloud</property>
<property name="margin_bottom">22</property>
<property name="margin_bottom">20</property>
<attributes>
<attribute name="scale" value="1.66" />
</attributes>
......@@ -154,7 +154,7 @@
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin-top">24</property>
<property name="margin-top">20</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Add an account</property>
<attributes>
......
......@@ -1683,7 +1683,7 @@ add_power_saving_section (CcPowerPanel *self)
g_free (s);
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
gtk_widget_set_halign (label, GTK_ALIGN_START);
gtk_widget_set_margin_bottom (label, 6);
gtk_widget_set_margin_bottom (label, 12);
gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0);
gtk_widget_show (label);
......@@ -1704,7 +1704,7 @@ add_power_saving_section (CcPowerPanel *self)
box = gtk_frame_new (NULL);
gtk_frame_set_shadow_type (GTK_FRAME (box), GTK_SHADOW_IN);
gtk_widget_set_margin_bottom (box, 24);
gtk_widget_set_margin_bottom (box, 32);
gtk_widget_show (box);
gtk_container_add (GTK_CONTAINER (box), widget);
gtk_box_pack_start (GTK_BOX (vbox), box, FALSE, TRUE, 0);
......@@ -2182,7 +2182,7 @@ add_suspend_and_power_off_section (CcPowerPanel *self)
g_free (s);
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
gtk_widget_set_halign (label, GTK_ALIGN_START);
gtk_widget_set_margin_bottom (label, 6);
gtk_widget_set_margin_bottom (label, 12);
gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0);
gtk_widget_show (label);
......@@ -2205,7 +2205,7 @@ add_suspend_and_power_off_section (CcPowerPanel *self)
box = gtk_frame_new (NULL);
gtk_frame_set_shadow_type (GTK_FRAME (box), GTK_SHADOW_IN);
gtk_widget_set_margin_bottom (box, 24);
gtk_widget_set_margin_bottom (box, 32);
gtk_widget_show (box);
gtk_container_add (GTK_CONTAINER (box), widget);
gtk_box_pack_start (GTK_BOX (vbox), box, FALSE, TRUE, 0);
......@@ -2350,7 +2350,7 @@ add_battery_section (CcPowerPanel *self)
vbox = WID (priv->builder, "vbox_power");
priv->battery_section = box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_set_margin_bottom (box, 24);
gtk_widget_set_margin_bottom (box, 32);
gtk_box_pack_start (GTK_BOX (vbox), box, FALSE, TRUE, 0);
s = g_markup_printf_escaped ("<b>%s</b>", _("Battery"));
......@@ -2358,8 +2358,8 @@ add_battery_section (CcPowerPanel *self)
g_free (s);
gtk_label_set_use_markup (GTK_LABEL (widget), TRUE);
gtk_widget_set_halign (widget, GTK_ALIGN_START);
gtk_widget_set_margin_bottom (widget, 6);
gtk_widget_set_margin_bottom (box, 24);
gtk_widget_set_margin_bottom (widget, 12);
gtk_widget_set_margin_bottom (box, 32);
gtk_box_pack_start (GTK_BOX (box), widget, FALSE, TRUE, 0);
priv->battery_list = widget = GTK_WIDGET (gtk_list_box_new ());
......@@ -2400,7 +2400,7 @@ add_device_section (CcPowerPanel *self)
priv->device_section = box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_set_margin_top (box, 6);
gtk_widget_set_margin_bottom (box, 24);
gtk_widget_set_margin_bottom (box, 32);
gtk_box_pack_start (GTK_BOX (vbox), box, FALSE, TRUE, 0);
s = g_markup_printf_escaped ("<b>%s</b>", _("Devices"));
......@@ -2408,7 +2408,7 @@ add_device_section (CcPowerPanel *self)
g_free (s);
gtk_label_set_use_markup (GTK_LABEL (widget), TRUE);
gtk_widget_set_halign (widget, GTK_ALIGN_START);
gtk_widget_set_margin_bottom (widget, 6);
gtk_widget_set_margin_bottom (widget, 12);
gtk_box_pack_start (GTK_BOX (box), widget, FALSE, TRUE, 0);
priv->device_list = widget = gtk_list_box_new ();
......
......@@ -130,7 +130,10 @@
<object class="GtkBox" id="vbox_power">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin">24</property>
<property name="margin_top">32</property>
<property name="margin_bottom">32</property>
<property name="margin_left">24</property>
<property name="margin_right">24</property>
<property name="orientation">vertical</property>
<property name="spacing">3</property>
<property name="hexpand">True</property>
......
......@@ -919,7 +919,7 @@ All the information we collect is made anonymous, and we will never share your d
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="margin">24</property>
<property name="margin">32</property>
<property name="hexpand">True</property>
<child>
<object class="GtkFrame" id="frame">
......
......@@ -31,14 +31,14 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="margin">24</property>
<property name="margin">32</property>
<property name="spacing">12</property>
<property name="hexpand">True</property>
<child>
<object class="GtkFrame" id="language_section">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_bottom">12</property>
<property name="margin_bottom">18</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkListBox" id="language_list">
......
......@@ -33,7 +33,7 @@
<object class="GtkBox">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="margin">24</property>
<property name="margin">32</property>
<property name="hexpand">True</property>
<child>
<object class="GtkFrame" id="search_frame">
......
......@@ -31,14 +31,17 @@
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin">24</property>
<property name="margin_top">32</property>
<property name="margin_bottom">32</property>
<property name="margin_left">24</property>
<property name="margin_right">24</property>
<property name="hexpand">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_bottom">6</property>
<property name="margin_bottom">12</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Computer Name</property>
<property name="use_underline">True</property>
......@@ -60,7 +63,7 @@
<object class="CcHostnameEntry" id="hostname-entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="margin_bottom">12</property>
<property name="margin_bottom">32</property>
<property name="invisible_char"></property>
<accessibility>
<relation type="labelled-by" target="label6"/>
......
......@@ -71,14 +71,17 @@
<object class="GtkBox" id="universal_access_content">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin">24</property>
<property name="margin_top">32</property>
<property name="margin_bottom">32</property>
<property name="margin_left">24</property>
<property name="margin_right">24</property>
<property name="orientation">vertical</property>
<property name="hexpand">True</property>
<child>
<object class="GtkBox" id="section_status">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_bottom">24</property>
<property name="margin_bottom">32</property>
<child>
<object class="GtkLabel" id="heading_status">
<property name="visible">True</property>
......@@ -116,14 +119,14 @@
<object class="GtkBox" id="section_seeing">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_bottom">24</property>
<property name="margin_bottom">32</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="heading_seeing">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_end">6</property>
<property name="margin_bottom">6</property>
<property name="margin_end">12</property>
<property name="margin_bottom">12</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Seeing</property>
<attributes>
......@@ -455,14 +458,14 @@
<object class="GtkBox" id="section_hearing">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_bottom">24</property>
<property name="margin_bottom">32</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="heading_hearing">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_end">6</property>
<property name="margin_bottom">6</property>
<property name="margin_end">12</property>
<property name="margin_bottom">12</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Hearing</property>
<attributes>
......@@ -561,14 +564,14 @@
<object class="GtkBox" id="section_typing">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_bottom">24</property>
<property name="margin_bottom">32</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="heading_typing">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_end">6</property>
<property name="margin_bottom">6</property>
<property name="margin_end">12</property>
<property name="margin_bottom">12</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Typing</property>
<attributes>
......@@ -811,8 +814,8 @@
<object class="GtkLabel" id="heading_pointing">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_end">6</property>
<property name="margin_bottom">6</property>
<property name="margin_end">12</property>
<property name="margin_bottom">12</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Pointing &amp; Clicking</property>
<attributes>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment