From 76234c271da9e60f08fd51fa9b0ec061d5826611 Mon Sep 17 00:00:00 2001
From: "Steinar H. Gunderson" <sgunderson@bigfoot.com>
Date: Thu, 8 Oct 2015 22:34:14 +0200
Subject: [PATCH] Hook up all three transition buttons to the theme.

---
 mainwindow.cpp   | 37 ++++++++++++++++++++++++++-----------
 mainwindow.h     |  4 ++--
 ui_mainwindow.ui |  6 +++---
 3 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 99b7974..a373670 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -14,7 +14,6 @@ MainWindow::MainWindow()
 {
 	Ui::MainWindow *ui = new Ui::MainWindow;
 	ui->setupUi(this);
-	connect(ui->cut_btn, SIGNAL(clicked()), this, SLOT(cut()));
 
 	ui->me_live->set_output(Mixer::OUTPUT_LIVE);
 	ui->me_preview->set_output(Mixer::OUTPUT_PREVIEW);
@@ -24,19 +23,35 @@ MainWindow::MainWindow()
 	ui->preview2->set_output(Mixer::OUTPUT_INPUT1);
 	ui->preview3->set_output(Mixer::OUTPUT_INPUT2);
 
-	QSignalMapper *mapper = new QSignalMapper(this);
-	mapper->setMapping(ui->preview1, 0),
-	mapper->setMapping(ui->preview2, 1);
-	mapper->setMapping(ui->preview3, 2);
-	connect(ui->preview1, SIGNAL(clicked()), mapper, SLOT(map()));
-	connect(ui->preview2, SIGNAL(clicked()), mapper, SLOT(map()));
-	connect(ui->preview3, SIGNAL(clicked()), mapper, SLOT(map()));
-	connect(mapper, SIGNAL(mapped(int)), this, SLOT(channel_clicked(int)));
+	// Hook up the preview clicks.
+	{
+		QSignalMapper *mapper = new QSignalMapper(this);
+		mapper->setMapping(ui->preview1, 0),
+		mapper->setMapping(ui->preview2, 1);
+		mapper->setMapping(ui->preview3, 2);
+		connect(ui->preview1, SIGNAL(clicked()), mapper, SLOT(map()));
+		connect(ui->preview2, SIGNAL(clicked()), mapper, SLOT(map()));
+		connect(ui->preview3, SIGNAL(clicked()), mapper, SLOT(map()));
+		connect(mapper, SIGNAL(mapped(int)), this, SLOT(channel_clicked(int)));
+	}
+
+	// Hook up the transition buttons.
+	// TODO: Make them dynamic.
+	{
+		QSignalMapper *mapper = new QSignalMapper(this);
+		mapper->setMapping(ui->transition_btn1, 0),
+		mapper->setMapping(ui->transition_btn2, 1);
+		mapper->setMapping(ui->transition_btn3, 2);
+		connect(ui->transition_btn1, SIGNAL(clicked()), mapper, SLOT(map()));
+		connect(ui->transition_btn2, SIGNAL(clicked()), mapper, SLOT(map()));
+		connect(ui->transition_btn3, SIGNAL(clicked()), mapper, SLOT(map()));
+		connect(mapper, SIGNAL(mapped(int)), this, SLOT(transition_clicked(int)));
+	}
 }
 
-void MainWindow::cut()
+void MainWindow::transition_clicked(int transition_number)
 {
-	global_mixer->transition_clicked(0);  // FIXME: real value
+	global_mixer->transition_clicked(transition_number);
 }
 
 void MainWindow::channel_clicked(int channel_number)
diff --git a/mainwindow.h b/mainwindow.h
index edea126..6db9a09 100644
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -11,8 +11,8 @@ public:
 	MainWindow();
 
 public slots:
-	void cut();
-	void channel_clicked(int id);
+	void transition_clicked(int transition_number);
+	void channel_clicked(int channel_number);
 };
 
 #endif
diff --git a/ui_mainwindow.ui b/ui_mainwindow.ui
index 8b143d8..fa8bbe0 100644
--- a/ui_mainwindow.ui
+++ b/ui_mainwindow.ui
@@ -58,21 +58,21 @@
         <item>
          <layout class="QVBoxLayout" name="verticalLayout_2">
           <item>
-           <widget class="QPushButton" name="cut_btn">
+           <widget class="QPushButton" name="transition_btn1">
             <property name="text">
              <string>Cut</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QPushButton" name="fade_btn">
+           <widget class="QPushButton" name="transition_btn2">
             <property name="text">
              <string>Fade</string>
             </property>
            </widget>
           </item>
           <item>
-           <widget class="QPushButton" name="wipe_btn">
+           <widget class="QPushButton" name="transition_btn3">
             <property name="text">
              <string>Wipe</string>
             </property>
-- 
2.39.2