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

printers: Place buttons adding/removing allowed users to toolbar

Browse source
This commit is contained in:
Marek Kasik 2011-01-25 15:24:07 +01:00
parent 51020d5976
commit 107e4db2f8
2 changed files with 48 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1337,8 +1337,8 @@ supply_levels_draw_cb (GtkWidget *widget,
} }
static void static void
allowed_user_remove_cb (GtkButton *button, allowed_user_remove_cb (GtkToolButton *button,
gpointer user_data) gpointer user_data)
{ {
CcPrintersPanelPrivate *priv; CcPrintersPanelPrivate *priv;
CcPrintersPanel *self = (CcPrintersPanel*) user_data; CcPrintersPanel *self = (CcPrintersPanel*) user_data;
@ -1470,8 +1470,8 @@ allowed_user_add_cb (GtkCellRendererText *renderer,
} }
static void static void
allowed_user_add_button_cb (GtkButton *button, allowed_user_add_button_cb (GtkToolButton *button,
gpointer user_data) gpointer user_data)
{ {
CcPrintersPanelPrivate *priv; CcPrintersPanelPrivate *priv;
GtkTreeViewColumn *column; GtkTreeViewColumn *column;
@ -1673,6 +1673,35 @@ printer_maintenance_cb (GtkButton *button,
} }
} }
static void
set_widget_style (GtkWidget *widget, gchar *style_data)
{
GtkStyleProvider *provider;
GtkStyleContext *context;
if (widget)
{
context = gtk_widget_get_style_context (widget);
provider = g_object_get_data (G_OBJECT (widget), "provider");
if (provider == NULL)
{
provider = (GtkStyleProvider *)gtk_css_provider_new ();
g_object_set_data (G_OBJECT (widget), "provider", provider);
gtk_style_context_add_provider (context,
GTK_STYLE_PROVIDER (provider),
GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
gtk_css_provider_load_from_data ((GtkCssProvider *)provider,
style_data, -1, NULL);
g_object_unref (provider);
}
else
gtk_css_provider_load_from_data ((GtkCssProvider *)provider,
style_data, -1, NULL);
gtk_style_context_invalidate (context);
}
}
static void static void
cc_printers_panel_init (CcPrintersPanel *self) cc_printers_panel_init (CcPrintersPanel *self)
{ {
@ -1755,6 +1784,10 @@ 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");
g_signal_connect (widget, "clicked", G_CALLBACK (printer_maintenance_cb), self); g_signal_connect (widget, "clicked", G_CALLBACK (printer_maintenance_cb), self);
widget = (GtkWidget*)
gtk_builder_get_object (priv->builder, "allowed-users-toolbar");
set_widget_style (widget, "GtkToolbar { border-style: none }");
gtk_style_context_get_background_color (gtk_widget_get_style_context (top_widget), gtk_style_context_get_background_color (gtk_widget_get_style_context (top_widget),
GTK_STATE_FLAG_NORMAL, GTK_STATE_FLAG_NORMAL,
&priv->background_color); &priv->background_color);

37
panels/printers/printers.ui
View file

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