diff --git a/sdrgui/mainwindow.cpp b/sdrgui/mainwindow.cpp
index 5c445b03d..b83f6446b 100644
--- a/sdrgui/mainwindow.cpp
+++ b/sdrgui/mainwindow.cpp
@@ -534,8 +534,6 @@ void MainWindow::loadSettings()
treeItem = addCommandToTree(m_settings.getCommand(i));
}
- tabifyDockWidget(ui->presetDock, ui->commandsDock);
-
setLoggingOptions();
}
@@ -565,6 +563,8 @@ void MainWindow::loadPresetSettings(const Preset* preset, int tabIndex)
// has to be last step
restoreState(preset->getLayout());
+ tabifyDockWidget(ui->presetDock, ui->commandsDock); // override this setting
+ ui->presetDock->raise();
}
void MainWindow::savePresetSettings(Preset* preset, int tabIndex)
@@ -1076,7 +1076,7 @@ void MainWindow::on_presetSave_clicked()
void MainWindow::on_presetUpdate_clicked()
{
QTreeWidgetItem* item = ui->presetTree->currentItem();
- const Preset* changedPreset;
+ const Preset* changedPreset = 0;
if(item != 0)
{
diff --git a/sdrgui/mainwindow.ui b/sdrgui/mainwindow.ui
index 5e80b5605..59f7dc4e6 100644
--- a/sdrgui/mainwindow.ui
+++ b/sdrgui/mainwindow.ui
@@ -301,8 +301,11 @@
1
-
-
+
+
+
+ 3
+
2
@@ -315,104 +318,7 @@
2
-
- 3
-
- -
-
-
- Update selected preset with current settings
-
-
- ...
-
-
-
- :/recycle.png:/recycle.png
-
-
-
- 16
- 16
-
-
-
-
- -
-
-
- Edit preset details
-
-
-
-
-
-
- :/edit.png:/edit.png
-
-
-
- -
-
-
- Export current preset to file
-
-
-
-
-
-
- :/export.png:/export.png
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
- Save the current settings (inc. presets)
-
-
- ...
-
-
-
- :/save.png:/save.png
-
-
-
- 16
- 16
-
-
-
-
- -
+
-
10
@@ -446,79 +352,177 @@
- -
-
-
- Import preset from file into current group
-
-
-
-
-
-
- :/import.png:/import.png
-
-
-
- -
-
-
- Save current settings as new preset
-
-
- ...
-
-
-
- :/create.png:/create.png
-
-
-
- 16
- 16
-
-
-
-
- -
-
-
- Load selected preset
-
-
- ...
-
-
-
- :/load.png:/load.png
-
-
-
- 16
- 16
-
-
-
-
- -
-
-
- Delete selected preset
-
-
- ...
-
-
-
- :/bin.png:/bin.png
-
-
-
- 16
- 16
-
-
-
+
-
+
+
-
+
+
+ Save current settings as new preset
+
+
+ ...
+
+
+
+ :/create.png:/create.png
+
+
+
+ 16
+ 16
+
+
+
+
+ -
+
+
+ Update selected preset with current settings
+
+
+ ...
+
+
+
+ :/recycle.png:/recycle.png
+
+
+
+ 16
+ 16
+
+
+
+
+ -
+
+
+ Save the current settings (inc. presets)
+
+
+ ...
+
+
+
+ :/save.png:/save.png
+
+
+
+ 16
+ 16
+
+
+
+
+ -
+
+
+ Edit preset details
+
+
+
+
+
+
+ :/edit.png:/edit.png
+
+
+
+ -
+
+
+ Export current preset to file
+
+
+
+
+
+
+ :/export.png:/export.png
+
+
+
+ -
+
+
+ Import preset from file into current group
+
+
+
+
+
+
+ :/import.png:/import.png
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+ Delete selected preset
+
+
+ ...
+
+
+
+ :/bin.png:/bin.png
+
+
+
+ 16
+ 16
+
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 40
+ 20
+
+
+
+
+ -
+
+
+ Load selected preset
+
+
+ ...
+
+
+
+ :/load.png:/load.png
+
+
+
+ 16
+ 16
+
+
+
+
+
@@ -617,18 +621,6 @@
-
-
- 6
-
-
- 6
-
-
- 6
-
-
- 6
-
-
@@ -924,7 +916,6 @@
presetTree
- presetSave