From 112d2a903b8d18050caafe9169c9e5326794de45 Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@gmail.com>
Date: Wed, 19 Aug 2015 00:13:56 -0400
Subject: [PATCH] Rename View Settings... to Spectrogram Settings... and enable
 it only for...

... spectrogram views, and don't show the Waveforms page.
---
 src/TrackPanel.cpp          | 18 +++++++++---------
 src/TrackPanel.h            |  2 +-
 src/prefs/SpectrumPrefs.cpp |  3 +--
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/TrackPanel.cpp b/src/TrackPanel.cpp
index 6c03d4fdf..b8e8c0f33 100644
--- a/src/TrackPanel.cpp
+++ b/src/TrackPanel.cpp
@@ -293,7 +293,7 @@ enum {
 
    OnWaveformID,
    OnSpectrumID,
-   OnViewSettingsID,
+   OnSpectrogramSettingsID,
 
    OnSplitStereoID,
    OnSplitStereoMonoID,
@@ -342,7 +342,7 @@ BEGIN_EVENT_TABLE(TrackPanel, wxWindow)
     EVT_MENU_RANGE(OnChannelLeftID, OnChannelMonoID,
                TrackPanel::OnChannelChange)
     EVT_MENU_RANGE(OnWaveformID, OnSpectrumID, TrackPanel::OnSetDisplay)
-    EVT_MENU(OnViewSettingsID, TrackPanel::OnViewSettings)
+    EVT_MENU(OnSpectrogramSettingsID, TrackPanel::OnSpectrogramSettings)
     EVT_MENU_RANGE(OnRate8ID, OnRate384ID, TrackPanel::OnRateChange)
     EVT_MENU_RANGE(On16BitID, OnFloatID, TrackPanel::OnFormatChange)
     EVT_MENU(OnRateOtherID, TrackPanel::OnRateOther)
@@ -753,7 +753,7 @@ void TrackPanel::BuildMenus(void)
    BuildCommonDropMenuItems(mWaveTrackMenu);   // does name, up/down etc
    mWaveTrackMenu->AppendRadioItem(OnWaveformID, _("&Waveform"));
    mWaveTrackMenu->AppendRadioItem(OnSpectrumID, _("&Spectrogram"));
-   mWaveTrackMenu->Append(OnViewSettingsID, _("&View Settings..."));
+   mWaveTrackMenu->Append(OnSpectrogramSettingsID, _("S&pectrogram Settings..."));
    mWaveTrackMenu->AppendSeparator();
 
    mChannelItemsInsertionPoint = mWaveTrackMenu->GetMenuItemCount();
@@ -8741,13 +8741,14 @@ void TrackPanel::OnTrackMenu(Track *t)
          }
       }
 
-      const int display = static_cast<WaveTrack *>(t)->GetDisplay();
+      WaveTrack *const track = (WaveTrack *)t;
+      const int display = track->GetDisplay();
       theMenu->Check(
          (display == WaveTrack::Waveform) ? OnWaveformID : OnSpectrumID,
          true
       );
+      theMenu->Enable(OnSpectrogramSettingsID, display == WaveTrack::Spectrum);
 
-      WaveTrack * track = (WaveTrack *)t;
       SetMenuCheck(*mRateMenu, IdOfRate((int) track->GetRate()));
       SetMenuCheck(*mFormatMenu, IdOfFormat(track->GetSampleFormat()));
 
@@ -9287,15 +9288,14 @@ private:
    const int mPage;
 };
 
-void TrackPanel::OnViewSettings(wxCommandEvent &)
+void TrackPanel::OnSpectrogramSettings(wxCommandEvent &)
 {
    WaveTrack *const wt = static_cast<WaveTrack*>(mPopupMenuTarget);
-   WaveformPrefsFactory waveformFactory(wt);
+   // WaveformPrefsFactory waveformFactory(wt);
    SpectrumPrefsFactory spectrumFactory(wt);
 
-   // Put Waveform page first
    PrefsDialog::Factories factories;
-   factories.push_back(&waveformFactory);
+   // factories.push_back(&waveformFactory);
    factories.push_back(&spectrumFactory);
    const int page = (wt->GetDisplay() == WaveTrack::Spectrum)
       ? 1 : 0;
diff --git a/src/TrackPanel.h b/src/TrackPanel.h
index d4e249d1f..5e782a1ff 100644
--- a/src/TrackPanel.h
+++ b/src/TrackPanel.h
@@ -484,7 +484,7 @@ protected:
    virtual void MoveTrack(Track* target, int eventId);
    virtual void OnChangeOctave (wxCommandEvent &event);
    virtual void OnChannelChange(wxCommandEvent &event);
-   virtual void OnViewSettings(wxCommandEvent &event);
+   virtual void OnSpectrogramSettings(wxCommandEvent &event);
    virtual void OnSetDisplay   (wxCommandEvent &event);
    virtual void OnSetTimeTrackRange (wxCommandEvent &event);
    virtual void OnTimeTrackLin(wxCommandEvent &event);
diff --git a/src/prefs/SpectrumPrefs.cpp b/src/prefs/SpectrumPrefs.cpp
index 5e125b530..54f5ef062 100644
--- a/src/prefs/SpectrumPrefs.cpp
+++ b/src/prefs/SpectrumPrefs.cpp
@@ -31,7 +31,7 @@
 #include <algorithm>
 
 SpectrumPrefs::SpectrumPrefs(wxWindow * parent, WaveTrack *wt)
-:  PrefsPanel(parent, _("Spectrograms"))
+:  PrefsPanel(parent, wt ? _("Spectrogram Settings") : _("Spectrograms"))
 , mWt(wt)
 , mPopulating(false)
 {
@@ -403,7 +403,6 @@ bool SpectrumPrefs::Apply()
    mTempSettings.ConvertToEnumeratedWindowSizes();
 
    if (mWt && isOpenPage) {
-      // Future: open page will determine the track view type
       mWt->SetDisplay(WaveTrack::Spectrum);
       if (partner)
          partner->SetDisplay(WaveTrack::Spectrum);