remove frame from effects parameter

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

diff --git a/src/effectstackedit.cpp b/src/effectstackedit.cpp
index 0bf13f39f6cd3c6301e7dd8852dd6ce588dd1377..483d4a87742eafc50a70f1d88d78fe9199604127 100644 (file)
--- a/src/effectstackedit.cpp
+++ b/src/effectstackedit.cpp
@@ -42,7 +42,9 @@ EffectStackEdit::EffectStackEdit(QFrame* frame,QWidget *parent): QObject(parent)
        vbox->setContentsMargins (0,0,0,0);
        vbox->setSpacing(0);
        frame->setLayout(vbox1);
-       
+       QFont widgetFont = frame->font();
+       widgetFont.setPointSize(widgetFont.pointSize() - 2);
+       frame->setFont(widgetFont);
        
        area=new QScrollArea(frame);
        QWidget *wid=new QWidget(area);
@@ -105,7 +107,7 @@ void EffectStackEdit::transferParamDesc(const QDomElement& d,int ,int){
                        bval->checkBox->setCheckState(value=="0" ? Qt::Unchecked : Qt::Checked);
                        
                        connect (bval->checkBox, SIGNAL(stateChanged(int)) , this, SLOT (collectAllParameters()));
-                       bval->title->setTitle(na.toElement().text() );
+                       bval->checkBox->setText(na.toElement().text() );
                        valueItems[paramName]=bval;
                        uiItems.append(bval);
                }else if(type=="complex"){
@@ -173,9 +175,9 @@ void EffectStackEdit::createSliderItem(const QString& name, int val ,int min, in
        ctval->horizontalSlider->setMaximum(max);
        ctval->spinBox->setMinimum(min);
        ctval->spinBox->setMaximum(max);
-       
+       ctval->horizontalSlider->setPageStep((int) (max - min)/10);     
        ctval->horizontalSlider->setValue(val);
-       ctval->title->setTitle(name);
+       ctval->label->setText(name);
        valueItems[name]=ctval;
        uiItems.append(ctval);
        connect (ctval->horizontalSlider, SIGNAL(valueChanged(int)) , this, SLOT (collectAllParameters()));

diff --git a/src/widgets/boolval_ui.ui b/src/widgets/boolval_ui.ui
index 6e5f8affb3870f1aa6aff704e74b47783bf684c8..45d1015ffb5c26b3ad6e76a2f7a69700add86649 100644 (file)
--- a/src/widgets/boolval_ui.ui
+++ b/src/widgets/boolval_ui.ui
@@ -5,65 +5,26 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>509</width>
-    <height>259</height>
+    <width>326</width>
+    <height>30</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <string>Form</string>
   </property>
-  <layout class="QGridLayout" >
-   <property name="leftMargin" >
-    <number>0</number>
-   </property>
-   <property name="topMargin" >
-    <number>0</number>
-   </property>
-   <property name="rightMargin" >
-    <number>0</number>
-   </property>
-   <property name="bottomMargin" >
-    <number>0</number>
-   </property>
-   <property name="horizontalSpacing" >
+  <layout class="QGridLayout" name="gridLayout" >
+   <property name="verticalSpacing" >
     <number>0</number>
    </property>
-   <property name="verticalSpacing" >
+   <property name="margin" >
     <number>0</number>
    </property>
    <item row="0" column="0" >
-    <layout class="QVBoxLayout" >
-     <item>
-      <widget class="QGroupBox" name="title" >
-       <property name="font" >
-        <font>
-         <pointsize>8</pointsize>
-        </font>
-       </property>
-       <property name="title" >
-        <string>GroupBox</string>
-       </property>
-       <property name="alignment" >
-        <set>Qt::AlignLeading</set>
-       </property>
-       <property name="flat" >
-        <bool>false</bool>
-       </property>
-       <property name="checkable" >
-        <bool>false</bool>
-       </property>
-       <layout class="QGridLayout" >
-        <item row="0" column="0" >
-         <widget class="QCheckBox" name="checkBox" >
-          <property name="text" >
-           <string>CheckBox</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </widget>
-     </item>
-    </layout>
+    <widget class="QCheckBox" name="checkBox" >
+     <property name="text" >
+      <string>CheckBox</string>
+     </property>
+    </widget>
    </item>
   </layout>
  </widget>

diff --git a/src/widgets/constval_ui.ui b/src/widgets/constval_ui.ui
index 2096564effca282efff3bc2963c958816705f092..063270135497ad39601999eb7501f3962a0c83ff 100644 (file)
--- a/src/widgets/constval_ui.ui
+++ b/src/widgets/constval_ui.ui
@@ -5,99 +5,42 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>312</width>
-    <height>67</height>
+    <width>261</width>
+    <height>50</height>
    </rect>
   </property>
   <property name="windowTitle" >
    <string>Form</string>
   </property>
-  <layout class="QGridLayout" >
-   <property name="leftMargin" >
-    <number>0</number>
-   </property>
-   <property name="topMargin" >
-    <number>0</number>
-   </property>
-   <property name="rightMargin" >
-    <number>0</number>
-   </property>
-   <property name="bottomMargin" >
-    <number>0</number>
-   </property>
-   <property name="horizontalSpacing" >
+  <layout class="QGridLayout" name="gridLayout" >
+   <property name="verticalSpacing" >
     <number>0</number>
    </property>
-   <property name="verticalSpacing" >
+   <property name="margin" >
     <number>0</number>
    </property>
-   <item row="0" column="0" >
-    <layout class="QVBoxLayout" >
-     <item>
-      <widget class="QGroupBox" name="title" >
-       <property name="font" >
-        <font>
-         <pointsize>8</pointsize>
-        </font>
-       </property>
-       <property name="title" >
-        <string>GroupBox</string>
-       </property>
-       <property name="alignment" >
-        <set>Qt::AlignLeading</set>
-       </property>
-       <property name="flat" >
-        <bool>false</bool>
-       </property>
-       <property name="checkable" >
-        <bool>false</bool>
-       </property>
-       <layout class="QGridLayout" >
-        <property name="leftMargin" >
-         <number>0</number>
-        </property>
-        <property name="topMargin" >
-         <number>0</number>
-        </property>
-        <property name="rightMargin" >
-         <number>0</number>
-        </property>
-        <property name="bottomMargin" >
-         <number>0</number>
-        </property>
-        <property name="horizontalSpacing" >
-         <number>0</number>
-        </property>
-        <property name="verticalSpacing" >
-         <number>0</number>
-        </property>
-        <item row="0" column="0" >
-         <layout class="QHBoxLayout" >
-          <item>
-           <widget class="QSlider" name="horizontalSlider" >
-            <property name="orientation" >
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="invertedControls" >
-             <bool>false</bool>
-            </property>
-            <property name="tickPosition" >
-             <enum>QSlider::TicksBelow</enum>
-            </property>
-            <property name="tickInterval" >
-             <number>10</number>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QSpinBox" name="spinBox" />
-          </item>
-         </layout>
-        </item>
-       </layout>
-      </widget>
-     </item>
-    </layout>
+   <item row="0" column="0" colspan="2" >
+    <widget class="QLabel" name="label" >
+     <property name="text" >
+      <string>Param</string>
+     </property>
+     <property name="alignment" >
+      <set>Qt::AlignCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0" >
+    <widget class="QSlider" name="horizontalSlider" >
+     <property name="orientation" >
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="invertedControls" >
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1" >
+    <widget class="QSpinBox" name="spinBox" />
    </item>
   </layout>
  </widget>