[Kst] kdeextragear-2/kst/kst

[Barth Netterfield]

CVS commit by netterfield: 

Curve placement widget has a 3rd option (don't plot)
Don't updateContents on dataManager if it is not showing.


  M +36 -28    curveplacementwidget.ui   1.11
  M +4 -1      kst.cpp   1.184


--- kdeextragear-2/kst/kst/curveplacementwidget.ui  #1.10:1.11
@@ -1,3 +1,3 @@
-<!DOCTYPE UI><UI version="3.1" stdsetdef="1">
+<!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>CurvePlacementWidget</class>
 <widget class="QWidget">
@@ -9,6 +9,6 @@
             <x>0</x>
             <y>0</y>
-            <width>289</width>
-            <height>110</height>
+            <width>348</width>
+            <height>134</height>
         </rect>
     </property>
@@ -76,29 +76,4 @@
                     </property>
                 </widget>
-                <widget class="QRadioButton" row="1" column="0" rowspan="1" colspan="2">
-                    <property name="name">
-                        <cstring>_inPlot</cstring>
-                    </property>
-                    <property name="text">
-                        <string>Place in &amp;existing plot:</string>
-                    </property>
-                    <property name="accel">
-                        <string>Alt+E</string>
-                    </property>
-                </widget>
-                <widget class="QRadioButton" row="2" column="0" rowspan="1" colspan="2">
-                    <property name="name">
-                        <cstring>_newPlot</cstring>
-                    </property>
-                    <property name="text">
-                        <string>Place in &amp;new plot.</string>
-                    </property>
-                    <property name="accel">
-                        <string>Alt+N</string>
-                    </property>
-                    <property name="checked">
-                        <bool>true</bool>
-                    </property>
-                </widget>
                 <widget class="QLabel" row="2" column="2">
                     <property name="name">
@@ -174,4 +149,37 @@
                     </property>
                 </widget>
+                <widget class="QRadioButton" row="1" column="0" rowspan="1" colspan="2">
+                    <property name="name">
+                        <cstring>_inPlot</cstring>
+                    </property>
+                    <property name="text">
+                        <string>Place in &amp;existing plot:</string>
+                    </property>
+                    <property name="accel">
+                        <string>Alt+E</string>
+                    </property>
+                </widget>
+                <widget class="QRadioButton" row="2" column="0" rowspan="1" colspan="2">
+                    <property name="name">
+                        <cstring>_newPlot</cstring>
+                    </property>
+                    <property name="text">
+                        <string>Place in &amp;new plot.</string>
+                    </property>
+                    <property name="accel">
+                        <string>Alt+N</string>
+                    </property>
+                    <property name="checked">
+                        <bool>true</bool>
+                    </property>
+                </widget>
+                <widget class="QRadioButton" row="3" column="0" rowspan="1" colspan="2">
+                    <property name="name">
+                        <cstring>_dontPlace</cstring>
+                    </property>
+                    <property name="text">
+                        <string>Do not place curve in any plot</string>
+                    </property>
+                </widget>
             </grid>
         </widget>

--- kdeextragear-2/kst/kst/kst.cpp  #1.183:1.184
@@ -1231,7 +1231,10 @@ void KstApp::updateDataDialogs(bool dm) 
     viewFitsDialog->updateViewFitsDialog();
   }
+
   if (dm) {
+    if (!dataManager->isHidden()) {
     dataManager->updateContents();
   }
+  }
 }