summaryrefslogtreecommitdiffstats
path: root/src/widgets
diff options
context:
space:
mode:
Diffstat (limited to 'src/widgets')
-rw-r--r--src/widgets/CMakeLists.txt2
-rw-r--r--src/widgets/dash-selector.cpp300
-rw-r--r--src/widgets/dash-selector.h105
-rwxr-xr-xsrc/widgets/stroke-style.cpp7
-rw-r--r--src/widgets/stroke-style.h6
5 files changed, 7 insertions, 413 deletions
diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt
index 184a25812..4bd1504f7 100644
--- a/src/widgets/CMakeLists.txt
+++ b/src/widgets/CMakeLists.txt
@@ -3,7 +3,6 @@ add_subdirectory(gimp)
set(widgets_SRC
button.cpp
- dash-selector.cpp
desktop-widget.cpp
eek-preview.cpp
ege-adjustment-action.cpp
@@ -33,7 +32,6 @@ set(widgets_SRC
# -------
# Headers
button.h
- dash-selector.h
desktop-widget.h
eek-preview.h
ege-adjustment-action.h
diff --git a/src/widgets/dash-selector.cpp b/src/widgets/dash-selector.cpp
deleted file mode 100644
index 16520bbf4..000000000
--- a/src/widgets/dash-selector.cpp
+++ /dev/null
@@ -1,300 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/**
- * @file
- * Combobox for selecting dash patterns - implementation.
- */
-/* Author:
- * Lauris Kaplinski <lauris@kaplinski.com>
- * bulia byak <buliabyak@users.sf.net>
- * Maximilian Albert <maximilian.albert@gmail.com>
- *
- * Copyright (C) 2002 Lauris Kaplinski
- *
- * Released under GNU GPL v2+, read the file 'COPYING' for more information.
- */
-
-#include "dash-selector.h"
-
-#include <cstring>
-
-#include <glibmm/i18n.h>
-
-#include <2geom/coord.h>
-
-#include "preferences.h"
-
-#include "display/cairo-utils.h"
-
-#include "style.h"
-
-#include "ui/dialog-events.h"
-#include "ui/widget/spinbutton.h"
-
-gchar const *const SPDashSelector::_prefs_path = "/palette/dashes";
-
-static double dash_0[] = {-1.0};
-static double dash_1_1[] = {1.0, 1.0, -1.0};
-static double dash_2_1[] = {2.0, 1.0, -1.0};
-static double dash_4_1[] = {4.0, 1.0, -1.0};
-static double dash_1_2[] = {1.0, 2.0, -1.0};
-static double dash_1_4[] = {1.0, 4.0, -1.0};
-
-static size_t BD_LEN = 7; // must correspond to the number of entries in the next line
-static double *builtin_dashes[] = {dash_0, dash_1_1, dash_2_1, dash_4_1, dash_1_2, dash_1_4, nullptr};
-
-static double **dashes = nullptr;
-
-SPDashSelector::SPDashSelector()
- : preview_width(80),
- preview_height(16),
- preview_lineheight(2)
-{
- // TODO: find something more sensible here!!
- init_dashes();
-
- dash_store = Gtk::ListStore::create(dash_columns);
- dash_combo.set_model(dash_store);
- dash_combo.pack_start(image_renderer);
- dash_combo.set_cell_data_func(image_renderer, sigc::mem_fun(*this, &SPDashSelector::prepareImageRenderer));
- dash_combo.set_tooltip_text(_("Dash pattern"));
- dash_combo.set_name("dashCombo");
- dash_combo.show();
- dash_combo.signal_changed().connect( sigc::mem_fun(*this, &SPDashSelector::on_selection) );
-
- this->pack_start(dash_combo, false, false, 0);
- offset = Gtk::Adjustment::create(0.0, 0.0, 10.0, 0.1, 1.0, 0.0);
- offset->signal_value_changed().connect(sigc::mem_fun(*this, &SPDashSelector::offset_value_changed));
- auto sb = new Inkscape::UI::Widget::SpinButton(offset, 0.1, 2);
- sb->set_tooltip_text(_("Pattern offset"));
- sp_dialog_defocus_on_enter_cpp(sb);
- sb->show();
-
- this->pack_start(*sb, false, false, 0);
-
-
- int np=0;
- while (dashes[np]){ np++;}
- for (int i = 0; i<np-1; i++) { // all but the custom one go this way
- // Add the dashes to the combobox
- Gtk::TreeModel::Row row = *(dash_store->append());
- row[dash_columns.dash] = dashes[i];
- row[dash_columns.pixbuf] = Glib::wrap(sp_dash_to_pixbuf(dashes[i]));
- }
- // add the custom one
- Gtk::TreeModel::Row row = *(dash_store->append());
- row[dash_columns.dash] = dashes[np-1];
- row[dash_columns.pixbuf] = Glib::wrap(sp_text_to_pixbuf((char *)"Custom"));
-
- this->set_data("pattern", dashes[0]);
-}
-
-SPDashSelector::~SPDashSelector() {
- // FIXME: for some reason this doesn't get called; does the call to manage() in
- // sp_stroke_style_line_widget_new() not processed correctly?
-}
-
-void SPDashSelector::prepareImageRenderer( Gtk::TreeModel::const_iterator const &row ) {
-
- Glib::RefPtr<Gdk::Pixbuf> pixbuf = (*row)[dash_columns.pixbuf];
- image_renderer.property_pixbuf() = pixbuf;
-}
-
-void SPDashSelector::init_dashes() {
-
- if (!dashes) {
- Inkscape::Preferences *prefs = Inkscape::Preferences::get();
- std::vector<Glib::ustring> dash_prefs = prefs->getAllDirs(_prefs_path);
-
- int pos = 0;
- if (!dash_prefs.empty()) {
- SPStyle style;
- dashes = g_new (double *, dash_prefs.size() + 2); // +1 for custom slot, +1 for terminator slot
-
- for (std::vector<Glib::ustring>::iterator i = dash_prefs.begin(); i != dash_prefs.end(); ++i) {
- style.readFromPrefs( *i );
-
- if (!style.stroke_dasharray.values.empty()) {
- dashes[pos] = g_new (double, style.stroke_dasharray.values.size() + 1);
- double *d = dashes[pos];
- unsigned i = 0;
- for (; i < style.stroke_dasharray.values.size(); i++) {
- d[i] = style.stroke_dasharray.values[i].value;
- }
- d[i] = -1;
- } else {
- dashes[pos] = dash_0;
- }
- pos += 1;
- }
- } else { // This code may never execute - a new preferences.xml is created for a new user. Maybe if the user deletes dashes from preferences.xml?
- dashes = g_new (double *, BD_LEN + 2); // +1 for custom slot, +1 for terminator slot
- unsigned i;
- for(i=0;i<BD_LEN;i++) {
- dashes[i] = builtin_dashes[i];
- }
- pos = BD_LEN;
- }
- // make a place to hold the custom dashes, up to 15 positions long (+ terminator)
- dashes[pos] = g_new (double, 16);
- double *d = dashes[pos];
- int i=0;
- for(i=0;i<15;i++){ d[i]=i; } // have to put something in there, this is a pattern hopefully nobody would choose
- d[15]=-1.0;
- // final terminator
- dashes[++pos] = nullptr;
- }
-}
-
-void SPDashSelector::set_dash (int ndash, double *dash, double o)
-{
- int pos = -1; // Allows custom patterns to remain unscathed by this.
- int count = 0; // will hold the NULL terminator at the end of the dashes list
- if (ndash > 0) {
- double delta = 0.0;
- for (int i = 0; i < ndash; i++)
- delta += dash[i];
- delta /= 1000.0;
-
- for (int i = 0; dashes[i]; i++,count++) {
- double *pattern = dashes[i];
- int np = 0;
- while (pattern[np] >= 0.0)
- np += 1;
- if (np == ndash) {
- int j;
- for (j = 0; j < ndash; j++) {
- if (!Geom::are_near(dash[j], pattern[j], delta)) {
- break;
- }
- }
- if (j == ndash) {
- pos = i;
- break;
- }
- }
- }
- }
- else if(ndash==0) {
- pos = 0;
- }
- if(pos>=0){
- this->set_data("pattern", dashes[pos]);
- this->dash_combo.set_active(pos);
- this->offset->set_value(o);
- if(pos == 10) {
- this->offset->set_value(10.0);
- }
- }
- else { // Hit a custom pattern in the SVG, write it into the combobox.
- count--; // the one slot for custom patterns
- double *d = dashes[count];
- int i=0;
- for(i=0;i< (ndash > 15 ? 15 : ndash) ;i++) {
- d[i]=dash[i];
- } // store the custom pattern
- d[ndash]=-1.0; //terminate it
- this->set_data("pattern", dashes[count]);
- this->dash_combo.set_active(count);
- this->offset->set_value(o); // what does this do????
- }
-}
-
-void SPDashSelector::get_dash(int *ndash, double **dash, double *off)
-{
- double *pattern = (double*) this->get_data("pattern");
-
- int nd = 0;
- while (pattern[nd] >= 0.0)
- nd += 1;
-
- if (nd > 0) {
- if (ndash)
- *ndash = nd;
- if (dash) {
- *dash = g_new (double, nd);
- memcpy (*dash, pattern, nd * sizeof (double));
- }
- if (off)
- *off = offset->get_value();
- } else {
- if (ndash)
- *ndash = 0;
- if (dash)
- *dash = nullptr;
- if (off)
- *off = 0.0;
- }
-}
-
-/**
- * Fill a pixbuf with the dash pattern using standard cairo drawing
- */
-GdkPixbuf* SPDashSelector::sp_dash_to_pixbuf(double *pattern)
-{
- int n_dashes;
- for (n_dashes = 0; pattern[n_dashes] >= 0.0; n_dashes ++) ;
-
- cairo_surface_t *s = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, preview_width, preview_height);
- cairo_t *ct = cairo_create(s);
-
- cairo_set_line_width (ct, preview_lineheight);
- cairo_scale (ct, preview_lineheight, 1);
- //cairo_set_source_rgb (ct, 0, 0, 0);
- cairo_move_to (ct, 0, preview_height/2);
- cairo_line_to (ct, preview_width, preview_height/2);
- cairo_set_dash(ct, pattern, n_dashes, 0);
- cairo_stroke (ct);
-
- cairo_destroy(ct);
- cairo_surface_flush(s);
-
- GdkPixbuf* pixbuf = ink_pixbuf_create_from_cairo_surface(s);
- return pixbuf;
-}
-
-/**
- * Fill a pixbuf with a text label using standard cairo drawing
- */
-GdkPixbuf* SPDashSelector::sp_text_to_pixbuf(char *text)
-{
- cairo_surface_t *s = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, preview_width, preview_height);
- cairo_t *ct = cairo_create(s);
-
- cairo_select_font_face (ct, "Sans", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
- cairo_set_font_size (ct, 12.0);
- cairo_set_source_rgb (ct, 0.0, 0.0, 0.0);
- cairo_move_to (ct, 16.0, 13.0);
- cairo_show_text (ct, text);
-
- cairo_stroke (ct);
-
- cairo_destroy(ct);
- cairo_surface_flush(s);
-
- GdkPixbuf* pixbuf = ink_pixbuf_create_from_cairo_surface(s);
- return pixbuf;
-}
-
-void SPDashSelector::on_selection ()
-{
- double *pattern = dash_combo.get_active()->get_value(dash_columns.dash);
- this->set_data ("pattern", pattern);
-
- changed_signal.emit();
-}
-
-void SPDashSelector::offset_value_changed()
-{
- changed_signal.emit();
-}
-
-/*
- Local Variables:
- mode:c++
- c-file-style:"stroustrup"
- c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
- indent-tabs-mode:nil
- fill-column:99
- End:
-*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/widgets/dash-selector.h b/src/widgets/dash-selector.h
deleted file mode 100644
index 485f8abed..000000000
--- a/src/widgets/dash-selector.h
+++ /dev/null
@@ -1,105 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-#ifndef SEEN_SP_DASH_SELECTOR_NEW_H
-#define SEEN_SP_DASH_SELECTOR_NEW_H
-
-/* Authors:
- * Lauris Kaplinski <lauris@kaplinski.com>
- * Maximilian Albert <maximilian.albert> (gtkmm-ification)
- *
- * Copyright (C) 2002 Lauris Kaplinski
- *
- * Released under GNU GPL v2+, read the file 'COPYING' for more information.
- */
-
-#include <gtkmm/box.h>
-#include <gtkmm/combobox.h>
-#include <gtkmm/liststore.h>
-
-#include <sigc++/signal.h>
-
-
-/**
- * Class that wraps a combobox and spinbutton for selecting dash patterns.
- */
-class SPDashSelector : public Gtk::HBox {
-public:
- SPDashSelector();
- ~SPDashSelector() override;
-
- /**
- * Get and set methods for dashes
- */
- void set_dash(int ndash, double *dash, double offset);
- void get_dash(int *ndash, double **dash, double *offset);
-
- sigc::signal<void> changed_signal;
-
-private:
-
- /**
- * Initialize dashes list from preferences
- */
- static void init_dashes();
-
- /**
- * Fill a pixbuf with the dash pattern using standard cairo drawing
- */
- GdkPixbuf* sp_dash_to_pixbuf(double *pattern);
-
- /**
- * Fill a pixbuf with text standard cairo drawing
- */
- GdkPixbuf* sp_text_to_pixbuf(char *text);
-
- /**
- * Callback for combobox image renderer
- */
- void prepareImageRenderer( Gtk::TreeModel::const_iterator const &row );
-
- /**
- * Callback for offset adjustment changing
- */
- void offset_value_changed();
-
- /**
- * Callback for combobox selection changing
- */
- void on_selection();
-
- /**
- * Combobox columns
- */
- class DashColumns : public Gtk::TreeModel::ColumnRecord {
- public:
- Gtk::TreeModelColumn<double *> dash;
- Gtk::TreeModelColumn<Glib::RefPtr<Gdk::Pixbuf> > pixbuf;
-
- DashColumns() {
- add(dash); add(pixbuf);
- }
- };
- DashColumns dash_columns;
- Glib::RefPtr<Gtk::ListStore> dash_store;
- Gtk::ComboBox dash_combo;
- Gtk::CellRendererPixbuf image_renderer;
- Glib::RefPtr<Gtk::Adjustment> offset;
-
- static gchar const *const _prefs_path;
- int preview_width;
- int preview_height;
- int preview_lineheight;
-
-};
-
-#endif // SEEN_SP_DASH_SELECTOR_NEW_H
-
-/*
- Local Variables:
- mode:c++
- c-file-style:"stroustrup"
- c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +))
- indent-tabs-mode:nil
- fill-column:99
- End:
-*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :
diff --git a/src/widgets/stroke-style.cpp b/src/widgets/stroke-style.cpp
index 46559f83a..7dee458f4 100755
--- a/src/widgets/stroke-style.cpp
+++ b/src/widgets/stroke-style.cpp
@@ -30,6 +30,7 @@
#include "svg/svg-color.h"
#include "ui/icon-loader.h"
+#include "ui/widget/dash-selector.h"
#include "ui/widget/unit-menu.h"
#include "widgets/style-utils.h"
@@ -214,9 +215,9 @@ StrokeStyle::StrokeStyle() :
spw_label(table, _("Dashes:"), 0, i, nullptr); //no mnemonic for now
//decide what to do:
// implement a set_mnemonic_source function in the
- // SPDashSelector class, so that we do not have to
+ // Inkscape::UI::Widget::DashSelector class, so that we do not have to
// expose any of the underlying widgets?
- dashSelector = Gtk::manage(new SPDashSelector);
+ dashSelector = Gtk::manage(new Inkscape::UI::Widget::DashSelector);
dashSelector->show();
dashSelector->set_hexpand();
@@ -735,7 +736,7 @@ StrokeStyle::getItemColorForMarker(SPItem *item, Inkscape::PaintTarget fill_or_s
* Sets selector widgets' dash style from an SPStyle object.
*/
void
-StrokeStyle::setDashSelectorFromStyle(SPDashSelector *dsel, SPStyle *style)
+StrokeStyle::setDashSelectorFromStyle(Inkscape::UI::Widget::DashSelector *dsel, SPStyle *style)
{
if (!style->stroke_dasharray.values.empty()) {
double d[64];
diff --git a/src/widgets/stroke-style.h b/src/widgets/stroke-style.h
index 88331a5bf..aca20718b 100644
--- a/src/widgets/stroke-style.h
+++ b/src/widgets/stroke-style.h
@@ -50,7 +50,6 @@
#include "ui/icon-names.h"
#include "ui/widget/spinbutton.h"
-#include "widgets/dash-selector.h"
#include "widgets/paint-selector.h"
#include "widgets/sp-widget.h"
#include "widgets/spw-utilities.h"
@@ -69,6 +68,7 @@ namespace Inkscape {
}
namespace UI {
namespace Widget {
+ class DashSelector;
class UnitMenu;
}
}
@@ -143,7 +143,7 @@ private:
void updateLine();
void updateAllMarkers(std::vector<SPItem*> const &objects, bool skip_undo = false);
void updateMarkerHist(SPMarkerLoc const which);
- void setDashSelectorFromStyle(SPDashSelector *dsel, SPStyle *style);
+ void setDashSelectorFromStyle(Inkscape::UI::Widget::DashSelector *dsel, SPStyle *style);
void setJoinType (unsigned const jointype);
void setCapType (unsigned const captype);
void setPaintOrder (gchar const *paint_order);
@@ -195,7 +195,7 @@ private:
StrokeStyleButton *paintOrderMFS;
StrokeStyleButton *paintOrderSMF;
StrokeStyleButton *paintOrderMSF;
- SPDashSelector *dashSelector;
+ Inkscape::UI::Widget::DashSelector *dashSelector;
gboolean update;
SPDesktop *desktop;
generated by cgit v1.2.3 (git 2.25.1) at 2026-05-19 11:37:40 +0000