Browse code

Tweaked default dockwidget configuration

* Tabify the Terrains dock with the Tilesets dock
* Show the Layers and Tilesets docks in front by default
* Shortened "Terrain Types" to "Terrains"
* Fixed the objectName of the terrain dock, which caused it to share
settings with the tileset dock

Thorbjørn Lindeijer authored on 04/06/2012 19:24:50
Showing 2 changed files
... ...
@@ -166,11 +166,12 @@ MainWindow::MainWindow(QWidget *parent, Qt::WFlags flags)
166 166
 
167 167
     addDockWidget(Qt::RightDockWidgetArea, mLayerDock);
168 168
     addDockWidget(Qt::RightDockWidgetArea, undoDock);
169
-    tabifyDockWidget(undoDock, mLayerDock);
170 169
     addDockWidget(Qt::RightDockWidgetArea, mObjectsDock);
171
-    tabifyDockWidget(mLayerDock, mObjectsDock);
172 170
     addDockWidget(Qt::RightDockWidgetArea, mTerrainDock);
173 171
     addDockWidget(Qt::RightDockWidgetArea, mTilesetDock);
172
+    tabifyDockWidget(undoDock, mObjectsDock);
173
+    tabifyDockWidget(mObjectsDock, mLayerDock);
174
+    tabifyDockWidget(mTerrainDock, mTilesetDock);
174 175
 
175 176
     statusBar()->addPermanentWidget(mZoomComboBox);
176 177
 
... ...
@@ -70,7 +70,7 @@ TerrainDock::TerrainDock(QWidget *parent):
70 70
     mTerrainMenu(new QMenu(this)),
71 71
     mTerrainMenuMapper(0)
72 72
 {
73
-    setObjectName(QLatin1String("TilesetDock"));
73
+    setObjectName(QLatin1String("TerrainDock"));
74 74
 
75 75
     mTabBar->setMovable(true);
76 76
     mTabBar->setUsesScrollButtons(true);
... ...
@@ -385,7 +385,7 @@ void TerrainDock::setCurrentTerrain(Terrain *terrain)
385 385
 
386 386
 void TerrainDock::retranslateUi()
387 387
 {
388
-    setWindowTitle(tr("Terrain Types"));
388
+    setWindowTitle(tr("Terrains"));
389 389
 }
390 390
 
391 391
 Tileset *TerrainDock::currentTileset() const