Make the master peak display clickable, like all the other peak labels.

diff --git a/mainwindow.cpp b/mainwindow.cpp
index ec13cd741c4730ee82cf983ec7ed74d9df8ee00a..d92847bf0f9e84caf45b9eb50513755b26f566f8 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -328,6 +328,10 @@ void MainWindow::mixer_created(Mixer *mixer)
                midi_mapper.refresh_lights();
        });
        connect(ui->reset_meters_button, &QPushButton::clicked, this, &MainWindow::reset_meters_button_clicked);
+       // Even though we have a reset button right next to it, the fact that
+       // the expanded audio view labels are clickable makes it natural to
+       // click this one as well.
+       connect(ui->peak_display, &ClickableLabel::clicked, this, &MainWindow::reset_meters_button_clicked);
        mixer->get_audio_mixer()->set_audio_level_callback(bind(&MainWindow::audio_level_callback, this, _1, _2, _3, _4, _5, _6, _7, _8));
 
        midi_mapper.refresh_highlights();

diff --git a/ui_mainwindow.ui b/ui_mainwindow.ui
index 8fb46ff966f0f2dfa6d567edecabfb6490818470..5959b11408fd50be4ea6561659804bde62a47799 100644 (file)
--- a/ui_mainwindow.ui
+++ b/ui_mainwindow.ui
@@ -383,7 +383,7 @@
                </layout>
               </item>
               <item>
-               <widget class="QLabel" name="peak_display">
+               <widget class="ClickableLabel" name="peak_display">
                 <property name="minimumSize">
                  <size>
                   <width>30</width>
@@ -1399,6 +1399,11 @@
    <header>vumeter.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>ClickableLabel</class>
+   <extends>QLabel</extends>
+   <header>clickable_label.h</header>
+  </customwidget>
   <customwidget>
    <class>GLWidget</class>
    <extends>QWidget</extends>