From: Jean-Baptiste Mardelle Date: Mon, 24 Sep 2012 22:25:22 +0000 (+0200) Subject: Start rendering on return pressed: http://kdenlive.org/mantis/view.php?id=2757 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=56bef60dc0a1e741f6c9afb4e4e2cc725f1aee78;hp=d55b20cc27a1fe56da437df67c593ed76e849f22;p=kdenlive Start rendering on return pressed: http://kdenlive.org/mantis/view.php?id=2757 --- diff --git a/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg index ac858ebc..516d42a8 100644 --- a/src/kdenlivesettings.kcfg +++ b/src/kdenlivesettings.kcfg @@ -584,7 +584,7 @@ - false + true diff --git a/src/renderwidget.cpp b/src/renderwidget.cpp index a3c2b03f..53848345 100644 --- a/src/renderwidget.cpp +++ b/src/renderwidget.cpp @@ -276,6 +276,7 @@ RenderWidget::RenderWidget(const QString &projectfolder, bool enableProxy, MltVi m_view.splitter->setStretchFactor(0, 2); m_view.out_file->setMode(KFile::File); + m_view.out_file->setFocusPolicy(Qt::ClickFocus); m_view.running_jobs->setHeaderLabels(QStringList() << QString() << i18n("File")); m_jobsDelegate = new RenderViewDelegate(this); @@ -1108,7 +1109,7 @@ void RenderWidget::checkRenderStatus() item = static_cast (m_view.running_jobs->topLevelItem(0)); bool waitingJob = false; - // Find first aiting job + // Find first waiting job while (item) { if (item->status() == WAITINGJOB) { item->setData(1, TimeRole, QTime::currentTime()); @@ -2228,3 +2229,20 @@ void RenderWidget::setRescaleEnabled(bool enable) } } +void RenderWidget::keyPressEvent(QKeyEvent *e) { + if(e->key()==Qt::Key_Return || e->key()==Qt::Key_Enter) { + switch (m_view.tabWidget->currentIndex()) { + case 1: + if (m_view.start_job->isEnabled()) slotStartCurrentJob(); + break; + case 2: + if (m_view.start_script->isEnabled()) slotStartScript(); + break; + default: + if (m_view.buttonRender->isEnabled()) slotPrepareExport(); + break; + } + } + else QDialog::keyPressEvent(e); +} + diff --git a/src/renderwidget.h b/src/renderwidget.h index dcaa4612..0fa647ac 100644 --- a/src/renderwidget.h +++ b/src/renderwidget.h @@ -29,6 +29,7 @@ #include #include #include +#include #include "definitions.h" #include "ui_renderwidget_ui.h" @@ -138,6 +139,7 @@ public: protected: virtual QSize sizeHint() const; + virtual void keyPressEvent(QKeyEvent *e); public slots: void slotExport(bool scriptExport, int zoneIn, int zoneOut, const QMap metadata, const QString &playlistPath, const QString &scriptPath, bool exportAudio);