[Kst] kdeextragear-2/kst/kst

[Rick Chern]

CVS commit by rchern: 

-No need to rename "Curve Placement" anymore for image dialog
-clean up button group names


  M +4 -4      imagedialog.ui   1.10
  M +11 -13    kstimagedialog_i.cpp   1.18


--- kdeextragear-2/kst/kst/imagedialog.ui  #1.9:1.10
@@ -118,5 +118,5 @@
         <widget class="QButtonGroup" row="1" column="0">
             <property name="name">
-                <cstring>buttonGroup9</cstring>
+                <cstring>_arrayGroup</cstring>
             </property>
             <property name="sizePolicy">
@@ -168,5 +168,5 @@
         <widget class="QButtonGroup" row="3" column="0">
             <property name="name">
-                <cstring>buttonGroup5</cstring>
+                <cstring>_colorMapGroup</cstring>
             </property>
             <property name="sizePolicy">
@@ -306,5 +306,5 @@
         <widget class="QButtonGroup" row="2" column="0">
             <property name="name">
-                <cstring>buttonGroup4</cstring>
+                <cstring>_imageTypeGroup</cstring>
             </property>
             <property name="title">
@@ -359,5 +359,5 @@
         <widget class="QButtonGroup" row="4" column="0">
             <property name="name">
-                <cstring>buttonGroup3</cstring>
+                <cstring>_contourMapGroup</cstring>
             </property>
             <property name="title">

--- kdeextragear-2/kst/kst/kstimagedialog_i.cpp  #1.17:1.18
@@ -169,17 +169,15 @@ void KstImageDialogI::_fillFieldsForNew(
   //let the image be placed in plots
   _curvePlacement->update();
-  _curvePlacement->_curvePlacementGroup->setTitle(i18n("Image Placement"));
-  _curvePlacement->_dontPlace->setText(i18n("Do not place image in any plot"));
+
   //for some reason the widgets need to be placed from bottom to top
-  // let's clean up the names here - it's impossible to know what these are
-  buttonGroup4->hide();
-  buttonGroup3->hide();
-  buttonGroup5->hide();
-  buttonGroup9->hide();
+  _imageTypeGroup->hide();
+  _contourMapGroup->hide();
+  _colorMapGroup->hide();
+  _arrayGroup->hide();
   _curvePlacement->show();
-  buttonGroup3->show();
-  buttonGroup5->show();
-  buttonGroup4->show();
-  buttonGroup9->show();
+  _contourMapGroup->show();
+  _colorMapGroup->show();
+  _imageTypeGroup->show();
+  _arrayGroup->show();
 
   //use whatever setting was used last
@@ -352,6 +350,6 @@ void KstImageDialogI::placeInPlot(KstIma
 
 void KstImageDialogI::updateGroups() {
-  buttonGroup5->setEnabled(_colorOnly->isChecked() || _colorAndContour->isChecked());
-  buttonGroup3->setEnabled(_contourOnly->isChecked() || _colorAndContour->isChecked());
+  _colorMapGroup->setEnabled(_colorOnly->isChecked() || _colorAndContour->isChecked());
+  _contourMapGroup->setEnabled(_contourOnly->isChecked() || _colorAndContour->isChecked());
 }