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

panels: Minor adjustments for the new shell

Browse source
This commit is contained in:
Georges Basile Stavracas Neto 2017-08-07 15:22:16 +01:00 • committed by Rui Matos
parent d5c4436869
commit f7bdd3c969
10 changed files with 1553 additions and 1378 deletions
Download patch file Download diff file Expand all files Collapse all files

19
panels/color/cc-color-panel.c
View file

@ -2314,17 +2314,6 @@ cc_color_panel_init (CcColorPanel *prefs)
G_CALLBACK (gcm_prefs_profiles_row_activated_cb),
prefs);
/* make larger by default */
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
"scrolledwindow_assign"));
gtk_widget_set_size_request (widget, -1, 250);
/* force to be at least ~6 rows high */
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
"scrolledwindow_devices"));
gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (widget),
300);
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
"toolbutton_device_default"));
g_signal_connect (widget, "clicked",
@ -2338,12 +2327,6 @@ cc_color_panel_init (CcColorPanel *prefs)
g_signal_connect (widget, "clicked",
G_CALLBACK (gcm_prefs_calibrate_cb), prefs);
/* make devices toolbar sexy */
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
"scrolledwindow_devices"));
context = gtk_widget_get_style_context (widget);
gtk_style_context_set_junction_sides (context, GTK_JUNCTION_BOTTOM);
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder,
"toolbar_devices"));
context = gtk_widget_get_style_context (widget);
@ -2529,7 +2512,7 @@ cc_color_panel_init (CcColorPanel *prefs)
prefs);
priv->list_box_size = gtk_size_group_new (GTK_SIZE_GROUP_VERTICAL);
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "scrolledwindow_devices"));
widget = GTK_WIDGET (gtk_builder_get_object (priv->builder, "frame_devices"));
gtk_container_add (GTK_CONTAINER (widget), GTK_WIDGET (priv->list_box));
gtk_widget_show (GTK_WIDGET (priv->list_box));

58
panels/color/color.ui
View file

@ -752,18 +752,45 @@
<action-widget response="0">button_assign_ok</action-widget>
</action-widgets>
</object>
<object class="GtkBox" id="dialog-vbox1">
<object class="GtkScrolledWindow" id="dialog-vbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<!-- Stub boxes to make the content cover 1/3 of the screen -->
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
</object>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
</object>
<packing>
<property name="pack_type">end</property>
</packing>
</child>
<!-- Content -->
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">15</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<property name="margin-start">6</property>
<property name="margin-end">6</property>
<property name="margin-top">6</property>
<property name="margin-bottom">6</property>
<property name="margin">24</property>
<property name="hexpand">True</property>
<child>
<object class="GtkHBox" id="hbox3">
<object class="GtkBox" id="hbox3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">9</property>
@ -821,23 +848,16 @@
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox3">
<object class="GtkBox" id="vbox3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow_devices">
<object class="GtkFrame" id="frame_devices">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="shadow_type">in</property>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkToolbar" id="toolbar_devices">
@ -992,6 +1012,10 @@
</packing>
</child>
</object>
</child>
</object>
</child>
</object>
<object class="GtkListStore" id="liststore_assign">
<columns>
<!-- column-name title -->

36
panels/notifications/notifications.ui
View file

@ -11,16 +11,40 @@
<object class="GtkViewport" id="ccnotify-viewport">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<!-- Stub boxes to make the content cover 1/3 of the screen -->
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
</object>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
</object>
<packing>
<property name="pack_type">end</property>
</packing>
</child>
<!-- Content -->
<child>
<object class="GtkBox" id="ccnotify-main-box">
<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">22</property>
<property name="margin_bottom">22</property>
<property name="margin">24</property>
<property name="orientation">vertical</property>
<property name="spacing">10</property>
<property name="spacing">12</property>
<property name="hexpand">True</property>
<child>
<object class="GtkFrame" id="ccnotify-switchbox-frame">
<property name="visible">True</property>
@ -197,6 +221,8 @@
</object>
</child>
</object>
</child>
</object>
<object class="GtkSizeGroup" id="sizegroup1">
<property name="mode">both</property>
</object>

15
panels/power/cc-power-panel.c
View file

@ -1683,8 +1683,6 @@ 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_start (label, 56);
gtk_widget_set_margin_end (label, 56);
gtk_widget_set_margin_bottom (label, 6);
gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0);
gtk_widget_show (label);
@ -1706,8 +1704,6 @@ 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_start (box, 50);
gtk_widget_set_margin_end (box, 50);
gtk_widget_set_margin_bottom (box, 24);
gtk_widget_show (box);
gtk_container_add (GTK_CONTAINER (box), widget);
@ -2186,8 +2182,6 @@ 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_start (label, 56);
gtk_widget_set_margin_end (label, 50);
gtk_widget_set_margin_bottom (label, 6);
gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0);
gtk_widget_show (label);
@ -2211,8 +2205,6 @@ 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_start (box, 50);
gtk_widget_set_margin_end (box, 50);
gtk_widget_set_margin_bottom (box, 24);
gtk_widget_show (box);
gtk_container_add (GTK_CONTAINER (box), widget);
@ -2358,9 +2350,6 @@ 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_start (box, 50);
gtk_widget_set_margin_end (box, 50);
gtk_widget_set_margin_bottom (box, 6);
gtk_widget_set_margin_bottom (box, 24);
gtk_box_pack_start (GTK_BOX (vbox), box, FALSE, TRUE, 0);
@ -2412,8 +2401,6 @@ add_device_section (CcPowerPanel *self)
vbox = WID (priv->builder, "vbox_power");
priv->device_section = box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_set_margin_start (box, 50);
gtk_widget_set_margin_end (box, 50);
gtk_widget_set_margin_top (box, 6);
gtk_widget_set_margin_bottom (box, 24);
gtk_box_pack_start (GTK_BOX (vbox), box, FALSE, TRUE, 0);
@ -2553,7 +2540,7 @@ cc_power_panel_init (CcPowerPanel *self)
}
up_client_changed (priv->up_client, NULL, self);
widget = WID (priv->builder, "vbox_power");
widget = WID (priv->builder, "main_box");
box = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (box),
GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);

32
panels/power/power.ui
View file

@ -101,13 +101,41 @@
<column type="gint"/>
</columns>
</object>
<object class="GtkBox" id="main_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<!-- Stub boxes to make the content cover 1/3 of the screen -->
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
</object>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
</object>
<packing>
<property name="pack_type">end</property>
</packing>
</child>
<!-- Content -->
<child>
<object class="GtkBox" id="vbox_power">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_top">12</property>
<property name="border_width">12</property>
<property name="margin">24</property>
<property name="orientation">vertical</property>
<property name="spacing">3</property>
<property name="hexpand">True</property>
</object>
</child>
</object>
<object class="GtkDialog" id="automatic_suspend_dialog">

39
panels/privacy/privacy.ui
View file

@ -892,22 +892,43 @@ All the information we collect is made anonymous, and we will never share your d
<object class="GtkBox" id="privacy_vbox">
<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">22</property>
<property name="margin_bottom">22</property>
<!-- Stub boxes to make the content cover 1/3 of the screen -->
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
</object>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
</object>
<packing>
<property name="pack_type">end</property>
</packing>
</child>
<!-- Content -->
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="margin">24</property>
<property name="hexpand">True</property>
<child>
<object class="GtkFrame" id="frame">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="shadow_type">in</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
</object>
</child>
</object>

41
panels/region/region.ui
View file

@ -4,15 +4,41 @@
<object class="GtkBox" id="vbox_region">
<property name="visible">True</property>
<property name="can_focus">False</property>
<!-- Stub boxes to make the content cover 1/3 of the screen -->
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
</object>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
</object>
<packing>
<property name="pack_type">end</property>
</packing>
</child>
<!-- Content -->
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="margin">24</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_start">134</property>
<property name="margin_end">134</property>
<property name="margin_top">24</property>
<property name="margin_bottom">32</property>
<property name="margin_bottom">12</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkListBox" id="language_list">
@ -186,10 +212,8 @@
<object class="GtkBox" id="input_section">
<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_bottom">24</property>
<property name="orientation">vertical</property>
<property name="hexpand">True</property>
<child>
<object class="GtkBox" id="input_heading_row">
<property name="visible">True</property>
@ -502,6 +526,7 @@
<object class="GtkLabel" id="login-label">
<property name="valign">end</property>
<property name="vexpand">True</property>
<property name="hexpand">True</property>
<property name="label" translatable="yes">Login settings are used by all users when logging into the system</property>
<property name="margin_bottom">12</property>
<style>
@ -510,4 +535,6 @@
</object>
</child>
</object>
</child>
</object>
</interface>

34
panels/search/search.ui
View file

@ -3,14 +3,38 @@
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkScrolledWindow" id="search_vbox">
<property name="visible">True</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<!-- Stub boxes to make the content cover 1/3 of the screen -->
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
</object>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
</object>
<packing>
<property name="pack_type">end</property>
</packing>
</child>
<!-- Content -->
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="margin-start">134</property>
<property name="margin-end">134</property>
<property name="margin-top">22</property>
<property name="margin-bottom">22</property>
<property name="margin">24</property>
<property name="hexpand">True</property>
<child>
<object class="GtkFrame" id="search_frame">
<property name="visible">True</property>
@ -116,4 +140,6 @@
</object>
</child>
</object>
</child>
</object>
</interface>

34
panels/sharing/sharing.ui
View file

@ -5,10 +5,34 @@
<object class="GtkBox" id="sharing-panel">
<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">22</property>
<property name="margin_bottom">22</property>
<!-- Stub boxes to make the content cover 1/3 of the screen -->
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
</object>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
</object>
<packing>
<property name="pack_type">end</property>
</packing>
</child>
<!-- Content -->
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin">24</property>
<property name="hexpand">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="label6">
@ -239,6 +263,8 @@
</packing>
</child>
</object>
</child>
</object>
<object class="GtkDialog" id="personal-file-sharing-dialog">
<property name="can_focus">False</property>
<property name="border_width">5</property>

35
panels/universal-access/uap.ui
View file

@ -40,15 +40,40 @@
<object class="GtkViewport" id="viewport1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<!-- Stub boxes to make the content cover 1/3 of the screen -->
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
</object>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
</object>
<packing>
<property name="pack_type">end</property>
</packing>
</child>
<!-- Content -->
<child>
<object class="GtkBox" id="universal_access_content">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_start">50</property>
<property name="margin_end">50</property>
<property name="margin_top">24</property>
<property name="margin_bottom">24</property>
<property name="margin">24</property>
<property name="orientation">vertical</property>
<property name="hexpand">True</property>
<child>
<object class="GtkBox" id="section_status">
<property name="visible">True</property>
@ -988,6 +1013,8 @@
</object>
</child>
</object>
</child>
</object>
<object class="GtkAdjustment" id="text_scaling_factor_adjustment">
<property name="lower">0.5</property>
<property name="upper">3</property>