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

printers: Add whitespace between top right buttons

Browse source 
Fixes #895
Fixes #685
This commit is contained in:
Felipe Borges 2020-03-02 13:59:04 +01:00 • committed by Georges Basile Stavracas Neto
parent 999962fbfc
commit 57eae62c6e
2 changed files with 26 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
panels/printers/cc-printers-panel.c
View file

@ -237,11 +237,7 @@ cc_printers_panel_constructed (GObject *object)
shell = cc_panel_get_shell (CC_PANEL (self)); shell = cc_panel_get_shell (CC_PANEL (self));
widget = (GtkWidget*) widget = (GtkWidget*)
gtk_builder_get_object (self->builder, "printer-add-button"); gtk_builder_get_object (self->builder, "top-right-buttons");
cc_shell_embed_widget_in_header (shell, widget, GTK_POS_RIGHT);
widget = (GtkWidget*)
gtk_builder_get_object (self->builder, "search-button");
cc_shell_embed_widget_in_header (shell, widget, GTK_POS_RIGHT); cc_shell_embed_widget_in_header (shell, widget, GTK_POS_RIGHT);
widget = (GtkWidget*) widget = (GtkWidget*)
@ -1163,7 +1159,7 @@ cc_printers_panel_init (CcPrintersPanel *self)
GtkWidget *widget; GtkWidget *widget;
PpCups *cups; PpCups *cups;
g_autoptr(GError) error = NULL; g_autoptr(GError) error = NULL;
gchar *objects[] = { "overlay", "permission-infobar", "printer-add-button", "search-button", NULL }; gchar *objects[] = { "overlay", "permission-infobar", "top-right-buttons", "printer-add-button", "search-button", NULL };
guint builder_result; guint builder_result;
g_resources_register (cc_printers_get_resource ()); g_resources_register (cc_printers_get_resource ());

41
panels/printers/printers.ui
View file

@ -1,26 +1,33 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<interface> <interface>
<requires lib="gtk+" version="3.12"/> <requires lib="gtk+" version="3.12"/>
<object class="GtkButton" id="printer-add-button"> <object class="GtkBox" id="top-right-buttons">
<property name="visible">True</property> <property name="visible">True</property>
<property name="sensitive">True</property> <property name="spacing">6</property>
<property name="use_underline">True</property>
<property name="label" translatable="yes" comments="Translators: This button adds new printer.">Add…</property>
<style>
<class name="suggested-action"/>
</style>
</object>
<object class="GtkToggleButton" id="search-button">
<property name="visible">True</property>
<property name="margin-end">6</property> <!-- since we don't have access to the shell header bar -->
<style>
<class name="image-button"/>
</style>
<child> <child>
<object class="GtkImage"> <object class="GtkButton" id="printer-add-button">
<property name="visible">True</property> <property name="visible">True</property>
<property name="icon_name">system-search-symbolic</property> <property name="sensitive">True</property>
<property name="use_underline">True</property>
<property name="label" translatable="yes" comments="Translators: This button adds new printer.">Add…</property>
<style>
<class name="suggested-action"/>
</style>
</object>
</child>
<child>
<object class="GtkToggleButton" id="search-button">
<property name="visible">True</property>
<property name="margin-end">6</property> <!-- since we don't have access to the shell header bar -->
<style>
<class name="image-button"/>
</style>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="icon_name">system-search-symbolic</property>
</object>
</child>
</object> </object>
</child> </child>
</object> </object>