[Kst] branches/work/kst/portto4/kst/src
Adam Treat
treat at kde.org
Wed Mar 14 23:36:22 CET 2007
SVN commit 642635 by treat:
* Presenting Kst 1.99 extreme alpha:
http://img358.imageshack.us/my.php?image=kst19extremealphano4.png
M +2 -1 kst/main.cpp
M +17 -17 libkstapp/kst.cpp
M +83 -83 libkstapp/kstdatamanager.cpp
--- branches/work/kst/portto4/kst/src/kst/main.cpp #642634:642635
@@ -797,7 +797,8 @@
delete kst;
return 0;
} else {
- kst->updateDialogs();
+//FIXME PORT!
+// kst->updateDialogs();
if (showQuickStart) {
kst->showQuickStartDialog();
--- branches/work/kst/portto4/kst/src/libkstapp/kst.cpp #642634:642635
@@ -156,7 +156,7 @@
viewStringsDialog = new KstViewStringsDialogI(this);
viewVectorsDialog = new KstViewVectorsDialogI(this);
viewMatricesDialog = new KstViewMatricesDialogI(this);
- viewFitsDialog = new KstViewFitsDialogI(this);
+// viewFitsDialog = new KstViewFitsDialogI(this);
changeFileDialog = new KstChangeFileDialogI(this);
chooseColorDialog = new KstChooseColorDialogI(this);
differentiateCurvesDialog = new KstCurveDifferentiateI(this);
@@ -175,7 +175,7 @@
_updateThread = new UpdateThread(doc);
_updateThread->setUpdateTime(KstSettings::globalSettings()->plotUpdateTimer);
- _updateThread->start();
+// _updateThread->start();
/*** Plot Dialog signals */
connect(changeFileDialog, SIGNAL(docChanged()),
@@ -199,7 +199,7 @@
connect(this, SIGNAL(settingsChanged()), this, SLOT(slotSettingsChanged()));
- QTimer::singleShot(0, this, SLOT(updateActions()));
+// QTimer::singleShot(0, this, SLOT(updateActions()));
//FIXME PORT!
// if (!isFakingSDIApplication()) {
@@ -535,12 +535,12 @@
KstVectorDialogI::globalInstance(), SLOT(show()));
/************/
- CurveDialogAction = new KAction(KIcon("kst_curvenew"), i18n("New &Curve..."),
- actionCollection());
- CurveDialogAction->setWhatsThis(i18n("Bring up a dialog box\n"
- "to create a new curve."));
- connect(CurveDialogAction, SIGNAL(triggered()),
- KstCurveDialogI::globalInstance(), SLOT(show()));
+// CurveDialogAction = new KAction(KIcon("kst_curvenew"), i18n("New &Curve..."),
+// actionCollection());
+// CurveDialogAction->setWhatsThis(i18n("Bring up a dialog box\n"
+// "to create a new curve."));
+// connect(CurveDialogAction, SIGNAL(triggered()),
+// KstCurveDialogI::globalInstance(), SLOT(show()));
/************/
CsdDialogAction = new KAction(KIcon("kst_csdnew"), i18n("New Cumulative &Spectral Decay..."),
@@ -1860,14 +1860,14 @@
// }
// }
- QListIterator<KMdiChildView*> it(childViews());
- while (it.hasNext()) {
- KstViewWindow *pView = dynamic_cast<KstViewWindow*>(it.next());
- if (pView) {
- pView->view()->setViewMode(mode, createType);
- }
- it.next();
- }
+// QListIterator<KMdiChildView*> it(childViews());
+// while (it.hasNext()) {
+// KstViewWindow *pView = dynamic_cast<KstViewWindow*>(it.next());
+// if (pView) {
+// pView->view()->setViewMode(mode, createType);
+// }
+// it.next();
+// }
_viewMode = mode;
_createType = createType;
--- branches/work/kst/portto4/kst/src/libkstapp/kstdatamanager.cpp #642634:642635
@@ -632,89 +632,89 @@
_searchWidget->createSearchLine(DataView);
_searchWidget->searchLine()->setSearchColumns(cols);
- Q3MainWindow *main = static_cast<Q3MainWindow*>(parent);
- main->setUsesTextLabel(true);
-
- _primitive = new Q3ToolBar(i18n("Primitive Objects"), main, this);
- _primitive->setFrameStyle(Q3Frame::NoFrame);
- _primitive->setOrientation(Qt::Vertical);
- _primitive->setBackgroundMode(Qt::PaletteBase);
-
- _data = new Q3ToolBar(i18n("Data Objects"), main, this);
- _data->setFrameStyle(Q3Frame::NoFrame);
- _data->setOrientation(Qt::Vertical);
- _data->setBackgroundMode(Qt::PaletteBase);
-
- _fits = new Q3ToolBar(i18n("Fit Objects"), main, this);
- _fits->setFrameStyle(Q3Frame::NoFrame);
- _fits->setOrientation(Qt::Vertical);
- _fits->setBackgroundMode(Qt::PaletteBase);
-
- _filters = new Q3ToolBar(i18n("Filter Objects"), main, this);
- _filters->setFrameStyle(Q3Frame::NoFrame);
- _filters->setOrientation(Qt::Vertical);
- _filters->setBackgroundMode(Qt::PaletteBase);
-
- ToolBox->setUpdatesEnabled(false);
-
- _primitive->setUpdatesEnabled(false);
- _primitive->clear();
-
- _data->setUpdatesEnabled(false);
- _data->clear();
-
- _fits->setUpdatesEnabled(false);
- _fits->clear();
-
- _filters->setUpdatesEnabled(false);
- _filters->clear();
-
- //Create canonical actions...
-// createObjectAction(i18n("Scalar"), _primitive, KstScalarDialogI::globalInstance(), SLOT(show()));
- createObjectAction(i18n("Vector"), _primitive, KstVectorDialogI::globalInstance(), SLOT(show()));
- createObjectAction(i18n("Matrix"), _primitive, KstMatrixDialogI::globalInstance(), SLOT(show()));
-// createObjectAction(i18n("String"), _primitive, KstStringDialogI::globalInstance(), SLOT(show()));
-
- createObjectAction(i18n("Curve"), _data, KstCurveDialogI::globalInstance(), SLOT(show()));
- createObjectAction(i18n("Equation"), _data, KstEqDialogI::globalInstance(), SLOT(show()));
- createObjectAction(i18n("Histogram"), _data, KstHsDialogI::globalInstance(), SLOT(show()));
- createObjectAction(i18n("Power Spectrum"), _data, KstPsdDialogI::globalInstance(), SLOT(show()));
- createObjectAction(i18n("Event Monitor"), _data, KstEventMonitorI::globalInstance(), SLOT(show()));
- createObjectAction(i18n("Image"), _data, KstImageDialogI::globalInstance(), SLOT(show()));
- createObjectAction(i18n("CSD"), _data, KstCsdDialogI::globalInstance(), SLOT(show()));
-
- //Create plugin actions...
- setupPluginActions();
-
- //TODO sort the actions in each box alphabetically?
-
- QWidget *priw = new QWidget(_primitive);
- priw->setBackgroundMode(Qt::PaletteBase);
- _primitive->setStretchableWidget(priw);
-
- QWidget *datw = new QWidget(_data);
- datw->setBackgroundMode(Qt::PaletteBase);
- _data->setStretchableWidget(datw);
-
- QWidget *fitw = new QWidget(_fits);
- fitw->setBackgroundMode(Qt::PaletteBase);
- _fits->setStretchableWidget(fitw);
-
- QWidget *filw = new QWidget(_filters);
- filw->setBackgroundMode(Qt::PaletteBase);
- _filters->setStretchableWidget(filw);
-
- ToolBox->setUpdatesEnabled(true);
-
- _primitive->setUpdatesEnabled(true);
- _data->setUpdatesEnabled(true);
- _fits->setUpdatesEnabled(true);
- _filters->setUpdatesEnabled(true);
-
- ToolBox->addItem(_primitive, i18n("Primitive Objects"));
- ToolBox->addItem(_data, i18n("Data Objects"));
- ToolBox->addItem(_fits, i18n("Fit Objects"));
- ToolBox->addItem(_filters, i18n("Filter Objects"));
+// Q3MainWindow *main = static_cast<Q3MainWindow*>(parent);
+// main->setUsesTextLabel(true);
+//
+// _primitive = new Q3ToolBar(i18n("Primitive Objects"), main, this);
+// _primitive->setFrameStyle(Q3Frame::NoFrame);
+// _primitive->setOrientation(Qt::Vertical);
+// _primitive->setBackgroundMode(Qt::PaletteBase);
+//
+// _data = new Q3ToolBar(i18n("Data Objects"), main, this);
+// _data->setFrameStyle(Q3Frame::NoFrame);
+// _data->setOrientation(Qt::Vertical);
+// _data->setBackgroundMode(Qt::PaletteBase);
+//
+// _fits = new Q3ToolBar(i18n("Fit Objects"), main, this);
+// _fits->setFrameStyle(Q3Frame::NoFrame);
+// _fits->setOrientation(Qt::Vertical);
+// _fits->setBackgroundMode(Qt::PaletteBase);
+//
+// _filters = new Q3ToolBar(i18n("Filter Objects"), main, this);
+// _filters->setFrameStyle(Q3Frame::NoFrame);
+// _filters->setOrientation(Qt::Vertical);
+// _filters->setBackgroundMode(Qt::PaletteBase);
+//
+// ToolBox->setUpdatesEnabled(false);
+//
+// _primitive->setUpdatesEnabled(false);
+// _primitive->clear();
+//
+// _data->setUpdatesEnabled(false);
+// _data->clear();
+//
+// _fits->setUpdatesEnabled(false);
+// _fits->clear();
+//
+// _filters->setUpdatesEnabled(false);
+// _filters->clear();
+//
+// //Create canonical actions...
+// // createObjectAction(i18n("Scalar"), _primitive, KstScalarDialogI::globalInstance(), SLOT(show()));
+// createObjectAction(i18n("Vector"), _primitive, KstVectorDialogI::globalInstance(), SLOT(show()));
+// createObjectAction(i18n("Matrix"), _primitive, KstMatrixDialogI::globalInstance(), SLOT(show()));
+// // createObjectAction(i18n("String"), _primitive, KstStringDialogI::globalInstance(), SLOT(show()));
+//
+// createObjectAction(i18n("Curve"), _data, KstCurveDialogI::globalInstance(), SLOT(show()));
+// createObjectAction(i18n("Equation"), _data, KstEqDialogI::globalInstance(), SLOT(show()));
+// createObjectAction(i18n("Histogram"), _data, KstHsDialogI::globalInstance(), SLOT(show()));
+// createObjectAction(i18n("Power Spectrum"), _data, KstPsdDialogI::globalInstance(), SLOT(show()));
+// createObjectAction(i18n("Event Monitor"), _data, KstEventMonitorI::globalInstance(), SLOT(show()));
+// createObjectAction(i18n("Image"), _data, KstImageDialogI::globalInstance(), SLOT(show()));
+// createObjectAction(i18n("CSD"), _data, KstCsdDialogI::globalInstance(), SLOT(show()));
+//
+// //Create plugin actions...
+// setupPluginActions();
+//
+// //TODO sort the actions in each box alphabetically?
+//
+// QWidget *priw = new QWidget(_primitive);
+// priw->setBackgroundMode(Qt::PaletteBase);
+// _primitive->setStretchableWidget(priw);
+//
+// QWidget *datw = new QWidget(_data);
+// datw->setBackgroundMode(Qt::PaletteBase);
+// _data->setStretchableWidget(datw);
+//
+// QWidget *fitw = new QWidget(_fits);
+// fitw->setBackgroundMode(Qt::PaletteBase);
+// _fits->setStretchableWidget(fitw);
+//
+// QWidget *filw = new QWidget(_filters);
+// filw->setBackgroundMode(Qt::PaletteBase);
+// _filters->setStretchableWidget(filw);
+//
+// ToolBox->setUpdatesEnabled(true);
+//
+// _primitive->setUpdatesEnabled(true);
+// _data->setUpdatesEnabled(true);
+// _fits->setUpdatesEnabled(true);
+// _filters->setUpdatesEnabled(true);
+//
+// ToolBox->addItem(_primitive, i18n("Primitive Objects"));
+// ToolBox->addItem(_data, i18n("Data Objects"));
+// ToolBox->addItem(_fits, i18n("Fit Objects"));
+// ToolBox->addItem(_filters, i18n("Filter Objects"));
}
More information about the Kst
mailing list