panels: Minor adjustments for the new shell

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

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));

View file

@ -752,28 +752,94 @@
<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>
<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>
<!-- Stub boxes to make the content cover 1/3 of the screen -->
<child>
<object class="GtkHBox" id="hbox3">
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">9</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="spacing">12</property>
<property name="margin">24</property>
<property name="hexpand">True</property>
<child>
<object class="GtkLabel" id="label_intro">
<object class="GtkBox" id="hbox3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Each device needs an up to date color profile to be color managed.</property>
<property name="wrap">True</property>
<property name="spacing">9</property>
<child>
<object class="GtkLabel" id="label_intro">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Each device needs an up to date color profile to be color managed.</property>
<property name="wrap">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label_padding">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkLinkButton" id="linkbutton_help">
<property name="label" translatable="yes">Learn more</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
<property name="tooltip_text" translatable="yes">Learn more about color management</property>
<property name="relief">none</property>
<property name="xalign">0.50999999046325684</property>
<property name="uri">help:gnome-help/color-whyimportant</property>
<accessibility>
<relation type="labelled-by" target="label_intro"/>
</accessibility>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
@ -782,9 +848,144 @@
</packing>
</child>
<child>
<object class="GtkLabel" id="label_padding">
<object class="GtkBox" id="vbox3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkFrame" id="frame_devices">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="shadow_type">in</property>
</object>
</child>
<child>
<object class="GtkToolbar" id="toolbar_devices">
<property name="can_focus">True</property>
<property name="show_arrow">False</property>
<property name="icon_size">1</property>
<child>
<object class="GtkToolItem" id="left_button_group">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkBox" id="left_button_group_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkButton" id="toolbutton_device_default">
<property name="label" translatable="yes">_Set for all users</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="has_tooltip">True</property>
<property name="tooltip_text" translatable="yes">Set this profile for all users on this computer</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="toolbutton_device_enable">
<property name="label" translatable="yes">_Enable</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
<property name="tooltip_markup" translatable="yes">Set this profile for all users on this computer</property>
<property name="tooltip_text" translatable="yes">Set this profile for all users on this computer</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
</child>
</object>
<packing>
<property name="expand">True</property>
</packing>
</child>
<child>
<object class="GtkToolItem" id="right_button_group">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkBox" id="right_button_group_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkButton" id="toolbutton_profile_add">
<property name="label" translatable="yes">_Add profile</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="toolbutton_device_calibrate">
<property name="label" translatable="yes">_Calibrate…</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="has_tooltip">True</property>
<property name="tooltip_text" translatable="yes">Calibrate the device</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="toolbutton_profile_remove">
<property name="label" translatable="yes">_Remove profile</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkButton" id="toolbutton_profile_view">
<property name="label" translatable="yes">_View details</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
</packing>
</child>
</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>
@ -793,19 +994,16 @@
</packing>
</child>
<child>
<object class="GtkLinkButton" id="linkbutton_help">
<property name="label" translatable="yes">Learn more</property>
<object class="GtkLabel" id="label_no_devices">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
<property name="tooltip_text" translatable="yes">Learn more about color management</property>
<property name="relief">none</property>
<property name="xalign">0.50999999046325684</property>
<property name="uri">help:gnome-help/color-whyimportant</property>
<accessibility>
<relation type="labelled-by" target="label_intro"/>
</accessibility>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Unable to detect any devices that can be color managed</property>
<style>
<class name="dim-label"/>
</style>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
<packing>
<property name="expand">False</property>
@ -814,184 +1012,10 @@
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkVBox" id="vbox3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow_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">
<property name="can_focus">True</property>
<property name="show_arrow">False</property>
<property name="icon_size">1</property>
<child>
<object class="GtkToolItem" id="left_button_group">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkBox" id="left_button_group_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkButton" id="toolbutton_device_default">
<property name="label" translatable="yes">_Set for all users</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="has_tooltip">True</property>
<property name="tooltip_text" translatable="yes">Set this profile for all users on this computer</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="toolbutton_device_enable">
<property name="label" translatable="yes">_Enable</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="has_tooltip">True</property>
<property name="tooltip_markup" translatable="yes">Set this profile for all users on this computer</property>
<property name="tooltip_text" translatable="yes">Set this profile for all users on this computer</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
</child>
</object>
<packing>
<property name="expand">True</property>
</packing>
</child>
<child>
<object class="GtkToolItem" id="right_button_group">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkBox" id="right_button_group_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkButton" id="toolbutton_profile_add">
<property name="label" translatable="yes">_Add profile</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="toolbutton_device_calibrate">
<property name="label" translatable="yes">_Calibrate…</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="has_tooltip">True</property>
<property name="tooltip_text" translatable="yes">Calibrate the device</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="toolbutton_profile_remove">
<property name="label" translatable="yes">_Remove profile</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkButton" id="toolbutton_profile_view">
<property name="label" translatable="yes">_View details</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
</packing>
</child>
</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>
<child>
<object class="GtkLabel" id="label_no_devices">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Unable to detect any devices that can be color managed</property>
<style>
<class name="dim-label"/>
</style>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
</child>
</object>
<object class="GtkListStore" id="liststore_assign">
<columns>
<!-- column-name title -->

View file

@ -12,185 +12,211 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkBox" id="ccnotify-main-box">
<object class="GtkBox">
<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="orientation">vertical</property>
<property name="spacing">10</property>
<!-- Stub boxes to make the content cover 1/3 of the screen -->
<child>
<object class="GtkFrame" id="ccnotify-switchbox-frame">
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_bottom">12</property>
<property name="hexpand">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">in</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">24</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<property name="hexpand">True</property>
<child>
<object class="GtkListBox" id="ccnotify-switch-listbox">
<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="hexpand">True</property>
<property name="selection_mode">none</property>
<property name="activate_on_single_click">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkListBoxRow" id="ccnotify-listboxrow-banners">
<object class="GtkListBox" id="ccnotify-switch-listbox">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="activatable">False</property>
<property name="selectable">False</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="selection_mode">none</property>
<property name="activate_on_single_click">False</property>
<child>
<object class="GtkBox" id="ccnotify-box-banners">
<object class="GtkListBoxRow" id="ccnotify-listboxrow-banners">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="can_focus">True</property>
<property name="activatable">False</property>
<property name="selectable">False</property>
<child>
<object class="GtkLabel" id="ccnotify-label-banners">
<property name="height_request">32</property>
<object class="GtkBox" id="ccnotify-box-banners">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="margin_start">12</property>
<property name="margin_top">8</property>
<property name="margin_bottom">8</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Notification _Popups</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">ccnotify-switch-banners</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkSwitch" id="ccnotify-switch-banners">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="halign">end</property>
<property name="valign">center</property>
<property name="margin_end">12</property>
<child>
<object class="GtkLabel" id="ccnotify-label-banners">
<property name="height_request">32</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="margin_start">12</property>
<property name="margin_top">8</property>
<property name="margin_bottom">8</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Notification _Popups</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">ccnotify-switch-banners</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkSwitch" id="ccnotify-switch-banners">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="halign">end</property>
<property name="valign">center</property>
<property name="margin_end">12</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="ccnotify-listboxrow-screen">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="activatable">False</property>
<property name="selectable">False</property>
<child>
<object class="GtkBox" id="ccnotify-box-screen">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<child>
<object class="GtkLabel" id="ccnotify-label-lock-screen">
<property name="height_request">32</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="margin_start">12</property>
<property name="margin_top">8</property>
<property name="margin_bottom">8</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Lock Screen Notifications</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">ccnotify-switch-lock-screen</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkSwitch" id="ccnotify-switch-lock-screen">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="halign">end</property>
<property name="valign">center</property>
<property name="margin_end">12</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">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
</child>
<child>
<object class="GtkListBoxRow" id="ccnotify-listboxrow-screen">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="activatable">False</property>
<property name="selectable">False</property>
<child>
<object class="GtkBox" id="ccnotify-box-screen">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<child>
<object class="GtkLabel" id="ccnotify-label-lock-screen">
<property name="height_request">32</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="margin_start">12</property>
<property name="margin_top">8</property>
<property name="margin_bottom">8</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Lock Screen Notifications</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">ccnotify-switch-lock-screen</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkSwitch" id="ccnotify-switch-lock-screen">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="halign">end</property>
<property name="valign">center</property>
<property name="margin_end">12</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
<child type="label_item">
<placeholder/>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child type="label_item">
<placeholder/>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="margin_start">3</property>
<property name="label" translatable="yes" comments="List of applications.">Applications</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="ccnotify-app-frame">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkListBox" id="ccnotify-app-listbox">
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="margin_start">3</property>
<property name="label" translatable="yes" comments="List of applications.">Applications</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="ccnotify-app-frame">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="selection_mode">none</property>
<property name="label_xalign">0</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkListBox" id="ccnotify-app-listbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="selection_mode">none</property>
</object>
</child>
<child>
<placeholder/>
</child>
</object>
</child>
<child>
<placeholder/>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
</child>

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);

View file

@ -101,14 +101,42 @@
<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">
<property name="can_focus">False</property>

View file

@ -889,27 +889,48 @@ All the information we collect is made anonymous, and we will never share your d
</object>
</child>
</object>
<object class="GtkBox" id="privacy_vbox">
<object class="GtkBox" id="privacy_vbox">
<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="margin_start">134</property>
<property name="margin_end">134</property>
<property name="margin_top">22</property>
<property name="margin_bottom">22</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>
<object class="GtkDialog" id="abrt_dialog">
<property name="can_focus">False</property>

View file

@ -1,18 +1,44 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkBox" id="vbox_region">
<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>

View file

@ -6,114 +6,140 @@
<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="can_focus">False</property>
<!-- Stub boxes to make the content cover 1/3 of the screen -->
<child>
<object class="GtkFrame" id="search_frame">
<property name="visible">True</property>
</object>
</child>
<child>
<object class="GtkToolbar" id="search_toolbar">
<object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<property name="icon_size">1</property>
<style>
<class name="inline-toolbar"/>
</style>
<child>
<object class="GtkToolItem" id="up_down_item">
<property name="visible">True</property>
<child>
<object class="GtkBox" id="up_down_box">
<property name="visible">True</property>
<child>
<object class="GtkButton" id="up_button">
<property name="visible">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="up_button_a11y">
<property name="accessible-name" translatable="yes">Move Up</property>
</object>
</child>
<child>
<object class="GtkImage" id="up_image">
<property name="visible">True</property>
<property name="icon-name">go-up-symbolic</property>
<property name="icon-size">1</property>
</object>
</child>
</object>
</child>
<child>
<object class="GtkButton" id="down_button">
<property name="visible">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="down_button_a11y">
<property name="accessible-name" translatable="yes">Move Down</property>
</object>
</child>
<child>
<object class="GtkImage" id="down_image">
<property name="visible">True</property>
<property name="icon-name">go-down-symbolic</property>
<property name="icon-size">1</property>
</object>
</child>
</object>
</child>
</object>
</child>
</object>
</child>
<child>
<object class="GtkSeparatorToolItem" id="sep1">
<property name="visible">True</property>
<property name="draw">False</property>
</object>
<packing>
<property name="expand">True</property>
</packing>
</child>
<child>
<object class="GtkToolItem" id="settings_item">
<property name="visible">True</property>
<child>
<object class="GtkBox" id="i_s_ud_box">
<property name="visible">True</property>
<child>
<object class="GtkButton" id="settings_button">
<property name="visible">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="settings_button_a11y">
<property name="accessible-name" translatable="yes">Preferences</property>
</object>
</child>
<child>
<object class="GtkImage" id="settings_image">
<property name="visible">True</property>
<property name="icon-name">emblem-system-symbolic</property>
<property name="icon-size">1</property>
</object>
</child>
</object>
</child>
</object>
</child>
</object>
</child>
<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="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
<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">24</property>
<property name="hexpand">True</property>
<child>
<object class="GtkFrame" id="search_frame">
<property name="visible">True</property>
</object>
</child>
<child>
<object class="GtkToolbar" id="search_toolbar">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="toolbar_style">icons</property>
<property name="show_arrow">False</property>
<property name="icon_size">1</property>
<style>
<class name="inline-toolbar"/>
</style>
<child>
<object class="GtkToolItem" id="up_down_item">
<property name="visible">True</property>
<child>
<object class="GtkBox" id="up_down_box">
<property name="visible">True</property>
<child>
<object class="GtkButton" id="up_button">
<property name="visible">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="up_button_a11y">
<property name="accessible-name" translatable="yes">Move Up</property>
</object>
</child>
<child>
<object class="GtkImage" id="up_image">
<property name="visible">True</property>
<property name="icon-name">go-up-symbolic</property>
<property name="icon-size">1</property>
</object>
</child>
</object>
</child>
<child>
<object class="GtkButton" id="down_button">
<property name="visible">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="down_button_a11y">
<property name="accessible-name" translatable="yes">Move Down</property>
</object>
</child>
<child>
<object class="GtkImage" id="down_image">
<property name="visible">True</property>
<property name="icon-name">go-down-symbolic</property>
<property name="icon-size">1</property>
</object>
</child>
</object>
</child>
</object>
</child>
</object>
</child>
<child>
<object class="GtkSeparatorToolItem" id="sep1">
<property name="visible">True</property>
<property name="draw">False</property>
</object>
<packing>
<property name="expand">True</property>
</packing>
</child>
<child>
<object class="GtkToolItem" id="settings_item">
<property name="visible">True</property>
<child>
<object class="GtkBox" id="i_s_ud_box">
<property name="visible">True</property>
<child>
<object class="GtkButton" id="settings_button">
<property name="visible">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="settings_button_a11y">
<property name="accessible-name" translatable="yes">Preferences</property>
</object>
</child>
<child>
<object class="GtkImage" id="settings_image">
<property name="visible">True</property>
<property name="icon-name">emblem-system-symbolic</property>
<property name="icon-size">1</property>
</object>
</child>
</object>
</child>
</object>
</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>
</child>
</object>
</interface>

View file

@ -2,13 +2,37 @@
<!-- Generated with glade 3.18.1 -->
<interface>
<requires lib="gtk+" version="3.10"/>
<object class="GtkBox" id="sharing-panel">
<object class="GtkBox" id="sharing-panel">
<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="margin_start">134</property>
<property name="margin_end">134</property>
<property name="margin_top">22</property>
<property name="margin_bottom">22</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>

File diff suppressed because it is too large Load diff