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

printers: Replace toolbar with horizontal box

Browse source 
Due to custom styles, toolbars can look very different
from the rest of panel. This changes toolbar which
contains controls for adding/removing allowed users
to horizontal box.
This commit is contained in:
Marek Kasik 2011-01-14 17:28:32 +01:00
parent 1ea42cc212
commit 7595228b19
2 changed files with 33 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1259,7 +1259,7 @@ supply_levels_draw_cb (GtkWidget *widget,
} }
static void static void
allowed_user_remove_cb (GtkToolButton *toolbutton, allowed_user_remove_cb (GtkButton *button,
gpointer user_data) gpointer user_data)
{ {
CcPrintersPanelPrivate *priv; CcPrintersPanelPrivate *priv;
@ -1414,15 +1414,16 @@ cc_printers_panel_init (CcPrintersPanel *self)
gtk_builder_get_object (priv->builder, "allowed-user-remove-button"); gtk_builder_get_object (priv->builder, "allowed-user-remove-button");
g_signal_connect (widget, "clicked", G_CALLBACK (allowed_user_remove_cb), self); g_signal_connect (widget, "clicked", G_CALLBACK (allowed_user_remove_cb), self);
widget = (GtkWidget*)
gtk_builder_get_object (priv->builder, "supply-drawing-area");
g_signal_connect (widget, "draw", G_CALLBACK (supply_levels_draw_cb), self);
/* set plain style for borders of toolbars */ /* set plain style for borders of toolbars */
widget = (GtkWidget*) widget = (GtkWidget*)
gtk_builder_get_object (priv->builder, "printers-toolbar"); gtk_builder_get_object (priv->builder, "printers-toolbar");
set_widget_style (widget, "GtkToolbar { border-style: none }"); set_widget_style (widget, "GtkToolbar { border-style: none }");
widget = (GtkWidget*)
gtk_builder_get_object (priv->builder, "allowed-users-toolbar");
set_widget_style (widget, "GtkToolbar { border-style: none }");
/* make unused widgets insensitive for now */ /* make unused widgets insensitive for now */
widget = (GtkWidget*) widget = (GtkWidget*)
@ -1441,9 +1442,6 @@ cc_printers_panel_init (CcPrintersPanel *self)
gtk_builder_get_object (priv->builder, "clean-print-heads-button"); gtk_builder_get_object (priv->builder, "clean-print-heads-button");
gtk_widget_set_sensitive (widget, FALSE); gtk_widget_set_sensitive (widget, FALSE);
widget = (GtkWidget*)
gtk_builder_get_object (priv->builder, "supply-drawing-area");
g_signal_connect (widget, "draw", G_CALLBACK (supply_levels_draw_cb), self);
populate_printers_list (self); populate_printers_list (self);
populate_jobs_list (self); populate_jobs_list (self);

33
panels/printers/printers.ui
View file

@ -97,35 +97,50 @@
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkToolbar" id="allowed-users-toolbar"> <object class="GtkHBox" id="hbox6">
<property name="visible">True</property> <property name="visible">True</property>
<child> <child>
<object class="GtkToolButton" id="allowed-user-add-button"> <object class="GtkButton" id="allowed-user-add-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="relief">none</property>
<child>
<object class="GtkImage" id="image4">
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes">toolbutton7</property>
<property name="use_underline">True</property>
<property name="icon_name">list-add</property> <property name="icon_name">list-add</property>
</object> </object>
</child>
</object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="homogeneous">True</property> <property name="fill">False</property>
<property name="position">0</property>
</packing> </packing>
</child> </child>
<child> <child>
<object class="GtkToolButton" id="allowed-user-remove-button"> <object class="GtkButton" id="allowed-user-remove-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="relief">none</property>
<child>
<object class="GtkImage" id="image5">
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes">toolbutton8</property>
<property name="use_underline">True</property>
<property name="icon_name">list-remove</property> <property name="icon_name">list-remove</property>
</object> </object>
</child>
</object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="homogeneous">True</property> <property name="fill">False</property>
<property name="position">1</property>
</packing> </packing>
</child> </child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">False</property>
<property name="position">1</property> <property name="position">1</property>
</packing> </packing>
</child> </child>