Add some options to Kdenlive settings dialog

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

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7a9d506e116d67c5245efde591c7c35c8c36c0aa..6ab47485cf225e503e332a0cb1e52fc8ebc6821b 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -25,6 +25,7 @@ kde4_add_ui_files(kdenlive_UI
   widgets/colorclip_ui.ui
   widgets/configmisc_ui.ui
   widgets/configenv_ui.ui
+  widgets/configdisplay_ui.ui
   widgets/effectlist_ui.ui
   widgets/effectstack_ui.ui
   widgets/profiledialog_ui.ui

diff --git a/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg
index 4e0359e50a17570e1bc750e393414e4df3692120..e26559863511c0491ba3dcb8a05fda95f18d2dd8 100644 (file)
--- a/src/kdenlivesettings.kcfg
+++ b/src/kdenlivesettings.kcfg
@@ -13,10 +13,17 @@
       <label>Default image clip duration.</label>
       <default>00:00:05:00</default>
     </entry>
+  </group>
 
-    <entry name="currenttmpfolder" type="Path">
-      <label>Default folder for tmp files.</label>
-      <default>/tmp/</default>
+  <group name="display">
+    <entry name="videothumbnails" type="Bool">
+      <label>Display video thumbnails in timeline.</label>
+      <default>true</default>
+    </entry>
+
+    <entry name="audiothumbnails" type="Bool">
+      <label>Display audio thumbnails in timeline.</label>
+      <default>true</default>
     </entry>
   </group>
 
@@ -30,6 +37,11 @@
       <label>Mlt inigo renderer install path.</label>
       <default></default>
     </entry>
+
+    <entry name="currenttmpfolder" type="Path">
+      <label>Default folder for tmp files.</label>
+      <default>/tmp/</default>
+    </entry>
   </group>
 
   <group name="unmanaged">

diff --git a/src/kdenlivesettingsdialog.cpp b/src/kdenlivesettingsdialog.cpp
index 3bbfc601a7c64970ec965558aaaceac1bf93678c..4be8b9ab71945ba07bcbe3ecab1fa7fcc99074ac 100644 (file)
--- a/src/kdenlivesettingsdialog.cpp
+++ b/src/kdenlivesettingsdialog.cpp
@@ -33,11 +33,17 @@ KdenliveSettingsDialog::KdenliveSettingsDialog(QWidget * parent): KConfigDialog(
   m_configMisc.setupUi(p1);
   page1 = addPage( p1, i18n("Misc"), "misc" );
 
+  QWidget *p3 = new QWidget;
+  m_configDisplay.setupUi(p3);
+  page3 = addPage( p3, i18n("Display"), "display" );
+
   QWidget *p2 = new QWidget;
   m_configEnv.setupUi(p2);
   m_configEnv.mltpathurl->setMode(KFile::Directory);
   m_configEnv.mltpathurl->lineEdit()->setObjectName("kcfg_mltpath");
   m_configEnv.rendererpathurl->lineEdit()->setObjectName("kcfg_rendererpath");
+  m_configEnv.tmppathurl->setMode(KFile::Directory);
+  m_configEnv.tmppathurl->lineEdit()->setObjectName("kcfg_currenttmpfolder");
   page2 = addPage( p2, i18n("Environnement"), "env" );
 
   QStringList profilesNames = ProfilesDialog::getProfileNames();

diff --git a/src/kdenlivesettingsdialog.h b/src/kdenlivesettingsdialog.h
index 5a5147b71ce23ac180f64ee4cf6385fc45243abc..b9b0d4638a4952d1c454af790b2efd4844da9330 100644 (file)
--- a/src/kdenlivesettingsdialog.h
+++ b/src/kdenlivesettingsdialog.h
@@ -27,6 +27,7 @@
 
 #include "ui_configmisc_ui.h"
 #include "ui_configenv_ui.h"
+#include "ui_configdisplay_ui.h"
 
 class KdenliveSettingsDialog : public KConfigDialog
 {
@@ -45,8 +46,10 @@ class KdenliveSettingsDialog : public KConfigDialog
   private:
     KPageWidgetItem *page1;
     KPageWidgetItem *page2;
+    KPageWidgetItem *page3;
     Ui::ConfigEnv_UI m_configEnv;
     Ui::ConfigMisc_UI m_configMisc;
+    Ui::ConfigDisplay_UI m_configDisplay;
     QStringList m_mltProfilesList;
     QStringList m_customProfilesList;
     bool m_isCustomProfile;

diff --git a/src/widgets/configdisplay_ui.ui b/src/widgets/configdisplay_ui.ui
new file mode 100644 (file)
index 0000000..0b947ee
--- /dev/null
+++ b/src/widgets/configdisplay_ui.ui
@@ -0,0 +1,73 @@
+<ui version="4.0" >
+ <class>ConfigDisplay_UI</class>
+ <widget class="QWidget" name="ConfigDisplay_UI" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>354</width>
+    <height>182</height>
+   </rect>
+  </property>
+  <layout class="QGridLayout" name="gridLayout_2" >
+   <item row="0" column="0" >
+    <widget class="QGroupBox" name="groupBox" >
+     <property name="title" >
+      <string>Timeline</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout" >
+      <item row="0" column="0" >
+       <widget class="QLabel" name="label_2" >
+        <property name="text" >
+         <string>Thumbnails:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="QCheckBox" name="kcfg_videothumbnails" >
+        <property name="text" >
+         <string>Video</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2" >
+       <widget class="QCheckBox" name="kcfg_audiothumbnails" >
+        <property name="text" >
+         <string>Audio</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="3" >
+       <spacer name="horizontalSpacer" >
+        <property name="orientation" >
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0" >
+         <size>
+          <width>96</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="1" column="0" >
+    <spacer name="verticalSpacer" >
+     <property name="orientation" >
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0" >
+      <size>
+       <width>20</width>
+       <height>56</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

diff --git a/src/widgets/configenv_ui.ui b/src/widgets/configenv_ui.ui
index a4ec594fba665a6871f2667aa83f92997060b712..716850a6424827a30b6cd7a051facdf1473427f2 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>354</width>
-    <height>182</height>
+    <width>394</width>
+    <height>203</height>
    </rect>
   </property>
-  <layout class="QGridLayout" name="gridLayout_2" >
+  <layout class="QGridLayout" name="gridLayout_3" >
    <item row="0" column="0" >
     <widget class="QGroupBox" name="groupBox" >
      <property name="title" >
@@ -40,6 +40,25 @@
     </widget>
    </item>
    <item row="1" column="0" >
+    <widget class="QGroupBox" name="groupBox_2" >
+     <property name="title" >
+      <string>Default folders</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout_2" >
+      <item row="0" column="0" >
+       <widget class="QLabel" name="label_3" >
+        <property name="text" >
+         <string>Temporary files</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1" >
+       <widget class="KUrlRequester" name="tmppathurl" />
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="2" column="0" >
     <spacer name="verticalSpacer" >
      <property name="orientation" >
       <enum>Qt::Vertical</enum>

diff --git a/src/widgets/projectsettings_ui.ui b/src/widgets/projectsettings_ui.ui
index d7fa4d8f2a69eb5a80529a0a01934507c3957de6..fce04a4e8592cfcfa63bc6f15e6f21fcafc1bc64 100644 (file)
--- a/src/widgets/projectsettings_ui.ui
+++ b/src/widgets/projectsettings_ui.ui
@@ -5,8 +5,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>308</width>
-    <height>250</height>
+    <width>475</width>
+    <height>333</height>
    </rect>
   </property>
   <property name="windowTitle" >
@@ -20,10 +20,10 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="1" >
+   <item row="0" column="1" colspan="3" >
     <widget class="KUrlRequester" name="kurlrequester" />
    </item>
-   <item row="1" column="0" colspan="2" >
+   <item row="1" column="0" colspan="4" >
     <widget class="QGroupBox" name="properties" >
      <property name="title" >
       <string>Video Profile</string>
@@ -109,7 +109,41 @@
      </layout>
     </widget>
    </item>
+   <item row="2" column="0" >
+    <widget class="QLabel" name="label_2" >
+     <property name="text" >
+      <string>Thumbnails:</string>
+     </property>
+    </widget>
+   </item>
    <item row="2" column="1" >
+    <widget class="QCheckBox" name="video_thumbs" >
+     <property name="text" >
+      <string>Video</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="2" >
+    <widget class="QCheckBox" name="audio_thumbs" >
+     <property name="text" >
+      <string>Audio</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="3" >
+    <spacer name="horizontalSpacer" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0" >
+      <size>
+       <width>229</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="3" column="0" colspan="4" >
     <spacer name="verticalSpacer" >
      <property name="orientation" >
       <enum>Qt::Vertical</enum>
@@ -122,7 +156,7 @@
      </property>
     </spacer>
    </item>
-   <item row="3" column="1" >
+   <item row="4" column="1" colspan="3" >
     <widget class="QDialogButtonBox" name="buttonBox" >
      <property name="orientation" >
       <enum>Qt::Horizontal</enum>