diff --git a/panels/color/cc-color-panel.c b/panels/color/cc-color-panel.c index 5cbcdf118..32f122892 100644 --- a/panels/color/cc-color-panel.c +++ b/panels/color/cc-color-panel.c @@ -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)); diff --git a/panels/color/color.ui b/panels/color/color.ui index 5680bf21d..b66a99122 100644 --- a/panels/color/color.ui +++ b/panels/color/color.ui @@ -752,28 +752,94 @@ button_assign_ok - + + True + False + + True False - 15 - vertical - 12 - 6 - 6 - 6 - 6 + + - + True False - 9 + True + + + + + + True + False + True + + + end + + + + + + + True + False + vertical + 12 + 24 + True - + True False - 0 - Each device needs an up to date color profile to be color managed. - True + 9 + + + True + False + 0 + Each device needs an up to date color profile to be color managed. + True + + + False + False + 0 + + + + + True + False + + + True + True + 1 + + + + + Learn more + True + True + True + True + Learn more about color management + none + 0.50999999046325684 + help:gnome-help/color-whyimportant + + + + + + False + True + 2 + + False @@ -782,9 +848,144 @@ - + True False + vertical + + + True + True + in + + + + + True + False + 1 + + + True + False + + + True + False + + + _Set for all users + True + False + True + Set this profile for all users on this computer + True + + + False + True + 1 + + + + + _Enable + True + True + True + Set this profile for all users on this computer + Set this profile for all users on this computer + True + + + False + True + 2 + + + + + + + True + + + + + True + False + + + True + False + + + _Add profile + True + False + True + + + False + True + 0 + + + + + _Calibrate… + True + False + True + Calibrate the device + True + + + False + True + 1 + + + + + _Remove profile + True + False + True + + + False + True + 2 + + + + + _View details + True + False + True + + + False + True + 3 + + + + + + + False + + + + + False + True + 1 + + True @@ -793,19 +994,16 @@ - - Learn more + True - True - True - True - Learn more about color management - none - 0.50999999046325684 - help:gnome-help/color-whyimportant - - - + False + Unable to detect any devices that can be color managed + + + + False @@ -814,184 +1012,10 @@ - - False - False - 0 - - - - - True - False - - - True - True - in - - - - - - True - True - 0 - - - - - True - False - 1 - - - True - False - - - True - False - - - _Set for all users - True - False - True - Set this profile for all users on this computer - True - - - False - True - 1 - - - - - _Enable - True - True - True - Set this profile for all users on this computer - Set this profile for all users on this computer - True - - - False - True - 2 - - - - - - - True - - - - - True - False - - - True - False - - - _Add profile - True - False - True - - - False - True - 0 - - - - - _Calibrate… - True - False - True - Calibrate the device - True - - - False - True - 1 - - - - - _Remove profile - True - False - True - - - False - True - 2 - - - - - _View details - True - False - True - - - False - True - 3 - - - - - - - False - - - - - False - True - 1 - - - - - True - True - 1 - - - - - True - False - Unable to detect any devices that can be color managed - - - - - - - False - True - 2 - + + diff --git a/panels/notifications/notifications.ui b/panels/notifications/notifications.ui index d86f19f05..13ab3d51d 100644 --- a/panels/notifications/notifications.ui +++ b/panels/notifications/notifications.ui @@ -12,185 +12,211 @@ True False - + True False - 134 - 134 - 22 - 22 - vertical - 10 + + - + True False - 12 True - 0 - in + + + + + + True + False + True + + + end + + + + + + + True + False + 24 + vertical + 12 + True - + True False + 12 True - none - False + 0 + in - + True - True - False - False + False + True + none + False - + True - False - center + True + False + False - - 32 + True False - start - 12 - 8 - 8 - True - 0 - Notification _Popups - True - ccnotify-switch-banners - - - False - True - 0 - - - - - True - True - end center - 12 + + + 32 + True + False + start + 12 + 8 + 8 + True + 0 + Notification _Popups + True + ccnotify-switch-banners + + + False + True + 0 + + + + + True + True + end + center + 12 + + + False + True + 1 + + + + + + + + + True + True + False + False + + + True + False + center + + + 32 + True + False + start + 12 + 8 + 8 + True + 0 + _Lock Screen Notifications + True + ccnotify-switch-lock-screen + + + False + True + 0 + + + + + True + True + end + center + 12 + + + False + True + 1 + + - - False - True - 1 - - - - True - True - False - False - - - True - False - center - - - 32 - True - False - start - 12 - 8 - 8 - True - 0 - _Lock Screen Notifications - True - ccnotify-switch-lock-screen - - - False - True - 0 - - - - - True - True - end - center - 12 - - - False - True - 1 - - - - - + + + + False + True + 0 + - - - - - - False - True - 0 - - - - - True - False - 0 - 3 - Applications - - - - - - False - True - 1 - - - - - True - False - True - True - 0 - in - + + True + False + 0 + 3 + Applications + + + + + + False + True + 1 + + + + True False True True - none + 0 + in + + + True + False + True + True + none + + + + + - - - + + False + True + 2 + - - False - True - 2 - diff --git a/panels/power/cc-power-panel.c b/panels/power/cc-power-panel.c index d2c6f9520..337750070 100644 --- a/panels/power/cc-power-panel.c +++ b/panels/power/cc-power-panel.c @@ -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); diff --git a/panels/power/power.ui b/panels/power/power.ui index 3619df60d..3f0a108ec 100644 --- a/panels/power/power.ui +++ b/panels/power/power.ui @@ -101,14 +101,42 @@ + + True + False + + + + + True + False + True + + + + + + True + False + True + + + end + + + + + True False - 12 - 12 + 24 vertical 3 + True + + False diff --git a/panels/privacy/privacy.ui b/panels/privacy/privacy.ui index 14bdc1b97..e9eeb019b 100644 --- a/panels/privacy/privacy.ui +++ b/panels/privacy/privacy.ui @@ -889,27 +889,48 @@ All the information we collect is made anonymous, and we will never share your d - + + True + False + + + + + True + False + True + + + + + + True + False + True + + + end + + + + + + True False - 134 - 134 - 22 - 22 vertical + 24 + True True False in - - False - True - 0 - + + False diff --git a/panels/region/region.ui b/panels/region/region.ui index b28504f8e..3dbd9adb4 100644 --- a/panels/region/region.ui +++ b/panels/region/region.ui @@ -1,18 +1,44 @@ - + + True + False + + + + + True + False + True + + + + + + True + False + True + + + end + + + + + + True False vertical + 24 + 12 + True True False - 134 - 134 - 24 - 32 + 12 in @@ -186,10 +212,8 @@ True False - 134 - 134 - 24 vertical + True True @@ -502,6 +526,7 @@ end True + True Login settings are used by all users when logging into the system 12 - - - True - - - True - - - True - - - Move Up - - - - - True - go-up-symbolic - 1 - - - - - - - True - - - Move Down - - - - - True - go-down-symbolic - 1 - - - - - - - - - - - True - False - - - True - - - - - True - - - True - - - True - - - Preferences - - - - - True - emblem-system-symbolic - 1 - - - - - - - - + True + + + + + + True + False + True - False - True - 1 + end + + + + + True + vertical + 24 + True + + + True + + + + + True + False + icons + False + 1 + + + + True + + + True + + + True + + + Move Up + + + + + True + go-up-symbolic + 1 + + + + + + + True + + + Move Down + + + + + True + go-down-symbolic + 1 + + + + + + + + + + + True + False + + + True + + + + + True + + + True + + + True + + + Preferences + + + + + True + emblem-system-symbolic + 1 + + + + + + + + + + + False + True + 1 + + + + - + diff --git a/panels/sharing/sharing.ui b/panels/sharing/sharing.ui index 67441720a..ea4701d46 100644 --- a/panels/sharing/sharing.ui +++ b/panels/sharing/sharing.ui @@ -2,13 +2,37 @@ - + + True + False + + + + True False - 134 - 134 - 22 - 22 + True + + + + + + True + False + True + + + end + + + + + + + True + False + 24 + True vertical @@ -239,6 +263,8 @@ + + False 5 diff --git a/panels/universal-access/uap.ui b/panels/universal-access/uap.ui index ab0c0c4a7..e40346149 100644 --- a/panels/universal-access/uap.ui +++ b/panels/universal-access/uap.ui @@ -41,520 +41,70 @@ True False - + True False - 50 - 50 - 24 - 24 - vertical + True + + - + True False - 24 - - - True - False - _Always Show Universal Access Menu - True - switch_status - - - False - True - 0 - - - - - True - True - end - - - True - True - 1 - - + True + + + + + + True + False + True - False - True - 0 + end + + - + True False - 24 + 24 vertical + True - + True False - 6 - 6 - 6 - 0 - Seeing - - - - - - - - - False - True - 0 - - - - - True - False - 0 - in + 24 - + True - True - none - - - - - - True - True - False - False - - - True - - - True - False - 20 - 20 - 6 - 6 - 0 - _High Contrast - True - value_highcontrast - - - True - True - 0 - - - - - True - True - 20 - 20 - 6 - 6 - - - False - True - 1 - - - - - - - - - True - True - False - False - - - True - - - True - False - 20 - 20 - 6 - 6 - 0 - _Large Text - True - value_large_text - - - True - True - 0 - - - - - True - True - 20 - 20 - 6 - 6 - - - False - True - 1 - - - - - - - - - True - True - - - True - False - - - True - False - 20 - 20 - 6 - 6 - C_ursor Size - True - 0 - - - True - True - 0 - - - - - True - False - 20 - 20 - 6 - 6 - 24 pixels - 1 - - - False - True - 1 - - - - - - - - - True - True - - - True - - - True - False - 20 - 20 - 6 - 6 - 0 - _Zoom - True - - - True - True - 0 - - - - - True - False - 20 - 20 - 6 - 6 - 1 - Off - - - False - True - 1 - - - - - - - - - True - True - - - True - - - True - False - 20 - 20 - 6 - 6 - 0 - Screen _Reader - True - - - True - True - 0 - - - - - True - False - 20 - 20 - 6 - 6 - 1 - Off - - - False - True - 1 - - - - - - - - - True - True - - - True - - - True - False - 20 - 20 - 6 - 6 - 0 - _Sound Keys - True - - - True - True - 0 - - - - - True - False - 20 - 20 - 6 - 6 - 1 - Off - - - False - True - 1 - - - - - - + False + _Always Show Universal Access Menu + True + switch_status + + False + True + 0 + - - - - - - False - True - 1 - - - - - False - True - 1 - - - - - True - False - 24 - vertical - - - True - False - 6 - 6 - 6 - 0 - Hearing - - - - - - - - - False - True - 0 - - - - - True - False - 0 - in - + True True - none - - - - - - True - True - - - True - - - True - False - 20 - 20 - 6 - 6 - 0 - _Visual Alerts - True - - - True - True - 0 - - - - - True - False - 20 - 20 - 6 - 6 - 1 - Off - - - False - True - 1 - - - - - - + end + + True + True + 1 + - - - - - - False - True - 1 - - - - - False - True - 2 - - - - - True - False - 24 - vertical - - - True - False - 6 - 6 - 6 - 0 - Typing - - - - - - False @@ -563,411 +113,337 @@ - + True False - 0 - in + 24 + vertical - + True - True - none + False + 6 + 6 + 6 + 0 + Seeing + + + - + - - - True - True - False - False - - - True - - - True - False - 20 - 20 - 6 - 6 - 0 - Screen _Keyboard - True - screen_keyboard_switch - - - True - True - 0 - - - - - True - True - 20 - 20 - 6 - 6 - - - False - True - 1 - - - - - - - - - True - True - - - True - - - True - False - 20 - 20 - 6 - 6 - 0 - R_epeat Keys - True - - - True - True - 0 - - - - - True - False - 20 - 20 - 6 - 6 - 1 - Off - - - False - True - 1 - - - - - - - - - True - True - - - True - - - True - False - 20 - 20 - 6 - 6 - 0 - Cursor _Blinking - True - - - True - True - 0 - - - - - True - False - 20 - 20 - 6 - 6 - 1 - Off - - - False - True - 1 - - - - - - - - - True - True - - - True - - - True - False - 20 - 20 - 6 - 6 - 0 - _Typing Assist (AccessX) - True - - - True - True - 0 - - - - - True - False - 20 - 20 - 6 - 6 - 1 - Off - - - False - True - 1 - - - - - - + + False + True + 0 + - - - - - - False - True - 1 - - - - - False - True - 3 - - - - - True - False - vertical - - - True - False - 6 - 6 - 6 - 0 - Pointing & Clicking - - - - - - - - - False - True - 0 - - - - - True - False - 0 - in - + True - True - none - - - + False + 0 + in - + True True - False - False + none + + + - + True + True + False + False - + True - False - 20 - 20 - 6 - 6 - 0 - _Mouse Keys - True - mouse_keys_switch - - - True - True - 0 - - - - - True - True - 20 - 20 - 6 - 6 - - - False - True - 1 - - - - - - - - - True - True - - - True - - - True - False - 20 - 20 - 6 - 6 - 0 - _Click Assist - True - - - True - True - 0 - - - - - True - False - 20 - 20 - 6 - 6 - 1 - Off - - - False - True - 1 - - - - - - - - - True - True - - - True - - - True - False - 20 - 20 - 6 - 6 - 0 - _Double-Click Delay - True - - - True - 0 - - - - - True - True - double-click-delay-adjustment - False - 20 - 20 - 6 - 6 - - - Double-Click Delay + + + True + False + 20 + 20 + 6 + 6 + 0 + _High Contrast + True + value_highcontrast + + True + True + 0 + + + + + True + True + 20 + 20 + 6 + 6 + + + False + True + 1 + + + + + + + + + True + True + False + False + + + True + + + True + False + 20 + 20 + 6 + 6 + 0 + _Large Text + True + value_large_text + + + True + True + 0 + + + + + True + True + 20 + 20 + 6 + 6 + + + False + True + 1 + + + + + + + + + True + True + + + True + False + + + True + False + 20 + 20 + 6 + 6 + C_ursor Size + True + 0 + + + True + True + 0 + + + + + True + False + 20 + 20 + 6 + 6 + 24 pixels + 1 + + + False + True + 1 + + + + + + + + + True + True + + + True + + + True + False + 20 + 20 + 6 + 6 + 0 + _Zoom + True + + + True + True + 0 + + + + + True + False + 20 + 20 + 6 + 6 + 1 + Off + + + False + True + 1 + + + + + + + + + True + True + + + True + + + True + False + 20 + 20 + 6 + 6 + 0 + Screen _Reader + True + + + True + True + 0 + + + + + True + False + 20 + 20 + 6 + 6 + 1 + Off + + + False + True + 1 + + + + + + + + + True + True + + + True + + + True + False + 20 + 20 + 6 + 6 + 0 + _Sound Keys + True + + + True + True + 0 + + + + + True + False + 20 + 20 + 6 + 6 + 1 + Off + + + False + True + 1 + - - True - True - 1 - + + + - - - + + False + True + 1 + @@ -976,12 +452,563 @@ 1 + + + True + False + 24 + vertical + + + True + False + 6 + 6 + 6 + 0 + Hearing + + + + + + + + + False + True + 0 + + + + + True + False + 0 + in + + + True + True + none + + + + + + True + True + + + True + + + True + False + 20 + 20 + 6 + 6 + 0 + _Visual Alerts + True + + + True + True + 0 + + + + + True + False + 20 + 20 + 6 + 6 + 1 + Off + + + False + True + 1 + + + + + + + + + + + + + + False + True + 1 + + + + + False + True + 2 + + + + + True + False + 24 + vertical + + + True + False + 6 + 6 + 6 + 0 + Typing + + + + + + + + + False + True + 0 + + + + + True + False + 0 + in + + + True + True + none + + + + + + True + True + False + False + + + True + + + True + False + 20 + 20 + 6 + 6 + 0 + Screen _Keyboard + True + screen_keyboard_switch + + + True + True + 0 + + + + + True + True + 20 + 20 + 6 + 6 + + + False + True + 1 + + + + + + + + + True + True + + + True + + + True + False + 20 + 20 + 6 + 6 + 0 + R_epeat Keys + True + + + True + True + 0 + + + + + True + False + 20 + 20 + 6 + 6 + 1 + Off + + + False + True + 1 + + + + + + + + + True + True + + + True + + + True + False + 20 + 20 + 6 + 6 + 0 + Cursor _Blinking + True + + + True + True + 0 + + + + + True + False + 20 + 20 + 6 + 6 + 1 + Off + + + False + True + 1 + + + + + + + + + True + True + + + True + + + True + False + 20 + 20 + 6 + 6 + 0 + _Typing Assist (AccessX) + True + + + True + True + 0 + + + + + True + False + 20 + 20 + 6 + 6 + 1 + Off + + + False + True + 1 + + + + + + + + + + + + + + False + True + 1 + + + + + False + True + 3 + + + + + True + False + vertical + + + True + False + 6 + 6 + 6 + 0 + Pointing & Clicking + + + + + + + + + False + True + 0 + + + + + True + False + 0 + in + + + True + True + none + + + + + + True + True + False + False + + + True + + + True + False + 20 + 20 + 6 + 6 + 0 + _Mouse Keys + True + mouse_keys_switch + + + True + True + 0 + + + + + True + True + 20 + 20 + 6 + 6 + + + False + True + 1 + + + + + + + + + True + True + + + True + + + True + False + 20 + 20 + 6 + 6 + 0 + _Click Assist + True + + + True + True + 0 + + + + + True + False + 20 + 20 + 6 + 6 + 1 + Off + + + False + True + 1 + + + + + + + + + True + True + + + True + + + True + False + 20 + 20 + 6 + 6 + 0 + _Double-Click Delay + True + + + True + 0 + + + + + True + True + double-click-delay-adjustment + False + 20 + 20 + 6 + 6 + + + Double-Click Delay + + + + + True + True + 1 + + + + + + + + + + + + + + False + True + 1 + + + + + False + True + 4 + + - - False - True - 4 -