X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fui%2Fwidget%2Fselected-style.cpp;h=20838ee22ba8d0d12d2ba9ece042db14363b35cc;hb=fd5e7b511a23f6228ce4cd3ef54795664811e615;hp=e2ac69b4c44ded970fb243d4deb3336e517ed929;hpb=ea7ff7f4ce41f6d5df49b2bc4bfb75a511ab4cfc;p=inkscape.git diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp index e2ac69b4c..20838ee22 100644 --- a/src/ui/widget/selected-style.cpp +++ b/src/ui/widget/selected-style.cpp @@ -27,7 +27,9 @@ #include "sp-linear-gradient-fns.h" #include "sp-radial-gradient-fns.h" #include "sp-pattern.h" -#include "dialogs/object-properties.h" +#include "ui/dialog/dialog-manager.h" +#include "ui/dialog/fill-and-stroke.h" +#include "ui/dialog/panel-dialog.h" #include "xml/repr.h" #include "document.h" #include "widgets/widget-sizes.h" @@ -37,13 +39,20 @@ #include "svg/svg-color.h" #include "svg/css-ostringstream.h" #include "helper/units.h" +#include "event-context.h" +#include "message-context.h" #include "verbs.h" +#include "color.h" #include +#include "pixmaps/cursor-adj-h.xpm" +#include "pixmaps/cursor-adj-s.xpm" +#include "pixmaps/cursor-adj-l.xpm" +#include "sp-cursor.h" static gdouble const _sw_presets[] = { 32 , 16 , 10 , 8 , 6 , 4 , 3 , 2 , 1.5 , 1 , 0.75 , 0.5 , 0.25 , 0.1 }; -static gchar* const _sw_presets_str[] = {"32", "16", "10", "8", "6", "4", "3", "2", "1.5", "1", "0.75", "0.5", "0.25", "0.1"}; +static gchar const *const _sw_presets_str[] = {"32", "16", "10", "8", "6", "4", "3", "2", "1.5", "1", "0.75", "0.5", "0.25", "0.1"}; -static void +static void ss_selection_changed (Inkscape::Selection *, gpointer data) { Inkscape::UI::Widget::SelectedStyle *ss = (Inkscape::UI::Widget::SelectedStyle *) data; @@ -51,13 +60,13 @@ ss_selection_changed (Inkscape::Selection *, gpointer data) } static void -ss_selection_modified (Inkscape::Selection *selection, guint flags, gpointer data) +ss_selection_modified( Inkscape::Selection *selection, guint /*flags*/, gpointer data ) { ss_selection_changed (selection, data); } static void -ss_subselection_changed (gpointer dragger, gpointer data) +ss_subselection_changed( gpointer /*dragger*/, gpointer data ) { ss_selection_changed (NULL, data); } @@ -84,16 +93,19 @@ static GtkTargetEntry ui_drop_target_entries [] = { #define ENTRIES_SIZE(n) sizeof(n)/sizeof(n[0]) static guint nui_drop_target_entries = ENTRIES_SIZE(ui_drop_target_entries); +/* convenience function */ +static Dialog::FillAndStroke *get_fill_and_stroke_panel(SPDesktop *desktop); -SelectedStyle::SelectedStyle(bool layout) +SelectedStyle::SelectedStyle(bool /*layout*/) : _desktop (NULL), _table(2, 6), _fill_label (_("Fill:")), _stroke_label (_("Stroke:")), _opacity_label (_("O:")), - _fill_place (), - _stroke_place (), + + _fill_place (SS_FILL), + _stroke_place (SS_STROKE), _fill_flag_place (), _stroke_flag_place (), @@ -118,7 +130,7 @@ SelectedStyle::SelectedStyle(bool layout) { _drop[0] = _drop[1] = 0; _dropEnabled[0] = _dropEnabled[1] = false; - + _fill_label.set_alignment(0.0, 0.5); _fill_label.set_padding(0, 0); _stroke_label.set_alignment(0.0, 0.5); @@ -192,52 +204,52 @@ SelectedStyle::SelectedStyle(bool layout) __multiple[i] = (i == SS_FILL)? (_("Multiple selected objects have the same fill")) : (_("Multiple selected objects have the same stroke")); _popup_edit[i].add(*(new Gtk::Label((i == SS_FILL)? _("Edit fill...") : _("Edit stroke..."), 0.0, 0.5))); - _popup_edit[i].signal_activate().connect(sigc::mem_fun(*this, + _popup_edit[i].signal_activate().connect(sigc::mem_fun(*this, (i == SS_FILL)? &SelectedStyle::on_fill_edit : &SelectedStyle::on_stroke_edit )); _popup_lastused[i].add(*(new Gtk::Label(_("Last set color"), 0.0, 0.5))); - _popup_lastused[i].signal_activate().connect(sigc::mem_fun(*this, + _popup_lastused[i].signal_activate().connect(sigc::mem_fun(*this, (i == SS_FILL)? &SelectedStyle::on_fill_lastused : &SelectedStyle::on_stroke_lastused )); _popup_lastselected[i].add(*(new Gtk::Label(_("Last selected color"), 0.0, 0.5))); - _popup_lastselected[i].signal_activate().connect(sigc::mem_fun(*this, + _popup_lastselected[i].signal_activate().connect(sigc::mem_fun(*this, (i == SS_FILL)? &SelectedStyle::on_fill_lastselected : &SelectedStyle::on_stroke_lastselected )); _popup_invert[i].add(*(new Gtk::Label(_("Invert"), 0.0, 0.5))); - _popup_invert[i].signal_activate().connect(sigc::mem_fun(*this, + _popup_invert[i].signal_activate().connect(sigc::mem_fun(*this, (i == SS_FILL)? &SelectedStyle::on_fill_invert : &SelectedStyle::on_stroke_invert )); _popup_white[i].add(*(new Gtk::Label(_("White"), 0.0, 0.5))); - _popup_white[i].signal_activate().connect(sigc::mem_fun(*this, + _popup_white[i].signal_activate().connect(sigc::mem_fun(*this, (i == SS_FILL)? &SelectedStyle::on_fill_white : &SelectedStyle::on_stroke_white )); _popup_black[i].add(*(new Gtk::Label(_("Black"), 0.0, 0.5))); - _popup_black[i].signal_activate().connect(sigc::mem_fun(*this, + _popup_black[i].signal_activate().connect(sigc::mem_fun(*this, (i == SS_FILL)? &SelectedStyle::on_fill_black : &SelectedStyle::on_stroke_black )); _popup_copy[i].add(*(new Gtk::Label(_("Copy color"), 0.0, 0.5))); - _popup_copy[i].signal_activate().connect(sigc::mem_fun(*this, + _popup_copy[i].signal_activate().connect(sigc::mem_fun(*this, (i == SS_FILL)? &SelectedStyle::on_fill_copy : &SelectedStyle::on_stroke_copy )); _popup_paste[i].add(*(new Gtk::Label(_("Paste color"), 0.0, 0.5))); - _popup_paste[i].signal_activate().connect(sigc::mem_fun(*this, + _popup_paste[i].signal_activate().connect(sigc::mem_fun(*this, (i == SS_FILL)? &SelectedStyle::on_fill_paste : &SelectedStyle::on_stroke_paste )); _popup_swap[i].add(*(new Gtk::Label(_("Swap fill and stroke"), 0.0, 0.5))); - _popup_swap[i].signal_activate().connect(sigc::mem_fun(*this, + _popup_swap[i].signal_activate().connect(sigc::mem_fun(*this, &SelectedStyle::on_fillstroke_swap)); _popup_opaque[i].add(*(new Gtk::Label((i == SS_FILL)? _("Make fill opaque") : _("Make stroke opaque"), 0.0, 0.5))); - _popup_opaque[i].signal_activate().connect(sigc::mem_fun(*this, + _popup_opaque[i].signal_activate().connect(sigc::mem_fun(*this, (i == SS_FILL)? &SelectedStyle::on_fill_opaque : &SelectedStyle::on_stroke_opaque )); //TRANSLATORS COMMENT: unset is a verb here _popup_unset[i].add(*(new Gtk::Label((i == SS_FILL)? _("Unset fill") : _("Unset stroke"), 0.0, 0.5))); - _popup_unset[i].signal_activate().connect(sigc::mem_fun(*this, + _popup_unset[i].signal_activate().connect(sigc::mem_fun(*this, (i == SS_FILL)? &SelectedStyle::on_fill_unset : &SelectedStyle::on_stroke_unset )); _popup_remove[i].add(*(new Gtk::Label((i == SS_FILL)? _("Remove fill") : _("Remove stroke"), 0.0, 0.5))); - _popup_remove[i].signal_activate().connect(sigc::mem_fun(*this, + _popup_remove[i].signal_activate().connect(sigc::mem_fun(*this, (i == SS_FILL)? &SelectedStyle::on_fill_remove : &SelectedStyle::on_stroke_remove )); _popup[i].attach(_popup_edit[i], 0,1, 0,1); @@ -254,7 +266,7 @@ SelectedStyle::SelectedStyle(bool layout) _popup_copy[i].set_sensitive(false); _popup[i].attach(_popup_paste[i], 0,1, 11,12); _popup[i].attach(_popup_swap[i], 0,1, 12,13); - _popup[i].attach(*(new Gtk::SeparatorMenuItem()), 0,1, 13,14); + _popup[i].attach(*(new Gtk::SeparatorMenuItem()), 0,1, 13,14); _popup[i].attach(_popup_opaque[i], 0,1, 14,15); _popup[i].attach(_popup_unset[i], 0,1, 15,16); _popup[i].attach(_popup_remove[i], 0,1, 16,17); @@ -296,8 +308,8 @@ SelectedStyle::SelectedStyle(bool layout) _popup_sw.show_all(); } - _fill_place.signal_button_press_event().connect(sigc::mem_fun(*this, &SelectedStyle::on_fill_click)); - _stroke_place.signal_button_press_event().connect(sigc::mem_fun(*this, &SelectedStyle::on_stroke_click)); + _fill_place.signal_button_release_event().connect(sigc::mem_fun(*this, &SelectedStyle::on_fill_click)); + _stroke_place.signal_button_release_event().connect(sigc::mem_fun(*this, &SelectedStyle::on_stroke_click)); _opacity_place.signal_button_press_event().connect(sigc::mem_fun(*this, &SelectedStyle::on_opacity_click)); _stroke_width_place.signal_button_press_event().connect(sigc::mem_fun(*this, &SelectedStyle::on_sw_click)); @@ -363,6 +375,9 @@ SelectedStyle::SelectedStyle(bool layout) "drag_data_received", G_CALLBACK(dragDataReceived), _drop[SS_FILL]); + + _fill_place.parent = this; + _stroke_place.parent = this; } SelectedStyle::~SelectedStyle() @@ -376,7 +391,7 @@ SelectedStyle::~SelectedStyle() for (int i = SS_FILL; i <= SS_STROKE; i++) { delete _color_preview[i]; - // FIXME: do we need this? the destroy methods are not exported + // FIXME: do we need this? the destroy methods are not exported //sp_gradient_image_destroy(GTK_OBJECT(_gradient_preview_l[i])); //sp_gradient_image_destroy(GTK_OBJECT(_gradient_preview_r[i])); } @@ -412,12 +427,12 @@ SelectedStyle::setDesktop(SPDesktop *desktop) //_sw_unit = (SPUnit *) sp_desktop_namedview(desktop)->doc_units; } -void SelectedStyle::dragDataReceived( GtkWidget *widget, - GdkDragContext *drag_context, - gint x, gint y, +void SelectedStyle::dragDataReceived( GtkWidget */*widget*/, + GdkDragContext */*drag_context*/, + gint /*x*/, gint /*y*/, GtkSelectionData *data, - guint info, - guint event_time, + guint /*info*/, + guint /*event_time*/, gpointer user_data ) { DropTracker* tracker = (DropTracker*)user_data; @@ -430,7 +445,7 @@ void SelectedStyle::dragDataReceived( GtkWidget *widget, gchar c[64]; // Careful about endian issues. guint16* dataVals = (guint16*)data->data; - sp_svg_write_color( c, 64, + sp_svg_write_color( c, sizeof(c), SP_RGBA32_U_COMPOSE( 0x0ff & (dataVals[0] >> 8), 0x0ff & (dataVals[1] >> 8), @@ -442,7 +457,7 @@ void SelectedStyle::dragDataReceived( GtkWidget *widget, sp_repr_css_set_property( css, (tracker->item == SS_FILL) ? "fill":"stroke", c ); sp_desktop_set_style( tracker->parent->_desktop, css ); sp_repr_css_attr_unref( css ); - sp_document_done( sp_desktop_document(tracker->parent->_desktop) , SP_VERB_NONE, + sp_document_done( sp_desktop_document(tracker->parent->_desktop) , SP_VERB_NONE, _("Drop color")); } } @@ -453,7 +468,7 @@ void SelectedStyle::dragDataReceived( GtkWidget *widget, void SelectedStyle::on_fill_remove() { SPCSSAttr *css = sp_repr_css_attr_new (); sp_repr_css_set_property (css, "fill", "none"); - sp_desktop_set_style (_desktop, css, true, true); + sp_desktop_set_style (_desktop, css, true, true); sp_repr_css_attr_unref (css); sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE, _("Remove fill")); @@ -462,7 +477,7 @@ void SelectedStyle::on_fill_remove() { void SelectedStyle::on_stroke_remove() { SPCSSAttr *css = sp_repr_css_attr_new (); sp_repr_css_set_property (css, "stroke", "none"); - sp_desktop_set_style (_desktop, css, true, true); + sp_desktop_set_style (_desktop, css, true, true); sp_repr_css_attr_unref (css); sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE, _("Remove stroke")); @@ -471,7 +486,7 @@ void SelectedStyle::on_stroke_remove() { void SelectedStyle::on_fill_unset() { SPCSSAttr *css = sp_repr_css_attr_new (); sp_repr_css_unset_property (css, "fill"); - sp_desktop_set_style (_desktop, css, true, true); + sp_desktop_set_style (_desktop, css, true, true); sp_repr_css_attr_unref (css); sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE, _("Unset fill")); @@ -515,11 +530,11 @@ void SelectedStyle::on_fill_lastused() { SPCSSAttr *css = sp_repr_css_attr_new (); guint32 color = sp_desktop_get_color(_desktop, true); gchar c[64]; - sp_svg_write_color (c, 64, color); + sp_svg_write_color (c, sizeof(c), color); sp_repr_css_set_property (css, "fill", c); sp_desktop_set_style (_desktop, css); sp_repr_css_attr_unref (css); - sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE, + sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE, _("Apply last set color to fill")); } @@ -527,18 +542,18 @@ void SelectedStyle::on_stroke_lastused() { SPCSSAttr *css = sp_repr_css_attr_new (); guint32 color = sp_desktop_get_color(_desktop, false); gchar c[64]; - sp_svg_write_color (c, 64, color); + sp_svg_write_color (c, sizeof(c), color); sp_repr_css_set_property (css, "stroke", c); sp_desktop_set_style (_desktop, css); sp_repr_css_attr_unref (css); - sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE, + sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE, _("Apply last set color to stroke")); } void SelectedStyle::on_fill_lastselected() { SPCSSAttr *css = sp_repr_css_attr_new (); gchar c[64]; - sp_svg_write_color (c, 64, _lastselected[SS_FILL]); + sp_svg_write_color (c, sizeof(c), _lastselected[SS_FILL]); sp_repr_css_set_property (css, "fill", c); sp_desktop_set_style (_desktop, css); sp_repr_css_attr_unref (css); @@ -549,11 +564,11 @@ void SelectedStyle::on_fill_lastselected() { void SelectedStyle::on_stroke_lastselected() { SPCSSAttr *css = sp_repr_css_attr_new (); gchar c[64]; - sp_svg_write_color (c, 64, _lastselected[SS_STROKE]); + sp_svg_write_color (c, sizeof(c), _lastselected[SS_STROKE]); sp_repr_css_set_property (css, "stroke", c); sp_desktop_set_style (_desktop, css); sp_repr_css_attr_unref (css); - sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE, + sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE, _("Apply last selected color to stroke")); } @@ -562,7 +577,7 @@ void SelectedStyle::on_fill_invert() { guint32 color = _thisselected[SS_FILL]; gchar c[64]; if (_mode[SS_FILL] != SS_COLOR) return; - sp_svg_write_color (c, 64, + sp_svg_write_color (c, sizeof(c), SP_RGBA32_U_COMPOSE( (255 - SP_RGBA32_R_U(color)), (255 - SP_RGBA32_G_U(color)), @@ -582,7 +597,7 @@ void SelectedStyle::on_stroke_invert() { guint32 color = _thisselected[SS_STROKE]; gchar c[64]; if (_mode[SS_STROKE] != SS_COLOR) return; - sp_svg_write_color (c, 64, + sp_svg_write_color (c, sizeof(c), SP_RGBA32_U_COMPOSE( (255 - SP_RGBA32_R_U(color)), (255 - SP_RGBA32_G_U(color)), @@ -595,12 +610,12 @@ void SelectedStyle::on_stroke_invert() { sp_repr_css_attr_unref (css); sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE, _("Invert stroke")); -} +} void SelectedStyle::on_fill_white() { SPCSSAttr *css = sp_repr_css_attr_new (); gchar c[64]; - sp_svg_write_color (c, 64, 0xffffffff); + sp_svg_write_color (c, sizeof(c), 0xffffffff); sp_repr_css_set_property (css, "fill", c); sp_repr_css_set_property (css, "fill-opacity", "1"); sp_desktop_set_style (_desktop, css); @@ -612,43 +627,43 @@ void SelectedStyle::on_fill_white() { void SelectedStyle::on_stroke_white() { SPCSSAttr *css = sp_repr_css_attr_new (); gchar c[64]; - sp_svg_write_color (c, 64, 0xffffffff); + sp_svg_write_color (c, sizeof(c), 0xffffffff); sp_repr_css_set_property (css, "stroke", c); sp_repr_css_set_property (css, "stroke-opacity", "1"); sp_desktop_set_style (_desktop, css); sp_repr_css_attr_unref (css); - sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE, + sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE, _("White stroke")); } void SelectedStyle::on_fill_black() { SPCSSAttr *css = sp_repr_css_attr_new (); gchar c[64]; - sp_svg_write_color (c, 64, 0x000000ff); + sp_svg_write_color (c, sizeof(c), 0x000000ff); sp_repr_css_set_property (css, "fill", c); sp_repr_css_set_property (css, "fill-opacity", "1.0"); sp_desktop_set_style (_desktop, css); sp_repr_css_attr_unref (css); - sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE, + sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE, _("Black fill")); } void SelectedStyle::on_stroke_black() { SPCSSAttr *css = sp_repr_css_attr_new (); gchar c[64]; - sp_svg_write_color (c, 64, 0x000000ff); + sp_svg_write_color (c, sizeof(c), 0x000000ff); sp_repr_css_set_property (css, "stroke", c); sp_repr_css_set_property (css, "stroke-opacity", "1.0"); sp_desktop_set_style (_desktop, css); sp_repr_css_attr_unref (css); - sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE, + sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE, _("Black stroke")); } void SelectedStyle::on_fill_copy() { if (_mode[SS_FILL] == SS_COLOR) { gchar c[64]; - sp_svg_write_color (c, 64, _thisselected[SS_FILL]); + sp_svg_write_color (c, sizeof(c), _thisselected[SS_FILL]); Glib::ustring text; text += c; if (!text.empty()) { @@ -661,7 +676,7 @@ void SelectedStyle::on_fill_copy() { void SelectedStyle::on_stroke_copy() { if (_mode[SS_STROKE] == SS_COLOR) { gchar c[64]; - sp_svg_write_color (c, 64, _thisselected[SS_STROKE]); + sp_svg_write_color (c, sizeof(c), _thisselected[SS_STROKE]); Glib::ustring text; text += c; if (!text.empty()) { @@ -684,7 +699,7 @@ void SelectedStyle::on_fill_paste() { sp_repr_css_set_property (css, "fill", text.c_str()); sp_desktop_set_style (_desktop, css); sp_repr_css_attr_unref (css); - sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE, + sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE, _("Paste fill")); } } @@ -722,7 +737,7 @@ void SelectedStyle::on_fillstroke_swap() { break; case SS_COLOR: gchar c[64]; - sp_svg_write_color (c, 64, _thisselected[SS_FILL]); + sp_svg_write_color (c, sizeof(c), _thisselected[SS_FILL]); sp_repr_css_set_property (css, "stroke", c); break; case SS_LGRADIENT: @@ -744,7 +759,7 @@ void SelectedStyle::on_fillstroke_swap() { break; case SS_COLOR: gchar c[64]; - sp_svg_write_color (c, 64, _thisselected[SS_STROKE]); + sp_svg_write_color (c, sizeof(c), _thisselected[SS_STROKE]); sp_repr_css_set_property (css, "fill", c); break; case SS_LGRADIENT: @@ -756,23 +771,28 @@ void SelectedStyle::on_fillstroke_swap() { sp_desktop_set_style (_desktop, css); sp_repr_css_attr_unref (css); - sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE, + sp_document_done (sp_desktop_document(_desktop), SP_VERB_DIALOG_FILL_STROKE, _("Swap fill and stroke")); } void SelectedStyle::on_fill_edit() { - sp_object_properties_fill(); + if (Dialog::FillAndStroke *fs = get_fill_and_stroke_panel(_desktop)) + fs->showPageFill(); } void SelectedStyle::on_stroke_edit() { - sp_object_properties_stroke(); + if (Dialog::FillAndStroke *fs = get_fill_and_stroke_panel(_desktop)) + fs->showPageStrokePaint(); } -bool +bool SelectedStyle::on_fill_click(GdkEventButton *event) { if (event->button == 1) { // click, open fill&stroke - sp_object_properties_fill(); + + if (Dialog::FillAndStroke *fs = get_fill_and_stroke_panel(_desktop)) + fs->showPageFill(); + } else if (event->button == 3) { // right-click, popup menu _popup[SS_FILL].popup(event->button, event->time); } else if (event->button == 2) { // middle click, toggle none/lastcolor @@ -785,11 +805,12 @@ SelectedStyle::on_fill_click(GdkEventButton *event) return true; } -bool +bool SelectedStyle::on_stroke_click(GdkEventButton *event) { if (event->button == 1) { // click, open fill&stroke - sp_object_properties_stroke(); + if (Dialog::FillAndStroke *fs = get_fill_and_stroke_panel(_desktop)) + fs->showPageStrokePaint(); } else if (event->button == 3) { // right-click, popup menu _popup[SS_STROKE].popup(event->button, event->time); } else if (event->button == 2) { // middle click, toggle none/lastcolor @@ -802,11 +823,12 @@ SelectedStyle::on_stroke_click(GdkEventButton *event) return true; } -bool +bool SelectedStyle::on_sw_click(GdkEventButton *event) { if (event->button == 1) { // click, open fill&stroke - sp_object_properties_stroke_style (); + if (Dialog::FillAndStroke *fs = get_fill_and_stroke_panel(_desktop)) + fs->showPageStrokeStyle(); } else if (event->button == 3) { // right-click, popup menu _popup_sw.popup(event->button, event->time); } else if (event->button == 2) { // middle click, toggle none/lastwidth? @@ -815,7 +837,7 @@ SelectedStyle::on_sw_click(GdkEventButton *event) return true; } -bool +bool SelectedStyle::on_opacity_click(GdkEventButton *event) { if (event->button == 2) { // middle click @@ -888,7 +910,7 @@ SelectedStyle::update() _popup_copy[i].set_sensitive(false); // query style from desktop. This returns a result flag and fills query with the style of subselection, if any, or selection - int result = sp_desktop_query_style (_desktop, query, + int result = sp_desktop_query_style (_desktop, query, (i == SS_FILL)? QUERY_STYLE_PROPERTY_FILL : QUERY_STYLE_PROPERTY_STROKE); switch (result) { case QUERY_STYLE_NOTHING: @@ -902,7 +924,7 @@ SelectedStyle::update() break; case QUERY_STYLE_SINGLE: case QUERY_STYLE_MULTIPLE_AVERAGED: - case QUERY_STYLE_MULTIPLE_SAME: + case QUERY_STYLE_MULTIPLE_SAME: if ( !_dropEnabled[i] ) { gtk_drag_dest_set( GTK_WIDGET( (i==SS_FILL) ? _fill_place.gobj():_stroke_place.gobj()), GTK_DEST_DEFAULT_ALL, @@ -917,21 +939,7 @@ SelectedStyle::update() } else { paint = &(query->stroke); } - if (paint->set && paint->type == SP_PAINT_TYPE_COLOR) { - guint32 color = sp_color_get_rgba32_falpha (&(paint->value.color), - SP_SCALE24_TO_FLOAT ((i == SS_FILL)? query->fill_opacity.value : query->stroke_opacity.value)); - _lastselected[i] = _thisselected[i]; - _thisselected[i] = color | 0xff; // only color, opacity === 1 - ((Inkscape::UI::Widget::ColorPreview*)_color_preview[i])->setRgba32 (color); - _color_preview[i]->show_all(); - place->add(*_color_preview[i]); - gchar c_string[64]; - g_snprintf (c_string, 64, "%06x/%.3g", color >> 8, SP_RGBA32_A_F(color)); - _tooltips.set_tip(*place, __color[i] + ": " + c_string); - _mode[i] = SS_COLOR; - _popup_copy[i].set_sensitive(true); - - } else if (paint->set && paint->type == SP_PAINT_TYPE_PAINTSERVER) { + if (paint->set && paint->isPaintserver()) { SPPaintServer *server = (i == SS_FILL)? SP_STYLE_FILL_SERVER (query) : SP_STYLE_STROKE_SERVER (query); if ( server ) { Inkscape::XML::Node *srepr = SP_OBJECT_REPR(server); @@ -959,8 +967,21 @@ SelectedStyle::update() } else { g_warning ("file %s: line %d: Unknown paint server", __FILE__, __LINE__); } + } else if (paint->set && paint->isColor()) { + guint32 color = paint->value.color.toRGBA32( + SP_SCALE24_TO_FLOAT ((i == SS_FILL)? query->fill_opacity.value : query->stroke_opacity.value)); + _lastselected[i] = _thisselected[i]; + _thisselected[i] = color | 0xff; // only color, opacity === 1 + ((Inkscape::UI::Widget::ColorPreview*)_color_preview[i])->setRgba32 (color); + _color_preview[i]->show_all(); + place->add(*_color_preview[i]); + gchar c_string[64]; + g_snprintf (c_string, 64, "%06x/%.3g", color >> 8, SP_RGBA32_A_F(color)); + _tooltips.set_tip(*place, __color[i] + ": " + c_string + _(", drag to adjust")); + _mode[i] = SS_COLOR; + _popup_copy[i].set_sensitive(true); - } else if (paint->set && paint->type == SP_PAINT_TYPE_NONE) { + } else if (paint->set && paint->isNone()) { place->add(_none[i]); _tooltips.set_tip(*place, __none[i]); _mode[i] = SS_NONE; @@ -1002,8 +1023,8 @@ SelectedStyle::update() case QUERY_STYLE_SINGLE: case QUERY_STYLE_MULTIPLE_AVERAGED: case QUERY_STYLE_MULTIPLE_SAME: - _tooltips.set_tip(_opacity_place, _("Master opacity, %")); - _tooltips.set_tip(_opacity_sb, _("Master opacity, %")); + _tooltips.set_tip(_opacity_place, _("Opacity, %")); + _tooltips.set_tip(_opacity_sb, _("Opacity, %")); if (_opacity_blocked) break; _opacity_blocked = true; _opacity_sb.set_sensitive(true); @@ -1020,7 +1041,7 @@ SelectedStyle::update() break; case QUERY_STYLE_SINGLE: case QUERY_STYLE_MULTIPLE_AVERAGED: - case QUERY_STYLE_MULTIPLE_SAME: + case QUERY_STYLE_MULTIPLE_SAME: { double w; if (_sw_unit) { @@ -1034,9 +1055,9 @@ SelectedStyle::update() g_free (str); } { - gchar *str = g_strdup_printf(_("Stroke width: %.5g%s%s"), - w, - _sw_unit? sp_unit_get_abbreviation(_sw_unit) : "px", + gchar *str = g_strdup_printf(_("Stroke width: %.5g%s%s"), + w, + _sw_unit? sp_unit_get_abbreviation(_sw_unit) : "px", (result_sw == QUERY_STYLE_MULTIPLE_AVERAGED)? _(" (averaged)") : ""); _tooltips.set_tip(_stroke_width_place, str); @@ -1124,11 +1145,200 @@ void SelectedStyle::on_opacity_changed () { _opacity_blocked = false; } +RotateableSwatch::RotateableSwatch(guint mode) { + fillstroke = mode; + startcolor_set = false; + undokey = "ssrot1"; + cr = NULL; + cr_set = false; +} + +RotateableSwatch::~RotateableSwatch() { +} + +double +RotateableSwatch::color_adjust(float *hsl, double by, guint32 cc, guint modifier) +{ + sp_color_rgb_to_hsl_floatv (hsl, SP_RGBA32_R_F(cc), SP_RGBA32_G_F(cc), SP_RGBA32_B_F(cc)); + + double diff = 0; + if (modifier == 2) { // saturation + double old = hsl[1]; + if (by > 0) { + hsl[1] += by * (1 - hsl[1]); + } else { + hsl[1] += by * (hsl[1]); + } + diff = hsl[1] - old; + } else if (modifier == 1) { // lightness + double old = hsl[2]; + if (by > 0) { + hsl[2] += by * (1 - hsl[2]); + } else { + hsl[2] += by * (hsl[2]); + } + diff = hsl[2] - old; + } else { // hue + double old = hsl[0]; + hsl[0] += by/2; + while (hsl[0] < 0) + hsl[0] += 1; + while (hsl[0] > 1) + hsl[0] -= 1; + diff = hsl[0] - old; + } + + float rgb[3]; + sp_color_hsl_to_rgb_floatv (rgb, hsl[0], hsl[1], hsl[2]); + + gchar c[64]; + sp_svg_write_color (c, sizeof(c), + SP_RGBA32_U_COMPOSE( + (SP_COLOR_F_TO_U(rgb[0])), + (SP_COLOR_F_TO_U(rgb[1])), + (SP_COLOR_F_TO_U(rgb[2])), + 0xff + ) + ); + + SPCSSAttr *css = sp_repr_css_attr_new (); + if (fillstroke == SS_FILL) + sp_repr_css_set_property (css, "fill", c); + else + sp_repr_css_set_property (css, "stroke", c); + sp_desktop_set_style (parent->getDesktop(), css); + sp_repr_css_attr_unref (css); + return diff; +} + +void +RotateableSwatch::do_motion(double by, guint modifier) { + if (parent->_mode[fillstroke] != SS_COLOR) + return; + + if (!cr_set && modifier != 3) { + GtkWidget *w = GTK_WIDGET(gobj()); + + GdkBitmap *bitmap = NULL; + GdkBitmap *mask = NULL; + if (modifier == 2) { // saturation + sp_cursor_bitmap_and_mask_from_xpm(&bitmap, &mask, cursor_adj_s_xpm); + } else if (modifier == 1) { // lightness + sp_cursor_bitmap_and_mask_from_xpm(&bitmap, &mask, cursor_adj_l_xpm); + } else { // hue + sp_cursor_bitmap_and_mask_from_xpm(&bitmap, &mask, cursor_adj_h_xpm); + } + if ((bitmap != NULL) && (mask != NULL)) { + cr = gdk_cursor_new_from_pixmap(bitmap, mask, + &w->style->black, + &w->style->white, + 16, 16); + g_object_unref (bitmap); + g_object_unref (mask); + gdk_window_set_cursor(w->window, cr); + cr_set = true; + } + } + + guint32 cc; + if (!startcolor_set) { + cc = startcolor = parent->_thisselected[fillstroke]; + startcolor_set = true; + } else { + cc = startcolor; + } + + float hsl[3]; + double diff = 0; + if (modifier != 3) { + diff = color_adjust(hsl, by, cc, modifier); + } + + if (modifier == 3) { // do nothing + + } else if (modifier == 2) { // saturation + sp_document_maybe_done (sp_desktop_document(parent->getDesktop()), undokey, + SP_VERB_DIALOG_FILL_STROKE, (_("Adjust saturation"))); + double ch = hsl[1]; + parent->getDesktop()->event_context->_message_context->setF(Inkscape::IMMEDIATE_MESSAGE, _("Adjusting saturation: was %.3g, now %.3g (diff %.3g); with Ctrl to adjust lightness, without modifiers to adjust hue"), ch - diff, ch, diff); + + } else if (modifier == 1) { // lightness + sp_document_maybe_done (sp_desktop_document(parent->getDesktop()), undokey, + SP_VERB_DIALOG_FILL_STROKE, (_("Adjust lightness"))); + double ch = hsl[2]; + parent->getDesktop()->event_context->_message_context->setF(Inkscape::IMMEDIATE_MESSAGE, _("Adjusting lightness: was %.3g, now %.3g (diff %.3g); with Shift to adjust saturation, without modifiers to adjust hue"), ch - diff, ch, diff); + + } else { // hue + sp_document_maybe_done (sp_desktop_document(parent->getDesktop()), undokey, + SP_VERB_DIALOG_FILL_STROKE, (_("Adjust hue"))); + double ch = hsl[0]; + parent->getDesktop()->event_context->_message_context->setF(Inkscape::IMMEDIATE_MESSAGE, _("Adjusting hue: was %.3g, now %.3g (diff %.3g); with Shift to adjust saturation, with Ctrl to adjust lightness"), ch - diff, ch, diff); + } +} + +void +RotateableSwatch::do_release(double by, guint modifier) { + if (parent->_mode[fillstroke] != SS_COLOR) + return; + + float hsl[3]; + if (modifier != 3) { + color_adjust(hsl, by, startcolor, modifier); + } + + if (cr_set) { + GtkWidget *w = GTK_WIDGET(gobj()); + gdk_window_set_cursor(w->window, NULL); + if (cr) { + gdk_cursor_unref (cr); + cr = NULL; + } + cr_set = false; + } + + if (modifier == 3) { // nothing + } else if (modifier == 2) { // saturation + sp_document_maybe_done (sp_desktop_document(parent->getDesktop()), undokey, + SP_VERB_DIALOG_FILL_STROKE, ("Adjust saturation")); + + } else if (modifier == 1) { // lightness + sp_document_maybe_done (sp_desktop_document(parent->getDesktop()), undokey, + SP_VERB_DIALOG_FILL_STROKE, ("Adjust lightness")); + + } else { // hue + sp_document_maybe_done (sp_desktop_document(parent->getDesktop()), undokey, + SP_VERB_DIALOG_FILL_STROKE, ("Adjust hue")); + } + + if (!strcmp(undokey, "ssrot1")) { + undokey = "ssrot2"; + } else { + undokey = "ssrot1"; + } + + parent->getDesktop()->event_context->_message_context->clear(); + startcolor_set = false; +} + +Dialog::FillAndStroke *get_fill_and_stroke_panel(SPDesktop *desktop) +{ + if (Dialog::PanelDialogBase *panel_dialog = + dynamic_cast(desktop->_dlg_mgr->getDialog("FillAndStroke"))) { + try { + Dialog::FillAndStroke &fill_and_stroke = + dynamic_cast(panel_dialog->getPanel()); + return &fill_and_stroke; + } catch (std::exception e) { } + } + + return 0; +} + } // namespace Widget } // namespace UI } // namespace Inkscape -/* +/* Local Variables: mode:c++ c-file-style:"stroustrup"