- Settings dialog: rename "Display" tab to "Timeline"

- update groups in settings file

svn path=/trunk/kdenlive/; revision=4660

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9152782b28da777bacb7734c83ee1b4c6b569c68..dff5a77f83840431d969cb29b57f4233340f4024 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -45,7 +45,7 @@ kde4_add_ui_files(kdenlive_UI
   widgets/slideshowclip_ui.ui
   widgets/configmisc_ui.ui
   widgets/configenv_ui.ui
-  widgets/configdisplay_ui.ui
+  widgets/configtimeline_ui.ui
   widgets/configsdl_ui.ui
   widgets/configcapture_ui.ui
   widgets/configtranscode_ui.ui

diff --git a/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg
index 21f197d0befd7572e1771aed72f5098ea5294345..27fe7fd16f0b37565488b0d814133a2da3d4b8ce 100644 (file)
--- a/src/kdenlivesettings.kcfg
+++ b/src/kdenlivesettings.kcfg
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE kcfg SYSTEM "http://www.kde.org/standards/kcfg/1.0/kcfg.xsd">
 <kcfg>
+
   <kcfgfile/>
+
   <group name="misc">
     <entry name="openlastproject" type="Bool">
       <label>Open last project on startup.</label>
@@ -37,7 +39,9 @@
       <label>Default title clip duration.</label>
       <default>00:00:05:00</default>
     </entry>
+  </group>
 
+  <group name="project">
     <entry name="videotracks" type="Int">
       <label>Default number of video tracks.</label>
       <default>3</default>
@@ -52,14 +56,9 @@
       <label>active project format.</label>
       <default></default>
     </entry>
-    
-    <entry name="splitaudio" type="Bool">
-      <label>Automatically split audio and video.</label>
-      <default>false</default>
-    </entry>
   </group>
 
-  <group name="display">
+  <group name="timeline">
     <entry name="videothumbnails" type="Bool">
       <label>Display video thumbnails in timeline.</label>
       <default>true</default>
@@ -95,9 +94,9 @@
       <default>50</default>
     </entry>
 
-    <entry name="audio_driver" type="UInt">
-      <label>Audio driver used for sound output.</label>
-      <default>0</default>
+    <entry name="splitaudio" type="Bool">
+      <label>Automatically split audio and video.</label>
+      <default>false</default>
     </entry>
     </group>
 
@@ -107,6 +106,11 @@
       <default>0</default>
     </entry>
 
+    <entry name="audio_driver" type="UInt">
+      <label>Audio driver used for sound output.</label>
+      <default>0</default>
+    </entry>
+
     <entry name="audiodevicename" type="String">
       <label>Audio device used for sound output.</label>
       <default></default>
@@ -268,7 +272,6 @@
       <default></default>
     </entry>
 
-
     <entry name="video4encoding" type="String">
       <label>ffmpeg encoding arguments.</label>
       <default>-qscale 1 -ab 224k</default>
@@ -398,6 +401,7 @@
       <label>Default name for dvgrab capture.</label>
       <default>capture</default>
     </entry>
+
     <entry name="dvgrabextra" type="String">
       <label>Additionnal dvgrab parameters.</label>
       <default></default>
@@ -559,14 +563,16 @@
       <label>Keep aspect ratio in render dialog rescale widget.</label>
       <default>false</default>
     </entry>
+
     <entry name="defaultrescalewidth" type="Int">
       <label>default width for rendering rescale.</label>
       <default>320</default>
     </entry>
+
     <entry name="defaultrescaleheight" type="Int">
       <label>default width for rendering rescale.</label>
       <default>240</default>
     </entry>
-
   </group>
+
 </kcfg>

diff --git a/src/kdenlivesettingsdialog.cpp b/src/kdenlivesettingsdialog.cpp
index 57989fdbf4d3e0b091bb52fa47fdea839a046c2d..9ddc792d196a3c100fa7445a63a404ec70a062c7 100644 (file)
--- a/src/kdenlivesettingsdialog.cpp
+++ b/src/kdenlivesettingsdialog.cpp
@@ -59,8 +59,8 @@ KdenliveSettingsDialog::KdenliveSettingsDialog(QWidget * parent) :
     m_page8 = addPage(p8, i18n("Project Defaults"), "document-new");
 
     QWidget *p3 = new QWidget;
-    m_configDisplay.setupUi(p3);
-    m_page3 = addPage(p3, i18n("Display"), "video-display");
+    m_configTimeline.setupUi(p3);
+    m_page3 = addPage(p3, i18n("Timeline"), "video-display");
 
     QWidget *p2 = new QWidget;
     m_configEnv.setupUi(p2);
@@ -186,8 +186,10 @@ KdenliveSettingsDialog::KdenliveSettingsDialog(QWidget * parent) :
         QString rmdpath = KStandardDirs::findExe("recordmydesktop");
         KdenliveSettings::setRmd_path(rmdpath);
     }
-    if (KdenliveSettings::rmd_path().isEmpty()) m_configCapture.rmd_info->setText(i18n("<strong><em>Recordmydesktop</em> utility not found, please install it for screen grabs</strong>"));
-    else m_configCapture.rmd_info->setText(i18n("Recordmydesktop found at: %1", KdenliveSettings::rmd_path()));
+    if (KdenliveSettings::rmd_path().isEmpty())
+        m_configCapture.rmd_info->setText(i18n("<strong><em>Recordmydesktop</em> utility not found, please install it for screen grabs</strong>"));
+    else
+        m_configCapture.rmd_info->setText(i18n("Recordmydesktop found at: %1", KdenliveSettings::rmd_path()));
 }
 
 KdenliveSettingsDialog::~KdenliveSettingsDialog() {}
@@ -520,8 +522,10 @@ void KdenliveSettingsDialog::slotUpdateDisplay()
     m_configProject.p_fps->setText(values.value("frame_rate_num") + '/' + values.value("frame_rate_den"));
     m_configProject.p_aspect->setText(values.value("sample_aspect_num") + '/' + values.value("sample_aspect_den"));
     m_configProject.p_display->setText(values.value("display_aspect_num") + '/' + values.value("display_aspect_den"));
-    if (values.value("progressive").toInt() == 0) m_configProject.p_progressive->setText(i18n("Interlaced"));
-    else m_configProject.p_progressive->setText(i18n("Progressive"));
+    if (values.value("progressive").toInt() == 0)
+        m_configProject.p_progressive->setText(i18n("Interlaced"));
+    else
+        m_configProject.p_progressive->setText(i18n("Progressive"));
     m_defaultProfile = m_configProject.kcfg_profiles_list->itemText(m_configProject.kcfg_profiles_list->currentIndex());
     m_defaultPath = currentProfile;
 }

diff --git a/src/kdenlivesettingsdialog.h b/src/kdenlivesettingsdialog.h
index d167dda0eaed885aa586e67ab1cd7a2975c87b13..b41e691dcb0e8d23bd31a3ad8bb75a9c36ba5928 100644 (file)
--- a/src/kdenlivesettingsdialog.h
+++ b/src/kdenlivesettingsdialog.h
@@ -28,7 +28,7 @@
 
 #include "ui_configmisc_ui.h"
 #include "ui_configenv_ui.h"
-#include "ui_configdisplay_ui.h"
+#include "ui_configtimeline_ui.h"
 #include "ui_configcapture_ui.h"
 #include "ui_configjogshuttle_ui.h"
 #include "ui_configsdl_ui.h"
@@ -77,7 +77,7 @@ private:
     KPageWidgetItem *m_page8;
     Ui::ConfigEnv_UI m_configEnv;
     Ui::ConfigMisc_UI m_configMisc;
-    Ui::ConfigDisplay_UI m_configDisplay;
+    Ui::ConfigTimeline_UI m_configTimeline;
     Ui::ConfigCapture_UI m_configCapture;
     Ui::ConfigJogShuttle_UI m_configShuttle;
     Ui::ConfigSdl_UI m_configSdl;

diff --git a/src/widgets/configmisc_ui.ui b/src/widgets/configmisc_ui.ui
index b9cfacad06e8254e915bb05c84b81edf8d775a03..5d43df74d34266c824f095286d72bc8237063d59 100644 (file)
--- a/src/widgets/configmisc_ui.ui
+++ b/src/widgets/configmisc_ui.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>298</width>
-    <height>220</height>
+    <width>348</width>
+    <height>215</height>
    </rect>
   </property>
   <layout class="QGridLayout" name="gridLayout_4">
@@ -32,7 +32,7 @@
      </property>
     </widget>
    </item>
-   <item row="5" column="0" colspan="3">
+   <item row="4" column="0" colspan="3">
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
       <string>Default Durations</string>
@@ -83,7 +83,7 @@
      </layout>
     </widget>
    </item>
-   <item row="6" column="0" colspan="3">
+   <item row="5" column="0" colspan="3">
     <spacer>
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -103,13 +103,6 @@
      </property>
     </widget>
    </item>
-   <item row="4" column="0" colspan="2">
-    <widget class="QCheckBox" name="kcfg_splitaudio">
-     <property name="text">
-      <string>Automatically split audio from video</string>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <customwidgets>

diff --git a/src/widgets/configtimeline_ui.ui b/src/widgets/configtimeline_ui.ui
new file mode 100644 (file)
index 0000000..d4a5f5c
--- /dev/null
+++ b/src/widgets/configtimeline_ui.ui
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ConfigTimeline_UI</class>
+ <widget class="QWidget" name="ConfigTimeline_UI">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>398</width>
+    <height>213</height>
+   </rect>
+  </property>
+  <layout class="QGridLayout" name="gridLayout_2">
+   <item row="0" column="0" colspan="3">
+    <widget class="QGroupBox" name="groupBox">
+     <property name="title">
+      <string>Thumbnails</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="0">
+       <widget class="QCheckBox" name="kcfg_videothumbnails">
+        <property name="text">
+         <string>Video</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <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>
+      <item row="1" column="0">
+       <widget class="QCheckBox" name="kcfg_audiothumbnails">
+        <property name="text">
+         <string>Audio</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QCheckBox" name="kcfg_normaliseaudiothumbs">
+        <property name="text">
+         <string>Normalise audio for thumbnails</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item row="1" column="0" colspan="2">
+    <widget class="QCheckBox" name="kcfg_showmarkers">
+     <property name="text">
+      <string>Display clip markers comments</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0" colspan="3">
+    <widget class="QCheckBox" name="kcfg_autoscroll">
+     <property name="text">
+      <string>Autoscroll while playing</string>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="0">
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>Track height</string>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="1">
+    <widget class="QSpinBox" name="kcfg_trackheight">
+     <property name="minimum">
+      <number>10</number>
+     </property>
+     <property name="value">
+      <number>10</number>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="2">
+    <spacer name="horizontalSpacer_2">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>166</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="7" column="1">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>23</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="3" column="0" colspan="3">
+    <widget class="QCheckBox" name="kcfg_verticalzoom">
+     <property name="text">
+      <string>Zoom using vertical drag in ruler</string>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="0">
+    <widget class="QCheckBox" name="kcfg_splitaudio">
+     <property name="text">
+      <string>Automatically split audio and video</string>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>