Better handling of the aspect ratio stuff. Still some weirdness, though.

[nageru] / mainwindow.cpp

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 65db8cf96bc1e17e0138515e7cd32ba4bc71083c..25d7a09645b02affc062186f61eeaf4298e7c9c5 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -5,6 +5,7 @@
 #include <string>
 #include <QSignalMapper>
 #include <QMetaType>
+#include <QShortcut>
 
 #include "context.h"
 #include "mixer.h"
@@ -16,8 +17,8 @@ using namespace std;
 Q_DECLARE_METATYPE(std::vector<std::string>);
 
 MainWindow::MainWindow()
+       : ui(new Ui::MainWindow)
 {
-       Ui::MainWindow *ui = new Ui::MainWindow;
        ui->setupUi(this);
 
        ui->me_live->set_output(Mixer::OUTPUT_LIVE);
@@ -37,6 +38,23 @@ MainWindow::MainWindow()
                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 keyboard keys.
+       {
+               QSignalMapper *mapper = new QSignalMapper(this);
+               QShortcut *shortcut1 = new QShortcut(QKeySequence(Qt::Key_1), this);
+               connect(shortcut1, SIGNAL(activated()), mapper, SLOT(map()));
+               QShortcut *shortcut2 = new QShortcut(QKeySequence(Qt::Key_2), this);
+               connect(shortcut2, SIGNAL(activated()), mapper, SLOT(map()));
+               QShortcut *shortcut3 = new QShortcut(QKeySequence(Qt::Key_3), this);
+               connect(shortcut3, SIGNAL(activated()), mapper, SLOT(map()));
+               mapper->setMapping(shortcut1, 0),
+               mapper->setMapping(shortcut2, 1);
+               mapper->setMapping(shortcut3, 2);
+
                connect(mapper, SIGNAL(mapped(int)), this, SLOT(channel_clicked(int)));
        }
 
@@ -62,6 +80,41 @@ MainWindow::MainWindow()
                this, SLOT(set_transition_names(std::vector<std::string>)));
 }
 
+void MainWindow::resizeEvent(QResizeEvent* event)
+{
+       QMainWindow::resizeEvent(event);
+
+       // Allocate the height; the most important part is to keep the main displays
+       // at 16:9 if at all possible.
+       double me_width = (width() - ui->transition_btn2->width()) / 2.0;
+       double me_height = me_width * 9.0 / 16.0 + ui->label_preview->height();
+       double me_proportion = me_height / height();
+
+       // TODO: Scale the widths when we need to do this.
+       if (me_proportion > 0.8) {
+               me_proportion = 0.8;
+       }
+
+       // The previews will be constrained by the remaining height, and the width.
+       // FIXME: spacing=
+       double preview_height = std::min(height() - me_height, (width() / 4.0) * 9.0 / 16.0);
+       double preview_proportion = preview_height / height();
+
+       ui->vertical_layout->setStretch(0, lrintf(1000 * me_proportion));
+       ui->vertical_layout->setStretch(1, lrintf(1000 * (1.0 - me_proportion - preview_proportion)));
+       ui->vertical_layout->setStretch(2, lrintf(1000 * preview_proportion));
+
+       // Set the widths for the previews.
+       double preview_width = preview_height * 16.0 / 9.0;
+       double preview_width_proportion = preview_width / width();  // FIXME: spacing?
+
+       ui->preview_displays->setStretch(0, lrintf(1000 * preview_width_proportion));
+       ui->preview_displays->setStretch(1, lrintf(1000 * preview_width_proportion));
+       ui->preview_displays->setStretch(2, lrintf(1000 * preview_width_proportion));
+       ui->preview_displays->setStretch(3, lrintf(1000 * preview_width_proportion));
+       ui->preview_displays->setStretch(4, lrintf(1000 * (1.0 - 4.0 * preview_width_proportion)));
+}
+
 void MainWindow::set_transition_names(vector<string> transition_names)
 {
        if (transition_names.size() < 1) {