From: joncruz Date: Thu, 6 Apr 2006 09:10:47 +0000 (+0000) Subject: Decoupling from direct use of GtkIconSize to allow for smaller custom ones. X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e42e6130e1aca183d24c4e696c9fae555c49beaa;p=inkscape.git Decoupling from direct use of GtkIconSize to allow for smaller custom ones. --- diff --git a/ChangeLog b/ChangeLog index 07fdbfb22..4ed99bb8c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +2006-04-06 Jon A. Cruz + + * src/interface.cpp, src/dialogs/clonetiler.cpp, + src/dialogs/object-properties.cpp, src/dialogs/stroke-style.cpp, + src/dialogs/text-edit.cpp, src/dialogs/tiledialog.cpp, + src/dialogs/xml-tree.cpp, src/ui/dialog/align-and-distribute.cpp, + src/ui/widget/labelled.cpp, src/widgets/button.cpp, + src/widgets/button.h, src/widgets/desktop-widget.cpp, + src/widgets/gradient-toolbar.cpp, src/widgets/icon.cpp, + src/widgets/icon.h, src/widgets/layer-selector.cpp, + src/widgets/paint-selector.cpp, src/widgets/select-toolbar.cpp, + src/widgets/toolbox.cpp, src/widgets/toolbox.h: + + Decoupling from direct use of GtkIconSize to allow for smaller + custom ones. + 2006-04-06 Jon A. Cruz * src/Makefile_insert, src/Makefile.am, src/color-profile.cpp @@ -17,7 +33,7 @@ * share/keys/Makefile.am, share/keys/default.xml, src/Makefile_insert, src/shortcuts.cpp, src/shortcuts-default-xml.cpp: - first shot at configurable keymaps + first shot at configurable keymaps 2006-04-05 MenTaLguY diff --git a/src/dialogs/clonetiler.cpp b/src/dialogs/clonetiler.cpp index 196bf7e86..555791545 100644 --- a/src/dialogs/clonetiler.cpp +++ b/src/dialogs/clonetiler.cpp @@ -1472,7 +1472,7 @@ clonetiler_table_x_y_rand (int values) { GtkWidget *hb = gtk_hbox_new (FALSE, 0); - GtkWidget *i = sp_icon_new (GTK_ICON_SIZE_MENU, "clonetiler_per_row"); + GtkWidget *i = sp_icon_new (Inkscape::ICON_SIZE_MENU, "clonetiler_per_row"); gtk_box_pack_start (GTK_BOX (hb), i, FALSE, FALSE, 2); GtkWidget *l = gtk_label_new (""); @@ -1485,7 +1485,7 @@ clonetiler_table_x_y_rand (int values) { GtkWidget *hb = gtk_hbox_new (FALSE, 0); - GtkWidget *i = sp_icon_new (GTK_ICON_SIZE_MENU, "clonetiler_per_column"); + GtkWidget *i = sp_icon_new (Inkscape::ICON_SIZE_MENU, "clonetiler_per_column"); gtk_box_pack_start (GTK_BOX (hb), i, FALSE, FALSE, 2); GtkWidget *l = gtk_label_new (""); diff --git a/src/dialogs/object-properties.cpp b/src/dialogs/object-properties.cpp index f4a40cd28..64b4b2574 100644 --- a/src/dialogs/object-properties.cpp +++ b/src/dialogs/object-properties.cpp @@ -93,7 +93,7 @@ sp_object_properties_page( GtkWidget *nb, hb = gtk_hbox_new (FALSE, 0); gtk_widget_show (hb); - px = sp_icon_new( GTK_ICON_SIZE_MENU, label_image ); + px = sp_icon_new( Inkscape::ICON_SIZE_MENU, label_image ); gtk_widget_show (px); gtk_box_pack_start (GTK_BOX (hb), px, FALSE, FALSE, 2); diff --git a/src/dialogs/stroke-style.cpp b/src/dialogs/stroke-style.cpp index b252cd125..6ad8e82c4 100644 --- a/src/dialogs/stroke-style.cpp +++ b/src/dialogs/stroke-style.cpp @@ -497,7 +497,7 @@ sp_stroke_radio_button(GtkWidget *tb, char const *icon, gtk_signal_connect(GTK_OBJECT(tb), "toggled", GTK_SIGNAL_FUNC(sp_stroke_style_any_toggled), spw); - GtkWidget *px = sp_icon_new(GTK_ICON_SIZE_LARGE_TOOLBAR, icon); + GtkWidget *px = sp_icon_new(Inkscape::ICON_SIZE_LARGE_TOOLBAR, icon); g_assert(px != NULL); gtk_widget_show(px); gtk_container_add(GTK_CONTAINER(tb), px); diff --git a/src/dialogs/text-edit.cpp b/src/dialogs/text-edit.cpp index 9d8fe5ced..15d510dda 100644 --- a/src/dialogs/text-edit.cpp +++ b/src/dialogs/text-edit.cpp @@ -225,6 +225,7 @@ sp_text_edit_dialog (void) // align left { + // TODO - replace with Inkscape-specific call GtkWidget *px = gtk_image_new_from_stock ( GTK_STOCK_JUSTIFY_LEFT, GTK_ICON_SIZE_LARGE_TOOLBAR ); GtkWidget *b = group = gtk_radio_button_new (NULL); gtk_tooltips_set_tip (tt, b, _("Align lines left"), NULL); @@ -238,6 +239,7 @@ sp_text_edit_dialog (void) // align center { + // TODO - replace with Inkscape-specific call GtkWidget *px = gtk_image_new_from_stock ( GTK_STOCK_JUSTIFY_CENTER, GTK_ICON_SIZE_LARGE_TOOLBAR ); GtkWidget *b = gtk_radio_button_new (gtk_radio_button_group (GTK_RADIO_BUTTON (group))); /* TRANSLATORS: `Center' here is a verb. */ @@ -252,6 +254,7 @@ sp_text_edit_dialog (void) // align right { + // TODO - replace with Inkscape-specific call GtkWidget *px = gtk_image_new_from_stock ( GTK_STOCK_JUSTIFY_RIGHT, GTK_ICON_SIZE_LARGE_TOOLBAR ); GtkWidget *b = gtk_radio_button_new (gtk_radio_button_group (GTK_RADIO_BUTTON (group))); gtk_tooltips_set_tip (tt, b, _("Align lines right"), NULL); @@ -273,7 +276,7 @@ sp_text_edit_dialog (void) // horizontal { - GtkWidget *px = sp_icon_new( GTK_ICON_SIZE_LARGE_TOOLBAR, + GtkWidget *px = sp_icon_new( Inkscape::ICON_SIZE_LARGE_TOOLBAR, INKSCAPE_STOCK_WRITING_MODE_LR ); GtkWidget *b = group = gtk_radio_button_new (NULL); gtk_tooltips_set_tip (tt, b, _("Horizontal text"), NULL); @@ -287,7 +290,7 @@ sp_text_edit_dialog (void) // vertical { - GtkWidget *px = sp_icon_new( GTK_ICON_SIZE_LARGE_TOOLBAR, + GtkWidget *px = sp_icon_new( Inkscape::ICON_SIZE_LARGE_TOOLBAR, INKSCAPE_STOCK_WRITING_MODE_TB ); GtkWidget *b = gtk_radio_button_new (gtk_radio_button_group (GTK_RADIO_BUTTON (group))); gtk_tooltips_set_tip (tt, b, _("Vertical text"), NULL); diff --git a/src/dialogs/tiledialog.cpp b/src/dialogs/tiledialog.cpp index 12c94ed81..c9c166bc2 100644 --- a/src/dialogs/tiledialog.cpp +++ b/src/dialogs/tiledialog.cpp @@ -780,7 +780,7 @@ TileDialog::TileDialog() { /*#### Y Padding ####*/ - GtkWidget *i = sp_icon_new (GTK_ICON_SIZE_MENU, "clonetiler_per_row"); + GtkWidget *i = sp_icon_new (Inkscape::ICON_SIZE_MENU, "clonetiler_per_row"); YPadBox.pack_start (*(Glib::wrap(i)), false, false, MARGIN); YPadSpinner.set_digits(1); @@ -805,7 +805,7 @@ TileDialog::TileDialog() { /*#### X padding ####*/ - GtkWidget *i = sp_icon_new (GTK_ICON_SIZE_MENU, "clonetiler_per_column"); + GtkWidget *i = sp_icon_new (Inkscape::ICON_SIZE_MENU, "clonetiler_per_column"); XPadBox.pack_start (*(Glib::wrap(i)), false, false, MARGIN); XPadSpinner.set_digits(1); diff --git a/src/dialogs/xml-tree.cpp b/src/dialogs/xml-tree.cpp index 44426d921..c386fe91b 100644 --- a/src/dialogs/xml-tree.cpp +++ b/src/dialogs/xml-tree.cpp @@ -300,7 +300,7 @@ void sp_xml_tree_dialog() NULL, _("New element node"), NULL, - sp_icon_new( GTK_ICON_SIZE_LARGE_TOOLBAR, + sp_icon_new( Inkscape::ICON_SIZE_LARGE_TOOLBAR, INKSCAPE_STOCK_ADD_XML_ELEMENT_NODE ), G_CALLBACK(cmd_new_element_node), NULL); @@ -321,7 +321,7 @@ void sp_xml_tree_dialog() button = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), NULL, _("New text node"), NULL, - sp_icon_new( GTK_ICON_SIZE_LARGE_TOOLBAR, + sp_icon_new( Inkscape::ICON_SIZE_LARGE_TOOLBAR, INKSCAPE_STOCK_ADD_XML_TEXT_NODE ), G_CALLBACK(cmd_new_text_node), NULL); @@ -342,7 +342,7 @@ void sp_xml_tree_dialog() button = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), NULL, _("Duplicate node"), NULL, - sp_icon_new( GTK_ICON_SIZE_LARGE_TOOLBAR, + sp_icon_new( Inkscape::ICON_SIZE_LARGE_TOOLBAR, INKSCAPE_STOCK_DUPLICATE_XML_NODE ), G_CALLBACK(cmd_duplicate_node), NULL); @@ -363,7 +363,7 @@ void sp_xml_tree_dialog() button = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), NULL, _("Delete node"), NULL, - sp_icon_new( GTK_ICON_SIZE_LARGE_TOOLBAR, + sp_icon_new( Inkscape::ICON_SIZE_LARGE_TOOLBAR, INKSCAPE_STOCK_DELETE_XML_NODE ), G_CALLBACK(cmd_delete_node), NULL ); @@ -463,7 +463,7 @@ void sp_xml_tree_dialog() button = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar), NULL, _("Delete attribute"), NULL, - sp_icon_new( GTK_ICON_SIZE_LARGE_TOOLBAR, + sp_icon_new( Inkscape::ICON_SIZE_LARGE_TOOLBAR, INKSCAPE_STOCK_DELETE_XML_ATTRIBUTE ), (GCallback) cmd_delete_attr, NULL); diff --git a/src/interface.cpp b/src/interface.cpp index 212a7b9a0..55a9601ee 100644 --- a/src/interface.cpp +++ b/src/interface.cpp @@ -336,7 +336,7 @@ sp_ui_menuitem_add_icon( GtkWidget *item, gchar *icon_name ) { GtkWidget *icon; - icon = sp_icon_new( GTK_ICON_SIZE_MENU, icon_name ); + icon = sp_icon_new( Inkscape::ICON_SIZE_MENU, icon_name ); gtk_widget_show(icon); gtk_image_menu_item_set_image((GtkImageMenuItem *) item, icon); } // end of sp_ui_menu_add_icon @@ -1008,10 +1008,7 @@ sp_ui_drag_data_received(GtkWidget *widget, //0x0ff & (data->data[3] >> 8), )); SPCSSAttr *css = sp_repr_css_attr_new(); - sp_repr_css_set_property( css, (drag_context->action != GDK_ACTION_MOVE) ? "fill":"stroke", c ); - - sp_desktop_apply_css_recursive( item, css, true ); - item->updateRepr(); + bool updatePerformed = false; if ( data->length > 14 ) { int flags = dataVals[4]; @@ -1035,9 +1032,19 @@ sp_ui_drag_data_received(GtkWidget *widget, palName.c_str(), false ); item->updateRepr(); + + sp_repr_css_set_property( css, (drag_context->action != GDK_ACTION_MOVE) ? "fill":"stroke", c ); + updatePerformed = true; } } + if ( !updatePerformed ) { + sp_repr_css_set_property( css, (drag_context->action != GDK_ACTION_MOVE) ? "fill":"stroke", c ); + } + + sp_desktop_apply_css_recursive( item, css, true ); + item->updateRepr(); + SPDocument *doc = SP_ACTIVE_DOCUMENT; sp_document_done( doc ); @@ -1273,7 +1280,10 @@ sp_ui_overwrite_file(gchar const *filename) gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE); hbox = gtk_hbox_new(FALSE, 5); + + // TODO - replace with Inkscape-specific call boxdata = gtk_image_new_from_stock(GTK_STOCK_DIALOG_QUESTION, GTK_ICON_SIZE_DIALOG); + gtk_widget_show(boxdata); gtk_box_pack_start(GTK_BOX(hbox), boxdata, TRUE, TRUE, 5); text = g_strdup_printf(_("The file %s already exists. Do you want to overwrite that file with the current document?"), filename); diff --git a/src/ui/dialog/align-and-distribute.cpp b/src/ui/dialog/align-and-distribute.cpp index 4acbbbb43..fc8b6b2f5 100644 --- a/src/ui/dialog/align-and-distribute.cpp +++ b/src/ui/dialog/align-and-distribute.cpp @@ -70,7 +70,7 @@ public : _id(id), _parent(parent) { - Gtk::Widget* pIcon = Gtk::manage( sp_icon_get_icon( _id, GTK_ICON_SIZE_LARGE_TOOLBAR) ); + Gtk::Widget* pIcon = Gtk::manage( sp_icon_get_icon( _id, Inkscape::ICON_SIZE_LARGE_TOOLBAR) ); Gtk::Button * pButton = Gtk::manage(new Gtk::Button()); pButton->set_relief(Gtk::RELIEF_NONE); pIcon->show(); diff --git a/src/ui/widget/labelled.cpp b/src/ui/widget/labelled.cpp index 64f9aef83..8f9eda3d7 100644 --- a/src/ui/widget/labelled.cpp +++ b/src/ui/widget/labelled.cpp @@ -48,7 +48,7 @@ Labelled::Labelled(Glib::ustring const &label, Glib::ustring const &tooltip, { g_assert(g_utf8_validate(icon.c_str(), -1, NULL)); if (icon != "") { - _icon = sp_icon_get_icon(icon.c_str(), GTK_ICON_SIZE_LARGE_TOOLBAR); + _icon = sp_icon_get_icon(icon.c_str(), Inkscape::ICON_SIZE_LARGE_TOOLBAR); pack_start(*Gtk::manage(_icon), Gtk::PACK_SHRINK); } pack_start(*Gtk::manage(_label), Gtk::PACK_EXPAND_WIDGET, 6); diff --git a/src/widgets/button.cpp b/src/widgets/button.cpp index 4860c9667..42775213a 100644 --- a/src/widgets/button.cpp +++ b/src/widgets/button.cpp @@ -180,14 +180,14 @@ sp_button_perform_action (SPButton *button, gpointer data) GtkWidget * -sp_button_new( GtkIconSize size, SPButtonType type, SPAction *action, SPAction *doubleclick_action, GtkTooltips *tooltips ) +sp_button_new( Inkscape::IconSize size, SPButtonType type, SPAction *action, SPAction *doubleclick_action, GtkTooltips *tooltips ) { SPButton *button; button = (SPButton *)g_object_new (SP_TYPE_BUTTON, NULL); button->type = type; - button->lsize = CLAMP( size, GTK_ICON_SIZE_MENU, GTK_ICON_SIZE_DIALOG ); + button->lsize = CLAMP( size, Inkscape::ICON_SIZE_MENU, Inkscape::ICON_SIZE_DECORATION ); button->tooltips = tooltips; if (tooltips) g_object_ref ((GObject *) tooltips); @@ -308,7 +308,7 @@ sp_button_set_composed_tooltip (GtkTooltips *tooltips, GtkWidget *widget, SPActi } GtkWidget * -sp_button_new_from_data( GtkIconSize size, +sp_button_new_from_data( Inkscape::IconSize size, SPButtonType type, Inkscape::UI::View::View *view, const gchar *name, diff --git a/src/widgets/button.h b/src/widgets/button.h index 5850d4b61..f14af94d1 100644 --- a/src/widgets/button.h +++ b/src/widgets/button.h @@ -20,7 +20,8 @@ #include #include -#include +#include "helper/action.h" +#include "icon-size.h" typedef enum { @@ -35,7 +36,7 @@ struct SPBChoiceData { struct SPButton { GtkToggleButton widget; SPButtonType type; - GtkIconSize lsize; + Inkscape::IconSize lsize; unsigned int psize; SPAction *action; SPAction *doubleclick_action; @@ -50,11 +51,11 @@ struct SPButtonClass { GType sp_button_get_type (void); -GtkWidget *sp_button_new (GtkIconSize size, SPButtonType type, SPAction *action, SPAction *doubleclick_action, GtkTooltips *tooltips); +GtkWidget *sp_button_new (Inkscape::IconSize size, SPButtonType type, SPAction *action, SPAction *doubleclick_action, GtkTooltips *tooltips); void sp_button_toggle_set_down (SPButton *button, gboolean down); -GtkWidget *sp_button_new_from_data (GtkIconSize size, +GtkWidget *sp_button_new_from_data (Inkscape::IconSize size, SPButtonType type, Inkscape::UI::View::View *view, const gchar *name, diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp index ce7f68316..7c70b01fa 100644 --- a/src/widgets/desktop-widget.cpp +++ b/src/widgets/desktop-widget.cpp @@ -234,7 +234,7 @@ sp_desktop_widget_init (SPDesktopWidget *dtw) gtk_table_attach (GTK_TABLE (tbl), dtw->hscrollbar, 1, 2, 2, 3, (GtkAttachOptions)(GTK_EXPAND | GTK_FILL), (GtkAttachOptions)(GTK_FILL), 0, 0); /* Vertical scrollbar and the sticky zoom button */ dtw->vscrollbar_box = gtk_vbox_new (FALSE, 0); - dtw->sticky_zoom = sp_button_new_from_data ( GTK_ICON_SIZE_MENU, + dtw->sticky_zoom = sp_button_new_from_data ( Inkscape::ICON_SIZE_MENU, SP_BUTTON_TYPE_TOGGLE, NULL, "sticky_zoom", diff --git a/src/widgets/gradient-toolbar.cpp b/src/widgets/gradient-toolbar.cpp index 53e194989..2ffd33d25 100644 --- a/src/widgets/gradient-toolbar.cpp +++ b/src/widgets/gradient-toolbar.cpp @@ -561,7 +561,7 @@ sp_gradient_toolbox_new(SPDesktop *desktop) GtkWidget *cbox = gtk_hbox_new (FALSE, 0); { - GtkWidget *button = sp_button_new_from_data( GTK_ICON_SIZE_SMALL_TOOLBAR, + GtkWidget *button = sp_button_new_from_data( Inkscape::ICON_SIZE_SMALL_TOOLBAR, SP_BUTTON_TYPE_TOGGLE, NULL, "fill_gradient", @@ -575,7 +575,7 @@ sp_gradient_toolbox_new(SPDesktop *desktop) } { - GtkWidget *button = sp_button_new_from_data( GTK_ICON_SIZE_SMALL_TOOLBAR, + GtkWidget *button = sp_button_new_from_data( Inkscape::ICON_SIZE_SMALL_TOOLBAR, SP_BUTTON_TYPE_TOGGLE, NULL, "fill_radial", @@ -603,7 +603,7 @@ sp_gradient_toolbox_new(SPDesktop *desktop) GtkWidget *cbox = gtk_hbox_new (FALSE, 0); { - GtkWidget *button = sp_button_new_from_data( GTK_ICON_SIZE_SMALL_TOOLBAR, + GtkWidget *button = sp_button_new_from_data( Inkscape::ICON_SIZE_SMALL_TOOLBAR, SP_BUTTON_TYPE_TOGGLE, NULL, "controls_fill", @@ -617,7 +617,7 @@ sp_gradient_toolbox_new(SPDesktop *desktop) } { - GtkWidget *button = sp_button_new_from_data( GTK_ICON_SIZE_SMALL_TOOLBAR, + GtkWidget *button = sp_button_new_from_data( Inkscape::ICON_SIZE_SMALL_TOOLBAR, SP_BUTTON_TYPE_TOGGLE, NULL, "controls_stroke", diff --git a/src/widgets/icon.cpp b/src/widgets/icon.cpp index 25f911d7d..55dab2ba7 100644 --- a/src/widgets/icon.cpp +++ b/src/widgets/icon.cpp @@ -112,7 +112,7 @@ static void sp_icon_init(SPIcon *icon) { GTK_WIDGET_FLAGS(icon) |= GTK_NO_WINDOW; - icon->lsize = GTK_ICON_SIZE_BUTTON; + icon->lsize = Inkscape::ICON_SIZE_BUTTON; icon->psize = 0; icon->name = 0; icon->pb = 0; @@ -282,7 +282,7 @@ sp_icon_new_full( GtkIconSize lsize, gchar const *name ) if ( !widget ) { SPIcon *icon = (SPIcon *)g_object_new(SP_TYPE_ICON, NULL); - icon->lsize = lsize; + icon->lsize = (Inkscape::IconSize)lsize; icon->name = g_strdup(name); icon->psize = sp_icon_get_phys_size(lsize); @@ -293,15 +293,16 @@ sp_icon_new_full( GtkIconSize lsize, gchar const *name ) } GtkWidget * -sp_icon_new( GtkIconSize lsize, gchar const *name ) +sp_icon_new( Inkscape::IconSize lsize, gchar const *name ) { - return sp_icon_new_full( lsize, name ); +// TODO FIX THIS + return sp_icon_new_full( (GtkIconSize)lsize, name ); } -Gtk::Widget *sp_icon_get_icon( Glib::ustring const &oid, GtkIconSize size ) +Gtk::Widget *sp_icon_get_icon( Glib::ustring const &oid, Inkscape::IconSize size ) { Gtk::Widget *result = 0; - GtkWidget *widget = sp_icon_new_full( size, oid.c_str() ); + GtkWidget *widget = sp_icon_new_full( (GtkIconSize)size, oid.c_str() ); if ( widget ) { if ( GTK_IS_IMAGE(widget) ) { diff --git a/src/widgets/icon.h b/src/widgets/icon.h index 2ed165f7e..de643a131 100644 --- a/src/widgets/icon.h +++ b/src/widgets/icon.h @@ -14,7 +14,7 @@ #include - +#include "icon-size.h" #define SP_TYPE_ICON (sp_icon_get_type ()) #define SP_ICON(o) (GTK_CHECK_CAST ((o), SP_TYPE_ICON, SPIcon)) @@ -25,7 +25,7 @@ struct SPIcon { GtkWidget widget; - GtkIconSize lsize; + Inkscape::IconSize lsize; int psize; gchar *name; @@ -39,13 +39,13 @@ struct SPIconClass { GType sp_icon_get_type (void); -GtkWidget *sp_icon_new( GtkIconSize size, const gchar *name ); +GtkWidget *sp_icon_new( Inkscape::IconSize size, const gchar *name ); #include #include // Might return a wrapped SPIcon, or Gtk::Image -Gtk::Widget *sp_icon_get_icon( const Glib::ustring &oid, GtkIconSize size = GTK_ICON_SIZE_BUTTON ); +Gtk::Widget *sp_icon_get_icon( const Glib::ustring &oid, Inkscape::IconSize size = Inkscape::ICON_SIZE_BUTTON ); #endif // SEEN_SP_ICON_H diff --git a/src/widgets/layer-selector.cpp b/src/widgets/layer-selector.cpp index 34433e9b7..b95005cd9 100644 --- a/src/widgets/layer-selector.cpp +++ b/src/widgets/layer-selector.cpp @@ -37,7 +37,7 @@ namespace { class AlternateIcons : public Gtk::HBox { public: - AlternateIcons(GtkIconSize size, gchar const *a, gchar const *b) + AlternateIcons(Inkscape::IconSize size, gchar const *a, gchar const *b) : _a(NULL), _b(NULL) { if (a) { @@ -46,7 +46,7 @@ public: add(*_a); } if (b) { - _b = Gtk::manage(sp_icon_get_icon(b,size)); + _b = Gtk::manage(sp_icon_get_icon(b, size)); _b->set_no_show_all(true); add(*_b); } @@ -91,7 +91,7 @@ LayerSelector::LayerSelector(SPDesktop *desktop) { AlternateIcons *label; - label = Gtk::manage(new AlternateIcons(GTK_ICON_SIZE_MENU, "visible", "hidden")); + label = Gtk::manage(new AlternateIcons(Inkscape::ICON_SIZE_MENU, "visible", "hidden")); _visibility_toggle.add(*label); _visibility_toggle.signal_toggled().connect( sigc::compose( @@ -111,7 +111,7 @@ LayerSelector::LayerSelector(SPDesktop *desktop) _tooltips.set_tip(_visibility_toggle, _("Toggle current layer visibility")); pack_start(_visibility_toggle, Gtk::PACK_EXPAND_PADDING); - label = Gtk::manage(new AlternateIcons(GTK_ICON_SIZE_MENU, "lock_unlocked", "width_height_lock")); + label = Gtk::manage(new AlternateIcons(Inkscape::ICON_SIZE_MENU, "lock_unlocked", "width_height_lock")); _lock_toggle.add(*label); _lock_toggle.signal_toggled().connect( sigc::compose( diff --git a/src/widgets/paint-selector.cpp b/src/widgets/paint-selector.cpp index 03ca29d9d..254fda0ca 100644 --- a/src/widgets/paint-selector.cpp +++ b/src/widgets/paint-selector.cpp @@ -189,7 +189,7 @@ sp_paint_selector_init(SPPaintSelector *psel) // TRANSLATORS: for info, see http://www.w3.org/TR/2000/CR-SVG-20000802/painting.html#FillRuleProperty gtk_tooltips_set_tip(tt, psel->evenodd, _("Any path self-intersections or subpaths create holes in the fill (fill-rule: evenodd)"), NULL); gtk_object_set_data(GTK_OBJECT(psel->evenodd), "mode", GUINT_TO_POINTER(SP_PAINT_SELECTOR_FILLRULE_EVENODD)); - w = sp_icon_new(GTK_ICON_SIZE_MENU, "fillrule_evenodd"); + w = sp_icon_new(Inkscape::ICON_SIZE_MENU, "fillrule_evenodd"); gtk_container_add(GTK_CONTAINER(psel->evenodd), w); gtk_box_pack_start(GTK_BOX(psel->fillrulebox), psel->evenodd, FALSE, FALSE, 0); gtk_signal_connect(GTK_OBJECT(psel->evenodd), "toggled", GTK_SIGNAL_FUNC(sp_paint_selector_fillrule_toggled), psel); @@ -200,7 +200,7 @@ sp_paint_selector_init(SPPaintSelector *psel) // TRANSLATORS: for info, see http://www.w3.org/TR/2000/CR-SVG-20000802/painting.html#FillRuleProperty gtk_tooltips_set_tip(tt, psel->nonzero, _("Fill is solid unless a subpath is counterdirectional (fill-rule: nonzero)"), NULL); gtk_object_set_data(GTK_OBJECT(psel->nonzero), "mode", GUINT_TO_POINTER(SP_PAINT_SELECTOR_FILLRULE_NONZERO)); - w = sp_icon_new(GTK_ICON_SIZE_MENU, "fillrule_nonzero"); + w = sp_icon_new(Inkscape::ICON_SIZE_MENU, "fillrule_nonzero"); gtk_container_add(GTK_CONTAINER(psel->nonzero), w); gtk_box_pack_start(GTK_BOX(psel->fillrulebox), psel->nonzero, FALSE, FALSE, 0); gtk_signal_connect(GTK_OBJECT(psel->nonzero), "toggled", GTK_SIGNAL_FUNC(sp_paint_selector_fillrule_toggled), psel); @@ -247,7 +247,7 @@ sp_paint_selector_style_button_add(SPPaintSelector *psel, gtk_toggle_button_set_mode(GTK_TOGGLE_BUTTON(b), FALSE); gtk_object_set_data(GTK_OBJECT(b), "mode", GUINT_TO_POINTER(mode)); - w = sp_icon_new(GTK_ICON_SIZE_BUTTON, pixmap); + w = sp_icon_new(Inkscape::ICON_SIZE_BUTTON, pixmap); gtk_widget_show(w); gtk_container_add(GTK_CONTAINER(b), w); diff --git a/src/widgets/select-toolbar.cpp b/src/widgets/select-toolbar.cpp index 0e2f25ab3..1565a4d8c 100644 --- a/src/widgets/select-toolbar.cpp +++ b/src/widgets/select-toolbar.cpp @@ -376,11 +376,11 @@ static void toggle_lock (GtkWidget *button, gpointer data) { gtk_container_remove (GTK_CONTAINER(button), old_child); if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button))) { - GtkWidget *child = sp_icon_new (GTK_ICON_SIZE_MENU, "width_height_lock"); + GtkWidget *child = sp_icon_new (Inkscape::ICON_SIZE_MENU, "width_height_lock"); gtk_widget_show (child); gtk_container_add (GTK_CONTAINER (button), child); } else { - GtkWidget *child = sp_icon_new (GTK_ICON_SIZE_MENU, "lock_unlocked"); + GtkWidget *child = sp_icon_new (Inkscape::ICON_SIZE_MENU, "lock_unlocked"); gtk_widget_show (child); gtk_container_add (GTK_CONTAINER (button), child); } @@ -394,17 +394,17 @@ sp_select_toolbox_new(SPDesktop *desktop) GtkTooltips *tt = gtk_tooltips_new(); GtkWidget *tb = gtk_hbox_new(FALSE, 0); - sp_toolbox_button_normal_new_from_verb(tb, GTK_ICON_SIZE_SMALL_TOOLBAR, Inkscape::Verb::get(SP_VERB_OBJECT_ROTATE_90_CCW), view, tt); - sp_toolbox_button_normal_new_from_verb(tb, GTK_ICON_SIZE_SMALL_TOOLBAR, Inkscape::Verb::get(SP_VERB_OBJECT_ROTATE_90_CW), view, tt); - sp_toolbox_button_normal_new_from_verb(tb, GTK_ICON_SIZE_SMALL_TOOLBAR, Inkscape::Verb::get(SP_VERB_OBJECT_FLIP_HORIZONTAL), view, tt); - sp_toolbox_button_normal_new_from_verb(tb, GTK_ICON_SIZE_SMALL_TOOLBAR, Inkscape::Verb::get(SP_VERB_OBJECT_FLIP_VERTICAL), view, tt); + sp_toolbox_button_normal_new_from_verb(tb, Inkscape::ICON_SIZE_SMALL_TOOLBAR, Inkscape::Verb::get(SP_VERB_OBJECT_ROTATE_90_CCW), view, tt); + sp_toolbox_button_normal_new_from_verb(tb, Inkscape::ICON_SIZE_SMALL_TOOLBAR, Inkscape::Verb::get(SP_VERB_OBJECT_ROTATE_90_CW), view, tt); + sp_toolbox_button_normal_new_from_verb(tb, Inkscape::ICON_SIZE_SMALL_TOOLBAR, Inkscape::Verb::get(SP_VERB_OBJECT_FLIP_HORIZONTAL), view, tt); + sp_toolbox_button_normal_new_from_verb(tb, Inkscape::ICON_SIZE_SMALL_TOOLBAR, Inkscape::Verb::get(SP_VERB_OBJECT_FLIP_VERTICAL), view, tt); aux_toolbox_space(tb, AUX_BETWEEN_BUTTON_GROUPS); - sp_toolbox_button_normal_new_from_verb(tb, GTK_ICON_SIZE_SMALL_TOOLBAR, Inkscape::Verb::get(SP_VERB_SELECTION_TO_BACK), view, tt); - sp_toolbox_button_normal_new_from_verb(tb, GTK_ICON_SIZE_SMALL_TOOLBAR, Inkscape::Verb::get(SP_VERB_SELECTION_LOWER), view, tt); - sp_toolbox_button_normal_new_from_verb(tb, GTK_ICON_SIZE_SMALL_TOOLBAR, Inkscape::Verb::get(SP_VERB_SELECTION_RAISE), view, tt); - sp_toolbox_button_normal_new_from_verb(tb, GTK_ICON_SIZE_SMALL_TOOLBAR, Inkscape::Verb::get(SP_VERB_SELECTION_TO_FRONT), view, tt); + sp_toolbox_button_normal_new_from_verb(tb, Inkscape::ICON_SIZE_SMALL_TOOLBAR, Inkscape::Verb::get(SP_VERB_SELECTION_TO_BACK), view, tt); + sp_toolbox_button_normal_new_from_verb(tb, Inkscape::ICON_SIZE_SMALL_TOOLBAR, Inkscape::Verb::get(SP_VERB_SELECTION_LOWER), view, tt); + sp_toolbox_button_normal_new_from_verb(tb, Inkscape::ICON_SIZE_SMALL_TOOLBAR, Inkscape::Verb::get(SP_VERB_SELECTION_RAISE), view, tt); + sp_toolbox_button_normal_new_from_verb(tb, Inkscape::ICON_SIZE_SMALL_TOOLBAR, Inkscape::Verb::get(SP_VERB_SELECTION_TO_FRONT), view, tt); // Create the parent widget for x y w h tracker. GtkWidget *spw = sp_widget_new_global(INKSCAPE); @@ -445,7 +445,7 @@ sp_select_toolbox_new(SPDesktop *desktop) // lock toggle GtkWidget *lockbox = gtk_vbox_new(TRUE, 0); - GtkWidget *lock = sp_button_new_from_data( GTK_ICON_SIZE_MENU, + GtkWidget *lock = sp_button_new_from_data( Inkscape::ICON_SIZE_MENU, SP_BUTTON_TYPE_TOGGLE, NULL, "lock_unlocked", @@ -489,7 +489,7 @@ sp_select_toolbox_new(SPDesktop *desktop) GtkWidget *cbox = gtk_hbox_new (FALSE, 0); { - GtkWidget *button = sp_button_new_from_data( GTK_ICON_SIZE_SMALL_TOOLBAR, + GtkWidget *button = sp_button_new_from_data( Inkscape::ICON_SIZE_SMALL_TOOLBAR, SP_BUTTON_TYPE_TOGGLE, NULL, "transform_stroke", @@ -501,7 +501,7 @@ sp_select_toolbox_new(SPDesktop *desktop) } { - GtkWidget *button = sp_button_new_from_data( GTK_ICON_SIZE_SMALL_TOOLBAR, + GtkWidget *button = sp_button_new_from_data( Inkscape::ICON_SIZE_SMALL_TOOLBAR, SP_BUTTON_TYPE_TOGGLE, NULL, "transform_corners", @@ -513,7 +513,7 @@ sp_select_toolbox_new(SPDesktop *desktop) } { - GtkWidget *button = sp_button_new_from_data( GTK_ICON_SIZE_SMALL_TOOLBAR, + GtkWidget *button = sp_button_new_from_data( Inkscape::ICON_SIZE_SMALL_TOOLBAR, SP_BUTTON_TYPE_TOGGLE, NULL, "transform_gradient", @@ -525,7 +525,7 @@ sp_select_toolbox_new(SPDesktop *desktop) } { - GtkWidget *button = sp_button_new_from_data( GTK_ICON_SIZE_SMALL_TOOLBAR, + GtkWidget *button = sp_button_new_from_data( Inkscape::ICON_SIZE_SMALL_TOOLBAR, SP_BUTTON_TYPE_TOGGLE, NULL, "transform_pattern", diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp index 5eacf74b4..eb5ff11a4 100644 --- a/src/widgets/toolbox.cpp +++ b/src/widgets/toolbox.cpp @@ -147,7 +147,7 @@ static void delete_connection(GObject *obj, sigc::connection *connection) { } static GtkWidget * -sp_toolbox_button_new(GtkWidget *t, GtkIconSize size, gchar const *pxname, GtkSignalFunc handler, +sp_toolbox_button_new(GtkWidget *t, Inkscape::IconSize size, gchar const *pxname, GtkSignalFunc handler, GtkTooltips *tt, gchar const *tip) { GtkWidget *b = sp_button_new_from_data(size, SP_BUTTON_TYPE_NORMAL, NULL, pxname, tip, tt); @@ -160,7 +160,7 @@ sp_toolbox_button_new(GtkWidget *t, GtkIconSize size, gchar const *pxname, GtkSi GtkWidget * -sp_toolbox_button_new_from_verb_with_doubleclick(GtkWidget *t, GtkIconSize size, SPButtonType type, +sp_toolbox_button_new_from_verb_with_doubleclick(GtkWidget *t, Inkscape::IconSize size, SPButtonType type, Inkscape::Verb *verb, Inkscape::Verb *doubleclick_verb, Inkscape::UI::View::View *view, GtkTooltips *tt) { @@ -182,13 +182,13 @@ sp_toolbox_button_new_from_verb_with_doubleclick(GtkWidget *t, GtkIconSize size, return b; } -GtkWidget *sp_toolbox_button_new_from_verb(GtkWidget *t, GtkIconSize size, SPButtonType type, Inkscape::Verb *verb, +GtkWidget *sp_toolbox_button_new_from_verb(GtkWidget *t, Inkscape::IconSize size, SPButtonType type, Inkscape::Verb *verb, Inkscape::UI::View::View *view, GtkTooltips *tt) { return sp_toolbox_button_new_from_verb_with_doubleclick(t, size, type, verb, NULL, view, tt); } -GtkWidget * sp_toolbox_button_normal_new_from_verb(GtkWidget *t, GtkIconSize size, Inkscape::Verb *verb, +GtkWidget * sp_toolbox_button_normal_new_from_verb(GtkWidget *t, Inkscape::IconSize size, Inkscape::Verb *verb, Inkscape::UI::View::View *view, GtkTooltips *tt) { return sp_toolbox_button_new_from_verb(t, size, SP_BUTTON_TYPE_NORMAL, verb, view, tt); @@ -388,48 +388,48 @@ sp_node_toolbox_new(SPDesktop *desktop) gtk_box_pack_start(GTK_BOX(tb), gtk_hbox_new(FALSE, 0), FALSE, FALSE, AUX_BETWEEN_BUTTON_GROUPS); - sp_toolbox_button_new(tb, GTK_ICON_SIZE_SMALL_TOOLBAR, "node_insert", + sp_toolbox_button_new(tb, Inkscape::ICON_SIZE_SMALL_TOOLBAR, "node_insert", GTK_SIGNAL_FUNC(sp_node_path_edit_add), tt, _("Insert new nodes into selected segments")); - sp_toolbox_button_new(tb, GTK_ICON_SIZE_SMALL_TOOLBAR, "node_delete", + sp_toolbox_button_new(tb, Inkscape::ICON_SIZE_SMALL_TOOLBAR, "node_delete", GTK_SIGNAL_FUNC(sp_node_path_edit_delete), tt, _("Delete selected nodes")); gtk_box_pack_start(GTK_BOX(tb), gtk_hbox_new(FALSE, 0), FALSE, FALSE, AUX_BETWEEN_BUTTON_GROUPS); - sp_toolbox_button_new(tb, GTK_ICON_SIZE_SMALL_TOOLBAR, "node_join", + sp_toolbox_button_new(tb, Inkscape::ICON_SIZE_SMALL_TOOLBAR, "node_join", GTK_SIGNAL_FUNC(sp_node_path_edit_join), tt, _("Join paths at selected nodes")); - sp_toolbox_button_new(tb, GTK_ICON_SIZE_SMALL_TOOLBAR, "node_join_segment", + sp_toolbox_button_new(tb, Inkscape::ICON_SIZE_SMALL_TOOLBAR, "node_join_segment", GTK_SIGNAL_FUNC(sp_node_path_edit_join_segment), tt, _("Join paths at selected nodes with new segment")); - sp_toolbox_button_new(tb, GTK_ICON_SIZE_SMALL_TOOLBAR, "node_delete_segment", + sp_toolbox_button_new(tb, Inkscape::ICON_SIZE_SMALL_TOOLBAR, "node_delete_segment", GTK_SIGNAL_FUNC(sp_node_path_edit_delete_segment), tt, _("Split path between two non-endpoint nodes")); - sp_toolbox_button_new(tb, GTK_ICON_SIZE_SMALL_TOOLBAR, "node_break", + sp_toolbox_button_new(tb, Inkscape::ICON_SIZE_SMALL_TOOLBAR, "node_break", GTK_SIGNAL_FUNC(sp_node_path_edit_break), tt, _("Break path at selected nodes")); gtk_box_pack_start(GTK_BOX(tb), gtk_hbox_new(FALSE, 0), FALSE, FALSE, AUX_BETWEEN_BUTTON_GROUPS); - sp_toolbox_button_new(tb, GTK_ICON_SIZE_SMALL_TOOLBAR, "node_cusp", + sp_toolbox_button_new(tb, Inkscape::ICON_SIZE_SMALL_TOOLBAR, "node_cusp", GTK_SIGNAL_FUNC(sp_node_path_edit_cusp), tt, _("Make selected nodes corner")); - sp_toolbox_button_new(tb, GTK_ICON_SIZE_SMALL_TOOLBAR, "node_smooth", + sp_toolbox_button_new(tb, Inkscape::ICON_SIZE_SMALL_TOOLBAR, "node_smooth", GTK_SIGNAL_FUNC(sp_node_path_edit_smooth), tt, _("Make selected nodes smooth")); - sp_toolbox_button_new(tb, GTK_ICON_SIZE_SMALL_TOOLBAR, "node_symmetric", + sp_toolbox_button_new(tb, Inkscape::ICON_SIZE_SMALL_TOOLBAR, "node_symmetric", GTK_SIGNAL_FUNC(sp_node_path_edit_symmetrical), tt, _("Make selected nodes symmetric")); gtk_box_pack_start(GTK_BOX(tb), gtk_hbox_new(FALSE, 0), FALSE, FALSE, AUX_BETWEEN_BUTTON_GROUPS); - sp_toolbox_button_new(tb, GTK_ICON_SIZE_SMALL_TOOLBAR, "node_line", + sp_toolbox_button_new(tb, Inkscape::ICON_SIZE_SMALL_TOOLBAR, "node_line", GTK_SIGNAL_FUNC(sp_node_path_edit_toline), tt, _("Make selected segments lines")); - sp_toolbox_button_new(tb, GTK_ICON_SIZE_SMALL_TOOLBAR, "node_curve", + sp_toolbox_button_new(tb, Inkscape::ICON_SIZE_SMALL_TOOLBAR, "node_curve", GTK_SIGNAL_FUNC(sp_node_path_edit_tocurve), tt, _("Make selected segments curves")); gtk_box_pack_start(GTK_BOX(tb), gtk_hbox_new(FALSE, 0), FALSE, FALSE, AUX_BETWEEN_BUTTON_GROUPS); - sp_toolbox_button_normal_new_from_verb(tb, GTK_ICON_SIZE_SMALL_TOOLBAR, Inkscape::Verb::get(SP_VERB_OBJECT_TO_CURVE), view, tt); + sp_toolbox_button_normal_new_from_verb(tb, Inkscape::ICON_SIZE_SMALL_TOOLBAR, Inkscape::Verb::get(SP_VERB_OBJECT_TO_CURVE), view, tt); - sp_toolbox_button_normal_new_from_verb(tb, GTK_ICON_SIZE_SMALL_TOOLBAR, Inkscape::Verb::get(SP_VERB_SELECTION_OUTLINE), view, tt); + sp_toolbox_button_normal_new_from_verb(tb, Inkscape::ICON_SIZE_SMALL_TOOLBAR, Inkscape::Verb::get(SP_VERB_SELECTION_OUTLINE), view, tt); gtk_widget_show_all(tb); @@ -453,33 +453,33 @@ sp_zoom_toolbox_new(SPDesktop *desktop) gtk_box_pack_start(GTK_BOX(tb), gtk_hbox_new(FALSE, 0), FALSE, FALSE, AUX_BETWEEN_BUTTON_GROUPS); - sp_toolbox_button_new_from_verb(tb, GTK_ICON_SIZE_SMALL_TOOLBAR, SP_BUTTON_TYPE_NORMAL, Inkscape::Verb::get(SP_VERB_ZOOM_IN), view, tt); + sp_toolbox_button_new_from_verb(tb, Inkscape::ICON_SIZE_SMALL_TOOLBAR, SP_BUTTON_TYPE_NORMAL, Inkscape::Verb::get(SP_VERB_ZOOM_IN), view, tt); - sp_toolbox_button_new_from_verb(tb, GTK_ICON_SIZE_SMALL_TOOLBAR, SP_BUTTON_TYPE_NORMAL, Inkscape::Verb::get(SP_VERB_ZOOM_OUT), view, tt); + sp_toolbox_button_new_from_verb(tb, Inkscape::ICON_SIZE_SMALL_TOOLBAR, SP_BUTTON_TYPE_NORMAL, Inkscape::Verb::get(SP_VERB_ZOOM_OUT), view, tt); gtk_box_pack_start(GTK_BOX(tb), gtk_hbox_new(FALSE, 0), FALSE, FALSE, AUX_BETWEEN_BUTTON_GROUPS); - sp_toolbox_button_new_from_verb(tb, GTK_ICON_SIZE_SMALL_TOOLBAR, SP_BUTTON_TYPE_NORMAL, Inkscape::Verb::get(SP_VERB_ZOOM_SELECTION), view, tt); + sp_toolbox_button_new_from_verb(tb, Inkscape::ICON_SIZE_SMALL_TOOLBAR, SP_BUTTON_TYPE_NORMAL, Inkscape::Verb::get(SP_VERB_ZOOM_SELECTION), view, tt); - sp_toolbox_button_new_from_verb(tb, GTK_ICON_SIZE_SMALL_TOOLBAR, SP_BUTTON_TYPE_NORMAL, Inkscape::Verb::get(SP_VERB_ZOOM_DRAWING), view, tt); + sp_toolbox_button_new_from_verb(tb, Inkscape::ICON_SIZE_SMALL_TOOLBAR, SP_BUTTON_TYPE_NORMAL, Inkscape::Verb::get(SP_VERB_ZOOM_DRAWING), view, tt); - sp_toolbox_button_new_from_verb(tb, GTK_ICON_SIZE_SMALL_TOOLBAR, SP_BUTTON_TYPE_NORMAL, Inkscape::Verb::get(SP_VERB_ZOOM_PAGE), view, tt); + sp_toolbox_button_new_from_verb(tb, Inkscape::ICON_SIZE_SMALL_TOOLBAR, SP_BUTTON_TYPE_NORMAL, Inkscape::Verb::get(SP_VERB_ZOOM_PAGE), view, tt); - sp_toolbox_button_new_from_verb(tb, GTK_ICON_SIZE_SMALL_TOOLBAR, SP_BUTTON_TYPE_NORMAL, Inkscape::Verb::get(SP_VERB_ZOOM_PAGE_WIDTH), view, tt); + sp_toolbox_button_new_from_verb(tb, Inkscape::ICON_SIZE_SMALL_TOOLBAR, SP_BUTTON_TYPE_NORMAL, Inkscape::Verb::get(SP_VERB_ZOOM_PAGE_WIDTH), view, tt); gtk_box_pack_start(GTK_BOX(tb), gtk_hbox_new(FALSE, 0), FALSE, FALSE, AUX_BETWEEN_BUTTON_GROUPS); - sp_toolbox_button_new_from_verb(tb, GTK_ICON_SIZE_SMALL_TOOLBAR, SP_BUTTON_TYPE_NORMAL, Inkscape::Verb::get(SP_VERB_ZOOM_PREV), view, tt); + sp_toolbox_button_new_from_verb(tb, Inkscape::ICON_SIZE_SMALL_TOOLBAR, SP_BUTTON_TYPE_NORMAL, Inkscape::Verb::get(SP_VERB_ZOOM_PREV), view, tt); - sp_toolbox_button_new_from_verb(tb, GTK_ICON_SIZE_SMALL_TOOLBAR, SP_BUTTON_TYPE_NORMAL, Inkscape::Verb::get(SP_VERB_ZOOM_NEXT), view, tt); + sp_toolbox_button_new_from_verb(tb, Inkscape::ICON_SIZE_SMALL_TOOLBAR, SP_BUTTON_TYPE_NORMAL, Inkscape::Verb::get(SP_VERB_ZOOM_NEXT), view, tt); gtk_box_pack_start(GTK_BOX(tb), gtk_hbox_new(FALSE, 0), FALSE, FALSE, AUX_BETWEEN_BUTTON_GROUPS); - sp_toolbox_button_new_from_verb(tb, GTK_ICON_SIZE_SMALL_TOOLBAR, SP_BUTTON_TYPE_NORMAL, Inkscape::Verb::get(SP_VERB_ZOOM_1_1), view, tt); + sp_toolbox_button_new_from_verb(tb, Inkscape::ICON_SIZE_SMALL_TOOLBAR, SP_BUTTON_TYPE_NORMAL, Inkscape::Verb::get(SP_VERB_ZOOM_1_1), view, tt); - sp_toolbox_button_new_from_verb(tb, GTK_ICON_SIZE_SMALL_TOOLBAR, SP_BUTTON_TYPE_NORMAL, Inkscape::Verb::get(SP_VERB_ZOOM_1_2), view, tt); + sp_toolbox_button_new_from_verb(tb, Inkscape::ICON_SIZE_SMALL_TOOLBAR, SP_BUTTON_TYPE_NORMAL, Inkscape::Verb::get(SP_VERB_ZOOM_1_2), view, tt); - sp_toolbox_button_new_from_verb(tb, GTK_ICON_SIZE_SMALL_TOOLBAR, SP_BUTTON_TYPE_NORMAL, Inkscape::Verb::get(SP_VERB_ZOOM_2_1), view, tt); + sp_toolbox_button_new_from_verb(tb, Inkscape::ICON_SIZE_SMALL_TOOLBAR, SP_BUTTON_TYPE_NORMAL, Inkscape::Verb::get(SP_VERB_ZOOM_2_1), view, tt); gtk_widget_show_all(tb); @@ -543,7 +543,7 @@ setup_tool_toolbox(GtkWidget *toolbox, SPDesktop *desktop) { GtkTooltips *tooltips=GTK_TOOLTIPS(g_object_get_data(G_OBJECT(toolbox), "tooltips")); gint shrinkLeft = prefs_get_int_attribute_limited( "toolbox.left", "small", 0, 0, 1 ); - GtkIconSize toolboxSize = shrinkLeft ? GTK_ICON_SIZE_SMALL_TOOLBAR : GTK_ICON_SIZE_LARGE_TOOLBAR; + Inkscape::IconSize toolboxSize = shrinkLeft ? Inkscape::ICON_SIZE_SMALL_TOOLBAR : Inkscape::ICON_SIZE_LARGE_TOOLBAR; for (int i = 0 ; tools[i].type_name ; i++ ) { GtkWidget *button = @@ -618,7 +618,7 @@ setup_commands_toolbox(GtkWidget *toolbox, SPDesktop *desktop) GtkWidget *tb = gtk_hbox_new(FALSE, 0); gint shrinkTop = prefs_get_int_attribute_limited( "toolbox", "small", 1, 0, 1 ); - GtkIconSize toolboxSize = shrinkTop ? GTK_ICON_SIZE_SMALL_TOOLBAR : GTK_ICON_SIZE_LARGE_TOOLBAR; + Inkscape::IconSize toolboxSize = shrinkTop ? Inkscape::ICON_SIZE_SMALL_TOOLBAR : Inkscape::ICON_SIZE_LARGE_TOOLBAR; sp_toolbox_button_new_from_verb(tb, toolboxSize, SP_BUTTON_TYPE_NORMAL, Inkscape::Verb::get(SP_VERB_FILE_NEW), view, tt); sp_toolbox_button_new_from_verb(tb, toolboxSize, SP_BUTTON_TYPE_NORMAL, Inkscape::Verb::get(SP_VERB_FILE_OPEN), view, tt); @@ -2011,7 +2011,7 @@ sp_calligraphy_toolbox_new(SPDesktop *desktop) /* Use Pressure button */ { - GtkWidget *button = sp_button_new_from_data( GTK_ICON_SIZE_SMALL_TOOLBAR, + GtkWidget *button = sp_button_new_from_data( Inkscape::ICON_SIZE_SMALL_TOOLBAR, SP_BUTTON_TYPE_TOGGLE, NULL, "use_pressure", @@ -2024,7 +2024,7 @@ sp_calligraphy_toolbox_new(SPDesktop *desktop) /* Use Tilt button */ { - GtkWidget *button = sp_button_new_from_data( GTK_ICON_SIZE_SMALL_TOOLBAR, + GtkWidget *button = sp_button_new_from_data( Inkscape::ICON_SIZE_SMALL_TOOLBAR, SP_BUTTON_TYPE_TOGGLE, NULL, "use_tilt", @@ -2620,7 +2620,7 @@ sp_dropper_toolbox_new(SPDesktop *desktop) GtkWidget *hb = gtk_hbox_new(FALSE, 1); GtkWidget *button = - sp_button_new_from_data( GTK_ICON_SIZE_SMALL_TOOLBAR, + sp_button_new_from_data( Inkscape::ICON_SIZE_SMALL_TOOLBAR, SP_BUTTON_TYPE_TOGGLE, NULL, "pick_color", @@ -2740,7 +2740,7 @@ sp_text_toolbox_new(SPDesktop *desktop) aux_toolbox_space(tbl, AUX_BETWEEN_BUTTON_GROUPS); //Bold { - GtkWidget *px = gtk_image_new_from_stock(GTK_STOCK_BOLD, GTK_ICON_SIZE_SMALL_TOOLBAR); + GtkWidget *px = gtk_image_new_from_stock(GTK_STOCK_BOLD, Inkscape::ICON_SIZE_SMALL_TOOLBAR); GtkWidget *button = gtk_toggle_button_new (); gtk_container_add (GTK_CONTAINER (button), px); gtk_widget_show(button); @@ -2753,7 +2753,7 @@ sp_text_toolbox_new(SPDesktop *desktop) //Italic { - GtkWidget *px = gtk_image_new_from_stock(GTK_STOCK_ITALIC, GTK_ICON_SIZE_SMALL_TOOLBAR); + GtkWidget *px = gtk_image_new_from_stock(GTK_STOCK_ITALIC, Inkscape::ICON_SIZE_SMALL_TOOLBAR); GtkWidget *button = gtk_toggle_button_new (); gtk_container_add (GTK_CONTAINER (button), px); gtk_widget_show(button); @@ -2765,7 +2765,7 @@ sp_text_toolbox_new(SPDesktop *desktop) //Underline { - GtkWidget *px = gtk_image_new_from_stock(GTK_STOCK_UNDERLINE, GTK_ICON_SIZE_SMALL_TOOLBAR); + GtkWidget *px = gtk_image_new_from_stock(GTK_STOCK_UNDERLINE, Inkscape::ICON_SIZE_SMALL_TOOLBAR); GtkWidget *button = gtk_toggle_button_new (); gtk_container_add (GTK_CONTAINER (button), px); gtk_widget_show(button); @@ -2778,7 +2778,7 @@ sp_text_toolbox_new(SPDesktop *desktop) aux_toolbox_space(tbl, AUX_BETWEEN_BUTTON_GROUPS); // align left { - GtkWidget *px = gtk_image_new_from_stock (GTK_STOCK_JUSTIFY_LEFT, GTK_ICON_SIZE_SMALL_TOOLBAR); + GtkWidget *px = gtk_image_new_from_stock (GTK_STOCK_JUSTIFY_LEFT, Inkscape::ICON_SIZE_SMALL_TOOLBAR); GtkWidget *b = group = gtk_radio_button_new (NULL); gtk_container_add (GTK_CONTAINER (b), px); gtk_tooltips_set_tip (tt, b, _("Align lines left"), NULL); @@ -2789,7 +2789,7 @@ sp_text_toolbox_new(SPDesktop *desktop) // align center { - GtkWidget *px = gtk_image_new_from_stock (GTK_STOCK_JUSTIFY_CENTER, GTK_ICON_SIZE_SMALL_TOOLBAR); + GtkWidget *px = gtk_image_new_from_stock (GTK_STOCK_JUSTIFY_CENTER, Inkscape::ICON_SIZE_SMALL_TOOLBAR); GtkWidget *b = gtk_radio_button_new (gtk_radio_button_group (GTK_RADIO_BUTTON (group))); gtk_container_add (GTK_CONTAINER (b), px); // TRANSLATORS: `Center' here is a verb. @@ -2801,7 +2801,7 @@ sp_text_toolbox_new(SPDesktop *desktop) // align right { - GtkWidget *px = gtk_image_new_from_stock (GTK_STOCK_JUSTIFY_RIGHT, GTK_ICON_SIZE_SMALL_TOOLBAR); + GtkWidget *px = gtk_image_new_from_stock (GTK_STOCK_JUSTIFY_RIGHT, Inkscape::ICON_SIZE_SMALL_TOOLBAR); GtkWidget *b = gtk_radio_button_new (gtk_radio_button_group (GTK_RADIO_BUTTON (group))); gtk_container_add (GTK_CONTAINER (b), px); gtk_tooltips_set_tip (tt, b, _("Align lines right"), NULL); @@ -2812,7 +2812,7 @@ sp_text_toolbox_new(SPDesktop *desktop) // full justification { - GtkWidget *px = gtk_image_new_from_stock (GTK_STOCK_JUSTIFY_FILL, GTK_ICON_SIZE_SMALL_TOOLBAR); + GtkWidget *px = gtk_image_new_from_stock (GTK_STOCK_JUSTIFY_FILL, Inkscape::ICON_SIZE_SMALL_TOOLBAR); GtkWidget *b = gtk_radio_button_new (gtk_radio_button_group (GTK_RADIO_BUTTON (group))); gtk_container_add (GTK_CONTAINER (b), px); gtk_tooltips_set_tip (tt, b, _("Full justification"), NULL); @@ -2826,7 +2826,7 @@ sp_text_toolbox_new(SPDesktop *desktop) // horizontal { - GtkWidget *px= sp_icon_new(GTK_ICON_SIZE_SMALL_TOOLBAR, INKSCAPE_STOCK_WRITING_MODE_LR); + GtkWidget *px= sp_icon_new(Inkscape::ICON_SIZE_SMALL_TOOLBAR, INKSCAPE_STOCK_WRITING_MODE_LR); GtkWidget *b = group = gtk_radio_button_new (NULL); gtk_container_add (GTK_CONTAINER (b), px); gtk_tooltips_set_tip (tt, b, _("Horizontal text"), NULL); @@ -2837,7 +2837,7 @@ sp_text_toolbox_new(SPDesktop *desktop) // vertical { - GtkWidget *px = sp_icon_new (GTK_ICON_SIZE_SMALL_TOOLBAR, INKSCAPE_STOCK_WRITING_MODE_TB); + GtkWidget *px = sp_icon_new (Inkscape::ICON_SIZE_SMALL_TOOLBAR, INKSCAPE_STOCK_WRITING_MODE_TB); GtkWidget *b = gtk_radio_button_new (gtk_radio_button_group (GTK_RADIO_BUTTON (group))); gtk_container_add (GTK_CONTAINER (b), px); gtk_tooltips_set_tip (tt, b, _("Vertical text"), NULL); @@ -2851,7 +2851,7 @@ sp_text_toolbox_new(SPDesktop *desktop) // letter spacing { { - GtkWidget *image = sp_icon_new (GTK_ICON_SIZE_SMALL_TOOLBAR, INKSCAPE_STOCK_TEXT_LETTER_SPACING); + GtkWidget *image = sp_icon_new (Inkscape::ICON_SIZE_SMALL_TOOLBAR, INKSCAPE_STOCK_TEXT_LETTER_SPACING); GtkWidget *hb = gtk_hbox_new(FALSE, 1); gtk_container_add (GTK_CONTAINER (hb), image); gtk_widget_show(image); @@ -2872,7 +2872,7 @@ sp_text_toolbox_new(SPDesktop *desktop) // line spacing { { - GtkWidget *image = sp_icon_new (GTK_ICON_SIZE_SMALL_TOOLBAR, INKSCAPE_STOCK_TEXT_LINE_SPACING); + GtkWidget *image = sp_icon_new (Inkscape::ICON_SIZE_SMALL_TOOLBAR, INKSCAPE_STOCK_TEXT_LINE_SPACING); GtkWidget *hb = gtk_hbox_new(FALSE, 1); gtk_container_add (GTK_CONTAINER (hb), image); gtk_widget_show(image); @@ -2901,7 +2901,7 @@ sp_text_toolbox_new(SPDesktop *desktop) // horizontal kerning { { - GtkWidget *image = sp_icon_new (GTK_ICON_SIZE_SMALL_TOOLBAR, INKSCAPE_STOCK_TEXT_HORZ_KERN); + GtkWidget *image = sp_icon_new (Inkscape::ICON_SIZE_SMALL_TOOLBAR, INKSCAPE_STOCK_TEXT_HORZ_KERN); GtkWidget *hb = gtk_hbox_new(FALSE, 1); gtk_container_add (GTK_CONTAINER (hb), image); gtk_widget_show(image); @@ -2922,7 +2922,7 @@ sp_text_toolbox_new(SPDesktop *desktop) // vertical kerning { { - GtkWidget *image = sp_icon_new (GTK_ICON_SIZE_SMALL_TOOLBAR, INKSCAPE_STOCK_TEXT_VERT_KERN); + GtkWidget *image = sp_icon_new (Inkscape::ICON_SIZE_SMALL_TOOLBAR, INKSCAPE_STOCK_TEXT_VERT_KERN); GtkWidget *hb = gtk_hbox_new(FALSE, 1); gtk_container_add (GTK_CONTAINER (hb), image); gtk_widget_show(image); @@ -2950,7 +2950,7 @@ sp_text_toolbox_new(SPDesktop *desktop) aux_toolbox_space(tbl, AUX_BETWEEN_BUTTON_GROUPS); { { - GtkWidget *image = sp_icon_new (GTK_ICON_SIZE_SMALL_TOOLBAR, INKSCAPE_STOCK_TEXT_ROTATION); + GtkWidget *image = sp_icon_new (Inkscape::ICON_SIZE_SMALL_TOOLBAR, INKSCAPE_STOCK_TEXT_ROTATION); GtkWidget *hb = gtk_hbox_new(FALSE, 1); gtk_container_add (GTK_CONTAINER (hb), image); gtk_widget_show(image); @@ -2974,7 +2974,7 @@ sp_text_toolbox_new(SPDesktop *desktop) // Remove Manual Kerns { - GtkWidget *px = sp_icon_new (GTK_ICON_SIZE_SMALL_TOOLBAR, INKSCAPE_STOCK_TEXT_REMOVE_KERNS); + GtkWidget *px = sp_icon_new (Inkscape::ICON_SIZE_SMALL_TOOLBAR, INKSCAPE_STOCK_TEXT_REMOVE_KERNS); GtkWidget *button = gtk_button_new (); gtk_container_add (GTK_CONTAINER (button), px); gtk_widget_show(button); @@ -3094,11 +3094,11 @@ sp_connector_toolbox_new(SPDesktop *desktop) gtk_box_pack_start(GTK_BOX(tbl), gtk_hbox_new(FALSE, 0), FALSE, FALSE, AUX_BETWEEN_BUTTON_GROUPS); - sp_toolbox_button_new(tbl, GTK_ICON_SIZE_SMALL_TOOLBAR, + sp_toolbox_button_new(tbl, Inkscape::ICON_SIZE_SMALL_TOOLBAR, "connector_avoid", GTK_SIGNAL_FUNC(sp_connector_path_set_avoid), tt, _("Make connectors avoid selected objects")); - sp_toolbox_button_new(tbl, GTK_ICON_SIZE_SMALL_TOOLBAR, + sp_toolbox_button_new(tbl, Inkscape::ICON_SIZE_SMALL_TOOLBAR, "connector_ignore", GTK_SIGNAL_FUNC(sp_connector_path_set_ignore), tt, _("Make connectors ignore selected objects")); diff --git a/src/widgets/toolbox.h b/src/widgets/toolbox.h index c6ae2a6f6..20a33909c 100644 --- a/src/widgets/toolbox.h +++ b/src/widgets/toolbox.h @@ -18,6 +18,7 @@ #include #include "forward.h" +#include "icon-size.h" GtkWidget *sp_tool_toolbox_new(void); void sp_tool_toolbox_set_desktop(GtkWidget *toolbox, SPDesktop *desktop); @@ -31,7 +32,7 @@ void sp_commands_toolbox_set_desktop(GtkWidget *toolbox, SPDesktop *desktop); void show_aux_toolbox(GtkWidget *toolbox); GtkWidget *sp_toolbox_button_normal_new_from_verb(GtkWidget *t, - GtkIconSize size, + Inkscape::IconSize size, Inkscape::Verb * verb, Inkscape::UI::View::View *view, GtkTooltips *tt);