cyrille / braindump / changeset / 478d373c7d75

Up to file-list src/import/ToolBox.cpp:

 /*
- * Copyright (c) 2005-2008 Thomas Zander <zander@kde.org>
+ * Copyright (c) 2005-2009 Thomas Zander <zander@kde.org>
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
 #include <QRect>
 #include "math.h"
 namespace {
 class SectionLayout : public QLayout
+{
 public:
@@ -153,13 +153,14 @@ private:
     QString m_name;
 };
 // Priorities for a specific columnwidth of a child depending on the width of the parent.
 static const int rowPriorities[][5] = {
     { 1, 1, 1, 1, 1 },
     { 2, 1, 1, 1, 1 },
     { 3, 2, 1, 1, 1 },
     { 2, 4, 1, 1, 1 },
     { 3, 2, 4, 5, 1 }
 // Priorities for a specific columnwidth for section depending on the width of the docker.
 static const int rowPriorities[][6] = {
     { 1, 1, 1, 1, 1 }, // values used when the docker has 1 column
     { 2, 1, 1, 1, 1 }, // values used when the docker has 2 columns
     { 3, 2, 1, 1, 1 }, // 3
     { 2, 4, 1, 1, 1 }, // 4
     { 5, 3, 2, 4, 1 }, // 5
     { 6, 3, 2, 4, 1 }  // 6
 };
 class ToolBoxLayout : public QLayout
@@ -235,7 +236,7 @@ public:
             return 0;
         QSize iconSize = static_cast<Section*> (m_sections[0]->widget())->iconSize();
         const int maxColumns = qMax(1, width / iconSize.width());
-        const int prioIndex = qMin(5, maxColumns) - 1;
+        const int prioIndex = qMin(6, maxColumns) - 1;
         // kDebug() << "tryPlaceItems w:" << width << "prioIndex:" << prioIndex << "max:" << maxColumns;
         int x = 0;
@@ -277,8 +278,6 @@ public:
+                }
                 preferredColumnWidth = suggestedColumnWidth;
                 if (rows > 2 && rows < colsLeft) // then its pretty wide, wait for something better...
                     continue;
                 break;
+            }
             // kDebug() << " + preferredColumnWidth" << preferredColumnWidth;
@@ -308,7 +307,7 @@ public:
 private:
     QList <QWidgetItem*> m_sections;
 };
+}
 class ToolBox::Private
+{
 public:
@@ -348,8 +347,8 @@ ToolBox::ToolBox(KoCanvasController *can
     // Update visibility of buttons
     setButtonsVisible(canvas, QList<QString>());
     connect(KoToolManager::instance(), SIGNAL(changedTool(const KoCanvasController*, int)),
             this, SLOT(setActiveTool(const KoCanvasController*, int)));
     connect(KoToolManager::instance(), SIGNAL(changedTool(KoCanvasController*, int)),
             this, SLOT(setActiveTool(KoCanvasController*, int)));
     connect(KoToolManager::instance(), SIGNAL(currentLayerChanged(const KoCanvasController*,const KoShapeLayer*)),
             this, SLOT(setCurrentLayer(const KoCanvasController*,const KoShapeLayer*)));
     connect(KoToolManager::instance(), SIGNAL(toolCodesSelected(const KoCanvasController*, QList<QString>)),
@@ -379,7 +378,7 @@ void ToolBox::addButton(QToolButton *but
         d->buttonGroup->addButton(button, buttonGroupId);
+}
-void ToolBox::setActiveTool(const KoCanvasController *canvas, int id)
+void ToolBox::setActiveTool(KoCanvasController *canvas, int id)
+{
     if (canvas->canvas() != d->canvas)
         return;
@@ -387,7 +386,7 @@ void ToolBox::setActiveTool(const KoCanv
     if (button)
         button->setChecked(true);
     else
-        kWarning(30004) << "KoToolBox::setActiveTool(" << id << "): no such button found\n";
+        kWarning(30004) << "ToolBox::setActiveTool(" << id << "): no such button found";
+}
 void ToolBox::setButtonsVisible(const KoCanvasController *canvas, const QList<QString> &codes)
@@ -475,14 +474,14 @@ void ToolBox::paintEvent(QPaintEvent *)
     painter.end();
+}
-KoToolBoxDocker::KoToolBoxDocker(ToolBox *toolBox)
+ToolBoxDocker::ToolBoxDocker(ToolBox *toolBox)
     : m_toolBox(toolBox)
+{
     setFeatures(QDockWidget::DockWidgetMovable | QDockWidget::DockWidgetFloatable);
     setWidget(toolBox);
+}
-void KoToolBoxDocker::setCanvas(KoCanvasBase *canvas)
+void ToolBoxDocker::setCanvas(KoCanvasBase *canvas)
+{
     m_toolBox->setCanvas(canvas);
+}

Up to file-list src/import/ToolBoxFactory.cpp:

@@ -58,7 +58,7 @@ KoDockFactory::DockPosition ToolBoxFacto
 QDockWidget* ToolBoxFactory::createDockWidget()
+{
     ToolBox *box = new ToolBox(d->canvas);
-    KoToolBoxDocker *docker = new KoToolBoxDocker(box);
+    ToolBoxDocker *docker = new ToolBoxDocker(box);
     docker->setWindowTitle(d->appName);
     docker->setObjectName("ToolBox_"+ d->appName);

Up to file-list src/import/ToolBox_p.h:

 #include <QtCore/QHash>
 #include <QtGui/QDockWidget>
 class QButtonGroup;
 class QBoxLayout;
 class QToolButton;
 class ToolArea;
 class KoCanvasController;
 class KoCanvasBase;
 class KoShapeLayer;
 /**
- * KoToolBox is a dock widget that can order tools according to type and
+ * ToolBox is a dock widget that can order tools according to type and
  * priority.
+ *
  * The ToolBox is a container for tool buttons which are themselves
@@ -78,7 +75,7 @@ public slots:
      * @param canvas the currently active canvas.
      * @param id an id to identify the button to activate.
      */
-    void setActiveTool(const KoCanvasController *canvas, int id);
+    void setActiveTool(KoCanvasController *canvas, int id);
     /**
      * Show only the dynamic buttons that have a code from parameter codes.
@@ -104,10 +101,10 @@ private:
     Private * const d;
 };
-class KoToolBoxDocker : public QDockWidget, public KoCanvasObserver
+class ToolBoxDocker : public QDockWidget, public KoCanvasObserver
+{
 public:
-    KoToolBoxDocker(ToolBox *toolBox);
+    ToolBoxDocker(ToolBox *toolBox);
     /// reimplemented from KoCanvasObserver
     virtual void setCanvas(KoCanvasBase *canvas);

commit 458:	478d373c7d75
parent 457:	0ba7a9ddf219
branch:	flake-2.1