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

List:       kde-commits
Subject:    playground/games/kolf-ng/textureblender
From:       Huan Zeng <zh.issac () gmail ! com>
Date:       2009-07-20 9:35:47
Message-ID: 1248082547.279020.8048.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 999614 by hzeng:

begin to implement heightmap creator, build it inside texture blender temporarily.


 M  +8 -1      mainwindow.cpp  
 M  +2 -0      mainwindow.h  
 A             toolbox.cpp   [License: GPL (v2+)]
 A             toolbox.h   [License: GPL (v2+)]
 A             toolbutton.cpp   [License: GPL (v2+)]
 A             toolbutton.h   [License: GPL (v2+)]


--- trunk/playground/games/kolf-ng/textureblender/mainwindow.cpp #999613:999614
@@ -121,12 +121,19 @@
 {
 	m_resultWidget = new ImageViewer(this);
 	m_resultWidget->setLeftText(tr("No heightmap loaded"));
-	setCentralWidget(m_resultWidget);
 
+	m_heightmapWidget = new ImageViewer(this);
+	m_heightmapWidget->setLeftText(tr("Heightmap creator"));
+
 	m_configDock = new QDockWidget(tr("Property Editor"), this);
 	m_configDock->setAllowedAreas(Qt::RightDockWidgetArea);
 	addDockWidget(Qt::RightDockWidgetArea, m_configDock);
 
+	m_mainTab = new QTabWidget(centralWidget());
+	m_mainTab->addTab(m_resultWidget, tr("Texture"));
+	m_mainTab->addTab(m_heightmapWidget, tr("Heightmap"));
+	setCentralWidget(m_mainTab);
+
 	m_configTab = new QTabWidget(m_configDock);
 	m_configTab->addTab(m_view, tr("Loaded Textures"));
 	m_configTab->addTab(m_configWidget, tr("Other Properties"));
--- trunk/playground/games/kolf-ng/textureblender/mainwindow.h #999613:999614
@@ -68,7 +68,9 @@
 
 		QToolBar* m_toolBar;
 		ImageViewer* m_resultWidget;
+		ImageViewer* m_heightmapWidget;
 		QDockWidget* m_configDock;
+		QTabWidget* m_mainTab;
 		QTabWidget* m_configTab;
 		ConfigWidget* m_configWidget;
 
[prev in list] [next in list] [prev in thread] [next in thread]