[Kst] kdeextragear-2/kst/kst

[George Staikos]

CVS commit by staikos: 

small fixlets, set focus, hide unimplemented feature in filters


  M +26 -6     datawizard.ui   1.19
  M +10 -1     datawizard.ui.h   1.27


--- kdeextragear-2/kst/kst/datawizard.ui  #1.18:1.19
@@ -9,6 +9,6 @@
             <x>0</x>
             <y>0</y>
-            <width>603</width>
-            <height>439</height>
+            <width>712</width>
+            <height>478</height>
         </rect>
     </property>
@@ -238,5 +238,5 @@
                 </property>
             </spacer>
-            <widget class="QLayoutWidget" row="2" column="0">
+            <widget class="QLayoutWidget" row="2" column="0" rowspan="2" colspan="1">
                 <property name="name">
                     <cstring>layout20</cstring>
@@ -516,4 +516,12 @@
                 </hbox>
             </widget>
+            <widget class="QCheckBox" row="3" column="1">
+                <property name="name">
+                    <cstring>_applyFilters</cstring>
+                </property>
+                <property name="text">
+                    <string>Apply filters</string>
+                </property>
+            </widget>
         </grid>
     </widget>
@@ -1056,4 +1064,10 @@
     </connection>
     <connection>
+        <sender>_applyFilters</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>DataWizard</receiver>
+        <slot>applyFiltersChecked(bool)</slot>
+    </connection>
+    <connection>
         <sender>_uncheckAll</sender>
         <signal>clicked()</signal>
@@ -1120,6 +1134,6 @@
     <include location="local" impldecl="in implementation">kstviewwindow.h</include>
     <include location="local" impldecl="in implementation">kst2dplot.h</include>
-    <include location="local" impldecl="in implementation">datawizard.ui.h</include>
     <include location="global" impldecl="in implementation">qdeepcopy.h</include>
+    <include location="local" impldecl="in implementation">datawizard.ui.h</include>
 </includes>
 <variables>
@@ -1132,4 +1146,6 @@
     <slot access="private">sourceChanged( const QString &amp; txt )</slot>
     <slot access="private">fieldListChanged()</slot>
+    <slot access="private">updateWindowBox()</slot>
+    <slot access="private">updatePlotBox()</slot>
     <slot access="private">uncheckAll()</slot>
     <slot access="private">vectorSubset( const QString &amp; filter )</slot>
@@ -1137,6 +1153,5 @@
     <slot access="private">newFilter()</slot>
     <slot access="private">finished()</slot>
-    <slot access="private">updateWindowBox()</slot>
-    <slot access="private">updatePlotBox()</slot>
+    <slot access="private">applyFiltersChecked( bool on )</slot>
 </slots>
 <functions>
@@ -1152,5 +1167,10 @@
     <includehint>kpushbutton.h</includehint>
     <includehint>kcombobox.h</includehint>
+    <includehint>klineedit.h</includehint>
+    <includehint>knuminput.h</includehint>
+    <includehint>knuminput.h</includehint>
     <includehint>knuminput.h</includehint>
+    <includehint>kcombobox.h</includehint>
+    <includehint>kcombobox.h</includehint>
 </includehints>
 </UI>

--- kdeextragear-2/kst/kst/datawizard.ui.h  #1.26:1.27
@@ -11,4 +11,5 @@
 void DataWizard::init()
 {
+  setAppropriate(_pageFilters, false);
   setIcon(BarIcon("kst_datawizard"));
   _source->setMode(KFile::File | KFile::Directory | KFile::ExistingOnly
@@ -19,5 +20,4 @@ void DataWizard::init()
   setNextEnabled(_pageFilters, true);
   setFinishEnabled(_pagePlot, true);
-  _newFilter->setEnabled(false); // FIXME - implement first
   
   connect(finishButton(), SIGNAL(clicked()), this, SLOT(finished()));
@@ -28,4 +28,7 @@ void DataWizard::init()
   setHelpEnabled(_pageFilters, false);
   setHelpEnabled(_pagePlot, false);
+  _source->setFocus();
+  _newFilter->setEnabled(false);
+  _newFilter->hide(); // FIXME: implement this
 }
 
@@ -484,2 +487,8 @@ void DataWizard::finished()
   delete dlg;
 }
+
+
+void DataWizard::applyFiltersChecked( bool on )
+{
+    setAppropriate(_pageFilters, on);
+}