diff --git a/mainwindow.cpp b/mainwindow.cpp
index 936dc34..92d86fc 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -146,6 +146,13 @@ MainWindow::MainWindow(bool portable, const QString &translationsPath, QTranslat
connect(minetestMapper, &MinetestMapperExe::busyStateChanged,
taskbarProgress, &QWinTaskbarProgress::setVisible);
#endif
+
+ // Align the Console and the Help action to the right
+ QWidget *spacerWidget = new QWidget(this);
+ spacerWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
+ spacerWidget->setVisible(true);
+ ui->mainToolBar->insertWidget(ui->actionOutputLog, spacerWidget);
+
minetestMapper->init();
}
@@ -635,6 +642,7 @@ void MainWindow::writeSettings()
settings->setValue("pos", pos());
}
settings->setValue("help", ui->actionHelp->isChecked());
+ settings->setValue("showOutputLog", ui->actionOutputLog->isChecked());
settings->setValue("profile", currentProfile);
settings->setValue("expertMode",ui->actionExpert_Mode->isChecked());
settings->setValue("openMap",ui->actionOpen_map_after_creation->isChecked());
@@ -738,6 +746,9 @@ void MainWindow::readSettings()
if(settings->value("help",false).toBool()==false){
ui->dockHelp->close();
}
+ if(settings->value("showOutputLog",false).toBool()==false){
+ ui->dockOutput->close();
+ }
currentProfile = settings->value("profile","default").toString();
ui->actionExpert_Mode->setChecked(settings->value("expertMode",false).toBool());
ui->actionOpen_map_after_creation->setChecked(settings->value("openMap",true).toBool());
diff --git a/mainwindow.ui b/mainwindow.ui
index f9b9d0c..ba19602 100644
--- a/mainwindow.ui
+++ b/mainwindow.ui
@@ -7,7 +7,7 @@
0
0
1061
- 605
+ 754
@@ -2343,65 +2343,6 @@ Nodes higher than this level will not be drawn. This can be used to avoid floati
-
-
- MinetestMapper Output
-
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
- -
-
-
-
- Courier New
-
-
-
- false
-
-
- true
-
-
-
- -
-
-
-
-
-
- Select all
-
-
-
- -
-
-
- Copy
-
-
-
- -
-
-
- Clear
-
-
-
-
-
-
-
-
@@ -2497,6 +2438,7 @@ Nodes higher than this level will not be drawn. This can be used to avoid floati
+
@@ -2519,6 +2461,8 @@ Nodes higher than this level will not be drawn. This can be used to avoid floati
+
+
@@ -2628,6 +2572,74 @@ p, li { white-space: pre-wrap; }
+
+
+
+ :/images/text.svg:/images/text.svg
+
+
+ false
+
+
+ QDockWidget::DockWidgetFeatureMask
+
+
+ Output log
+
+
+ 8
+
+
+
+
-
+
+
+
+ Courier New
+
+
+
+ false
+
+
+ true
+
+
+
+ -
+
+
-
+
+
+ Clear
+
+
+
+ -
+
+
+
+ 0
+ 28
+
+
+
+ Copy
+
+
+
+ -
+
+
+ Select all
+
+
+
+
+
+
+
+
@@ -2820,6 +2832,27 @@ p, li { white-space: pre-wrap; }
Open &Terminal
+
+ T
+
+
+
+
+ true
+
+
+
+ :/images/text.svg:/images/text.svg
+
+
+ Output &Log
+
+
+ Shows / Hides Output Log
+
+
+ Ctrl+L
+
@@ -2907,406 +2940,6 @@ p, li { white-space: pre-wrap; }
-
- heightmapColor
- toggled(bool)
- colorHeightmap
- setEnabled(bool)
-
-
- 98
- 302
-
-
- 354
- 303
-
-
-
-
- heightmapFile
- toggled(bool)
- path_HeightmapColors
- setEnabled(bool)
-
-
- 98
- 338
-
-
- 354
- 339
-
-
-
-
- actionOpen_World
- triggered()
- browseWorld
- click()
-
-
- -1
- -1
-
-
- 395
- 169
-
-
-
-
- actionSave_map_as
- triggered()
- saveImage
- click()
-
-
- -1
- -1
-
-
- 526
- 245
-
-
-
-
- generateHeightmap
- toggled(bool)
- scrollArea
- setEnabled(bool)
-
-
- 214
- 132
-
-
- 277
- 234
-
-
-
-
- checkBox_minY
- toggled(bool)
- minY
- setEnabled(bool)
-
-
- 87
- 185
-
-
- 292
- 186
-
-
-
-
- checkBox_maxY
- toggled(bool)
- maxY
- setEnabled(bool)
-
-
- 97
- 214
-
-
- 293
- 215
-
-
-
-
- tiles_sizeAndBorder
- toggled(bool)
- tilesize
- setEnabled(bool)
-
-
- 167
- 200
-
-
- 356
- 201
-
-
-
-
- tiles
- toggled(bool)
- scrollArea_2
- setEnabled(bool)
-
-
- 88
- 132
-
-
- 88
- 241
-
-
-
-
- tiles_sizeAndBorder
- toggled(bool)
- tileborder
- setEnabled(bool)
-
-
- 130
- 200
-
-
- 514
- 201
-
-
-
-
- tiles_coordinates
- toggled(bool)
- tiles_coordinateX
- setEnabled(bool)
-
-
- 351
- 351
-
-
- 427
- 352
-
-
-
-
- pushButton
- clicked()
- standardOutput
- selectAll()
-
-
- 161
- 525
-
-
- 121
- 289
-
-
-
-
- tiles_coordinates
- toggled(bool)
- tiles_coordinateY
- setEnabled(bool)
-
-
- 351
- 351
-
-
- 502
- 352
-
-
-
-
- pushButton_2
- clicked()
- standardOutput
- copy()
-
-
- 367
- 525
-
-
- 332
- 283
-
-
-
-
- pushButton_3
- clicked()
- standardOutput
- clear()
-
-
- 548
- 525
-
-
- 424
- 268
-
-
-
-
- selectBgColor
- clicked()
- bgcolor
- selectColor()
-
-
- 538
- 204
-
-
- 431
- 200
-
-
-
-
- selectBlockColor
- clicked()
- blockcolor
- selectColor()
-
-
- 538
- 240
-
-
- 431
- 236
-
-
-
-
- selectScaleColor
- clicked()
- scalecolor
- selectColor()
-
-
- 538
- 276
-
-
- 431
- 272
-
-
-
-
- selectOriginColor
- clicked()
- origincolor
- selectColor()
-
-
- 538
- 312
-
-
- 431
- 308
-
-
-
-
- selectPlayerColor
- clicked()
- playercolor
- selectColor()
-
-
- 538
- 348
-
-
- 431
- 344
-
-
-
-
- selectTileBorderColor
- clicked()
- tilebordercolor
- selectColor()
-
-
- 538
- 384
-
-
- 431
- 380
-
-
-
-
- heightscaleInterval
- toggled(bool)
- heightscaleIntervalMajor
- setEnabled(bool)
-
-
- 149
- 438
-
-
- 369
- 439
-
-
-
-
- heightscaleInterval
- toggled(bool)
- heightscaleIntervalMinor
- setEnabled(bool)
-
-
- 149
- 438
-
-
- 504
- 439
-
-
-
-
- sidescaleInterval
- toggled(bool)
- sidescaleIntervalMajor
- setEnabled(bool)
-
-
- 108
- 186
-
-
- 444
- 188
-
-
-
-
- sidescaleInterval
- toggled(bool)
- sidescaleIntervalMinor
- setEnabled(bool)
-
-
- 108
- 186
-
-
- 444
- 217
-
-
-
pushButton_4
clicked()
@@ -3419,6 +3052,134 @@ p, li { white-space: pre-wrap; }
+
+ checkBox_maxY
+ toggled(bool)
+ maxY
+ setEnabled(bool)
+
+
+ 97
+ 214
+
+
+ 293
+ 215
+
+
+
+
+ checkBox_minY
+ toggled(bool)
+ minY
+ setEnabled(bool)
+
+
+ 87
+ 185
+
+
+ 292
+ 186
+
+
+
+
+ heightmapColor
+ toggled(bool)
+ colorHeightmap
+ setEnabled(bool)
+
+
+ 98
+ 302
+
+
+ 354
+ 303
+
+
+
+
+ generateHeightmap
+ toggled(bool)
+ scrollArea
+ setEnabled(bool)
+
+
+ 214
+ 132
+
+
+ 277
+ 234
+
+
+
+
+ actionOpen_World
+ triggered()
+ browseWorld
+ click()
+
+
+ -1
+ -1
+
+
+ 395
+ 169
+
+
+
+
+ heightmapFile
+ toggled(bool)
+ path_HeightmapColors
+ setEnabled(bool)
+
+
+ 98
+ 338
+
+
+ 354
+ 339
+
+
+
+
+ actionSave_map_as
+ triggered()
+ saveImage
+ click()
+
+
+ -1
+ -1
+
+
+ 526
+ 245
+
+
+
+
+ tiles_sizeAndBorder
+ toggled(bool)
+ tileborder
+ setEnabled(bool)
+
+
+ 130
+ 200
+
+
+ 514
+ 201
+
+
+
selectHeightmapColor
clicked()
@@ -3435,12 +3196,268 @@ p, li { white-space: pre-wrap; }
+
+ selectBlockColor
+ clicked()
+ blockcolor
+ selectColor()
+
+
+ 538
+ 240
+
+
+ 431
+ 236
+
+
+
+
+ sidescaleInterval
+ toggled(bool)
+ sidescaleIntervalMinor
+ setEnabled(bool)
+
+
+ 108
+ 186
+
+
+ 444
+ 217
+
+
+
+
+ tiles_coordinates
+ toggled(bool)
+ tiles_coordinateY
+ setEnabled(bool)
+
+
+ 351
+ 351
+
+
+ 502
+ 352
+
+
+
+
+ heightscaleInterval
+ toggled(bool)
+ heightscaleIntervalMajor
+ setEnabled(bool)
+
+
+ 149
+ 438
+
+
+ 369
+ 439
+
+
+
+
+ selectScaleColor
+ clicked()
+ scalecolor
+ selectColor()
+
+
+ 538
+ 276
+
+
+ 431
+ 272
+
+
+
+
+ selectPlayerColor
+ clicked()
+ playercolor
+ selectColor()
+
+
+ 538
+ 348
+
+
+ 431
+ 344
+
+
+
+
+ sidescaleInterval
+ toggled(bool)
+ sidescaleIntervalMajor
+ setEnabled(bool)
+
+
+ 108
+ 186
+
+
+ 444
+ 188
+
+
+
+
+ tiles_coordinates
+ toggled(bool)
+ tiles_coordinateX
+ setEnabled(bool)
+
+
+ 351
+ 351
+
+
+ 427
+ 352
+
+
+
+
+ selectOriginColor
+ clicked()
+ origincolor
+ selectColor()
+
+
+ 538
+ 312
+
+
+ 431
+ 308
+
+
+
+
+ selectBgColor
+ clicked()
+ bgcolor
+ selectColor()
+
+
+ 538
+ 204
+
+
+ 431
+ 200
+
+
+
+
+ heightscaleInterval
+ toggled(bool)
+ heightscaleIntervalMinor
+ setEnabled(bool)
+
+
+ 149
+ 438
+
+
+ 504
+ 439
+
+
+
+
+ selectTileBorderColor
+ clicked()
+ tilebordercolor
+ selectColor()
+
+
+ 538
+ 384
+
+
+ 431
+ 380
+
+
+
+
+ tiles_sizeAndBorder
+ toggled(bool)
+ tilesize
+ setEnabled(bool)
+
+
+ 167
+ 200
+
+
+ 356
+ 201
+
+
+
+
+ tiles
+ toggled(bool)
+ scrollArea_2
+ setEnabled(bool)
+
+
+ 88
+ 132
+
+
+ 88
+ 241
+
+
+
+
+ actionOutputLog
+ triggered(bool)
+ dockOutput
+ setVisible(bool)
+
+
+ -1
+ -1
+
+
+ 530
+ 654
+
+
+
+
+ dockOutput
+ visibilityChanged(bool)
+ actionOutputLog
+ setChecked(bool)
+
+
+ 530
+ 654
+
+
+ -1
+ -1
+
+
+
-
-
+
+