From 23e929240ea0e2d5ec5c84c1ba37ce4b99ed34c8 Mon Sep 17 00:00:00 2001
From: Martin Owens <doctormo@gmail.com>
Date: Wed, 14 Jun 2017 21:20:41 -0400
Subject: Use user interface files for the user interface

---
 src/io/resource.cpp     | 36 ++++++++++++++++++++++++++++++++++--
 src/io/resource.h       |  2 ++
 src/widgets/toolbox.cpp | 20 +++++++++++++++++---
 3 files changed, 53 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/io/resource.cpp b/src/io/resource.cpp
index 501eab03b..52ac884b1 100644
--- a/src/io/resource.cpp
+++ b/src/io/resource.cpp
@@ -19,15 +19,18 @@
 #include <glib.h> // g_assert()
 #include "path-prefix.h"
 #include "inkscape.h"
+#include "io/sys.h"
 #include "io/resource.h"
 
+using Inkscape::IO::file_test;
+
 namespace Inkscape {
 
 namespace IO {
 
 namespace Resource {
 
-Util::ptr_shared<char> get_path(Domain domain, Type type, char const *filename)
+gchar *_get_path(Domain domain, Type type, char const *filename)
 {
     gchar *path=NULL;
     switch (domain) {
@@ -71,7 +74,8 @@ Util::ptr_shared<char> get_path(Domain domain, Type type, char const *filename)
                 case PALETTES: name = "palettes"; break;
                 case PATTERNS: name = "patterns"; break;
                 case TEMPLATES: name = "templates"; break;
-                default: return get_path(SYSTEM, type, filename);
+                case UI: name = "ui"; break;
+                default: return _get_path(SYSTEM, type, filename);
             }
             path = Inkscape::Application::profile_path(name);
         } break;
@@ -83,11 +87,39 @@ Util::ptr_shared<char> get_path(Domain domain, Type type, char const *filename)
         path = temp;
     }
 
+    return path;
+}
+
+Util::ptr_shared<char> get_path(Domain domain, Type type, char const *filename)
+{
+    char *path = _get_path(domain, type, filename);
     Util::ptr_shared<char> result=Util::share_string(path);
     g_free(path);
     return result;
 }
 
+/*
+ * Same as get_path, but checks for file's existance and falls back
+ * from USER to SYSTEM modes.
+ */
+Util::ptr_shared<char> get_filename(Type type, char const *filename)
+{
+    Util::ptr_shared<char> result;
+    char *user_filename = _get_path(USER, type, filename);
+    char *sys_filename = _get_path(SYSTEM, type, filename);
+
+    if (file_test(user_filename, G_FILE_TEST_EXISTS)) {
+        result = Util::share_string(user_filename);
+    } else if(file_test(sys_filename, G_FILE_TEST_EXISTS)) {
+        result = Util::share_string(sys_filename);
+    } else {
+        g_warning("Failed to load resource: %s", filename);
+    }
+    g_free(user_filename);
+    g_free(sys_filename);
+    return result;
+}
+
 }
 
 }
diff --git a/src/io/resource.h b/src/io/resource.h
index 36fe5f81e..fbf2111f4 100644
--- a/src/io/resource.h
+++ b/src/io/resource.h
@@ -48,6 +48,8 @@ enum Domain {
 Util::ptr_shared<char> get_path(Domain domain, Type type,
                                 char const *filename=NULL);
 
+Util::ptr_shared<char> get_filename(Type type, char const *filename=NULL);
+
 }
 
 }
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 016eafdaa..3f595dd35 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -61,7 +61,7 @@
 #include "../xml/attribute-record.h"
 #include "../xml/node-event-vector.h"
 #include "ui/uxmanager.h"
-
+#include "io/resource.h"
 
 #include "arc-toolbar.h"
 #include "box3d-toolbar.h"
@@ -101,6 +101,9 @@ using Inkscape::UI::PrefPusher;
 using Inkscape::UI::ToolboxFactory;
 using Inkscape::UI::Tools::ToolBase;
 
+using Inkscape::IO::Resource::get_filename;
+using Inkscape::IO::Resource::UI;
+
 typedef void (*SetupFunction)(GtkWidget *toolbox, SPDesktop *desktop);
 typedef void (*UpdateFunction)(SPDesktop *desktop, ToolBase *eventcontext, GtkWidget *toolbox);
 
@@ -1209,7 +1212,15 @@ static void setupToolboxCommon( GtkWidget *toolbox,
     GtkOrientation orientation = GTK_ORIENTATION_HORIZONTAL;
 
     gtk_ui_manager_insert_action_group( mgr, mainActions->gobj(), 0 );
-    gtk_ui_manager_add_ui_from_string( mgr, descr, -1, &errVal );
+
+    // This isn't good, but it is flexible.
+    if(descr[0] == '<') {
+      gtk_ui_manager_add_ui_from_string( mgr, descr, -1, &errVal );
+    } else {
+      char const *filename = get_filename(UI, descr);
+      gtk_ui_manager_add_ui_from_file( mgr, filename, &errVal );
+      g_warning("RET CODE: %d", errVal);
+    }
 
     GtkWidget* toolBar = gtk_ui_manager_get_widget( mgr, toolbarName );
     if ( prefs->getBool("/toolbox/icononly", true) ) {
@@ -1313,12 +1324,14 @@ void ToolboxFactory::setOrientation(GtkWidget* toolbox, GtkOrientation orientati
 
 void setup_tool_toolbox(GtkWidget *toolbox, SPDesktop *desktop)
 {
-    gchar const * descr =
+    gchar const * descr = "tool-toolbar.ui";
+    /*
         "<ui>"
         "  <toolbar name='ToolToolbar'>"
 
         "   <!-- Basics -->"
         "    <toolitem action='ToolSelector' />"
+        "    <toolitem action='FooBar' />"
         "    <toolitem action='ToolNode' />"
         "    <toolitem action='ToolTweak' />"
         "    <toolitem action='ToolZoom' />"
@@ -1360,6 +1373,7 @@ void setup_tool_toolbox(GtkWidget *toolbox, SPDesktop *desktop)
 #endif
         "  </toolbar>"
         "</ui>";
+*/
 
     setupToolboxCommon( toolbox, desktop, descr,
                         "/ui/ToolToolbar",
-- 
cgit v1.2.3


From ee36458b5c235d13d30ae8e16a5be44415fe0dfb Mon Sep 17 00:00:00 2001
From: Martin Owens <doctormo@gmail.com>
Date: Thu, 15 Jun 2017 13:15:06 -0400
Subject: Cleanup old xml

---
 src/widgets/toolbox.cpp | 59 ++++---------------------------------------------
 1 file changed, 4 insertions(+), 55 deletions(-)

(limited to 'src')

diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 3f595dd35..846321c71 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -1219,7 +1219,6 @@ static void setupToolboxCommon( GtkWidget *toolbox,
     } else {
       char const *filename = get_filename(UI, descr);
       gtk_ui_manager_add_ui_from_file( mgr, filename, &errVal );
-      g_warning("RET CODE: %d", errVal);
     }
 
     GtkWidget* toolBar = gtk_ui_manager_get_widget( mgr, toolbarName );
@@ -1324,60 +1323,10 @@ void ToolboxFactory::setOrientation(GtkWidget* toolbox, GtkOrientation orientati
 
 void setup_tool_toolbox(GtkWidget *toolbox, SPDesktop *desktop)
 {
-    gchar const * descr = "tool-toolbar.ui";
-    /*
-        "<ui>"
-        "  <toolbar name='ToolToolbar'>"
-
-        "   <!-- Basics -->"
-        "    <toolitem action='ToolSelector' />"
-        "    <toolitem action='FooBar' />"
-        "    <toolitem action='ToolNode' />"
-        "    <toolitem action='ToolTweak' />"
-        "    <toolitem action='ToolZoom' />"
-        "    <toolitem action='ToolMeasure' />"
-
-        "   <!-- Shapes -->"
-        "    <toolitem action='ToolRect' />"
-        "    <toolitem action='Tool3DBox' />"
-        "    <toolitem action='ToolArc' />"
-        "    <toolitem action='ToolStar' />"
-        "    <toolitem action='ToolSpiral' />"
-
-        "   <!-- Paths -->"
-        "    <toolitem action='ToolPencil' />"
-        "    <toolitem action='ToolPen' />"
-        "    <toolitem action='ToolCalligraphic' />"
-
-        "   <!-- Text -->"
-        "    <toolitem action='ToolText' />"
-
-        "   <!-- Paint large areas -->"
-        "    <toolitem action='ToolSpray' />"
-        "    <toolitem action='ToolEraser' />"
-
-#if HAVE_POTRACE
-        "   <!-- Fill -->"
-        "    <toolitem action='ToolPaintBucket' />"
-#endif
-
-        "    <toolitem action='ToolGradient' />"
-#ifdef WITH_MESH
-        "    <toolitem action='ToolMesh' />"
-#endif
-        "    <toolitem action='ToolDropper' />"
-
-        "    <toolitem action='ToolConnector' />"
-#ifdef WITH_LPETOOL
-        "    <toolitem action='ToolLPETool' />"
-#endif
-        "  </toolbar>"
-        "</ui>";
-*/
-
-    setupToolboxCommon( toolbox, desktop, descr,
-                        "/ui/ToolToolbar",
-                        "/toolbox/tools/small");
+    setupToolboxCommon( toolbox, desktop,
+            "tool-toolbar.ui",
+            "/ui/ToolToolbar",
+            "/toolbox/tools/small");
 }
 
 void update_tool_toolbox( SPDesktop *desktop, ToolBase *eventcontext, GtkWidget * /*toolbox*/ )
-- 
cgit v1.2.3


From 57be02b6e23a06a2d5e3a1a26655ec0003841469 Mon Sep 17 00:00:00 2001
From: Martin Owens <doctormo@gmail.com>
Date: Thu, 15 Jun 2017 22:08:04 -0400
Subject: Complete to move to using ui files instead of compiled in xml

---
 src/widgets/toolbox.cpp | 493 +++---------------------------------------------
 1 file changed, 23 insertions(+), 470 deletions(-)

(limited to 'src')

diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 846321c71..671689716 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -225,390 +225,6 @@ static struct {
     { NULL, NULL, NULL, NULL, NULL, SP_VERB_INVALID, NULL, NULL }
 };
 
-static gchar const * ui_descr =
-        "<ui>"
-        "  <toolbar name='SelectToolbar'>"
-        "    <toolitem action='EditSelectAll' />"
-        "    <toolitem action='EditSelectAllInAllLayers' />"
-        "    <toolitem action='EditDeselect' />"
-        "    <separator />"
-        "    <toolitem action='ObjectRotate90CCW' />"
-        "    <toolitem action='ObjectRotate90' />"
-        "    <toolitem action='ObjectFlipHorizontally' />"
-        "    <toolitem action='ObjectFlipVertically' />"
-        "    <separator />"
-        "    <toolitem action='SelectionToBack' />"
-        "    <toolitem action='SelectionLower' />"
-        "    <toolitem action='SelectionRaise' />"
-        "    <toolitem action='SelectionToFront' />"
-        "    <separator />"
-        "    <toolitem action='XAction' />"
-        "    <toolitem action='YAction' />"
-        "    <toolitem action='WidthAction' />"
-        "    <toolitem action='LockAction' />"
-        "    <toolitem action='HeightAction' />"
-        "    <toolitem action='UnitsAction' />"
-        "    <separator />"
-        "    <toolitem action='transform_stroke' />"
-        "    <toolitem action='transform_corners' />"
-        "    <toolitem action='transform_gradient' />"
-        "    <toolitem action='transform_pattern' />"
-        "  </toolbar>"
-
-        "  <toolbar name='NodeToolbar'>"
-        "    <separator />"
-        "    <toolitem action='NodeInsertAction'>"
-        "      <menu action='NodeInsertActionMenu'>"
-        "        <menuitem action='NodeInsertActionMinX' />"
-        "        <menuitem action='NodeInsertActionMaxX' />"
-        "        <menuitem action='NodeInsertActionMinY' />"
-        "        <menuitem action='NodeInsertActionMaxY' />"
-        "      </menu>"
-        "    </toolitem>"
-        "    <toolitem action='NodeDeleteAction' />"
-        "    <separator />"
-        "    <toolitem action='NodeJoinAction' />"
-        "    <toolitem action='NodeBreakAction' />"
-        "    <separator />"
-        "    <toolitem action='NodeJoinSegmentAction' />"
-        "    <toolitem action='NodeDeleteSegmentAction' />"
-        "    <separator />"
-        "    <toolitem action='NodeCuspAction' />"
-        "    <toolitem action='NodeSmoothAction' />"
-        "    <toolitem action='NodeSymmetricAction' />"
-        "    <toolitem action='NodeAutoAction' />"
-        "    <separator />"
-        "    <toolitem action='NodeLineAction' />"
-        "    <toolitem action='NodeCurveAction' />"
-        "    <separator />"
-        "    <toolitem action='ObjectToPath' />"
-        "    <toolitem action='StrokeToPath' />"
-        "    <separator />"
-        "    <toolitem action='NodeXAction' />"
-        "    <toolitem action='NodeYAction' />"
-        "    <toolitem action='NodeUnitsAction' />"
-        "    <separator />"
-        "    <toolitem action='ObjectEditClipPathAction' />"
-        "    <toolitem action='ObjectEditMaskPathAction' />"
-        "    <toolitem action='EditNextPathEffectParameter' />"
-        "    <separator />"
-        "    <toolitem action='NodesShowTransformHandlesAction' />"
-        "    <toolitem action='NodesShowHandlesAction' />"
-        "    <toolitem action='NodesShowHelperpath' />"
-        "  </toolbar>"
-
-        "  <toolbar name='TweakToolbar'>"
-        "    <toolitem action='TweakWidthAction' />"
-        "    <separator />"
-        "    <toolitem action='TweakForceAction' />"
-        "    <toolitem action='TweakPressureAction' />"
-        "    <separator />"
-        "    <toolitem action='TweakModeAction' />"
-        "    <separator />"
-        "    <toolitem action='TweakFidelityAction' />"
-        "    <separator />"
-        "    <toolitem action='TweakChannelsLabel' />"
-        "    <toolitem action='TweakDoH' />"
-        "    <toolitem action='TweakDoS' />"
-        "    <toolitem action='TweakDoL' />"
-        "    <toolitem action='TweakDoO' />"
-        "  </toolbar>"
-
-        "  <toolbar name='SprayToolbar'>"
-        "    <toolitem action='SprayModeAction' />"
-        "    <separator />"
-        "    <toolitem action='SprayWidthAction' />"
-        "    <toolitem action='SprayPressureWidthAction' />"
-        "    <toolitem action='SprayPopulationAction' />"
-        "    <toolitem action='SprayPressurePopulationAction' />"
-        "    <separator />"
-        "    <toolitem action='SprayRotationAction' />"
-        "    <toolitem action='SprayScaleAction' />"
-        "    <toolitem action='SprayPressureScaleAction' />"
-        "    <separator />"
-        "    <toolitem action='SprayStandard_deviationAction' />"
-        "    <toolitem action='SprayMeanAction' />"
-        "    <separator />"
-        "    <toolitem action='SprayOverNoTransparentAction' />"
-        "    <toolitem action='SprayOverTransparentAction' />"
-        "    <toolitem action='SprayPickNoOverlapAction' />"
-        "    <toolitem action='SprayNoOverlapAction' />"
-        "    <toolitem action='SprayToolOffsetAction' />"
-        "    <separator />"
-        "    <toolitem action='SprayPickColorAction' />"
-        "    <toolitem action='SprayPickFillAction' />"
-        "    <toolitem action='SprayPickStrokeAction' />"
-        "    <toolitem action='SprayPickInverseValueAction' />"
-        "    <toolitem action='SprayPickCenterAction' />"
-        "  </toolbar>"
-
-        "  <toolbar name='ZoomToolbar'>"
-        "    <toolitem action='ZoomIn' />"
-        "    <toolitem action='ZoomOut' />"
-        "    <separator />"
-        "    <toolitem action='Zoom1:0' />"
-        "    <toolitem action='Zoom1:2' />"
-        "    <toolitem action='Zoom2:1' />"
-        "    <separator />"
-        "    <toolitem action='ZoomSelection' />"
-        "    <toolitem action='ZoomDrawing' />"
-        "    <toolitem action='ZoomPage' />"
-        "    <toolitem action='ZoomPageWidth' />"
-        "    <separator />"
-        "    <toolitem action='ZoomPrev' />"
-        "    <toolitem action='ZoomNext' />"
-        "  </toolbar>"
-
-        "  <toolbar name='MeasureToolbar'>"
-        "    <toolitem action='MeasureFontSizeAction' />"
-        "    <separator />"
-        "    <toolitem action='MeasurePrecisionAction' />"
-        "    <separator />"
-        "    <toolitem action='MeasureScaleAction' />"
-        "    <separator />"
-        "    <toolitem action='measure_units_label' />"
-        "    <toolitem action='MeasureUnitsAction' />"
-        "    <toolitem action='MeasureIgnore1stAndLast' />"
-        "    <toolitem action='MeasureInBettween' />"
-        "    <toolitem action='MeasureShowHidden' />"
-        "    <toolitem action='MeasureAllLayers' />"
-        "    <toolitem action='MeasureReverse' />"
-        "    <toolitem action='MeasureToPhantom' />"
-        "    <toolitem action='MeasureToGuides' />"
-        "    <toolitem action='MeasureToItem' />"
-        "    <toolitem action='MeasureMarkDimension' />"
-        "    <toolitem action='MeasureOffsetAction' />"
-        "  </toolbar>" 
-
-        "  <toolbar name='StarToolbar'>"
-        "    <separator />"
-        "    <toolitem action='StarStateAction' />"
-        "    <separator />"
-        "    <toolitem action='FlatAction' />"
-        "    <separator />"
-        "    <toolitem action='MagnitudeAction' />"
-        "    <toolitem action='SpokeAction' />"
-        "    <toolitem action='RoundednessAction' />"
-        "    <toolitem action='RandomizationAction' />"
-        "    <separator />"
-        "    <toolitem action='StarResetAction' />"
-        "  </toolbar>"
-
-        "  <toolbar name='RectToolbar'>"
-        "    <toolitem action='RectStateAction' />"
-        "    <toolitem action='RectWidthAction' />"
-        "    <toolitem action='RectHeightAction' />"
-        "    <toolitem action='RadiusXAction' />"
-        "    <toolitem action='RadiusYAction' />"
-        "    <toolitem action='RectUnitsAction' />"
-        "    <separator />"
-        "    <toolitem action='RectResetAction' />"
-        "  </toolbar>"
-
-        "  <toolbar name='3DBoxToolbar'>"
-        "    <toolitem action='3DBoxAngleXAction' />"
-        "    <toolitem action='3DBoxVPXStateAction' />"
-        "    <separator />"
-        "    <toolitem action='3DBoxAngleYAction' />"
-        "    <toolitem action='3DBoxVPYStateAction' />"
-        "    <separator />"
-        "    <toolitem action='3DBoxAngleZAction' />"
-        "    <toolitem action='3DBoxVPZStateAction' />"
-        "  </toolbar>"
-
-        "  <toolbar name='SpiralToolbar'>"
-        "    <toolitem action='SpiralStateAction' />"
-        "    <toolitem action='SpiralRevolutionAction' />"
-        "    <toolitem action='SpiralExpansionAction' />"
-        "    <toolitem action='SpiralT0Action' />"
-        "    <separator />"
-        "    <toolitem action='SpiralResetAction' />"
-        "  </toolbar>"
-
-        "  <toolbar name='PenToolbar'>"
-        "    <toolitem action='FreehandModeActionPen' />"
-        "    <separator />"
-        "    <toolitem action='SetPenShapeAction'/>"
-        "  </toolbar>"
-
-        "  <toolbar name='PencilToolbar'>"
-        "    <toolitem action='FreehandModeActionPencil' />"
-        "    <separator />"
-        "    <toolitem action='PencilToleranceAction' />"
-        "    <toolitem action='PencilLpeSimplify' />"
-        "    <toolitem action='PencilLpeSimplifyFlatten' />"
-        "    <separator />"
-        "    <toolitem action='PencilResetAction' />"
-        "    <separator />"
-        "    <toolitem action='SetPencilShapeAction'/>"
-        "  </toolbar>"
-
-        "  <toolbar name='CalligraphyToolbar'>"
-        "    <separator />"
-        "    <toolitem action='SetProfileAction'/>"
-        "    <toolitem action='ProfileEditAction'/>"
-        "    <separator />"
-        "    <toolitem action='CalligraphyWidthAction' />"
-        "    <toolitem action='PressureAction' />"
-        "    <toolitem action='TraceAction' />"
-        "    <toolitem action='ThinningAction' />"
-        "    <separator />"
-        "    <toolitem action='AngleAction' />"
-        "    <toolitem action='TiltAction' />"
-        "    <toolitem action='FixationAction' />"
-        "    <separator />"
-        "    <toolitem action='CapRoundingAction' />"
-        "    <separator />"
-        "    <toolitem action='TremorAction' />"
-        "    <toolitem action='WiggleAction' />"
-        "    <toolitem action='MassAction' />"
-        "    <separator />"
-        "  </toolbar>"
-
-        "  <toolbar name='ArcToolbar'>"
-        "    <toolitem action='ArcStateAction' />"
-        "    <separator />"
-        "    <toolitem action='ArcStartAction' />"
-        "    <toolitem action='ArcEndAction' />"
-        "    <separator />"
-        "    <toolitem action='ArcOpenAction' />"
-        "    <separator />"
-        "    <toolitem action='ArcResetAction' />"
-        "    <separator />"
-        "  </toolbar>"
-
-#if HAVE_POTRACE
-        "  <toolbar name='PaintbucketToolbar'>"
-        "    <toolitem action='ChannelsAction' />"
-        "    <separator />"
-        "    <toolitem action='ThresholdAction' />"
-        "    <separator />"
-        "    <toolitem action='OffsetAction' />"
-        "    <toolitem action='PaintbucketUnitsAction' />"
-        "    <separator />"
-        "    <toolitem action='AutoGapAction' />"
-        "    <separator />"
-        "    <toolitem action='PaintbucketResetAction' />"
-        "  </toolbar>"
-#endif
-
-        "  <toolbar name='EraserToolbar'>"
-        "    <toolitem action='EraserModeAction' />"
-        "    <separator />"
-        "    <toolitem action='EraserWidthAction' />"
-        "    <toolitem action='EraserPressureAction' />"
-        "    <separator />"
-        "    <toolitem action='EraserThinningAction' />"
-        "    <separator />"
-        "    <toolitem action='EraserCapRoundingAction' />"
-        "    <separator />"
-        "    <toolitem action='EraserTremorAction' />"
-        "    <separator />"
-        "    <toolitem action='EraserMassAction' />"
-        "    <separator />"
-        "    <toolitem action='EraserBreakAppart' />"
-        "  </toolbar>"
-
-        "  <toolbar name='TextToolbar'>"
-        "    <toolitem action='TextFontFamilyAction' />"
-        "    <toolitem action='TextFontStyleAction' />"
-        "    <separator />"
-        "    <toolitem action='TextOuterStyleAction' />"
-        "    <toolitem action='TextFontSizeAction' />"
-        "    <toolitem action='TextLineHeightAction' />"
-        "    <toolitem action='TextLineHeightUnitsAction' />"
-        "    <toolitem action='TextLineHeightUnsetAction' />"
-        "    <separator />"
-        "    <toolitem action='TextAlignAction' />"
-        "    <separator />"
-        "    <toolitem action='TextSuperscriptAction' />"
-        "    <toolitem action='TextSubscriptAction' />"
-        "    <separator />"
-        "    <toolitem action='TextLetterSpacingAction' />"
-        "    <toolitem action='TextWordSpacingAction' />"
-        "    <toolitem action='TextDxAction' />"
-        "    <toolitem action='TextDyAction' />"
-        "    <toolitem action='TextRotationAction' />"
-        "    <separator />"
-        "    <toolitem action='TextWritingModeAction' />"
-        "    <separator />"
-        "    <toolitem action='TextOrientationAction' />"
-        "    <separator />"
-        "    <toolitem action='TextDirectionAction' />"
-        "  </toolbar>"
-
-        "  <toolbar name='LPEToolToolbar'>"
-        "    <toolitem action='LPEToolModeAction' />"
-        "    <separator />"
-        "    <toolitem action='LPEShowBBoxAction' />"
-        "    <toolitem action='LPEBBoxFromSelectionAction' />"
-        "    <separator />"
-        "    <toolitem action='LPELineSegmentAction' />"
-        "    <separator />"
-        "    <toolitem action='LPEMeasuringAction' />"
-        "    <toolitem action='LPEToolUnitsAction' />"
-        "    <separator />"
-        "    <toolitem action='LPEOpenLPEDialogAction' />"
-        "  </toolbar>"
-
-        "  <toolbar name='GradientToolbar'>"
-        "    <toolitem action='GradientNewTypeAction' />"
-        "    <toolitem action='GradientNewFillStrokeAction' />"
-        "    <separator />"
-        "    <toolitem action='GradientSelectGradientAction' />"
-        "    <toolitem action='GradientEditLinkAction' />"
-        "    <toolitem action='GradientEditReverseAction' />"
-        "    <toolitem action='GradientSelectRepeatAction' />"
-        "    <separator />"
-        "    <toolitem action='GradientEditStopsAction' />"
-        "    <toolitem action='GradientEditOffsetAction' />"
-        "    <toolitem action='GradientEditAddAction' />"
-        "    <toolitem action='GradientEditDeleteAction' />"
-        "  </toolbar>"
-
-        "  <toolbar name='MeshToolbar'>"
-        "    <toolitem action='MeshNewTypeAction' />"
-        "    <toolitem action='MeshNewFillStrokeAction' />"
-        "    <toolitem action='MeshRowAction' />"
-        "    <toolitem action='MeshColumnAction' />"
-        "    <separator />"
-//        "    <toolitem action='MeshEditFillAction' />"
-//        "    <toolitem action='MeshEditStrokeAction' />"
-//        "    <toolitem action='MeshShowHandlesAction' />"
-        "    <toolitem action='MeshToggleSidesAction' />"
-        "    <toolitem action='MeshMakeEllipticalAction' />"
-        "    <toolitem action='MeshPickColorsAction' />"
-        "    <toolitem action='MeshFitInBoundingBoxAction' />"
-        "    <separator />"
-        "    <toolitem action='MeshShowHandlesAction' />"
-        "    <toolitem action='MeshEditFillAction' />"
-        "    <toolitem action='MeshEditStrokeAction' />"
-        "    <separator />"
-        "    <toolitem action='MeshWarningAction' />"
-        "    <separator />"
-        "    <toolitem action='MeshSmoothAction' />"
-        "  </toolbar>"
-
-        "  <toolbar name='DropperToolbar'>"
-        "    <toolitem action='DropperOpacityAction' />"
-        "    <toolitem action='DropperPickAlphaAction' />"
-        "    <toolitem action='DropperSetAlphaAction' />"
-        "  </toolbar>"
-
-        "  <toolbar name='ConnectorToolbar'>"
-        "    <toolitem action='ConnectorAvoidAction' />"
-        "    <toolitem action='ConnectorIgnoreAction' />"
-        "    <toolitem action='ConnectorOrthogonalAction' />"
-        "    <toolitem action='ConnectorCurvatureAction' />"
-        "    <toolitem action='ConnectorSpacingAction' />"
-        "    <toolitem action='ConnectorGraphAction' />"
-        "    <toolitem action='ConnectorLengthAction' />"
-        "    <toolitem action='ConnectorDirectedAction' />"
-        "    <toolitem action='ConnectorOverlapAction' />"
-        "  </toolbar>"
-
-        "</ui>"
-;
 
 static Glib::RefPtr<Gtk::ActionGroup> create_or_fetch_actions( SPDesktop* desktop );
 
@@ -1199,7 +815,7 @@ void ToolboxFactory::setToolboxDesktop(GtkWidget *toolbox, SPDesktop *desktop)
 
 static void setupToolboxCommon( GtkWidget *toolbox,
                                 SPDesktop *desktop,
-                                gchar const *descr,
+                                gchar const *ui_file,
                                 gchar const* toolbarName,
                                 gchar const* sizePref )
 {
@@ -1207,18 +823,17 @@ static void setupToolboxCommon( GtkWidget *toolbox,
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
 
     GtkUIManager* mgr = gtk_ui_manager_new();
-    GError* errVal = 0;
+    GError* err = 0;
 
     GtkOrientation orientation = GTK_ORIENTATION_HORIZONTAL;
 
     gtk_ui_manager_insert_action_group( mgr, mainActions->gobj(), 0 );
 
-    // This isn't good, but it is flexible.
-    if(descr[0] == '<') {
-      gtk_ui_manager_add_ui_from_string( mgr, descr, -1, &errVal );
-    } else {
-      char const *filename = get_filename(UI, descr);
-      gtk_ui_manager_add_ui_from_file( mgr, filename, &errVal );
+    char const *filename = get_filename(UI, ui_file);
+    gtk_ui_manager_add_ui_from_file( mgr, filename, &err );
+    if(err) {
+        g_warning("Failed to load %s: %s", filename, err->message);
+        return;
     }
 
     GtkWidget* toolBar = gtk_ui_manager_get_widget( mgr, toolbarName );
@@ -1354,9 +969,15 @@ void setup_aux_toolbox(GtkWidget *toolbox, SPDesktop *desktop)
     GtkSizeGroup* grouper = gtk_size_group_new( GTK_SIZE_GROUP_BOTH );
     Glib::RefPtr<Gtk::ActionGroup> mainActions = create_or_fetch_actions( desktop );
     GtkUIManager* mgr = gtk_ui_manager_new();
-    GError* errVal = 0;
+    GError *err = 0;
     gtk_ui_manager_insert_action_group( mgr, mainActions->gobj(), 0 );
-    gtk_ui_manager_add_ui_from_string( mgr, ui_descr, -1, &errVal );
+
+    char const *filename = get_filename(UI, "select-toolbar.ui");
+    guint ret = gtk_ui_manager_add_ui_from_file(mgr, filename, &err);
+    if(err) {
+      g_warning("Failed to load aux toolbar %s: %s", filename, err->message);
+      return;
+    }
 
     std::map<std::string, GtkWidget*> dataHolders;
 
@@ -1457,49 +1078,10 @@ void update_aux_toolbox(SPDesktop * /*desktop*/, ToolBase *eventcontext, GtkWidg
 
 void setup_commands_toolbox(GtkWidget *toolbox, SPDesktop *desktop)
 {
-    gchar const * descr =
-        "<ui>"
-        "  <toolbar name='CommandsToolbar'>"
-        "    <toolitem action='FileNew' />"
-        "    <toolitem action='FileOpen' />"
-        "    <toolitem action='FileSave' />"
-        "    <toolitem action='FilePrint' />"
-        "    <separator />"
-        "    <toolitem action='FileImport' />"
-        "    <toolitem action='DialogExport' />"
-        "    <separator />"
-        "    <toolitem action='EditUndo' />"
-        "    <toolitem action='EditRedo' />"
-        "    <separator />"
-        "    <toolitem action='EditCopy' />"
-        "    <toolitem action='EditCut' />"
-        "    <toolitem action='EditPaste' />"
-        "    <separator />"
-        "    <toolitem action='ZoomSelection' />"
-        "    <toolitem action='ZoomDrawing' />"
-        "    <toolitem action='ZoomPage' />"
-        "    <separator />"
-        "    <toolitem action='EditDuplicate' />"
-        "    <toolitem action='EditClone' />"
-        "    <toolitem action='EditUnlinkClone' />"
-        "    <separator />"
-        "    <toolitem action='SelectionGroup' />"
-        "    <toolitem action='SelectionUnGroup' />"
-        "    <separator />"
-        "    <toolitem action='DialogFillStroke' />"
-        "    <toolitem action='DialogText' />"
-        "    <toolitem action='DialogLayers' />"
-        "    <toolitem action='DialogXMLEditor' />"
-        "    <toolitem action='DialogAlignDistribute' />"
-        "    <separator />"
-        "    <toolitem action='DialogDocumentProperties' />"
-        "    <toolitem action='DialogPreferences' />"
-        "  </toolbar>"
-        "</ui>";
-
-    setupToolboxCommon( toolbox, desktop, descr,
-                        "/ui/CommandsToolbar",
-                        "/toolbox/small" );
+    setupToolboxCommon( toolbox, desktop,
+            "commands-toolbar.ui",
+            "/ui/CommandsToolbar",
+            "/toolbox/small" );
 }
 
 void update_commands_toolbox(SPDesktop * /*desktop*/, ToolBase * /*eventcontext*/, GtkWidget * /*toolbox*/)
@@ -1635,36 +1217,6 @@ void setup_snap_toolbox(GtkWidget *toolbox, SPDesktop *desktop)
 {
     Glib::RefPtr<Gtk::ActionGroup> mainActions = create_or_fetch_actions(desktop);
 
-    gchar const * descr =
-        "<ui>"
-        "  <toolbar name='SnapToolbar'>"
-        "    <toolitem action='ToggleSnapGlobal' />"
-        "    <separator />"
-        "    <toolitem action='ToggleSnapFromBBoxCorner' />"
-        "    <toolitem action='ToggleSnapToBBoxPath' />"
-        "    <toolitem action='ToggleSnapToBBoxNode' />"
-        "    <toolitem action='ToggleSnapToFromBBoxEdgeMidpoints' />"
-        "    <toolitem action='ToggleSnapToFromBBoxCenters' />"
-        "    <separator />"
-        "    <toolitem action='ToggleSnapFromNode' />"
-        "    <toolitem action='ToggleSnapToItemPath' />"
-        "    <toolitem action='ToggleSnapToPathIntersections' />"
-        "    <toolitem action='ToggleSnapToItemNode' />"
-        "    <toolitem action='ToggleSnapToSmoothNodes' />"
-        "    <toolitem action='ToggleSnapToFromLineMidpoints' />"
-        "    <separator />"
-        "    <toolitem action='ToggleSnapFromOthers' />"
-        "    <toolitem action='ToggleSnapToFromObjectCenters' />"
-        "    <toolitem action='ToggleSnapToFromRotationCenter' />"
-        "    <toolitem action='ToggleSnapToFromTextBaseline' />"
-        "    <separator />"
-        "    <toolitem action='ToggleSnapToPageBorder' />"
-        "    <toolitem action='ToggleSnapToGrids' />"
-        "    <toolitem action='ToggleSnapToGuides' />"
-        //"    <toolitem action='ToggleSnapToGridGuideIntersections' />"
-        "  </toolbar>"
-        "</ui>";
-
     Inkscape::IconSize secondarySize = ToolboxFactory::prefToSize("/toolbox/secondary", 1);
 
     {
@@ -1843,9 +1395,10 @@ void setup_snap_toolbox(GtkWidget *toolbox, SPDesktop *desktop)
         g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(toggle_snap_callback), toolbox );
     }
 
-    setupToolboxCommon( toolbox, desktop, descr,
-                        "/ui/SnapToolbar",
-                        "/toolbox/secondary" );
+    setupToolboxCommon( toolbox, desktop,
+            "snap-toolbar.ui",
+            "/ui/SnapToolbar",
+            "/toolbox/secondary" );
 }
 
 Glib::ustring ToolboxFactory::getToolboxName(GtkWidget* toolbox)
-- 
cgit v1.2.3


From 3821d895efa6b20ade67292fd9f6732b695d9fe3 Mon Sep 17 00:00:00 2001
From: Martin Owens <doctormo@gmail.com>
Date: Fri, 16 Jun 2017 07:18:39 -0400
Subject: Fix err leaking and cmake

---
 src/widgets/toolbox.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src')

diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 671689716..45f81ee81 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -833,6 +833,7 @@ static void setupToolboxCommon( GtkWidget *toolbox,
     gtk_ui_manager_add_ui_from_file( mgr, filename, &err );
     if(err) {
         g_warning("Failed to load %s: %s", filename, err->message);
+        g_error_free(err);
         return;
     }
 
@@ -976,6 +977,7 @@ void setup_aux_toolbox(GtkWidget *toolbox, SPDesktop *desktop)
     guint ret = gtk_ui_manager_add_ui_from_file(mgr, filename, &err);
     if(err) {
       g_warning("Failed to load aux toolbar %s: %s", filename, err->message);
+      g_error_free(err);
       return;
     }
 
-- 
cgit v1.2.3


From 67bf524361882fb368175d3455620f5edc15d218 Mon Sep 17 00:00:00 2001
From: Martin Owens <doctormo@gmail.com>
Date: Fri, 16 Jun 2017 10:29:04 -0400
Subject: Attempt to make paintbucket build option not cause errors for toolbar
 loading

---
 src/widgets/toolbox.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'src')

diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 45f81ee81..65c54f0ce 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -156,6 +156,9 @@ static struct {
 	{ "/tools/eraser",   "eraser_tool",    SP_VERB_CONTEXT_ERASER, SP_VERB_CONTEXT_ERASER_PREFS },
 #if HAVE_POTRACE
 	{ "/tools/paintbucket",    "paintbucket_tool",     SP_VERB_CONTEXT_PAINTBUCKET, SP_VERB_CONTEXT_PAINTBUCKET_PREFS },
+#else
+        // Replacement blank action for ToolPaintBucket to prevent loading errors in ui file
+	{ "/tools/paintbucket",    "ToolPaintBucket",     SP_VERB_NONE, SP_VERB_NONE },
 #endif
 	{ "/tools/text",     "text_tool",      SP_VERB_CONTEXT_TEXT, SP_VERB_CONTEXT_TEXT_PREFS },
 	{ "/tools/connector","connector_tool", SP_VERB_CONTEXT_CONNECTOR, SP_VERB_CONTEXT_CONNECTOR_PREFS },
@@ -221,6 +224,8 @@ static struct {
 #if HAVE_POTRACE
     { "/tools/paintbucket",  "paintbucket_toolbox",  0, sp_paintbucket_toolbox_prep, "PaintbucketToolbar",
       SP_VERB_CONTEXT_PAINTBUCKET_PREFS, "/tools/paintbucket", N_("Style of Paint Bucket fill objects")},
+#else
+    { "/tools/paintbucket",  "paintbucket_toolbox",  0, NULL, "PaintbucketToolbar", SP_VERB_NONE, "/tools/paintbucket", N_("Disabled")},
 #endif
     { NULL, NULL, NULL, NULL, NULL, SP_VERB_INVALID, NULL, NULL }
 };
@@ -614,6 +619,12 @@ static Glib::RefPtr<Gtk::ActionGroup> create_or_fetch_actions( SPDesktop* deskto
                 if ( i == 0 ) {
                     va->set_active(true);
                 }
+            } else {
+                // This creates a blank action using the data_name, this can replace
+                // tools that have been disabled by compile time options.
+                Glib::RefPtr<Gtk::Action> act = Gtk::Action::create(Glib::ustring(tools[i].data_name));
+                act->set_sensitive(false);
+                mainActions->add(act);
             }
         }
     }
-- 
cgit v1.2.3