[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    koffice/krita/tools
From:       Boudewijn Rempt <boud () valdyas ! org>
Date:       2005-07-30 10:38:40
Message-ID: 1122719920.232188.12392.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 440393 by rempt:

The popup with brushes etc. will go into the toolbar, not the tool's option widget


 M  +1 -15     kis_tool_brush.cc  
 M  +6 -7      kis_tool_brush.h  


--- trunk/koffice/krita/tools/kis_tool_brush.cc #440392:440393
@@ -48,6 +48,7 @@
 	Q_CHECK_PTR(m_timer);
 
 	connect(m_timer, SIGNAL(timeout()), this, SLOT(timeoutPaint()));
+
 }
 
 KisToolBrush::~KisToolBrush()
@@ -107,21 +108,6 @@
 	}
 }
 
-QWidget* KisToolBrush::createOptionWidget(QWidget* parent)
-{
-	QWidget *widget = super::createOptionWidget(parent);
 
-
-	QPushButton * bnBrushesPopup = new QPushButton(i18n("Brushes"), parent, "brushes");
-	QHBoxLayout * layout = new QHBoxLayout(widget);
-	layout->add( bnBrushesPopup );
-
-	super::addOptionWidgetLayout(layout);
-	
-	return widget;
-	
-}
-
-
 #include "kis_tool_brush.moc"
 
--- trunk/koffice/krita/tools/kis_tool_brush.h #440392:440393
@@ -1,6 +1,4 @@
-/**
- *  kis_tool_brush.h - part of Krita
- *
+/*
  *  Copyright (c) 2003-2004 Boudewijn Rempt <boud@valdyas.org>
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -21,6 +19,7 @@
 #ifndef KIS_TOOL_BRUSH_H_
 #define KIS_TOOL_BRUSH_H_
 
+
 #include "kis_tool_freehand.h"
 
 #include "kis_tool_factory.h"
@@ -28,6 +27,7 @@
 
 class QTimer;
 class KisPoint;
+class QHBoxLayout;
 
 class KRITACORE_EXPORT KisToolBrush : public KisToolFreehand {
 	Q_OBJECT
@@ -40,8 +40,6 @@
 	virtual void setup(KActionCollection *collection);
 	virtual enumToolType toolType() { return TOOL_FREEHAND; }
 
-	QWidget* createOptionWidget(QWidget* parent);
-
 protected:
 	
 	virtual void initPaint(KisEvent *e);
@@ -50,11 +48,12 @@
 private slots:
 
 	virtual void timeoutPaint();
-
+	
 private:
 	Q_INT32 m_rate;
 	QTimer * m_timer;
-	
+
+
 };
 
 class KisToolBrushFactory : public KisToolFactory {
[prev in list] [next in list] [prev in thread] [next in thread]