[Kst] extragear/graphics/kst/kst

[Barth Netterfield]

SVN commit 484292 by netterfield:

Scalar selector emits into text.
Fill Justification combos
Setting transparent disables irrelevant box properties.



 M  +5 -1      ksteditviewobjectdialog_i.cpp  
 M  +59 -2     viewlabelwidget.ui  
 A             viewlabelwidget.ui.h   [License: no copyright]


--- trunk/extragear/graphics/kst/kst/ksteditviewobjectdialog_i.cpp #484291:484292
@@ -101,8 +101,12 @@
       return;
     }
 
+    //---------------------------------------------------------------
+    // NOTE: due to Early return, nothing after this line is executed
+    // if the view object provides a custom widget.
+
     int numProperties = _viewObject->metaObject()->numProperties(true);
-    
+
     // create a new grid
     _grid = new QGridLayout(_propertiesFrame, numProperties, 2, 0, 8);
     _grid->setColStretch(0,0);
--- trunk/extragear/graphics/kst/kst/viewlabelwidget.ui #484291:484292
@@ -1,9 +1,20 @@
-<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
+<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>ViewLabelWidget</class>
 <widget class="QWidget">
     <property name="name">
         <cstring>viewLabelWidget</cstring>
     </property>
+    <property name="geometry">
+        <rect>
+            <x>0</x>
+            <y>0</y>
+            <width>525</width>
+            <height>396</height>
+        </rect>
+    </property>
+    <property name="caption">
+        <string>viewLabelWidget</string>
+    </property>
     <vbox>
         <property name="name">
             <cstring>unnamed</cstring>
@@ -90,7 +101,7 @@
                                 <cstring>textLabel5_3</cstring>
                             </property>
                             <property name="text">
-                                <string>Justification - </string>
+                                <string>Justification -</string>
                             </property>
                             <property name="alignment">
                                 <set>AlignVCenter</set>
@@ -360,15 +371,61 @@
 </widget>
 <customwidgets>
 </customwidgets>
+<connections>
+    <connection>
+        <sender>_transparent</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>textLabel4_4</receiver>
+        <slot>setDisabled(bool)</slot>
+    </connection>
+    <connection>
+        <sender>_transparent</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>_border</receiver>
+        <slot>setDisabled(bool)</slot>
+    </connection>
+    <connection>
+        <sender>_transparent</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>textLabel4_4_3</receiver>
+        <slot>setDisabled(bool)</slot>
+    </connection>
+    <connection>
+        <sender>_transparent</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>_margin</receiver>
+        <slot>setDisabled(bool)</slot>
+    </connection>
+    <connection>
+        <sender>_transparent</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>textLabel4_4_2</receiver>
+        <slot>setDisabled(bool)</slot>
+    </connection>
+    <connection>
+        <sender>_transparent</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>_boxColors</receiver>
+        <slot>setDisabled(bool)</slot>
+    </connection>
+</connections>
 <includes>
     <include location="global" impldecl="in implementation">scalarselector.h</include>
     <include location="global" impldecl="in declaration">kst_export.h</include>
+    <include location="local" impldecl="in implementation">viewlabelwidget.ui.h</include>
 </includes>
+<slots>
+    <slot>insertScalarInText( const QString &amp; S )</slot>
+</slots>
+<functions>
+    <function>init()</function>
+</functions>
 <exportmacro>KST_EXPORT</exportmacro>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>knuminput.h</includehint>
+    <includehint>kcombobox.h</includehint>
     <includehint>kfontcombo.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>kcolorbutton.h</includehint>