diff --git a/sdrgui/gui/glspectrumgui.cpp b/sdrgui/gui/glspectrumgui.cpp
index cd7793d5e..91cc244fa 100644
--- a/sdrgui/gui/glspectrumgui.cpp
+++ b/sdrgui/gui/glspectrumgui.cpp
@@ -50,16 +50,18 @@ GLSpectrumGUI::GLSpectrumGUI(QWidget* parent) :
// Use the custom flow layout for the 3 main horizontal layouts (lines)
ui->verticalLayout->removeItem(ui->Line5Layout);
+ ui->verticalLayout->removeItem(ui->Line6Layout);
ui->verticalLayout->removeItem(ui->Line4Layout);
ui->verticalLayout->removeItem(ui->Line3Layout);
ui->verticalLayout->removeItem(ui->Line2Layout);
ui->verticalLayout->removeItem(ui->Line1Layout);
FlowLayout *flowLayout = new FlowLayout(nullptr, 1, 1, 1);
- flowLayout->addItem(ui->Line3Layout);
- flowLayout->addItem(ui->Line4Layout);
flowLayout->addItem(ui->Line1Layout);
flowLayout->addItem(ui->Line2Layout);
+ flowLayout->addItem(ui->Line3Layout);
+ flowLayout->addItem(ui->Line4Layout);
flowLayout->addItem(ui->Line5Layout);
+ flowLayout->addItem(ui->Line6Layout);
ui->verticalLayout->addItem(flowLayout);
on_linscale_toggled(false);
diff --git a/sdrgui/gui/glspectrumgui.ui b/sdrgui/gui/glspectrumgui.ui
index d0b6a4fc9..559a1afa1 100644
--- a/sdrgui/gui/glspectrumgui.ui
+++ b/sdrgui/gui/glspectrumgui.ui
@@ -7,7 +7,7 @@
0
0
630
- 151
+ 250
@@ -37,6 +37,452 @@
-
+
+ 1
+
+
-
+
+
+ Toggle the scale grid
+
+
+ Grid
+
+
+
+ :/gridrect.png:/gridrect.png
+
+
+
+ 16
+ 16
+
+
+
+ true
+
+
+
+ -
+
+
+
+ 24
+ 24
+
+
+
+ ArrowCursor
+
+
+ Grid intensity
+
+
+ 100
+
+
+ 1
+
+
+ 5
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Clear spectrum histogram
+
+
+
+
+
+
+ :/clear.png:/clear.png
+
+
+
+ 16
+ 16
+
+
+
+
+ -
+
+
+ Display phosphor effect spectrum
+
+
+ Histogram
+
+
+
+ :/bell_phosphor.png:/bell_phosphor.png
+
+
+
+ 16
+ 16
+
+
+
+ true
+
+
+
+ -
+
+
+ Display max hold
+
+
+ Max Hold
+
+
+
+ :/bell_max.png:/bell_max.png
+
+
+
+ 16
+ 16
+
+
+
+ true
+
+
+
+ -
+
+
+
+ 24
+ 24
+
+
+
+ Decay:
+
+
+ 20
+
+
+ 1
+
+
+
+ -
+
+
+
+ 24
+ 24
+
+
+
+ Decay divisor:
+
+
+ 1
+
+
+ 20
+
+
+ 1
+
+
+
+ -
+
+
+
+ 24
+ 24
+
+
+
+ Stroke:
+
+
+ 1
+
+
+ 60
+
+
+ 1
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ 5
+ 22
+
+
+
+
+
+
+
+
+
+ -
+
+
-
+
+
+ Display live spectrum line style
+
+
+ Max Hold
+
+
+
+ :/bell_line.png:/bell_line.png
+
+
+
+ 16
+ 16
+
+
+
+ true
+
+
+
+ -
+
+
+ Display live spectrum fill style
+
+
+ Max Hold
+
+
+
+ :/bell_fill.png:/bell_fill.png
+
+
+
+ 16
+ 16
+
+
+
+ true
+
+
+
+ -
+
+
+ Display live spectrum gradient style
+
+
+ Max Hold
+
+
+
+ :/bell_gradient.png:/bell_gradient.png
+
+
+
+ 16
+ 16
+
+
+
+ true
+
+
+
+ -
+
+
+
+ 24
+ 24
+
+
+
+ Trace intensity
+
+
+ 100
+
+
+ 1
+
+
+ 50
+
+
+
+ -
+
+
+
+ 70
+ 0
+
+
+
+
+ 80
+ 16777215
+
+
+
+ Color Map
+
+
+
+
+
+ -
+
+
-
+
+
+ Exchange waterfall and spectrum
+
+
+ Inv
+
+
+
+ :/flip_windows.png:/flip_windows.png
+
+
+
+ 16
+ 16
+
+
+
+ true
+
+
+
+ -
+
+
+ Display waterfall
+
+
+ Waterfall
+
+
+
+ :/waterfall.png:/waterfall.png
+
+
+
+ 16
+ 16
+
+
+
+ true
+
+
+ false
+
+
+
+ -
+
+
+ Display 3D spectrogram
+
+
+ 3D Spectrogram
+
+
+
+ :/waterfall_3d.png:/waterfall_3d.png
+
+
+
+ 16
+ 16
+
+
+
+ true
+
+
+ false
+
+
+
+ -
+
+
+
+ 80
+ 0
+
+
+
+
+ 80
+ 16777215
+
+
+
+ 3D Spectrogram Style
+
+
-
+
+ Points
+
+
+ -
+
+ Lines
+
+
+ -
+
+ Solid
+
+
+ -
+
+ Outline
+
+
+ -
+
+ Shaded
+
+
+
+
+
+
+ -
+
1
@@ -388,7 +834,7 @@
-
-
+
1
@@ -561,449 +1007,7 @@
-
-
-
- 1
-
-
-
-
-
- Toggle the scale grid
-
-
- Grid
-
-
-
- :/grid.png:/grid.png
-
-
-
- 16
- 16
-
-
-
- true
-
-
-
- -
-
-
-
- 24
- 24
-
-
-
- ArrowCursor
-
-
- Grid intensity
-
-
- 100
-
-
- 1
-
-
- 5
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Clear spectrum histogram
-
-
-
-
-
-
- :/clear.png:/clear.png
-
-
-
- 16
- 16
-
-
-
-
- -
-
-
- Display phosphor effect spectrum
-
-
- Histogram
-
-
-
- :/histogram.png:/histogram.png
-
-
-
- 16
- 16
-
-
-
- true
-
-
-
- -
-
-
- Display max hold
-
-
- Max Hold
-
-
-
- :/bell_red.png:/bell_red.png
-
-
-
- 16
- 16
-
-
-
- true
-
-
-
- -
-
-
-
- 24
- 24
-
-
-
- Decay:
-
-
- 20
-
-
- 1
-
-
-
- -
-
-
-
- 24
- 24
-
-
-
- Decay divisor:
-
-
- 1
-
-
- 20
-
-
- 1
-
-
-
- -
-
-
-
- 24
- 24
-
-
-
- Stroke:
-
-
- 1
-
-
- 60
-
-
- 1
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 5
- 22
-
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
- Display live spectrum
-
-
- Max Hold
-
-
-
- :/bell_line.png:/bell_line.png
-
-
-
- 16
- 16
-
-
-
- true
-
-
-
- -
-
-
- Display live spectrum
-
-
- Max Hold
-
-
-
- :/bell_fill.png:/bell_fill.png
-
-
-
- 16
- 16
-
-
-
- true
-
-
-
- -
-
-
- Display live spectrum
-
-
- Max Hold
-
-
-
- :/bell_gradient.png:/bell_gradient.png
-
-
-
- 16
- 16
-
-
-
- true
-
-
-
- -
-
-
-
- 24
- 24
-
-
-
- Trace intensity
-
-
- 100
-
-
- 1
-
-
- 50
-
-
-
- -
-
-
-
- 70
- 0
-
-
-
-
- 80
- 16777215
-
-
-
- Color Map
-
-
-
- -
-
-
- Exchange waterfall and histogram
-
-
- Inv
-
-
-
- :/invertspectrum.png:/invertspectrum.png
-
-
-
- 16
- 16
-
-
-
- true
-
-
-
- -
-
-
- Display waterfall
-
-
- Waterfall
-
-
-
- :/waterfall.png:/waterfall.png
-
-
-
- 16
- 16
-
-
-
- true
-
-
- false
-
-
-
- -
-
-
- Display 3D spectrogram
-
-
- 3D Spectrogram
-
-
-
- :/3dspectrogram.png:/3dspectrogram.png
-
-
-
- 16
- 16
-
-
-
- true
-
-
- false
-
-
-
- -
-
-
-
- 80
- 0
-
-
-
-
- 80
- 16777215
-
-
-
- 3D Spectrogram Style
-
-
-
-
- Points
-
-
- -
-
- Lines
-
-
- -
-
- Solid
-
-
- -
-
- Outline
-
-
- -
-
- Shaded
-
-
-
-
-
-
- -
-
+
-
diff --git a/sdrgui/resources/bell_max.png b/sdrgui/resources/bell_max.png
new file mode 100644
index 000000000..552c72c80
Binary files /dev/null and b/sdrgui/resources/bell_max.png differ
diff --git a/sdrgui/resources/bell_phosphor.png b/sdrgui/resources/bell_phosphor.png
new file mode 100644
index 000000000..0ab140f10
Binary files /dev/null and b/sdrgui/resources/bell_phosphor.png differ
diff --git a/sdrgui/resources/flip_windows.png b/sdrgui/resources/flip_windows.png
new file mode 100644
index 000000000..33e282451
Binary files /dev/null and b/sdrgui/resources/flip_windows.png differ
diff --git a/sdrgui/resources/res.qrc b/sdrgui/resources/res.qrc
index c3db0a837..c62dcd600 100644
--- a/sdrgui/resources/res.qrc
+++ b/sdrgui/resources/res.qrc
@@ -1,5 +1,9 @@
+ flip_windows.png
+ waterfall_3d.png
+ bell_max.png
+ bell_phosphor.png
bell_red.png
bell_fill.png
bell_gradient.png
diff --git a/sdrgui/resources/waterfall.png b/sdrgui/resources/waterfall.png
index 9e520906e..4f6d44416 100644
Binary files a/sdrgui/resources/waterfall.png and b/sdrgui/resources/waterfall.png differ
diff --git a/sdrgui/resources/waterfall2.png b/sdrgui/resources/waterfall2.png
new file mode 100644
index 000000000..9e520906e
Binary files /dev/null and b/sdrgui/resources/waterfall2.png differ
diff --git a/sdrgui/resources/waterfall_3d.png b/sdrgui/resources/waterfall_3d.png
new file mode 100644
index 000000000..3592846d0
Binary files /dev/null and b/sdrgui/resources/waterfall_3d.png differ