default apps (video player, external image / sound editor) can now be defined in...

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

diff --git a/src/customruler.cpp b/src/customruler.cpp
index 79b9bb2a5242a78f6eed2e5d79103917302a1270..0806f5e9f279c92f87070770c74457ff55184371 100644 (file)
--- a/src/customruler.cpp
+++ b/src/customruler.cpp
@@ -118,27 +118,26 @@ void CustomRuler::mousePressEvent(QMouseEvent * event) {
 // virtual
 void CustomRuler::mouseMoveEvent(QMouseEvent * event) {
     if (event->buttons() == Qt::LeftButton) {
-       int pos = (int)((event->x() + offset()) / pixelPerMark() / FRAME_SIZE);
-       if (pos < 0) pos = 0;
-       if (m_moveCursor == RULER_CURSOR) {
-           m_view->setCursorPos(pos);
-           return;
-       } else if (m_moveCursor == RULER_START) m_zoneStart = pos;
-       else if (m_moveCursor == RULER_END) m_zoneEnd = pos;
-       else if (m_moveCursor == RULER_MIDDLE) {
-           int move = pos - (m_zoneStart + (m_zoneEnd - m_zoneStart) / 2);
-           m_zoneStart += move;
-           m_zoneEnd += move;
-       }
-       update();
-    }
-    else {
-       int pos = (int)((event->x() + offset()));
-       if (event->y() <= 10) setCursor(Qt::ArrowCursor);
-       else if (qAbs(pos - m_zoneStart * pixelPerMark() * FRAME_SIZE) < 4) setCursor(KCursor("left_side", Qt::SizeHorCursor));
-       else if (qAbs(pos - m_zoneEnd * pixelPerMark() * FRAME_SIZE) < 4) setCursor(KCursor("right_side", Qt::SizeHorCursor));
-       else if (qAbs(pos - (m_zoneStart + (m_zoneEnd - m_zoneStart) / 2) * pixelPerMark() * FRAME_SIZE) < 4) setCursor(Qt::SizeHorCursor);
-       else setCursor(Qt::ArrowCursor);
+        int pos = (int)((event->x() + offset()) / pixelPerMark() / FRAME_SIZE);
+        if (pos < 0) pos = 0;
+        if (m_moveCursor == RULER_CURSOR) {
+            m_view->setCursorPos(pos);
+            return;
+        } else if (m_moveCursor == RULER_START) m_zoneStart = pos;
+        else if (m_moveCursor == RULER_END) m_zoneEnd = pos;
+        else if (m_moveCursor == RULER_MIDDLE) {
+            int move = pos - (m_zoneStart + (m_zoneEnd - m_zoneStart) / 2);
+            m_zoneStart += move;
+            m_zoneEnd += move;
+        }
+        update();
+    } else {
+        int pos = (int)((event->x() + offset()));
+        if (event->y() <= 10) setCursor(Qt::ArrowCursor);
+        else if (qAbs(pos - m_zoneStart * pixelPerMark() * FRAME_SIZE) < 4) setCursor(KCursor("left_side", Qt::SizeHorCursor));
+        else if (qAbs(pos - m_zoneEnd * pixelPerMark() * FRAME_SIZE) < 4) setCursor(KCursor("right_side", Qt::SizeHorCursor));
+        else if (qAbs(pos - (m_zoneStart + (m_zoneEnd - m_zoneStart) / 2) * pixelPerMark() * FRAME_SIZE) < 4) setCursor(Qt::SizeHorCursor);
+        else setCursor(Qt::ArrowCursor);
     }
 }
 

diff --git a/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg
index 7772aa4ce928c94c098a04cd14dc126b1dd10fe3..37da7acd201bef9f7e62ecec812932277717e896 100644 (file)
--- a/src/kdenlivesettings.kcfg
+++ b/src/kdenlivesettings.kcfg
@@ -72,8 +72,25 @@
       <label>Default folder for captured files.</label>
       <default>$HOME</default>
     </entry>
+
+    <entry name="defaultimageapp" type="String">
+      <label>Default image editing application.</label>
+      <default></default>
+    </entry>
+
+    <entry name="defaultaudioapp" type="String">
+      <label>Default audio editing application.</label>
+      <default></default>
+    </entry>
+
+    <entry name="defaultplayerapp" type="String">
+      <label>Default video player application.</label>
+      <default></default>
+    </entry>
+
   </group>
 
+
   <group name="capture">
     <entry name="defaultcapture" type="UInt">
       <label>Default video capture system.</label>

diff --git a/src/kdenlivesettingsdialog.cpp b/src/kdenlivesettingsdialog.cpp
index 8ca2706a39d44dc58458d68f08179cd0da6f2822..8b0f5d206e8f8d7d5aab0f122dfc8779ccc96f6b 100644 (file)
--- a/src/kdenlivesettingsdialog.cpp
+++ b/src/kdenlivesettingsdialog.cpp
@@ -22,6 +22,7 @@
 
 #include <KStandardDirs>
 #include <KDebug>
+#include <kopenwithdialog.h>
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -85,6 +86,9 @@ KdenliveSettingsDialog::KdenliveSettingsDialog(QWidget * parent): KConfigDialog(
     connect(m_configCapture.kcfg_video4size, SIGNAL(editingFinished()), this, SLOT(rebuildVideo4Commands()));
     connect(m_configCapture.kcfg_video4rate, SIGNAL(editingFinished()), this, SLOT(rebuildVideo4Commands()));
 
+    connect(m_configEnv.kp_image, SIGNAL(clicked()), this, SLOT(slotEditImageApplication()));
+    connect(m_configEnv.kp_audio, SIGNAL(clicked()), this, SLOT(slotEditAudioApplication()));
+    connect(m_configEnv.kp_player, SIGNAL(clicked()), this, SLOT(slotEditVideoApplication()));
 
     QStringList profilesNames = ProfilesDialog::getProfileNames();
     m_configMisc.kcfg_profiles_list->addItems(profilesNames);
@@ -102,6 +106,36 @@ KdenliveSettingsDialog::KdenliveSettingsDialog(QWidget * parent): KConfigDialog(
 KdenliveSettingsDialog::~KdenliveSettingsDialog() {}
 
 
+void KdenliveSettingsDialog::slotEditVideoApplication() {
+    KService::Ptr service;
+    KOpenWithDialog dlg(KUrl::List(), i18n("Select default video player"), m_configEnv.kcfg_defaultplayerapp->text(), this);
+    if (dlg.exec() != QDialog::Accepted)
+        return;
+
+    service = dlg.service();
+    m_configEnv.kcfg_defaultplayerapp->setText(service->exec());
+}
+
+void KdenliveSettingsDialog::slotEditAudioApplication() {
+    KService::Ptr service;
+    KOpenWithDialog dlg(KUrl::List(), i18n("Select default audio editor"), m_configEnv.kcfg_defaultaudioapp->text(), this);
+    if (dlg.exec() != QDialog::Accepted)
+        return;
+
+    service = dlg.service();
+    m_configEnv.kcfg_defaultaudioapp->setText(service->exec());
+}
+
+void KdenliveSettingsDialog::slotEditImageApplication() {
+    KService::Ptr service;
+    KOpenWithDialog dlg(KUrl::List(), i18n("Select default image editor"), m_configEnv.kcfg_defaultimageapp->text(), this);
+    if (dlg.exec() != QDialog::Accepted)
+        return;
+
+    service = dlg.service();
+    m_configEnv.kcfg_defaultimageapp->setText(service->exec());
+}
+
 void KdenliveSettingsDialog::slotCheckShuttle(int state) {
     m_configShuttle.config_group->setEnabled(state);
     if (m_configShuttle.shuttledevicelist->count() == 0) {

diff --git a/src/kdenlivesettingsdialog.h b/src/kdenlivesettingsdialog.h
index 486f952a45aabbb032d329a418ce44efd3487788..20bb0a63ef83305d8b295805fd199e7fa2f882c1 100644 (file)
--- a/src/kdenlivesettingsdialog.h
+++ b/src/kdenlivesettingsdialog.h
@@ -47,6 +47,9 @@ private slots:
     void rebuildVideo4Commands();
     void slotCheckShuttle(int state = 0);
     void slotUpdateShuttleDevice(int ix = 0);
+    void slotEditImageApplication();
+    void slotEditAudioApplication();
+    void slotEditVideoApplication();
 
 private:
     KPageWidgetItem *page1;

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 5d0aa757622c4969ec83f10f1a7ea712422ed824..3e9693f91b7f7765d6fa85e8dd815665bfba21e0 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -860,7 +860,10 @@ void MainWindow::slotDoRender(const QString &dest, const QString &render, const
         args << "-erase";
         if (zoneOnly) args << "in=" + QString::number(in) << "out=" + QString::number(out);
         QString videoPlayer = "-";
-        if (playAfter) videoPlayer = "kmplayer";
+        if (playAfter) {
+            videoPlayer = KdenliveSettings::defaultplayerapp();
+            if (videoPlayer.isEmpty()) KMessageBox::sorry(this, i18n("Cannot play video after rendering because the default video player application is not set.\nPlease define it in Kdenlive settings dialog."));
+        }
         args << "inigo" << m_activeDocument->profilePath() << render << videoPlayer << temp.fileName() << dest << avformat_args;
         QProcess::startDetached("kdenlive_render", args);
     }

diff --git a/src/widgets/configenv_ui.ui b/src/widgets/configenv_ui.ui
index 2c2b49474fe80ae58719756d5b4e877de625bf40..3e128bbfe0770f7a17349d92bcd5454cd8cd913f 100644 (file)
--- a/src/widgets/configenv_ui.ui
+++ b/src/widgets/configenv_ui.ui
@@ -5,11 +5,11 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>416</width>
-    <height>238</height>
+    <width>342</width>
+    <height>378</height>
    </rect>
   </property>
-  <layout class="QGridLayout" name="gridLayout_3" >
+  <layout class="QGridLayout" name="gridLayout_4" >
    <item row="0" column="0" >
     <widget class="QGroupBox" name="groupBox" >
      <property name="title" >
@@ -69,6 +69,78 @@
     </widget>
    </item>
    <item row="2" column="0" >
+    <widget class="QGroupBox" name="groupBox_3" >
+     <property name="title" >
+      <string>Default apps</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_3" >
+      <item row="0" column="0" >
+       <widget class="QLabel" name="label_4" >
+        <property name="text" >
+         <string>Image editing</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="KLineEdit" name="kcfg_defaultimageapp" >
+        <property name="showClearButton" stdset="0" >
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2" >
+       <widget class="KPushButton" name="kp_image" >
+        <property name="text" >
+         <string>Change</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="label_11" >
+        <property name="text" >
+         <string>Audio editing</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" >
+       <widget class="KLineEdit" name="kcfg_defaultaudioapp" >
+        <property name="showClearButton" stdset="0" >
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2" >
+       <widget class="KPushButton" name="kp_audio" >
+        <property name="text" >
+         <string>Change</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="label_12" >
+        <property name="text" >
+         <string>Video player</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1" >
+       <widget class="KLineEdit" name="kcfg_defaultplayerapp" >
+        <property name="showClearButton" stdset="0" >
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="2" >
+       <widget class="KPushButton" name="kp_player" >
+        <property name="text" >
+         <string>Change</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="3" column="0" >
     <spacer name="verticalSpacer" >
      <property name="orientation" >
       <enum>Qt::Vertical</enum>
@@ -84,6 +156,16 @@
   </layout>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>KLineEdit</class>
+   <extends>QLineEdit</extends>
+   <header>klineedit.h</header>
+  </customwidget>
+  <customwidget>
+   <class>KPushButton</class>
+   <extends>QPushButton</extends>
+   <header>kpushbutton.h</header>
+  </customwidget>
   <customwidget>
    <class>KUrlRequester</class>
    <extends>QFrame</extends>