branches/koffice/1.6/koffice/krita/plugins/tools

[Sander Koning]

SVN commit 582436 by skoning:

Change tool order so that more commonly used tools come first (and the order as
it was in 1.5 is mostly restored)

CCMAIL:kimageshop at kde.org



 M  +1 -0      defaulttools/kis_tool_duplicate.h  
 M  +2 -1      defaulttools/kis_tool_fill.h  
 M  +2 -1      defaulttools/kis_tool_gradient.h  
 M  +2 -1      defaulttools/kis_tool_pan.h  
 M  +1 -0      defaulttools/kis_tool_text.h  
 M  +1 -1      defaulttools/kis_tool_zoom.h  
 M  +2 -1      tool_curves/kis_tool_bezier_paint.h  
 M  +1 -0      tool_curves/kis_tool_bezier_select.h  
 M  +1 -0      tool_curves/kis_tool_moutline.h  
 M  +1 -0      tool_filter/kis_tool_filter.h  
 M  +1 -1      tool_perspectivegrid/kis_tool_perspectivegrid.h  
 M  +1 -1      tool_perspectivetransform/kis_tool_perspectivetransform.h  
 M  +1 -0      tool_star/kis_tool_star.h  
 M  +1 -1      tool_transform/kis_tool_transform.h  


--- branches/koffice/1.6/koffice/krita/plugins/tools/defaulttools/kis_tool_duplicate.h #582435:582436
@@ -41,6 +41,7 @@
   
     virtual void setup(KActionCollection *collection);
     virtual enumToolType toolType() { return TOOL_FREEHAND; }
+    virtual Q_UINT32 priority() { return 0; }
     virtual void buttonPress(KisButtonPressEvent *e);
     virtual void move(KisMoveEvent *e);
     
--- branches/koffice/1.6/koffice/krita/plugins/tools/defaulttools/kis_tool_fill.h #582435:582436
@@ -44,7 +44,8 @@
     virtual ~KisToolFill();
 
     virtual void setup(KActionCollection *collection);
-        virtual enumToolType toolType() { return TOOL_FILL; }
+    virtual enumToolType toolType() { return TOOL_FILL; }
+    virtual Q_UINT32 priority() { return 0; }
 
     virtual void update(KisCanvasSubject *subject);
 
--- branches/koffice/1.6/koffice/krita/plugins/tools/defaulttools/kis_tool_gradient.h #582435:582436
@@ -54,7 +54,8 @@
     virtual ~KisToolGradient();
 
     virtual void setup(KActionCollection *collection);
-        virtual enumToolType toolType() { return TOOL_FILL; }
+    virtual enumToolType toolType() { return TOOL_FILL; }
+    virtual Q_UINT32 priority() { return 1; }
 
     virtual void update(KisCanvasSubject *subject);
 
--- branches/koffice/1.6/koffice/krita/plugins/tools/defaulttools/kis_tool_pan.h #582435:582436
@@ -40,7 +40,8 @@
     virtual void update(KisCanvasSubject *subject);
 
     virtual void setup(KActionCollection *collection);
-        virtual enumToolType toolType() { return TOOL_VIEW; }
+    virtual enumToolType toolType() { return TOOL_VIEW; }
+    virtual Q_UINT32 priority() { return 1; }
 
     virtual void buttonPress(KisButtonPressEvent *e);
     virtual void move(KisMoveEvent *e);
--- branches/koffice/1.6/koffice/krita/plugins/tools/defaulttools/kis_tool_text.h #582435:582436
@@ -42,6 +42,7 @@
     virtual void update(KisCanvasSubject *subject);
     virtual void setup(KActionCollection *collection);
     virtual enumToolType toolType() { return TOOL_FILL; }
+    virtual Q_UINT32 priority() { return 2; }
     virtual void buttonRelease(KisButtonReleaseEvent *e);
 
     virtual QWidget* createOptionWidget(QWidget* parent);
--- branches/koffice/1.6/koffice/krita/plugins/tools/defaulttools/kis_tool_zoom.h #582435:582436
@@ -44,7 +44,7 @@
 public:
     virtual void setup(KActionCollection *collection);
     virtual enumToolType toolType() { return TOOL_VIEW; }
-    virtual Q_UINT32 priority() { return 3; }
+    virtual Q_UINT32 priority() { return 2; }
 
     virtual void buttonPress(KisButtonPressEvent *e);
     virtual void move(KisMoveEvent *e);
--- branches/koffice/1.6/koffice/krita/plugins/tools/tool_curves/kis_tool_bezier_paint.h #582435:582436
@@ -36,7 +36,8 @@
 
     virtual void setup(KActionCollection *collection);
     virtual enumToolType toolType() { return TOOL_SHAPE; }
-
+    virtual Q_UINT32 priority() { return 7; }
+    
 protected:
 
     virtual KisCurve::iterator paintPoint(KisPainter& painter, KisCurve::iterator point);
--- branches/koffice/1.6/koffice/krita/plugins/tools/tool_curves/kis_tool_bezier_select.h #582435:582436
@@ -36,6 +36,7 @@
 
     virtual void setup(KActionCollection *collection);
     virtual enumToolType toolType() { return TOOL_SELECT; }
+    virtual Q_UINT32 priority() { return 10; }
 
 protected:
 
--- branches/koffice/1.6/koffice/krita/plugins/tools/tool_curves/kis_tool_moutline.h #582435:582436
@@ -77,6 +77,7 @@
     virtual void update (KisCanvasSubject*);
     virtual void setup (KActionCollection*);
     virtual enumToolType toolType() { return TOOL_SELECT; }
+    virtual Q_UINT32 priority() { return 9; }
 
     virtual void keyPress(QKeyEvent*);
     virtual void buttonPress(KisButtonPressEvent*);
--- branches/koffice/1.6/koffice/krita/plugins/tools/tool_filter/kis_tool_filter.h #582435:582436
@@ -44,6 +44,7 @@
 
     virtual void setup(KActionCollection *collection);
     virtual enumToolType toolType() { return TOOL_FREEHAND; }
+    virtual Q_UINT32 priority() { return 1; }
     virtual QWidget* createOptionWidget(QWidget* parent);
 
 public slots:
--- branches/koffice/1.6/koffice/krita/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.h #582435:582436
@@ -49,7 +49,7 @@
         //
 
     virtual void setup(KActionCollection *collection);
-    virtual Q_UINT32 priority() { return 5; }
+    virtual Q_UINT32 priority() { return 3; }
     virtual enumToolType toolType() { return TOOL_VIEW; }
     virtual void buttonPress(KisButtonPressEvent *event);
     virtual void move(KisMoveEvent *event);
--- branches/koffice/1.6/koffice/krita/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.h #582435:582436
@@ -57,7 +57,7 @@
 
     virtual void setup(KActionCollection *collection);
     virtual enumToolType toolType() { return TOOL_TRANSFORM; }
-    virtual Q_UINT32 priority() { return 0; }
+    virtual Q_UINT32 priority() { return 4; }
     virtual void paint(KisCanvasPainter& gc);
     virtual void paint(KisCanvasPainter& gc, const QRect& rc);
     virtual void buttonPress(KisButtonPressEvent *e);
--- branches/koffice/1.6/koffice/krita/plugins/tools/tool_star/kis_tool_star.h #582435:582436
@@ -53,6 +53,7 @@
 
     virtual void setup(KActionCollection *collection);
     virtual enumToolType toolType() { return TOOL_SHAPE; }
+    virtual Q_UINT32 priority() { return 6; }	
     virtual void buttonPress(KisButtonPressEvent *event);
     virtual void move(KisMoveEvent *event);
     virtual void buttonRelease(KisButtonReleaseEvent *event);
--- branches/koffice/1.6/koffice/krita/plugins/tools/tool_transform/kis_tool_transform.h #582435:582436
@@ -52,7 +52,7 @@
 
     virtual void setup(KActionCollection *collection);
     virtual enumToolType toolType() { return TOOL_TRANSFORM; }
-    virtual Q_UINT32 priority() { return 0; }
+    virtual Q_UINT32 priority() { return 3; }
     virtual void paint(KisCanvasPainter& gc);
     virtual void paint(KisCanvasPainter& gc, const QRect& rc);
     virtual void buttonPress(KisButtonPressEvent *e);