From bf40a3bb5dd33538d81b03317af4093d30c8944d Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Mon, 3 Nov 2014 13:18:53 +0100
Subject: [PATCH] enhanced SceneToolBar tool handling (remove and insert at
 specific point)

---
 apps/opencs/view/widget/scenetoolbar.cpp | 15 +++++++++++++--
 apps/opencs/view/widget/scenetoolbar.hpp |  6 +++++-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/apps/opencs/view/widget/scenetoolbar.cpp b/apps/opencs/view/widget/scenetoolbar.cpp
index eac9bcec32..f7023b31f3 100644
--- a/apps/opencs/view/widget/scenetoolbar.cpp
+++ b/apps/opencs/view/widget/scenetoolbar.cpp
@@ -31,9 +31,20 @@ CSVWidget::SceneToolbar::SceneToolbar (int buttonSize, QWidget *parent)
     connect (focusScene, SIGNAL (activated()), this, SIGNAL (focusSceneRequest()));
 }
 
-void CSVWidget::SceneToolbar::addTool (SceneTool *tool)
+void CSVWidget::SceneToolbar::addTool (SceneTool *tool, SceneTool *insertPoint)
 {
-    mLayout->addWidget (tool, 0, Qt::AlignTop);
+    if (!insertPoint)
+        mLayout->addWidget (tool, 0, Qt::AlignTop);
+    else
+    {
+        int index = mLayout->indexOf (insertPoint);
+        mLayout->insertWidget (index+1, tool, 0, Qt::AlignTop);
+    }
+}
+
+void CSVWidget::SceneToolbar::removeTool (SceneTool *tool)
+{
+    mLayout->removeWidget (tool);
 }
 
 int CSVWidget::SceneToolbar::getButtonSize() const
diff --git a/apps/opencs/view/widget/scenetoolbar.hpp b/apps/opencs/view/widget/scenetoolbar.hpp
index 1902ba2bed..8e2c8ab00b 100644
--- a/apps/opencs/view/widget/scenetoolbar.hpp
+++ b/apps/opencs/view/widget/scenetoolbar.hpp
@@ -25,7 +25,11 @@ namespace CSVWidget
 
             SceneToolbar (int buttonSize, QWidget *parent = 0);
 
-            void addTool (SceneTool *tool);
+            /// If insertPoint==0, insert \a tool at the end of the scrollbar. Otherwise
+            /// insert tool after \a insertPoint.
+            void addTool (SceneTool *tool, SceneTool *insertPoint = 0);
+
+            void removeTool (SceneTool *tool);
 
             int getButtonSize() const;