[Kst] branches/work/kst/1.5/kst/src/libkstapp

[Andrew Walker]

SVN commit 677646 by arwalker:

CCBUG:111114 Continue support for multiple editing of plots

 M  +1 -0      Makefile.am  
 D             datawizard.ui.h  
 M  +17 -5     kst2dplot.cpp  
 M  +1 -0      kst2dplot.h  
 M  +0 -31     view2dplotwidget.ui  
 D             view2dplotwidget.ui.h  


--- branches/work/kst/1.5/kst/src/libkstapp/Makefile.am #677645:677646
@@ -43,6 +43,7 @@
 	kstviewlabel.cpp \
 	kstplotlabel.cpp \
 	kst2dplot.cpp \
+	kst2dplotwidget_i.cpp \
 	kstviewlegend.cpp \
 	kstviewbox.cpp \
 	kstviewline.cpp \
--- branches/work/kst/1.5/kst/src/libkstapp/kst2dplot.cpp #677645:677646
@@ -72,7 +72,7 @@
 #include "kstviewlegend.h"
 #include "kstviewobjectfactory.h"
 #include "plotmimesource.h"
-#include "view2dplotwidget.h"
+#include "kst2dplotwidget_i.h"
 #include "plotlistbox.h"
 #include "vectorselector.h"
 #include "kstgfx2dplotmousehandler.h"
@@ -6964,13 +6964,25 @@
   }
 }
 
+/** prepare the custom widget for multiple edit */
+/** Unlike most viewObject dialogs, here we let the dialog prepare itself,
+    rather than having kst2dplot prepare it - kst2dplot is already too big! */
+void Kst2DPlot::populateEditMultiple(QWidget *w) {
+  Kst2dPlotWidget *widget = dynamic_cast<Kst2dPlotWidget*>(w);
+  if (!widget) {
+    return;
+  }
+
+  widget->populateEditMultiple(this);
+}
+
 /** fill the custom widget with current properties */
 /** Unlike most viewObject dialogs, here we let the dialog fill itself,
     rather than having kst2dplot fill it - kst2dplot is already too big! */
 bool Kst2DPlot::fillConfigWidget(QWidget *w, bool isNew) const {
   Q_UNUSED(isNew)
 
-  View2DPlotWidget *widget = dynamic_cast<View2DPlotWidget*>(w);
+  Kst2dPlotWidget *widget = dynamic_cast<Kst2dPlotWidget*>(w);
   if (!widget) {
     return false;
   }
@@ -6986,7 +6998,7 @@
 bool Kst2DPlot::readConfigWidget(QWidget *w, bool editMultipleMode) {
   Q_UNUSED(editMultipleMode)
 
-  View2DPlotWidget *widget = dynamic_cast<View2DPlotWidget*>(w);
+  Kst2dPlotWidget *widget = dynamic_cast<Kst2dPlotWidget*>(w);
   if (!widget) {
     return false;
   }
@@ -6997,7 +7009,7 @@
 }
 
 void Kst2DPlot::connectConfigWidget(QWidget *parent, QWidget *w) const {
-  View2DPlotWidget *widget = dynamic_cast<View2DPlotWidget*>(w);
+  Kst2dPlotWidget *widget = dynamic_cast<Kst2dPlotWidget*>(w);
   if (!widget) {
     return;
   }
@@ -7165,7 +7177,7 @@
 }
 
 QWidget *Kst2DPlot::configWidget(QWidget *parent) {
-  return new View2DPlotWidget(parent, "custom");
+  return new Kst2dPlotWidget(parent, "custom");
 }
 
 namespace {
--- branches/work/kst/1.5/kst/src/libkstapp/kst2dplot.h #677645:677646
@@ -102,6 +102,7 @@
   bool fillConfigWidget(QWidget *w, bool isNew) const;
   bool readConfigWidget(QWidget *w, bool editMultipleMode);
   void connectConfigWidget(QWidget *parent, QWidget *w) const;
+  void populateEditMultiple(QWidget *w);
 
   static Kst2DPlotList globalPlotList();
   static Kst2DPlotPtr findPlotByName(const QString& name);
--- branches/work/kst/1.5/kst/src/libkstapp/view2dplotwidget.ui #677645:677646
@@ -2925,54 +2925,23 @@
     <include location="local" impldecl="in implementation">kstplotlabel.h</include>
     <include location="local" impldecl="in implementation">kstdebug.h</include>
     <include location="local" impldecl="in implementation">kstdefaultnames.h</include>
-    <include location="local" impldecl="in implementation">view2dplotwidget.ui.h</include>
 </includes>
 <variables>
-    <variable access="private">Kst2DPlotPtr _plot;</variable>
-    <variable access="private">QLineEdit *ScalarDest;</variable>
 </variables>
 <signals>
-    <signal>changed()</signal>
 </signals>
 <slots>
-    <slot>generateDefaultLabels()</slot>
-    <slot>updateButtons()</slot>
-    <slot>addDisplayedCurve()</slot>
-    <slot>removeDisplayedCurve()</slot>
-    <slot>fillMarkerLineCombo()</slot>
-    <slot>updateAxesButtons()</slot>
-    <slot>updateScalarCombo()</slot>
-    <slot>updatePlotMarkers( const Kst2DPlot * plot )</slot>
-    <slot>fillWidget( const Kst2DPlot * plot )</slot>
-    <slot>applyAppearance( Kst2DPlotPtr plot )</slot>
-    <slot>applyXAxis( Kst2DPlotPtr plot )</slot>
-    <slot>applyYAxis( Kst2DPlotPtr plot )</slot>
-    <slot>applyRange( Kst2DPlotPtr plot )</slot>
-    <slot>addPlotMarker()</slot>
-    <slot>removePlotMarker()</slot>
-    <slot>removeAllPlotMarkers()</slot>
-    <slot>applyPlotMarkers( Kst2DPlotPtr plot )</slot>
-    <slot>fillPlot( Kst2DPlotPtr plot )</slot>
-    <slot>insertCurrentScalar()</slot>
-    <slot>setScalarDestXLabel()</slot>
-    <slot>setScalarDestYLabel()</slot>
-    <slot>setScalarDestTopLabel()</slot>
-    <slot>editLegend()</slot>
 </slots>
 <functions>
-    <function access="private" specifier="non virtual">init()</function>
 </functions>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>plotlistbox.h</includehint>
-    <includehint>plotlistbox.h</includehint>
     <includehint>kdualcolorbutton.h</includehint>
     <includehint>kcolorbutton.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
     <includehint>kfontcombo.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>kcombobox.h</includehint>
-    <includehint>kcolorbutton.h</includehint>
     <includehint>vectorselector.h</includehint>
     <includehint>kstcombobox.h</includehint>
 </includehints>