Reorder buttons, attempt to suppress close button from first pane

sonic-visualiser · May 17, 2019 · 729b97f · 729b97f
1 parent 4ce1853
commit 729b97f
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 21 deletions.
diff --git a/main/MainWindow.cpp b/main/MainWindow.cpp
@@ -207,6 +207,7 @@ MainWindow::MainWindow(bool withAudioOutput) :
 
     m_paneStack->setResizeMode(PaneStack::AutoResizeOnly);
     m_paneStack->setLayoutStyle(PaneStack::NoPropertyStacks);
+    m_paneStack->setShowCloseButtonOnFirstPane(false);
     m_paneStack->setShowAlignmentViews(true);
     m_mainScroll->setWidget(m_paneStack);
 
@@ -250,59 +251,60 @@ MainWindow::MainWindow(bool withAudioOutput) :
     m_modeButtons[WaveformMode] = button;
 
     button = new QPushButton;
-    button->setIcon(il.load("values"));
-    button->setText(tr("Spectral flux"));
+    button->setIcon(il.load("colour3d"));
+    button->setText(tr("Melodic spectrogram"));
     button->setCheckable(true);
     button->setChecked(false);
     button->setFixedHeight(bottomButtonHeight);
     bg->addButton(button);
     buttonLayout->addWidget(button);
-    connect(button, SIGNAL(clicked()), this, SLOT(curveModeSelected()));
-    m_modeButtons[CurveMode] = button;
+    connect(button, SIGNAL(clicked()), this, SLOT(melodogramModeSelected()));
+    m_modeButtons[MelodogramMode] = button;
 
     button = new QPushButton;
-    button->setIcon(il.load("values"));
-    button->setText(tr("Sung pitch"));
+    button->setIcon(il.load("colour3d"));
+    button->setText(tr("Spectrogram"));
     button->setCheckable(true);
     button->setChecked(false);
     button->setFixedHeight(bottomButtonHeight);
     bg->addButton(button);
     buttonLayout->addWidget(button);
-    connect(button, SIGNAL(clicked()), this, SLOT(pitchModeSelected()));
-    m_modeButtons[PitchMode] = button;
+    connect(button, SIGNAL(clicked()), this, SLOT(spectrogramModeSelected()));
+    m_modeButtons[SpectrogramMode] = button;
 
+/*
     button = new QPushButton;
-    button->setIcon(il.load("colour3d"));
-    button->setText(tr("Stereo azimuth"));
+    button->setIcon(il.load("values"));
+    button->setText(tr("Spectral flux"));
     button->setCheckable(true);
     button->setChecked(false);
     button->setFixedHeight(bottomButtonHeight);
     bg->addButton(button);
     buttonLayout->addWidget(button);
-    connect(button, SIGNAL(clicked()), this, SLOT(azimuthModeSelected()));
-    m_modeButtons[AzimuthMode] = button;
-
+    connect(button, SIGNAL(clicked()), this, SLOT(curveModeSelected()));
+    m_modeButtons[CurveMode] = button;
+*/
     button = new QPushButton;
-    button->setIcon(il.load("colour3d"));
-    button->setText(tr("Spectrogram"));
+    button->setIcon(il.load("values"));
+    button->setText(tr("Sung pitch"));
     button->setCheckable(true);
     button->setChecked(false);
     button->setFixedHeight(bottomButtonHeight);
     bg->addButton(button);
     buttonLayout->addWidget(button);
-    connect(button, SIGNAL(clicked()), this, SLOT(spectrogramModeSelected()));
-    m_modeButtons[SpectrogramMode] = button;
+    connect(button, SIGNAL(clicked()), this, SLOT(pitchModeSelected()));
+    m_modeButtons[PitchMode] = button;
 
     button = new QPushButton;
     button->setIcon(il.load("colour3d"));
-    button->setText(tr("Melodic spectrogram"));
+    button->setText(tr("Stereo azimuth"));
     button->setCheckable(true);
     button->setChecked(false);
     button->setFixedHeight(bottomButtonHeight);
     bg->addButton(button);
     buttonLayout->addWidget(button);
-    connect(button, SIGNAL(clicked()), this, SLOT(melodogramModeSelected()));
-    m_modeButtons[MelodogramMode] = button;
+    connect(button, SIGNAL(clicked()), this, SLOT(azimuthModeSelected()));
+    m_modeButtons[AzimuthMode] = button;
 
     m_playSpeed = new AudioDial(bottomFrame);
     m_playSpeed->setMinimum(0);

diff --git a/repoint-lock.json b/repoint-lock.json
@@ -7,7 +7,7 @@
       "pin": "417528c41e66"
     },
     "svgui": {
-      "pin": "42c87368287c"
+      "pin": "69b7fdd6394f"
     },
     "svapp": {
       "pin": "b375fdbb74bc"