From kde-commits Fri Nov 30 23:17:03 2007 From: Andrew Walker Date: Fri, 30 Nov 2007 23:17:03 +0000 To: kde-commits Subject: branches/work/kst/1.6/kst/src/libkstapp Message-Id: <1196464623.611820.12799.nullmailer () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=119646528802494 SVN commit 743437 by arwalker: further work on Apply functionality for data object dialogs - only plugins and testing remain M +1 -0 kstdatadialog.ui.h M +16 -2 ksteventmonitor_i.cpp M +2 -4 ksteventmonitor_i.h M +21 -0 kstimagedialog_i.cpp M +31 -0 kstmatrixdialog_i.cpp M +33 -1 kstvvdialog_i.cpp M +1 -1 kstvvdialog_i.h --- branches/work/kst/1.6/kst/src/libkstapp/kstdatadialog.ui.h #743436:743437 @@ -78,6 +78,7 @@ connect(this, SIGNAL(modified()), KstApp::inst()->document(), SLOT(wasModified())); connect(_editMultiple, SIGNAL(clicked()), this, SLOT(toggleEditMultiple())); connect(_tagName, SIGNAL(textChanged(const QString&)), this, SLOT(wasModifiedApply())); + connect(_legendText, SIGNAL(textChanged(const QString&)), this, SLOT(wasModifiedApply())); _editMultiple->hide(); _editMultipleWidget->hide(); } --- branches/work/kst/1.6/kst/src/libkstapp/ksteventmonitor_i.cpp #743436:743437 @@ -60,7 +60,7 @@ connect(_w->_scalarSelectorEq, SIGNAL(selectionChangedLabel(const QString&)), _w->lineEditEquation, SLOT(insert(const QString&))); connect(_w->_scalarSelectorEq, SIGNAL(selectionChangedLabel(const QString&)), _w->lineEditEquation, SLOT(setFocus())); connect(_w->_pushButtonELOGConfigure, SIGNAL(clicked()), KstApp::inst(), SLOT(EventELOGConfigure())); - + // more multiple edit mode connect(_w->checkBoxDebug, SIGNAL(clicked()), this, SLOT(setcheckBoxDebugDirty())); connect(_w->checkBoxEMailNotify, SIGNAL(clicked()), this, SLOT(setcheckBoxEMailNotifyDirty())); @@ -68,6 +68,20 @@ connect(_w->_useScript, SIGNAL(clicked()), this, SLOT(setScriptDirty())); connect(_w->_script, SIGNAL(textChanged()), this, SLOT(setScriptDirty())); + // for apply button + connect(_w->lineEditEquation, SIGNAL(textChanged(const QString&)), this, SLOT(wasModifiedApply())); + connect(_w->lineEditDescription, SIGNAL(textChanged(const QString&)), this, SLOT(wasModifiedApply())); + connect(_w->checkBoxDebug, SIGNAL(clicked()), this, SLOT(wasModifiedApply())); + connect(_w->radioButtonLogNotice, SIGNAL(clicked()), this, SLOT(wasModifiedApply())); + connect(_w->radioButtonLogWarning, SIGNAL(clicked()), this, SLOT(wasModifiedApply())); + connect(_w->radioButtonLogError, SIGNAL(clicked()), this, SLOT(wasModifiedApply())); + connect(_w->checkBoxEMailNotify, SIGNAL(clicked()), this, SLOT(wasModifiedApply())); + connect(_w->lineEditEMailRecipients, SIGNAL(textChanged(const QString&)), this, SLOT(wasModifiedApply())); + connect(_w->checkBoxELOGNotify, SIGNAL(clicked()), this, SLOT(wasModifiedApply())); + connect(_w->_pushButtonELOGConfigure, SIGNAL(clicked()), this, SLOT(wasModifiedApply())); + connect(_w->_useScript, SIGNAL(clicked()), this, SLOT(wasModifiedApply())); + connect(_w->_script, SIGNAL(textChanged()), this, SLOT(wasModifiedApply())); + setFixedHeight(height()); } @@ -406,4 +420,4 @@ } #include "ksteventmonitor_i.moc" -// vim: ts=2 sw=2 et + --- branches/work/kst/1.6/kst/src/libkstapp/ksteventmonitor_i.h #743436:743437 @@ -33,7 +33,7 @@ protected: QString editTitle() { return tr("Edit Event Monitor"); } QString newTitle() { return tr("New Event Monitor"); } - + public slots: void update(); bool newObject(); @@ -63,7 +63,7 @@ bool _checkBoxELOGNotifyDirty : 1; bool _scriptDirty : 1; bool editSingleObject(EventMonitorEntryPtr emPtr); - + private slots: void setcheckBoxDebugDirty(); void setcheckBoxEMailNotifyDirty(); @@ -76,6 +76,4 @@ EventMonitorWidget *_w; }; - #endif -// vim: ts=2 sw=2 et --- branches/work/kst/1.6/kst/src/libkstapp/kstimagedialog_i.cpp #743436:743437 @@ -75,6 +75,27 @@ connect(_w->_realTimeAutoThreshold, SIGNAL(clicked()), this, SLOT(setRealTimeAutoThresholdDirty())); connect(_w->_useVariableWeight, SIGNAL(clicked()), this, SLOT(setUseVariableWeightDirty())); connect(_w->_contourColor, SIGNAL(clicked()), this, SLOT(setContourColorDirty())); + + // for apply button + connect(_w->_matrix, SIGNAL(selectionChanged(const QString&)), this, SLOT(wasModifiedApply())); + connect(_w->_matrix, SIGNAL(selectionChangedLabel(const QString&)), this, SLOT(wasModifiedApply())); + connect(_w->_colorOnly, SIGNAL(clicked()), this, SLOT(wasModifiedApply())); + connect(_w->_contourOnly, SIGNAL(clicked()), this, SLOT(wasModifiedApply())); + connect(_w->_colorAndContour, SIGNAL(clicked()), this, SLOT(wasModifiedApply())); + connect(_w->_colorPalette->_palette, SIGNAL(highlighted(int)), this, SLOT(wasModifiedApply())); + connect(_w->_lowerZ, SIGNAL(textChanged(const QString&)), this, SLOT(wasModifiedApply())); + connect(_w->_upperZ, SIGNAL(textChanged(const QString&)), this, SLOT(wasModifiedApply())); + connect(_w->_autoThreshold, SIGNAL(clicked()), this, SLOT(wasModifiedApply())); + connect(_w->_smartThreshold, SIGNAL(clicked()), this, SLOT(wasModifiedApply())); + connect(_w->_smartThresholdValue, SIGNAL(valueChanged(double)), this, SLOT(wasModifiedApply())); + connect(_w->_smartThresholdValue->child("qt_spinbox_edit"), SIGNAL(textChanged(const QString&)), this, SLOT(wasModifiedApply())); + connect(_w->_realTimeAutoThreshold, SIGNAL(clicked()), this, SLOT(wasModifiedApply())); + connect(_w->_numContourLines, SIGNAL(valueChanged(int)), this, SLOT(wasModifiedApply())); + connect(_w->_numContourLines->child("qt_spinbox_edit"), SIGNAL(textChanged(const QString&)), this, SLOT(wasModifiedApply())); + connect(_w->_contourColor, SIGNAL(changed(const QColor&)), this, SLOT(wasModifiedApply())); + connect(_w->_contourWeight, SIGNAL(valueChanged(int)), this, SLOT(wasModifiedApply())); + connect(_w->_contourWeight->child("qt_spinbox_edit"), SIGNAL(textChanged(const QString&)), this, SLOT(wasModifiedApply())); + connect(_w->_useVariableWeight, SIGNAL(clicked()), this, SLOT(wasModifiedApply())); } --- branches/work/kst/1.6/kst/src/libkstapp/kstmatrixdialog_i.cpp #743436:743437 @@ -90,6 +90,37 @@ connect(_w->_doSkip, SIGNAL(clicked()), this, SLOT(setDoSkipDirty())); connect(_w->_doAve, SIGNAL(clicked()), this, SLOT(setDoAveDirty())); + // for apply button + connect(_w->_fileName, SIGNAL(textChanged(const QString&)), this, SLOT(wasModifiedApply())); + connect(_w->_field, SIGNAL(highlighted(int)), this, SLOT(wasModifiedApply())); + connect(_w->_configure, SIGNAL(clicked()), this, SLOT(wasModifiedApply())); + connect(_w->_xStart, SIGNAL(valueChanged(int)), this, SLOT(wasModifiedApply())); + connect(_w->_yStart, SIGNAL(valueChanged(int)), this, SLOT(wasModifiedApply())); + connect(_w->_xNumSteps, SIGNAL(valueChanged(int)), this, SLOT(wasModifiedApply())); + connect(_w->_yNumSteps, SIGNAL(valueChanged(int)), this, SLOT(wasModifiedApply())); + connect(_w->_xStart->child("qt_spinbox_edit"), SIGNAL(textChanged(const QString&)), this, SLOT(wasModifiedApply())); + connect(_w->_yStart->child("qt_spinbox_edit"), SIGNAL(textChanged(const QString&)), this, SLOT(wasModifiedApply())); + connect(_w->_xNumSteps->child("qt_spinbox_edit"), SIGNAL(textChanged(const QString&)), this, SLOT(wasModifiedApply())); + connect(_w->_yNumSteps->child("qt_spinbox_edit"), SIGNAL(textChanged(const QString&)), this, SLOT(wasModifiedApply())); + connect(_w->_xStartCountFromEnd, SIGNAL(clicked()), this, SLOT(wasModifiedApply())); + connect(_w->_yStartCountFromEnd, SIGNAL(clicked()), this, SLOT(wasModifiedApply())); + connect(_w->_xNumStepsReadToEnd, SIGNAL(clicked()), this, SLOT(wasModifiedApply())); + connect(_w->_yNumStepsReadToEnd, SIGNAL(clicked()), this, SLOT(wasModifiedApply())); + connect(_w->_doSkip, SIGNAL(clicked()), this, SLOT(wasModifiedApply())); + connect(_w->_skip, SIGNAL(valueChanged(int)), this, SLOT(wasModifiedApply())); + connect(_w->_skip->child("qt_spinbox_edit"), SIGNAL(textChanged(const QString&)), this, SLOT(wasModifiedApply())); + connect(_w->_doAve, SIGNAL(clicked()), this, SLOT(wasModifiedApply())); + connect(_w->_gradientX, SIGNAL(clicked()), this, SLOT(wasModifiedApply())); + connect(_w->_gradientY, SIGNAL(clicked()), this, SLOT(wasModifiedApply())); + connect(_w->_gradientZAtMin, SIGNAL(textChanged(const QString&)), this, SLOT(wasModifiedApply())); + connect(_w->_gradientZAtMax, SIGNAL(textChanged(const QString&)), this, SLOT(wasModifiedApply())); + connect(_w->_nX, SIGNAL(valueChanged(int)), this, SLOT(wasModifiedApply())); + connect(_w->_nY, SIGNAL(valueChanged(int)), this, SLOT(wasModifiedApply())); + connect(_w->_minX, SIGNAL(textChanged(const QString&)), this, SLOT(wasModifiedApply())); + connect(_w->_minY, SIGNAL(textChanged(const QString&)), this, SLOT(wasModifiedApply())); + connect(_w->_xStep, SIGNAL(textChanged(const QString&)), this, SLOT(wasModifiedApply())); + connect(_w->_yStep, SIGNAL(textChanged(const QString&)), this, SLOT(wasModifiedApply())); + adjustSize(); resize(minimumSizeHint()); setFixedHeight(height()); --- branches/work/kst/1.6/kst/src/libkstapp/kstvvdialog_i.cpp #743436:743437 @@ -93,6 +93,37 @@ connect(_w->_xMaxCheckbox, SIGNAL(clicked()), this, SLOT(xMaxCheckboxClicked())); connect(_w->_yMinCheckbox, SIGNAL(clicked()), this, SLOT(yMinCheckboxClicked())); connect(_w->_yMaxCheckbox, SIGNAL(clicked()), this, SLOT(yMaxCheckboxClicked())); + + // for apply button + connect(_w->_xVector, SIGNAL(selectionChanged(const QString&)), this, SLOT(wasModifiedApply())); + connect(_w->_xVector, SIGNAL(selectionChangedLabel(const QString&)), this, SLOT(wasModifiedApply())); + connect(_w->_xVector->_vector, SIGNAL(textChanged(const QString&)), this, SLOT(wasModifiedApply())); + connect(_w->_yVector, SIGNAL(selectionChanged(const QString&)), this, SLOT(wasModifiedApply())); + connect(_w->_yVector, SIGNAL(selectionChangedLabel(const QString&)), this, SLOT(wasModifiedApply())); + connect(_w->_yVector->_vector, SIGNAL(textChanged(const QString&)), this, SLOT(wasModifiedApply())); + connect(_w->_interp, SIGNAL(highlighted(int)), this, SLOT(wasModifiedApply())); + connect(_w->_xMinCheckbox, SIGNAL(clicked()), this, SLOT(wasModifiedApply())); + connect(_w->_xMinScalar, SIGNAL(selectionChanged(const QString&)), this, SLOT(wasModifiedApply())); + connect(_w->_xMinScalar, SIGNAL(selectionChangedLabel(const QString&)), this, SLOT(wasModifiedApply())); + connect(_w->_xMinScalar->_scalar, SIGNAL(textChanged(const QString&)), this, SLOT(wasModifiedApply())); + connect(_w->_xMaxCheckbox, SIGNAL(clicked()), this, SLOT(wasModifiedApply())); + connect(_w->_xMaxScalar, SIGNAL(selectionChanged(const QString&)), this, SLOT(wasModifiedApply())); + connect(_w->_xMaxScalar, SIGNAL(selectionChangedLabel(const QString&)), this, SLOT(wasModifiedApply())); + connect(_w->_xMaxScalar->_scalar, SIGNAL(textChanged(const QString&)), this, SLOT(wasModifiedApply())); + connect(_w->_yMinCheckbox, SIGNAL(clicked()), this, SLOT(wasModifiedApply())); + connect(_w->_yMinScalar, SIGNAL(selectionChanged(const QString&)), this, SLOT(wasModifiedApply())); + connect(_w->_yMinScalar, SIGNAL(selectionChangedLabel(const QString&)), this, SLOT(wasModifiedApply())); + connect(_w->_yMinScalar->_scalar, SIGNAL(textChanged(const QString&)), this, SLOT(wasModifiedApply())); + connect(_w->_yMaxCheckbox, SIGNAL(clicked()), this, SLOT(wasModifiedApply())); + connect(_w->_yMaxScalar, SIGNAL(selectionChanged(const QString&)), this, SLOT(wasModifiedApply())); + connect(_w->_yMaxScalar, SIGNAL(selectionChangedLabel(const QString&)), this, SLOT(wasModifiedApply())); + connect(_w->_yMaxScalar->_scalar, SIGNAL(textChanged(const QString&)), this, SLOT(wasModifiedApply())); + connect(_w->_plotAxes, SIGNAL(highlighted(int)), this, SLOT(wasModifiedApply())); + connect(_w->_plotList, SIGNAL(highlighted(int)), this, SLOT(wasModifiedApply())); + connect(_w->_realtimeButton, SIGNAL(clicked()), this, SLOT(wasModifiedApply())); + connect(_w->_currentButton, SIGNAL(clicked()), this, SLOT(wasModifiedApply())); + connect(_w->_FlagVector, SIGNAL(selectionChanged(const QString&)), this, SLOT(wasModifiedApply())); + connect(_w->_FlagVector, SIGNAL(selectionChangedLabel(const QString&)), this, SLOT(wasModifiedApply())); } @@ -146,6 +177,7 @@ _w->_yMaxCheckbox->setChecked(vp->useYmax()); KstScalarPtr sc; + QString str; sc = vp->xMinScalar(); if (!sc) { @@ -157,7 +189,7 @@ // just put its current value into the scalar selector. // warning: after edit it won't be updated anymore! // the motivation for putting this in is to not lose scale information when a plot is deleted. - _w->_xMinScalar->setSelection(QString::number(sc->value())); + _w->_xMinScalar->setSelection(QString::number(sc->value())); } sc = vp->xMaxScalar(); --- branches/work/kst/1.6/kst/src/libkstapp/kstvvdialog_i.h #743436:743437 @@ -34,7 +34,7 @@ protected: QString editTitle() { return tr("Edit Vector View"); } QString newTitle() { return tr("New Vector View"); } - + public slots: void update(); void updateWindow();