[Kst] kdeextragear-2/kst/kst

[George Staikos]

CVS commit by staikos: 

fix legends


  M +12 -0     datawizard.ui   1.7
  M +13 -1     datawizard.ui.h   1.7


--- kdeextragear-2/kst/kst/datawizard.ui  #1.6:1.7
@@ -605,4 +605,16 @@
 <connections>
     <connection>
+        <sender>_cycleExisting</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>_legends</receiver>
+        <slot>setDisabled(bool)</slot>
+    </connection>
+    <connection>
+        <sender>_existingPlot</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>_legends</receiver>
+        <slot>setDisabled(bool)</slot>
+    </connection>
+    <connection>
         <sender>_cycleThrough</sender>
         <signal>toggled(bool)</signal>

--- kdeextragear-2/kst/kst/datawizard.ui.h  #1.6:1.7
@@ -215,4 +215,9 @@ void DataWizard::finished()
     if (_onePlot->isChecked()) {
         KstPlot *p = new KstPlot(KST::plotList.generatePlotName());
+        p->GenerateDefaultLabels();
+        if (_legends->isChecked()) {
+            p->Legend->setShow(true);
+            p->Legend->setFront(true);
+        }
         plots.append(p);
         KST::plotList.append(p);
@@ -221,4 +226,9 @@ void DataWizard::finished()
         for (uint i = 0; i < l.count(); ++i) {
             p = new KstPlot(KST::plotList.generatePlotName());
+            p->GenerateDefaultLabels();
+            if (_legends->isChecked()) {
+                p->Legend->setShow(true);
+                p->Legend->setFront(true);
+            }
             plots.append(p);
             KST::plotList.append(p);
@@ -234,6 +244,8 @@ void DataWizard::finished()
         for (int i = 0; i < _plotNumber->value(); ++i) {
             p = new KstPlot(KST::plotList.generatePlotName());
+            p->GenerateDefaultLabels();
             if (_legends->isChecked()) {
                 p->Legend->setShow(true);
+                p->Legend->setFront(true);
             }
             plots.append(p);
@@ -274,5 +286,5 @@ void DataWizard::finished()
 
     if (relayout) {
-        KST::plotList.arrangePlots(QMAX(KST::plotList.getPlotCols(), int(sqrt(plots.count()))));
+        KST::plotList.arrangePlots(QMAX(KST::plotList.getPlotCols(), unsigned(sqrt(plots.count()))));
     }
 }