diff options
Diffstat (limited to 'mainwindow.cpp')
| -rw-r--r-- | mainwindow.cpp | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/mainwindow.cpp b/mainwindow.cpp index e89df5a..d7d7efb 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -6,11 +6,12 @@ #include "job.h" #include "newdvdgui.h" #include "newimagegui.h" -#include <QGridLayout> +#include <QVBoxLayout> #include <QHBoxLayout> #include <QSettings> #include <QLabel> #include <QPushButton> +#include <QGroupBox> #include <QDebug> MainWindow::MainWindow() @@ -31,16 +32,20 @@ MainWindow::MainWindow() connect(m_queue, SIGNAL(runningJob(Job*)), this, SLOT(runningJob(Job*))); m_videoGuis = new QVBoxLayout; m_jobGuis = new QVBoxLayout; - QGridLayout *layout = new QGridLayout; - layout->addWidget(new QLabel(tr("<b>Video Queue</b>")), 0, 0, Qt::AlignTop | Qt::AlignHCenter); - layout->addWidget(new QLabel(tr("<b>Job Queue</b>")), 0, 1, Qt::AlignTop | Qt::AlignHCenter); - layout->addLayout(m_videoGuis, 1, 0, Qt::AlignTop); - layout->addLayout(m_jobGuis, 1, 1, Qt::AlignTop); + QGroupBox *videoGuiBox = new QGroupBox; + videoGuiBox->setTitle(tr("Video Queue")); + videoGuiBox->setLayout(m_videoGuis); + QGroupBox *jobsGuiBox = new QGroupBox; + jobsGuiBox->setTitle(tr("Job Queue")); + jobsGuiBox->setLayout(m_jobGuis); + QHBoxLayout *layout = new QHBoxLayout; + layout->addWidget(videoGuiBox); + layout->addWidget(jobsGuiBox); NewDVDGui *newDvdGui = new NewDVDGui; connect(newDvdGui, SIGNAL(newDVD(QString,QMap<int,QString>)), this, SLOT(newVideoFromDVD(QString,QMap<int,QString>))); m_jobGuis->addWidget(newDvdGui, 0, Qt::AlignTop); NewImageGui *newImageGui = new NewImageGui; - connect(newImageGui, SIGNAL(newImage(QString,QString)), this, SLOT(newVideoFromImage(QString,QString))); + connect(newImageGui, SIGNAL(newImage(QString,QString,QMap<int,QString>)), this, SLOT(newVideoFromImage(QString,QString,QMap<int,QString>))); m_jobGuis->addWidget(newImageGui, 0, Qt::AlignTop); foreach (Video *video, toAdd) addVideo(video); @@ -51,16 +56,17 @@ void MainWindow::addVideo(Video *video) m_videoGuis->addWidget(video->widget(), 0, Qt::AlignTop); m_queue->newVideo(video); } -void MainWindow::newVideoFromDVD(QString name, QMap<int, QString> titles) //TODO: use const QString &name +void MainWindow::newVideoFromDVD(const QString &name, QMap<int, QString> titles) //TODO: use const QString &name { Video *video = new Video(name, this); video->setDvdTitles(titles); addVideo(video); } -void MainWindow::newVideoFromImage(const QString &path, const QString &name) +void MainWindow::newVideoFromImage(const QString &path, const QString &name, QMap<int, QString> titles) { Video *video = new Video(name, this); video->setDvdImage(path); + video->setDvdTitles(titles); addVideo(video); } void MainWindow::runningJob(Job *job) |