From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Wed, 19 Oct 2016 19:52:55 +0000 (+0200)
Subject: Make the master peak display clickable, like all the other peak labels.
X-Git-Tag: 1.4.0~22
X-Git-Url: https://git.sesse.net/?p=nageru;a=commitdiff_plain;h=177725e4f259a75dcdbd4260ac57e5dd9c01fd57

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

diff --git a/mainwindow.cpp b/mainwindow.cpp
index ec13cd7..d92847b 100644
--- 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 8fb46ff..5959b11 100644
--- 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>