SVN commit 999880 by hzeng:

add two tool buttons


 M  +2 -0      CMakeLists.txt  
 A             icons (directory)  
 M  +3 -0      mainwindow.cpp  
 M  +2 -0      mainwindow.h  
 M  +20 -0     toolbox.cpp  
 M  +9 -0      toolbox.h  
 M  +8 -3      toolbutton.cpp  
 M  +1 -1      toolbutton.h  


--- trunk/playground/games/kolf-ng/textureblender/CMakeLists.txt #999879:999880
@@ -14,6 +14,8 @@
 	mainwindow.cpp
 	texturelistdelegate.cpp
 	texturelistmodel.cpp
+	toolbox.cpp
+	toolbutton.cpp
 )
 
 kde4_add_executable(kolf-textureblender ${kolf_textureblender_SRCS})
--- trunk/playground/games/kolf-ng/textureblender/mainwindow.cpp #999879:999880
@@ -20,6 +20,7 @@
 #include "heightmap.h"
 #include "imageviewer.h"
 #include "configwidget.h"
+#include "toolbox.h"
 #include <QDockWidget>
 #include <QFileDialog>
 #include <QList>
@@ -137,6 +138,7 @@
 	m_configTab = new QTabWidget(m_configDock);
 	m_configTab->addTab(m_view, tr("Loaded Textures"));
 	m_configTab->addTab(m_configWidget, tr("Other Properties"));
+	m_configTab->addTab(m_toolBox, tr("Tool Box"));
 	m_configDock->setWidget(m_configTab);
 
 }
@@ -144,6 +146,7 @@
 void MainWindow::createWidgets()
 {
 	m_configWidget = new ConfigWidget(this);
+	m_toolBox = new ToolBox(this);
 }
 
 void MainWindow::addTexture()
--- trunk/playground/games/kolf-ng/textureblender/mainwindow.h #999879:999880
@@ -31,6 +31,7 @@
 class Texture;
 class TextureListDelegate;
 class TextureListModel;
+class ToolBox;
 
 class MainWindow : public QMainWindow
 {
@@ -73,6 +74,7 @@
 		QTabWidget* m_mainTab;
 		QTabWidget* m_configTab;
 		ConfigWidget* m_configWidget;
+		ToolBox* m_toolBox;
 
 		TextureListModel* m_model;
 		TextureListDelegate* m_delegate;
--- trunk/playground/games/kolf-ng/textureblender/toolbox.cpp #999879:999880
@@ -16,10 +16,30 @@
  *   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  ***************************************************************************/
 
+
 #include "toolbox.h"
+#include "toolbutton.h"
+#include <KIcon>
+#include <QGridLayout>
+
 ToolBox::ToolBox(QWidget* parent)
 	: QWidget(parent)
 {
+	createButtons();
 	QGridLayout *layout = new QGridLayout();
+	layout->setSizeConstraint(QLayout::SetFixedSize);
+	layout->addWidget(m_circleButton, 0, 0);
+	layout->addWidget(m_rectButton, 0, 1);
 	setLayout(layout);	
 }
+
+ToolBox::~ToolBox()
+{
+
+}
+
+void ToolBox::createButtons()
+{
+	m_circleButton = new ToolButton(KIcon("draw-freehand"), this);
+	m_rectButton = new ToolButton(KIcon("select-rectangular"), this);
+}
--- trunk/playground/games/kolf-ng/textureblender/toolbox.h #999879:999880
@@ -19,10 +19,19 @@
 #ifndef TOOLBOX_H
 #define TOOLBOX_H
 
+#include <QWidget>
+
+class ToolButton;
+
 class ToolBox : public QWidget
 {
+	Q_OBJECT
 	public:
 		ToolBox(QWidget* parent = 0);
 		~ToolBox();
+	private:
+		void createButtons();
+		ToolButton* m_circleButton;
+		ToolButton* m_rectButton;
 };
 #endif
--- trunk/playground/games/kolf-ng/textureblender/toolbutton.cpp #999879:999880
@@ -19,13 +19,18 @@
 #include <QSize>
 #include "toolbutton.h"
 
-Button::ToolButton(const QIcon &icon, QWidget *parent)
+ToolButton::ToolButton(const QIcon &icon, QWidget *parent)
 	: QToolButton(parent)
 {
 	setIcon(icon);
 }
 
-QSize Button::sizeHint() const
+ToolButton::~ToolButton()
 {
-	return QSize(16, 16);
+
 }
+
+QSize ToolButton::sizeHint() const
+{
+	return QSize(22, 22);
+}
--- trunk/playground/games/kolf-ng/textureblender/toolbutton.h #999879:999880
@@ -29,7 +29,7 @@
 
 	public:
 		ToolButton(const QIcon &icon, QWidget *parent = 0);
-
+		~ToolButton();
     		QSize sizeHint() const;
 };