some video-editor-keyboard-shortcuts

svn path=/branches/KDE4/; revision=2064

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 8069ed9a8e1331b781e478737f0b2495c0d87dc8..02c20ee777504d7ae0ca5a9531769f26aee0b8c5 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -259,7 +259,7 @@ bool MainWindow::queryClose() {
 }
 
 void MainWindow::slotFullScreen() {
-    KToggleFullScreenAction::setFullScreen(this, actionCollection()->action("fullscreen")->isChecked());
+    //KToggleFullScreenAction::setFullScreen(this, actionCollection()->action("fullscreen")->isChecked());
 }
 
 void MainWindow::slotAddEffect(QDomElement effect, GenTime pos, int track) {
@@ -326,6 +326,34 @@ void MainWindow::setupActions() {
     actionCollection()->addAction("monitor_play", monitorPlay);
     connect(monitorPlay, SIGNAL(triggered(bool)), m_monitorManager, SLOT(slotPlay()));
 
+    KAction* monitorSeekBackward = new KAction(this);
+    monitorSeekBackward->setText(i18n("Rewind"));
+    monitorSeekBackward->setIcon(KIcon("media-seek-backward"));
+    monitorSeekBackward->setShortcut(Qt::Key_J);
+    actionCollection()->addAction("monitor_seek_backward", monitorSeekBackward);
+    connect(monitorSeekBackward, SIGNAL(triggered(bool)), m_monitorManager, SLOT(slotRewind()));
+
+    KAction* monitorSeekBackwardOneFrame = new KAction(this);
+    monitorSeekBackwardOneFrame->setText(i18n("Rewind 1 Frame"));
+    monitorSeekBackwardOneFrame->setIcon(KIcon("media-skip-backward"));
+    monitorSeekBackwardOneFrame->setShortcut(Qt::Key_Left);
+    actionCollection()->addAction("monitor_seek_backward-one-frame", monitorSeekBackwardOneFrame);
+    connect(monitorSeekBackwardOneFrame, SIGNAL(triggered(bool)), m_monitorManager, SLOT(slotRewindOneFrame()));
+
+    KAction* monitorSeekForward = new KAction(this);
+    monitorSeekForward->setText(i18n("Forward"));
+    monitorSeekForward->setIcon(KIcon("media-seek-forward"));
+    monitorSeekForward->setShortcut(Qt::Key_L);
+    actionCollection()->addAction("monitor_seek_forward", monitorSeekForward);
+    connect(monitorSeekForward, SIGNAL(triggered(bool)), m_monitorManager, SLOT(slotForward()));
+
+    KAction* monitorSeekForwardOneFrame = new KAction(this);
+    monitorSeekForwardOneFrame->setText(i18n("Forward 1 Frame"));
+    monitorSeekForwardOneFrame->setIcon(KIcon("media-skip-forward"));
+    monitorSeekForwardOneFrame->setShortcut(Qt::Key_Right);
+    actionCollection()->addAction("monitor_seek_forward-one-frame", monitorSeekForwardOneFrame);
+    connect(monitorSeekForwardOneFrame, SIGNAL(triggered(bool)), m_monitorManager, SLOT(slotForwardOneFrame()));
+
     KAction* deleteTimelineClip = new KAction(this);
     deleteTimelineClip->setText(i18n("Delete Clip"));
     deleteTimelineClip->setShortcut(Qt::Key_Delete);

diff --git a/src/monitor.h b/src/monitor.h
index d5909cc45e9b882649d7913de03085b8171e51f9..c60ca279698a1d617cee916e2c04610c4e765dab 100644 (file)
--- a/src/monitor.h
+++ b/src/monitor.h
@@ -66,10 +66,7 @@ private slots:
     void adjustRulerSize(int length);
     void seekCursor(int pos);
     void rendererStopped(int pos);
-    void slotRewindOneFrame();
-    void slotForwardOneFrame();
-    void slotForward();
-    void slotRewind();
+    
 
 public slots:
     void slotOpenFile(const QString &);
@@ -81,6 +78,10 @@ public slots:
     void start();
     void activateMonitor();
     void slotPlay();
+    void slotForward();
+    void slotRewind();
+    void slotRewindOneFrame();
+    void slotForwardOneFrame();
     void saveSceneList(QString path, QDomElement e = QDomElement());
 
 signals:

diff --git a/src/monitormanager.cpp b/src/monitormanager.cpp
index 1765fa86cc4567ef0be401c32891741332050bf4..aff200877f0f5221b97caa388cdc390c8c7e6641 100644 (file)
--- a/src/monitormanager.cpp
+++ b/src/monitormanager.cpp
@@ -79,6 +79,26 @@ void MonitorManager::slotPlay() {
     else m_projectMonitor->slotPlay();
 }
 
+void MonitorManager::slotRewind() {
+    if (m_activeMonitor == "clip") m_clipMonitor->slotRewind();
+    else m_projectMonitor->slotRewind();
+}
+
+void MonitorManager::slotForward() {
+    if (m_activeMonitor == "clip") m_clipMonitor->slotForward();
+    else m_projectMonitor->slotForward();
+}
+
+void MonitorManager::slotRewindOneFrame() {
+    if (m_activeMonitor == "clip") m_clipMonitor->slotRewindOneFrame();
+    else m_projectMonitor->slotRewindOneFrame();
+}
+
+void MonitorManager::slotForwardOneFrame() {
+    if (m_activeMonitor == "clip") m_clipMonitor->slotForwardOneFrame();
+    else m_projectMonitor->slotForwardOneFrame();
+}
+
 void MonitorManager::resetProfiles(QString prof) {
     m_clipMonitor->resetProfile(prof);
     m_projectMonitor->resetProfile(prof);

diff --git a/src/monitormanager.h b/src/monitormanager.h
index c2160b1adc89a60f7f05a6e8a4e539cb71405f27..e8f5aa779afcfab4e0827d4e3dfcd3762104ceef 100644 (file)
--- a/src/monitormanager.h
+++ b/src/monitormanager.h
@@ -40,6 +40,10 @@ public:
 public slots:
     void activateMonitor(QString name = QString::null);
     void slotPlay();
+    void slotRewind();
+    void slotForward();
+    void slotRewindOneFrame();
+    void slotForwardOneFrame();
 
 private:
     Monitor *m_clipMonitor;