Some config dialog cleanup

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

diff --git a/src/kdenlivesettings.kcfg b/src/kdenlivesettings.kcfg
index 1e979ea526a7a2e4e6a1ed3d3ce18ef499efe1d4..b49ce190dbe27c0ebd649e3d9dfbef1823bb7efb 100644 (file)
--- a/src/kdenlivesettings.kcfg
+++ b/src/kdenlivesettings.kcfg
@@ -43,6 +43,11 @@
       <label>Default number of audio tracks.</label>
       <default>2</default>
     </entry>
+
+    <entry name="profiles_list" type="UInt">
+      <label>active project format.</label>
+      <default></default>
+    </entry>
   </group>
 
   <group name="display">
@@ -103,6 +108,11 @@
       <default></default>
     </entry>
 
+    <entry name="audio_device" type="UInt">
+      <label>Audio device for SDL output.</label>
+      <default></default>
+    </entry>
+
     <entry name="dropbframes" type="Bool">
       <label>Drop B Frames on H.264 clips for faster playback (For monitor preview only).</label>
       <default>false</default>
@@ -285,6 +295,11 @@
       <default></default>
     </entry>
 
+    <entry name="rmd_alsa_device" type="UInt">
+      <label>Audio device for rmd capture.</label>
+      <default></default>
+    </entry>
+
     <entry name="rmd_path" type="String">
       <label>Path for the recordmydesktop binary.</label>
       <default></default>
@@ -378,11 +393,6 @@
       <default>hdv_1080_50i</default>
     </entry>
 
-    <entry name="profiles_list" type="UInt">
-      <label>active project format.</label>
-      <default></default>
-    </entry>
-
     <entry name="showdescriptioncolumn" type="Bool">
       <label>Show descriptions in project tree view.</label>
       <default>true</default>

diff --git a/src/kdenlivesettingsdialog.cpp b/src/kdenlivesettingsdialog.cpp
index 7c5f7a002c57e16df8213c9b858cecb7857e00ae..cda84a8b878559966c0d9ece5ac25d7262cbef37 100644 (file)
--- a/src/kdenlivesettingsdialog.cpp
+++ b/src/kdenlivesettingsdialog.cpp
@@ -23,6 +23,7 @@
 #include <KStandardDirs>
 #include <KDebug>
 #include <kopenwithdialog.h>
+#include <KConfigDialogManager>
 
 #include <stdlib.h>
 #include <stdio.h>
@@ -42,6 +43,9 @@ KdenliveSettingsDialog::KdenliveSettingsDialog(QWidget * parent): KConfigDialog(
     m_configMisc.setupUi(p1);
     page1 = addPage(p1, i18n("Misc"), "configure");
 
+    // Hide multi tab option until Kdenlive really supports it
+    m_configMisc.kcfg_activatetabs->setVisible(false);
+
     QWidget *p3 = new QWidget;
     m_configDisplay.setupUi(p3);
     page3 = addPage(p3, i18n("Display"), "display");
@@ -106,8 +110,6 @@ KdenliveSettingsDialog::KdenliveSettingsDialog(QWidget * parent): KConfigDialog(
     connect(m_configEnv.kp_audio, SIGNAL(clicked()), this, SLOT(slotEditAudioApplication()));
     connect(m_configEnv.kp_player, SIGNAL(clicked()), this, SLOT(slotEditVideoApplication()));
 
-
-
     QMap <QString, QString> profilesInfo = ProfilesDialog::getProfilesInfo();
     QMapIterator<QString, QString> i(profilesInfo);
     while (i.hasNext()) {
@@ -116,11 +118,11 @@ KdenliveSettingsDialog::KdenliveSettingsDialog(QWidget * parent): KConfigDialog(
     }
 
     checkProfile();
+
     slotUpdateDisplay();
 
     initDevices();
     connect(m_configMisc.kcfg_profiles_list, SIGNAL(currentIndexChanged(int)), this, SLOT(slotUpdateDisplay()));
-
     connect(m_configCapture.kcfg_rmd_capture_type, SIGNAL(currentIndexChanged(int)), this, SLOT(slotUpdateRmdRegionStatus()));
 
     slotUpdateRmdRegionStatus();
@@ -209,8 +211,8 @@ void KdenliveSettingsDialog::initDevices() {
     m_configSdl.kcfg_video_driver->addItem(i18n("Ascii art library"), "aalib");
 
     // Fill the list of audio playback devices
-    m_configSdl.audio_device->addItem(i18n("Default"), QString());
-    m_configCapture.rmd_alsa_device->addItem(i18n("Default"), QString());
+    m_configSdl.kcfg_audio_device->addItem(i18n("Default"), QString());
+    m_configCapture.kcfg_rmd_alsa_device->addItem(i18n("Default"), QString());
     if (KStandardDirs::findExe("aplay") != QString::null) {
         m_readProcess.setOutputChannelMode(KProcess::OnlyStdoutChannel);
         m_readProcess.setProgram("aplay", QStringList() << "-l");
@@ -227,11 +229,11 @@ void KdenliveSettingsDialog::initDevices() {
                 line = stream.readLine();
                 if (line.contains("playback")) {
                     deviceId = line.section(":", 0, 0);
-                    m_configSdl.audio_device->addItem(line.section(":", 1, 1), "plughw:" + QString::number(deviceId.section("-", 0, 0).toInt()) + "," + QString::number(deviceId.section("-", 1, 1).toInt()));
+                    m_configSdl.kcfg_audio_device->addItem(line.section(":", 1, 1), "plughw:" + QString::number(deviceId.section("-", 0, 0).toInt()) + "," + QString::number(deviceId.section("-", 1, 1).toInt()));
                 }
                 if (line.contains("capture")) {
                     deviceId = line.section(":", 0, 0);
-                    m_configCapture.rmd_alsa_device->addItem(line.section(":", 1, 1), "plughw:" + QString::number(deviceId.section("-", 0, 0).toInt()) + "," + QString::number(deviceId.section("-", 1, 1).toInt()));
+                    m_configCapture.kcfg_rmd_alsa_device->addItem(line.section(":", 1, 1), "plughw:" + QString::number(deviceId.section("-", 0, 0).toInt()) + "," + QString::number(deviceId.section("-", 1, 1).toInt()));
                 }
             }
             file.close();
@@ -239,13 +241,15 @@ void KdenliveSettingsDialog::initDevices() {
     }
     if (!KdenliveSettings::audiodevicename().isEmpty()) {
         // Select correct alsa device
-        int ix = m_configSdl.audio_device->findData(KdenliveSettings::audiodevicename());
-        if (ix > 0) m_configSdl.audio_device->setCurrentIndex(ix);
+        int ix = m_configSdl.kcfg_audio_device->findData(KdenliveSettings::audiodevicename());
+        m_configSdl.kcfg_audio_device->setCurrentIndex(ix);
+        KdenliveSettings::setAudio_device(ix);
     }
     if (!KdenliveSettings::rmd_alsadevicename().isEmpty()) {
         // Select correct alsa device
-        int ix = m_configCapture.rmd_alsa_device->findData(KdenliveSettings::rmd_alsadevicename());
-        if (ix > 0) m_configCapture.rmd_alsa_device->setCurrentIndex(ix);
+        int ix = m_configCapture.kcfg_rmd_alsa_device->findData(KdenliveSettings::rmd_alsadevicename());
+        m_configCapture.kcfg_rmd_alsa_device->setCurrentIndex(ix);
+        KdenliveSettings::setRmd_alsa_device(ix);
     }
 }
 
@@ -260,8 +264,8 @@ void KdenliveSettingsDialog::slotReadAudioDevices() {
         if (data.simplified().startsWith("card")) {
             QString card = data.section(":", 0, 0).section(" ", -1);
             QString device = data.section(":", 1, 1).section(" ", -1);
-            m_configSdl.audio_device->addItem(data.section(":", -1), "plughw:" + card + "," + device);
-            m_configCapture.rmd_alsa_device->addItem(data.section(":", -1), "plughw:" + card + "," + device);
+            m_configSdl.kcfg_audio_device->addItem(data.section(":", -1), "plughw:" + card + "," + device);
+            m_configCapture.kcfg_rmd_alsa_device->addItem(data.section(":", -1), "plughw:" + card + "," + device);
         }
     }
 }
@@ -356,32 +360,19 @@ void KdenliveSettingsDialog::rebuildVideo4Commands() {
 }
 
 
-// virtual protected
-bool KdenliveSettingsDialog::isDefault() {
-    return KConfigDialog::isDefault();
-}
-
-// virtual protected
-bool KdenliveSettingsDialog::hasChanged() {
-    kDebug() << "// // // KCONFIG hasChanged called: " << m_configMisc.kcfg_profiles_list->currentText() << ", " << m_defaultProfile;
-
-    if (m_configMisc.kcfg_profiles_list->currentText() != m_defaultProfile) return true;
-    return KConfigDialog::hasChanged();
-}
-
 void KdenliveSettingsDialog::updateSettings() {
     kDebug() << "// // // KCONFIG UPDATE called";
     m_defaultProfile = m_configMisc.kcfg_profiles_list->currentText();
     KdenliveSettings::setDefault_profile(m_defaultPath);
 
     bool resetProfile = false;
-    QString value = m_configSdl.audio_device->itemData(m_configSdl.audio_device->currentIndex()).toString();
+    QString value = m_configSdl.kcfg_audio_device->itemData(m_configSdl.kcfg_audio_device->currentIndex()).toString();
     if (value != KdenliveSettings::audiodevicename()) {
         KdenliveSettings::setAudiodevicename(value);
         resetProfile = true;
     }
 
-    value = m_configCapture.rmd_alsa_device->itemData(m_configCapture.rmd_alsa_device->currentIndex()).toString();
+    value = m_configCapture.kcfg_rmd_alsa_device->itemData(m_configCapture.kcfg_rmd_alsa_device->currentIndex()).toString();
     if (value != KdenliveSettings::rmd_alsadevicename()) {
         KdenliveSettings::setRmd_alsadevicename(value);
     }

diff --git a/src/kdenlivesettingsdialog.h b/src/kdenlivesettingsdialog.h
index b9e45761e6c8cab333e66dd5a224f115dcbdef35..4594064ab39c5a6d792cd937ba889bc398a9672c 100644 (file)
--- a/src/kdenlivesettingsdialog.h
+++ b/src/kdenlivesettingsdialog.h
@@ -41,10 +41,11 @@ public:
     ~KdenliveSettingsDialog();
     void showPage(int page, int option);
     void checkProfile();
-    bool hasChanged();
-    bool isDefault();
+
+protected slots:
     void updateSettings();
 
+
 private slots:
     void slotUpdateDisplay();
     void rebuildVideo4Commands();

diff --git a/src/widgets/configcapture_ui.ui b/src/widgets/configcapture_ui.ui
index 421ecee254fd70ad1153a0656c5336a99e62ac63..8591d3803a24f39f1eba9ce2311428d9beb74fa4 100644 (file)
--- a/src/widgets/configcapture_ui.ui
+++ b/src/widgets/configcapture_ui.ui
@@ -45,7 +45,7 @@
       </size>
      </property>
      <property name="currentIndex" >
-      <number>2</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="tab" >
       <attribute name="title" >
@@ -305,29 +305,12 @@
         </widget>
        </item>
       </layout>
-      <zorder>label_3</zorder>
-      <zorder>label_14</zorder>
-      <zorder>kcfg_video4adevice</zorder>
-      <zorder>label_9</zorder>
-      <zorder>label_16</zorder>
-      <zorder>label_11</zorder>
-      <zorder>kcfg_video4encoding</zorder>
-      <zorder>label_12</zorder>
-      <zorder>kcfg_video4aformat</zorder>
-      <zorder>kcfg_video4vformat</zorder>
-      <zorder>kcfg_video4vdevice</zorder>
-      <zorder>kcfg_video4capture</zorder>
-      <zorder>line_3</zorder>
-      <zorder>label_4</zorder>
-      <zorder>kcfg_video4size</zorder>
-      <zorder>label_6</zorder>
-      <zorder>kcfg_video4rate</zorder>
      </widget>
      <widget class="QWidget" name="tab_3" >
       <attribute name="title" >
        <string>Screen Grab</string>
       </attribute>
-      <layout class="QGridLayout" name="gridLayout_3" >
+      <layout class="QGridLayout" name="gridLayout_5" >
        <item row="0" column="0" colspan="3" >
         <widget class="QLabel" name="rmd_info" >
          <property name="frameShape" >
@@ -357,6 +340,69 @@
           <enum>QFrame::Raised</enum>
          </property>
          <layout class="QGridLayout" name="gridLayout_4" >
+          <item row="0" column="0" colspan="5" >
+           <layout class="QHBoxLayout" name="horizontalLayout_2" >
+            <item>
+             <widget class="QLabel" name="label_8" >
+              <property name="text" >
+               <string>Audio channels</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="KIntSpinBox" name="kcfg_rmd_audio_channels" />
+            </item>
+            <item>
+             <spacer name="horizontalSpacer_3" >
+              <property name="orientation" >
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0" >
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+            <item>
+             <widget class="QLabel" name="label_22" >
+              <property name="text" >
+               <string>Audio frequency</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="KComboBox" name="kcfg_rmd_audio_freq" >
+              <item>
+               <property name="text" >
+                <string>48000</string>
+               </property>
+              </item>
+              <item>
+               <property name="text" >
+                <string>41000</string>
+               </property>
+              </item>
+              <item>
+               <property name="text" >
+                <string>32000</string>
+               </property>
+              </item>
+              <item>
+               <property name="text" >
+                <string>22500</string>
+               </property>
+              </item>
+              <item>
+               <property name="text" >
+                <string>11250</string>
+               </property>
+              </item>
+             </widget>
+            </item>
+           </layout>
+          </item>
           <item row="1" column="0" >
            <widget class="QRadioButton" name="radioButton_2" >
             <property name="text" >
@@ -367,108 +413,63 @@
             </property>
            </widget>
           </item>
-          <item row="1" column="1" colspan="3" >
-           <widget class="KComboBox" name="rmd_alsa_device" />
-          </item>
-          <item row="2" column="0" >
-           <widget class="QRadioButton" name="kcfg_rmd_use_jack" >
-            <property name="text" >
-             <string>Jack</string>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="1" >
-           <widget class="QLabel" name="label_10" >
-            <property name="text" >
-             <string>Ports:</string>
+          <item row="1" column="1" colspan="2" >
+           <widget class="KComboBox" name="kcfg_rmd_alsa_device" >
+            <property name="sizePolicy" >
+             <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
             </property>
            </widget>
           </item>
-          <item row="2" column="3" >
-           <widget class="KLineEdit" name="kcfg_rmd_jackports" />
-          </item>
-          <item row="2" column="4" >
-           <widget class="QLabel" name="label_21" >
+          <item row="1" column="3" >
+           <widget class="QLabel" name="label_17" >
             <property name="text" >
              <string>Buffer</string>
             </property>
            </widget>
           </item>
-          <item row="2" column="5" >
-           <widget class="KDoubleNumInput" name="kcfg_rmd_jack_buffer" />
-          </item>
-          <item row="1" column="5" >
+          <item row="1" column="4" >
            <widget class="KIntSpinBox" name="kcfg_rmd_alsa_buffer" >
             <property name="maximum" >
              <number>999</number>
             </property>
            </widget>
           </item>
-          <item row="1" column="4" >
-           <widget class="QLabel" name="label_17" >
+          <item row="2" column="0" >
+           <widget class="QRadioButton" name="kcfg_rmd_use_jack" >
             <property name="text" >
-             <string>Buffer</string>
+             <string>Jack</string>
             </property>
            </widget>
           </item>
-          <item row="0" column="0" >
-           <widget class="QLabel" name="label_8" >
+          <item row="2" column="1" >
+           <widget class="QLabel" name="label_10" >
             <property name="text" >
-             <string>Audio channels</string>
+             <string>Ports:</string>
             </property>
            </widget>
           </item>
-          <item row="0" column="1" >
-           <widget class="KIntSpinBox" name="kcfg_rmd_audio_channels" />
-          </item>
-          <item row="0" column="3" >
-           <widget class="QLabel" name="label_22" >
-            <property name="text" >
-             <string>Audio frequency</string>
+          <item row="2" column="2" >
+           <widget class="KLineEdit" name="kcfg_rmd_jackports" >
+            <property name="sizePolicy" >
+             <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
             </property>
            </widget>
           </item>
-          <item row="0" column="4" colspan="2" >
-           <widget class="KComboBox" name="kcfg_rmd_audio_freq" >
-            <item>
-             <property name="text" >
-              <string>48000</string>
-             </property>
-            </item>
-            <item>
-             <property name="text" >
-              <string>41000</string>
-             </property>
-            </item>
-            <item>
-             <property name="text" >
-              <string>32000</string>
-             </property>
-            </item>
-            <item>
-             <property name="text" >
-              <string>22500</string>
-             </property>
-            </item>
-            <item>
-             <property name="text" >
-              <string>11250</string>
-             </property>
-            </item>
+          <item row="2" column="3" >
+           <widget class="QLabel" name="label_21" >
+            <property name="text" >
+             <string>Buffer</string>
+            </property>
            </widget>
           </item>
-          <item row="0" column="2" >
-           <spacer name="horizontalSpacer_3" >
-            <property name="orientation" >
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeHint" stdset="0" >
-             <size>
-              <width>40</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
+          <item row="2" column="4" >
+           <widget class="KDoubleNumInput" name="kcfg_rmd_jack_buffer" />
           </item>
          </layout>
         </widget>
@@ -495,9 +496,53 @@
          <property name="frameShadow" >
           <enum>QFrame::Raised</enum>
          </property>
-         <layout class="QGridLayout" name="gridLayout_5" >
+         <layout class="QGridLayout" name="gridLayout_3" >
+          <item row="0" column="0" colspan="3" >
+           <layout class="QHBoxLayout" name="horizontalLayout" >
+            <item>
+             <widget class="QCheckBox" name="kcfg_rmd_follow_mouse" >
+              <property name="text" >
+               <string>Follow mouse</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QCheckBox" name="kcfg_rmd_hide_frame" >
+              <property name="text" >
+               <string>Hide frame</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <spacer name="horizontalSpacer_4" >
+              <property name="orientation" >
+               <enum>Qt::Horizontal</enum>
+              </property>
+              <property name="sizeHint" stdset="0" >
+               <size>
+                <width>40</width>
+                <height>20</height>
+               </size>
+              </property>
+             </spacer>
+            </item>
+           </layout>
+          </item>
+          <item row="1" column="0" >
+           <widget class="QLabel" name="label_19" >
+            <property name="text" >
+             <string>Offset</string>
+            </property>
+           </widget>
+          </item>
           <item row="1" column="1" >
            <widget class="KIntSpinBox" name="kcfg_rmd_offsetx" >
+            <property name="sizePolicy" >
+             <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
             <property name="minimum" >
              <number>1</number>
             </property>
@@ -508,6 +553,12 @@
           </item>
           <item row="1" column="2" >
            <widget class="KIntSpinBox" name="kcfg_rmd_offsety" >
+            <property name="sizePolicy" >
+             <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
             <property name="minimum" >
              <number>1</number>
             </property>
@@ -516,27 +567,6 @@
             </property>
            </widget>
           </item>
-          <item row="2" column="2" >
-           <widget class="KIntSpinBox" name="kcfg_rmd_height" >
-            <property name="maximum" >
-             <number>5000</number>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="1" >
-           <widget class="KIntSpinBox" name="kcfg_rmd_width" >
-            <property name="maximum" >
-             <number>5000</number>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="0" >
-           <widget class="QLabel" name="label_19" >
-            <property name="text" >
-             <string>Offset</string>
-            </property>
-           </widget>
-          </item>
           <item row="2" column="0" >
            <widget class="QLabel" name="label_20" >
             <property name="text" >
@@ -544,17 +574,17 @@
             </property>
            </widget>
           </item>
-          <item row="0" column="0" >
-           <widget class="QCheckBox" name="kcfg_rmd_follow_mouse" >
-            <property name="text" >
-             <string>Follow mouse</string>
+          <item row="2" column="1" >
+           <widget class="KIntSpinBox" name="kcfg_rmd_width" >
+            <property name="maximum" >
+             <number>5000</number>
             </property>
            </widget>
           </item>
-          <item row="0" column="1" >
-           <widget class="QCheckBox" name="kcfg_rmd_hide_frame" >
-            <property name="text" >
-             <string>Hide frame</string>
+          <item row="2" column="2" >
+           <widget class="KIntSpinBox" name="kcfg_rmd_height" >
+            <property name="maximum" >
+             <number>5000</number>
             </property>
            </widget>
           </item>
@@ -645,7 +675,7 @@
   <tabstop>kcfg_video4encoding</tabstop>
   <tabstop>kcfg_rmd_capture_audio</tabstop>
   <tabstop>radioButton_2</tabstop>
-  <tabstop>rmd_alsa_device</tabstop>
+  <tabstop>kcfg_rmd_alsa_device</tabstop>
   <tabstop>kcfg_rmd_alsa_buffer</tabstop>
   <tabstop>kcfg_rmd_use_jack</tabstop>
   <tabstop>kcfg_rmd_jackports</tabstop>

diff --git a/src/widgets/configsdl_ui.ui b/src/widgets/configsdl_ui.ui
index cd1d086ad0bb3f0f2bc0be06975210baa6467ed1..5163b81765e1242bf305be060531bd14a4244019 100644 (file)
--- a/src/widgets/configsdl_ui.ui
+++ b/src/widgets/configsdl_ui.ui
@@ -69,7 +69,7 @@
     </widget>
    </item>
    <item row="3" column="1" >
-    <widget class="KComboBox" name="audio_device" />
+    <widget class="KComboBox" name="kcfg_audio_device" />
    </item>
    <item row="4" column="0" colspan="2" >
     <widget class="QGroupBox" name="groupBox" >