Merge pull request #208 from Cambloid/patch-1

accurate naming for viewer buttons

panels/viewer.cpp

@@ -78,11 +78,11 @@ Viewer::~Viewer() {
 bool Viewer::is_focused() {
     return ui->headers->hasFocus()
             || viewer_widget->hasFocus()
-            || ui->pushButton->hasFocus()
+            || ui->btnSkipToStart->hasFocus()
-            || ui->pushButton_2->hasFocus()
+            || ui->btnRewind->hasFocus()
-            || ui->pushButton_3->hasFocus()
+            || ui->btnPlay->hasFocus()
-            || ui->pushButton_4->hasFocus()
+            || ui->btnFastForward->hasFocus()
-            || ui->pushButton_5->hasFocus();
+            || ui->btnSkipToEnd->hasFocus();
 }
 
 void Viewer::set_main_sequence() {
@@ -278,7 +278,7 @@ void Viewer::cue_recording(long start, long end, int track) {
 void Viewer::uncue_recording() {
 	cue_recording_internal = false;
 	recording_flasher.stop();
-	ui->pushButton_3->setStyleSheet(QString());
+    ui->btnPlay->setStyleSheet(QString());
 }
 
 bool Viewer::is_recording_cued() {
@@ -525,23 +525,23 @@ void Viewer::set_media(Media* m) {
     set_sequence(false, seq);
 }
 
-void Viewer::on_pushButton_clicked() {
+void Viewer::on_btnSkipToStart_clicked() {
 	go_to_start();
 }
 
-void Viewer::on_pushButton_5_clicked() {
+void Viewer::on_btnSkipToEnd_clicked() {
 	go_to_end();
 }
 
-void Viewer::on_pushButton_2_clicked() {
+void Viewer::on_btnRewind_clicked() {
 	previous_frame();
 }
 
-void Viewer::on_pushButton_4_clicked() {
+void Viewer::on_btnFastForward_clicked() {
 	next_frame();
 }
 
-void Viewer::on_pushButton_3_clicked() {
+void Viewer::on_btnPlay_clicked() {
 	toggle_play();
 }
 
@@ -566,10 +566,10 @@ void Viewer::timer_update() {
 }
 
 void Viewer::recording_flasher_update() {
-	if (ui->pushButton_3->styleSheet().isEmpty()) {
+    if (ui->btnPlay->styleSheet().isEmpty()) {
-		ui->pushButton_3->setStyleSheet("background: red;");
+        ui->btnPlay->setStyleSheet("background: red;");
 	} else {
-		ui->pushButton_3->setStyleSheet(QString());
+        ui->btnPlay->setStyleSheet(QString());
     }
 }
 
@@ -604,11 +604,11 @@ void Viewer::set_sequence(bool main, Sequence *s) {
     ui->currentTimecode->setEnabled(!null_sequence);
     viewer_widget->setEnabled(!null_sequence);
     viewer_widget->setVisible(!null_sequence);
-    ui->pushButton->setEnabled(!null_sequence);
+    ui->btnSkipToStart->setEnabled(!null_sequence);
-    ui->pushButton_2->setEnabled(!null_sequence);
+    ui->btnRewind->setEnabled(!null_sequence);
-    ui->pushButton_3->setEnabled(!null_sequence);
+    ui->btnPlay->setEnabled(!null_sequence);
-    ui->pushButton_4->setEnabled(!null_sequence);
+    ui->btnFastForward->setEnabled(!null_sequence);
-    ui->pushButton_5->setEnabled(!null_sequence);
+    ui->btnSkipToEnd->setEnabled(!null_sequence);
 
     if (!null_sequence) {
 		ui->currentTimecode->set_frame_rate(seq->frame_rate);
@@ -636,5 +636,5 @@ void Viewer::set_sequence(bool main, Sequence *s) {
 }
 
 void Viewer::set_playpause_icon(bool play) {
-	ui->pushButton_3->setIcon(QIcon((play) ? ":/icons/play.png" : ":/icons/pause.png"));
+    ui->btnPlay->setIcon(QIcon((play) ? ":/icons/play.png" : ":/icons/pause.png"));
 }

panels/viewer.h

@@ -77,15 +77,17 @@ public slots:
 	void play_wake();
 
 private slots:
-	void on_pushButton_clicked();
+    void on_btnSkipToStart_clicked();
-    void on_pushButton_5_clicked();
+    void on_btnRewind_clicked();
-	void on_pushButton_2_clicked();
+    void on_btnPlay_clicked();
-	void on_pushButton_4_clicked();
+    void on_btnFastForward_clicked();
-    void on_pushButton_3_clicked();
+    void on_btnSkipToEnd_clicked();
+
 	void update_playhead();
 	void timer_update();
 	void recording_flasher_update();
     void resize_move(double d);
+
 private:
 	void clean_created_seq();
     void set_sequence(bool main, Sequence* s);

panels/viewer.ui

@@ -138,7 +138,7 @@
              <number>0</number>
             </property>
             <item>
-             <widget class="QPushButton" name="pushButton">
+             <widget class="QPushButton" name="btnSkipToStart">
               <property name="enabled">
                <bool>true</bool>
               </property>
@@ -150,7 +150,7 @@
              </widget>
             </item>
             <item>
-             <widget class="QPushButton" name="pushButton_2">
+             <widget class="QPushButton" name="btnRewind">
               <property name="icon">
                <iconset resource="../icons/icons.qrc">
                 <normaloff>:/icons/rew.png</normaloff>
@@ -159,7 +159,7 @@
              </widget>
             </item>
             <item>
-             <widget class="QPushButton" name="pushButton_3">
+             <widget class="QPushButton" name="btnPlay">
               <property name="icon">
                <iconset resource="../icons/icons.qrc">
                 <normaloff>:/icons/play.png</normaloff>
@@ -168,7 +168,7 @@
              </widget>
             </item>
             <item>
-             <widget class="QPushButton" name="pushButton_4">
+             <widget class="QPushButton" name="btnFastForward">
               <property name="icon">
                <iconset>
                 <normalon>:/icons/ff.png</normalon>
@@ -178,7 +178,7 @@
              </widget>
             </item>
             <item>
-             <widget class="QPushButton" name="pushButton_5">
+             <widget class="QPushButton" name="btnSkipToEnd">
               <property name="icon">
                <iconset resource="../icons/icons.qrc">
                 <normaloff>:/icons/next.png</normaloff>