GUI fixes (enable / disable) actions when they should be available or not.

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

diff --git a/src/clipproperties.cpp b/src/clipproperties.cpp
index ee08ce24317b54070b629319e21f43f3432ec69b..6d02576fa969d5270a14adec6f7baca37197e61f 100644 (file)
--- a/src/clipproperties.cpp
+++ b/src/clipproperties.cpp
@@ -163,10 +163,15 @@ ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidg
             m_view.luma_file->addItem(KIcon(folder + '/' + fname), fname, folder + '/' + fname);
         }
 
+        slotEnableLuma(m_view.slide_fade->isChecked());
+        slotEnableLumaFile(m_view.slide_luma->isChecked());
+
         if (!lumaFile.isEmpty()) {
             m_view.slide_luma->setChecked(true);
             m_view.luma_file->setCurrentIndex(m_view.luma_file->findData(lumaFile));
-        }
+        } else m_view.luma_file->setEnabled(false);
+        connect(m_view.slide_fade, SIGNAL(stateChanged(int)), this, SLOT(slotEnableLuma(int)));
+        connect(m_view.slide_luma, SIGNAL(stateChanged(int)), this, SLOT(slotEnableLumaFile(int)));
 
         connect(m_view.image_type, SIGNAL(currentIndexChanged(int)), this, SLOT(parseFolder()));
     } else if (t != AUDIO) {
@@ -216,6 +221,26 @@ ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidg
     adjustSize();
 }
 
+void ClipProperties::slotEnableLuma(int state) {
+    bool enable = false;
+    if (state == Qt::Checked) enable = true;
+    m_view.luma_duration->setEnabled(enable);
+    m_view.slide_luma->setEnabled(enable);
+    if (enable) {
+        m_view.luma_file->setEnabled(m_view.slide_luma->isChecked());
+    } else m_view.luma_file->setEnabled(false);
+    m_view.label_softness->setEnabled(m_view.slide_luma->isChecked() && enable);
+    m_view.luma_softness->setEnabled(m_view.label_softness->isEnabled());
+}
+
+void ClipProperties::slotEnableLumaFile(int state) {
+    bool enable = false;
+    if (state == Qt::Checked) enable = true;
+    m_view.luma_file->setEnabled(enable);
+    m_view.luma_softness->setEnabled(enable);
+    m_view.label_softness->setEnabled(enable);
+}
+
 void ClipProperties::slotFillMarkersList() {
     m_view.markers_list->clear();
     QList < CommentedTime > marks = m_clip->commentedSnapMarkers();

diff --git a/src/clipproperties.h b/src/clipproperties.h
index 929cc75bcc6d1c4f6c40e4e48d8ffbe4c50d91d5..6e486fe03da8cdfd5eff7dc683e59e7b24245631 100644 (file)
--- a/src/clipproperties.h
+++ b/src/clipproperties.h
@@ -44,6 +44,8 @@ private slots:
     void slotDeleteMarker();
     void slotFillMarkersList();
     void slotCheckMaxLength();
+    void slotEnableLuma(int state);
+    void slotEnableLumaFile(int state);
 
 private:
     Ui::ClipProperties_UI m_view;

diff --git a/src/slideshowclip.cpp b/src/slideshowclip.cpp
index 55f63fd14f5f4cb0e9b662711d7b811c97856090..90651110af323a57d053718edbd92f558400b985 100644 (file)
--- a/src/slideshowclip.cpp
+++ b/src/slideshowclip.cpp
@@ -83,8 +83,11 @@ void SlideshowClip::slotEnableLuma(int state) {
     if (state == Qt::Checked) enable = true;
     m_view.luma_duration->setEnabled(enable);
     m_view.luma_fade->setEnabled(enable);
-    if (enable) m_view.luma_file->setEnabled(m_view.luma_fade->isChecked());
-    else m_view.luma_file->setEnabled(false);
+    if (enable) {
+        m_view.luma_file->setEnabled(m_view.luma_fade->isChecked());
+    } else m_view.luma_file->setEnabled(false);
+    m_view.label_softness->setEnabled(m_view.luma_fade->isChecked() && enable);
+    m_view.luma_softness->setEnabled(m_view.label_softness->isEnabled());
 }
 
 void SlideshowClip::slotEnableLumaFile(int state) {

diff --git a/src/widgets/clipproperties_ui.ui b/src/widgets/clipproperties_ui.ui
index cbf4bfb843714448a8b8f2a29612eb420999da18..27462589f576296d0c4a587fa4e641923a9a9878 100644 (file)
--- a/src/widgets/clipproperties_ui.ui
+++ b/src/widgets/clipproperties_ui.ui
@@ -369,7 +369,7 @@
         </widget>
        </item>
        <item row="5" column="0" >
-        <widget class="QLabel" name="label_15" >
+        <widget class="QLabel" name="label_softness" >
          <property name="text" >
           <string>Softness</string>
          </property>
@@ -493,6 +493,19 @@
        <string>Advanced</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_3" >
+       <item row="4" column="2" >
+        <spacer name="verticalSpacer" >
+         <property name="orientation" >
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0" >
+          <size>
+           <width>20</width>
+           <height>19</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
        <item row="0" column="1" >
         <widget class="QCheckBox" name="clip_force_ar" >
          <property name="text" >
@@ -533,19 +546,6 @@
          </property>
         </widget>
        </item>
-       <item row="4" column="2" >
-        <spacer name="verticalSpacer" >
-         <property name="orientation" >
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0" >
-          <size>
-           <width>20</width>
-           <height>19</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
        <item row="1" column="1" >
         <widget class="QCheckBox" name="clip_force_threads" >
          <property name="text" >
@@ -581,17 +581,6 @@
         </widget>
        </item>
       </layout>
-      <zorder>clip_force_ar</zorder>
-      <zorder>clip_ar</zorder>
-      <zorder>label_4</zorder>
-      <zorder>label</zorder>
-      <zorder>clip_vindex</zorder>
-      <zorder>label_2</zorder>
-      <zorder>clip_aindex</zorder>
-      <zorder>clip_force_threads</zorder>
-      <zorder>clip_force_vindex</zorder>
-      <zorder>clip_force_aindex</zorder>
-      <zorder>clip_threads</zorder>
      </widget>
     </widget>
    </item>