From afcec343e905389d2645115d60f14dfd45f5f2d0 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Fri, 14 Dec 2012 01:01:57 +0100 Subject: bzr history lost by a killed merge (bzr r11950.1.1) --- src/widgets/pencil-toolbar.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src/widgets') diff --git a/src/widgets/pencil-toolbar.cpp b/src/widgets/pencil-toolbar.cpp index d0e71d2b0..7e28f7c8c 100644 --- a/src/widgets/pencil-toolbar.cpp +++ b/src/widgets/pencil-toolbar.cpp @@ -139,7 +139,14 @@ static void sp_add_freehand_mode_toggle(GtkActionGroup* mainActions, GObject* ho 1, _("Create Spiro path"), 2, INKSCAPE_ICON("path-mode-spiro"), -1 ); - + //BSpline + gtk_list_store_append( model, &iter ); + gtk_list_store_set( model, &iter, + 0, _("BSpline"), + 1, _("Create BSpline path"), + 2, INKSCAPE_ICON("path-mode-bspline"), + -1 ); + //BSpline if (!tool_is_pencil) { gtk_list_store_append( model, &iter ); gtk_list_store_set( model, &iter, -- cgit v1.2.3 From 732618cd7d6159ee47cc0dd8b86cf07790e3e724 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Sun, 17 Mar 2013 13:29:02 +0100 Subject: Working with widjets (bzr r11950.1.56) --- src/widgets/gradient-vector.h | 2 +- src/widgets/paint-selector.h | 2 +- src/widgets/swatch-selector.h | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) (limited to 'src/widgets') diff --git a/src/widgets/gradient-vector.h b/src/widgets/gradient-vector.h index 6719691d1..1ed6c6c46 100644 --- a/src/widgets/gradient-vector.h +++ b/src/widgets/gradient-vector.h @@ -33,7 +33,7 @@ class SPDocument; class SPObject; class SPGradient; -struct SPStop; +class SPStop; struct SPGradientVectorSelector { GtkVBox vbox; diff --git a/src/widgets/paint-selector.h b/src/widgets/paint-selector.h index a66758434..d3b3f4116 100644 --- a/src/widgets/paint-selector.h +++ b/src/widgets/paint-selector.h @@ -22,7 +22,7 @@ class SPGradient; class SPDesktop; -struct SPPattern; +class SPPattern; struct SPStyle; #define SP_TYPE_PAINT_SELECTOR (sp_paint_selector_get_type ()) diff --git a/src/widgets/swatch-selector.h b/src/widgets/swatch-selector.h index 4b7aa483f..b97aac4f1 100644 --- a/src/widgets/swatch-selector.h +++ b/src/widgets/swatch-selector.h @@ -1,12 +1,14 @@ #ifndef SEEN_SP_SWATCH_SELECTOR_H #define SEEN_SP_SWATCH_SELECTOR_H + + #include class SPDocument; class SPGradient; -struct SPColorSelector; -struct SPGradientSelector; +class SPColorSelector; +class SPGradientSelector; namespace Inkscape { -- cgit v1.2.3 From fc95705f9d5761fe111a445c51afc505d08738a7 Mon Sep 17 00:00:00 2001 From: jtx Date: Tue, 19 Mar 2013 17:56:26 +0100 Subject: Fixing regression (bzr r11950.1.61) --- src/widgets/gradient-vector.h | 2 +- src/widgets/paint-selector.h | 2 +- src/widgets/swatch-selector.h | 6 ++---- 3 files changed, 4 insertions(+), 6 deletions(-) (limited to 'src/widgets') diff --git a/src/widgets/gradient-vector.h b/src/widgets/gradient-vector.h index 1ed6c6c46..6719691d1 100644 --- a/src/widgets/gradient-vector.h +++ b/src/widgets/gradient-vector.h @@ -33,7 +33,7 @@ class SPDocument; class SPObject; class SPGradient; -class SPStop; +struct SPStop; struct SPGradientVectorSelector { GtkVBox vbox; diff --git a/src/widgets/paint-selector.h b/src/widgets/paint-selector.h index d3b3f4116..a66758434 100644 --- a/src/widgets/paint-selector.h +++ b/src/widgets/paint-selector.h @@ -22,7 +22,7 @@ class SPGradient; class SPDesktop; -class SPPattern; +struct SPPattern; struct SPStyle; #define SP_TYPE_PAINT_SELECTOR (sp_paint_selector_get_type ()) diff --git a/src/widgets/swatch-selector.h b/src/widgets/swatch-selector.h index b97aac4f1..4b7aa483f 100644 --- a/src/widgets/swatch-selector.h +++ b/src/widgets/swatch-selector.h @@ -1,14 +1,12 @@ #ifndef SEEN_SP_SWATCH_SELECTOR_H #define SEEN_SP_SWATCH_SELECTOR_H - - #include class SPDocument; class SPGradient; -class SPColorSelector; -class SPGradientSelector; +struct SPColorSelector; +struct SPGradientSelector; namespace Inkscape { -- cgit v1.2.3 From d142ebe8740c40922c1a6aa423ca4e0e7d2335d6 Mon Sep 17 00:00:00 2001 From: root Date: Fri, 22 Mar 2013 01:50:18 +0100 Subject: Fixed end extremium node delete fault, ready for testing (bzr r11950.1.66) --- src/widgets/toolbox.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/widgets') diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp index 3a7eb6b9c..99978c019 100644 --- a/src/widgets/toolbox.cpp +++ b/src/widgets/toolbox.cpp @@ -514,9 +514,9 @@ static gchar const * ui_descr = " " " " " " -// " " -// " " -// " " + " " + " " + " " " " " " -- cgit v1.2.3 From ce36f79a45c3ce7e520c14b6cab965c0bd9a32fa Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Fri, 22 Mar 2013 09:48:09 +0100 Subject: Enabling Mesh (bzr r11950.1.67) --- src/widgets/toolbox.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/widgets') diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp index 99978c019..3ffeff1fd 100644 --- a/src/widgets/toolbox.cpp +++ b/src/widgets/toolbox.cpp @@ -113,7 +113,7 @@ enum BarId { #define BAR_ID_KEY "BarIdValue" #define HANDLE_POS_MARK "x-inkscape-pos" - +#define WITH_MESH static GtkWidget *sp_empty_toolbox_new(SPDesktop *desktop); -- cgit v1.2.3 From dc09bd5bbbacdf10d28ee9053ce3c74f87753f3e Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Fri, 29 Mar 2013 12:34:40 +0100 Subject: Fix bspline icon show (bzr r11950.1.77) --- src/widgets/mappings.xml | 1 + 1 file changed, 1 insertion(+) (limited to 'src/widgets') diff --git a/src/widgets/mappings.xml b/src/widgets/mappings.xml index 2de3ff545..089bf76ea 100644 --- a/src/widgets/mappings.xml +++ b/src/widgets/mappings.xml @@ -197,6 +197,7 @@ + -- cgit v1.2.3 From fc5f8b8694f2b583f08fc423787319193097c9ca Mon Sep 17 00:00:00 2001 From: root Date: Thu, 18 Apr 2013 22:56:50 +0200 Subject: Remove mesh tool active from source (bzr r11950.1.101) --- src/widgets/toolbox.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/widgets') diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp index f9f13fa3a..88821b69b 100644 --- a/src/widgets/toolbox.cpp +++ b/src/widgets/toolbox.cpp @@ -110,7 +110,7 @@ enum BarId { BAR_COMMANDS, BAR_SNAP, }; -#define WITH_MESH +//#define WITH_MESH #define BAR_ID_KEY "BarIdValue" #define HANDLE_POS_MARK "x-inkscape-pos" -- cgit v1.2.3 From 56d9d0a05e24697275ebcfcbbabe46a401e8df31 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Fri, 26 Apr 2013 19:06:13 +0200 Subject: update icons (bzr r11950.1.108) --- src/widgets/icon.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/widgets') diff --git a/src/widgets/icon.cpp b/src/widgets/icon.cpp index 7580d9602..977b1badf 100644 --- a/src/widgets/icon.cpp +++ b/src/widgets/icon.cpp @@ -679,6 +679,7 @@ void IconImpl::setupLegacyNaming() { legacyNames["draw-star"] ="star_angled"; legacyNames["path-mode-bezier"] ="bezier_mode"; legacyNames["path-mode-spiro"] ="spiro_splines_mode"; + legacyNames["path-mode-bspline"] ="bspline_mode"; legacyNames["path-mode-polyline"] ="polylines_mode"; legacyNames["path-mode-polyline-paraxial"] ="paraxial_lines_mode"; legacyNames["draw-use-tilt"] ="guse_tilt"; -- cgit v1.2.3 From 4c6918c72721a35e0347e9e087396238e72eb62e Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Mon, 30 Dec 2013 20:41:32 +0100 Subject: Refactorizing (bzr r11950.1.212) --- src/widgets/pencil-toolbar.cpp | 2 -- src/widgets/toolbox.cpp | 1 - 2 files changed, 3 deletions(-) (limited to 'src/widgets') diff --git a/src/widgets/pencil-toolbar.cpp b/src/widgets/pencil-toolbar.cpp index d9d53117c..3289ed181 100644 --- a/src/widgets/pencil-toolbar.cpp +++ b/src/widgets/pencil-toolbar.cpp @@ -133,14 +133,12 @@ static void sp_add_freehand_mode_toggle(GtkActionGroup* mainActions, GObject* ho 1, _("Create Spiro path"), 2, INKSCAPE_ICON("path-mode-spiro"), -1 ); - //BSpline gtk_list_store_append( model, &iter ); gtk_list_store_set( model, &iter, 0, _("BSpline"), 1, _("Create BSpline path"), 2, INKSCAPE_ICON("path-mode-bspline"), -1 ); - //BSpline if (!tool_is_pencil) { gtk_list_store_append( model, &iter ); gtk_list_store_set( model, &iter, diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp index 9f64f6336..901276620 100644 --- a/src/widgets/toolbox.cpp +++ b/src/widgets/toolbox.cpp @@ -115,7 +115,6 @@ enum BarId { BAR_COMMANDS, BAR_SNAP, }; -//#define WITH_MESH #define BAR_ID_KEY "BarIdValue" #define HANDLE_POS_MARK "x-inkscape-pos" -- cgit v1.2.3 From b28d4dbc9e7ad573973f557afcec89dd005c9d96 Mon Sep 17 00:00:00 2001 From: Jabier Arraiza Cenoz Date: Tue, 31 Dec 2013 01:06:03 +0100 Subject: refactor, fixing some diff diferences (bzr r11950.1.228) --- src/widgets/toolbox.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'src/widgets') diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp index 901276620..02da805bf 100644 --- a/src/widgets/toolbox.cpp +++ b/src/widgets/toolbox.cpp @@ -115,6 +115,7 @@ enum BarId { BAR_COMMANDS, BAR_SNAP, }; + #define BAR_ID_KEY "BarIdValue" #define HANDLE_POS_MARK "x-inkscape-pos" -- cgit v1.2.3