headers
Adam Treat | 1 Oct 2007 17:50
Picon
Favicon
Gravatar

branches/work/kst/portto4/kst/src

SVN commit 719660 by treat:

* Reintroduce the dialoglauncher.
* Note only the dialoglauncher is a singleton, not
the various dialogs it calls.
* Modify DataManager to use this new class.
* Modify DataDialogs to use only one constructor to
simplify the API.
* Hookup the VectorSelector widget to use this.

 M  +4 -0      libkstapp/application.cpp  
 M  +4 -11     libkstapp/curvedialog.cpp  
 M  +0 -1      libkstapp/curvedialog.h  
 M  +7 -7      libkstapp/datadialog.cpp  
 M  +1 -2      libkstapp/datadialog.h  
 M  +9 -22     libkstapp/datamanager.cpp  
 M  +0 -4      libkstapp/datamanager.h  
 A             libkstapp/dialoglaunchergui.cpp   [License: GPL (v2+)]
 A             libkstapp/dialoglaunchergui.h   [License: GPL (v2+)]
 M  +4 -11     libkstapp/equationdialog.cpp  
 M  +0 -1      libkstapp/equationdialog.h  
 M  +2 -0      libkstapp/libkstapp.pro  
 M  +4 -11     libkstapp/vectordialog.cpp  
 M  +0 -1      libkstapp/vectordialog.h  
 M  +33 -51    libkstmath/dialoglauncher.cpp  
 M  +33 -21    libkstmath/dialoglauncher.h  
 M  +2 -3      libkstmath/kstbasicplugin.cpp  
 M  +2 -2      libkstmath/kstcsd.cpp  
 M  +2 -2      libkstmath/kstequation.cpp  
 M  +2 -2      libkstmath/ksthistogram.cpp
(Continue reading)

Permalink | Reply | 0 comments |
headers
Mike Fenton | 1 Oct 2007 17:55

branches/work/kst/portto4/kst/src/widgets

SVN commit 719662 by fenton:

Adding popup auto completion to kst combobox.

 M  +15 -0     combobox.cpp  
 M  +3 -0      combobox.h  

--- branches/work/kst/portto4/kst/src/widgets/combobox.cpp #719661:719662
 <at>  <at>  -10,19 +10,33  <at>  <at> 
  ***************************************************************************/

 #include "combobox.h"
+#include <QLineEdit>
+#include <QCompleter>

 namespace Kst {

 ComboBox::ComboBox(QWidget *parent)
   : QComboBox(parent), _editable(true) {
+  setupLineEdit();
 }

 
 ComboBox::ComboBox(bool editable, QWidget *parent)
   : QComboBox(parent), _editable(editable) {
+  setupLineEdit();
 }

+void ComboBox::setupLineEdit(void) {
+  setInsertPolicy(QComboBox::NoInsert);
(Continue reading)

Permalink | Reply | 0 comments |
headers
Adam Treat | 1 Oct 2007 19:17
Picon
Favicon
Gravatar

branches/work/kst/portto4/kst/src

SVN commit 719683 by treat:

* Flesh out the vectorselector.  It basically works now.
* Provide metatype information for a host of KstObject's.

 M  +2 -0      libkst/kstmatrix.h  
 M  +3 -0      libkst/kstobject.h  
 M  +2 -0      libkst/kstscalar.h  
 M  +2 -0      libkst/kststring.h  
 M  +2 -0      libkst/kstvector.h  
 M  +0 -3      libkstapp/sessionmodel.cpp  
 M  +1 -0      libkstmath/kstdataobject.h  
 M  +24 -7     widgets/vectorselector.cpp  

--- branches/work/kst/portto4/kst/src/libkst/kstmatrix.h #719682:719683
 <at>  <at>  -167,6 +167,8  <at>  <at> 
     KstObject::UpdateType internalUpdate(KstObject::UpdateType providerUpdateType);
 };

+Q_DECLARE_METATYPE(KstMatrix*)
+
 typedef KstObjectList<KstMatrixPtr> KstMatrixList;
 typedef KstObjectMap<KstMatrixPtr> KstMatrixMap;
 typedef KstObjectCollection<KstMatrix> KstMatrixCollection;
--- branches/work/kst/portto4/kst/src/libkst/kstobject.h #719682:719683
 <at>  <at>  -24,6 +24,7  <at>  <at> 
 #include <qstring.h>
 #include <qdebug.h>
 #include <qstringlist.h>
+#include <QMetaType>
(Continue reading)

Permalink | Reply | 0 comments |
headers
Mike Fenton | 1 Oct 2007 20:11

branches/work/kst/portto4/kst

SVN commit 719698 by fenton:

Rename of kstamatrix to Kst::EditableMatrix and the associated changes.

 A             src/libkst/editablematrix.cpp   src/libkst/kstamatrix.cpp#719662 [License: GPL (v2+)]
 A             src/libkst/editablematrix.h   src/libkst/kstamatrix.h#719662 [License: GPL (v2+)]
 D             src/libkst/kstamatrix.cpp  
 D             src/libkst/kstamatrix.h  
 M  +2 -2      src/libkst/libkst.pro  
 M  +2 -2      tests/main.cpp  
 D             tests/testamatrix.cpp  
 D             tests/testamatrix.h  
 A             tests/testeditablematrix.cpp   tests/testamatrix.cpp#719662 [License: GPL (v2+)]
 A             tests/testeditablematrix.h   tests/testamatrix.h#719662 [License: GPL (v2+)]
 M  +2 -2      tests/tests.pro  

--- branches/work/kst/portto4/kst/src/libkst/libkst.pro #719697:719698
 <at>  <at>  -32,7 +32,7  <at>  <at> 
     kstmatrix.cpp \
     kstrmatrix.cpp \
     kstsmatrix.cpp \
-    kstamatrix.cpp \
+    editablematrix.cpp \
     kstvector.cpp \
     kstsvector.cpp \
     kstavector.cpp \
 <at>  <at>  -55,7 +55,7  <at>  <at> 
 HEADERS += \
     datasourcefactory.h \
     defaultprimitivenames.h \
(Continue reading)

Permalink | Reply | 0 comments |
headers
Mike Fenton | 1 Oct 2007 20:19

branches/work/kst/portto4/kst/src/libkst

SVN commit 719699 by fenton:

Updating header.

 M  +3 -9      editablematrix.h  

--- branches/work/kst/portto4/kst/src/libkst/editablematrix.h #719698:719699
 <at>  <at>  -1,13 +1,7  <at>  <at> 
 /***************************************************************************
-                 kstmatrix.h - a matrix with nX*nY editable points
-                             -------------------
-    begin                : July 2005
-    copyright            : (C) 2005 by University of British Columbia
-    email                :
- ***************************************************************************/
-
-/***************************************************************************
  *                                                                         *
+ *   copyright : (C) 2007 The University of Toronto                        *
+ *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
 <at>  <at>  -31,7 +25,7  <at>  <at> 
 };

 typedef KstSharedPtr<EditableMatrix> EditableMatrixPtr;
-typedef KstObjectList<EditableMatrix> EditableMatrixList;
+typedef KstObjectList<EditableMatrixPtr> EditableMatrixList;
(Continue reading)

Permalink | Reply | 0 comments |
headers
Mike Fenton | 1 Oct 2007 20:33

branches/work/kst/portto4/kst/src/libkst

SVN commit 719703 by fenton:

Rename of KstAVector to Kst::EditableVector

 A             editablevector.cpp   kstavector.cpp#719662 [License: GPL (v2+)]
 A             editablevector.h   kstavector.h#719662 [License: GPL (v2+)]
 D             kstavector.cpp  
 D             kstavector.h  
 M  +2 -2      libkst.pro  

--- branches/work/kst/portto4/kst/src/libkst/libkst.pro #719702:719703
 <at>  <at>  -35,7 +35,7  <at>  <at> 
     editablematrix.cpp \
     kstvector.cpp \
     kstsvector.cpp \
-    kstavector.cpp \
+    editablevector.cpp \
     kstrvector.cpp \
     kstvectordefaults.cpp \
     kstmatrixdefaults.cpp \
 <at>  <at>  -56,7 +56,7  <at>  <at> 
     datasourcefactory.h \
     defaultprimitivenames.h \
     editablematrix.h \
-    kstavector.h \
+    editablevector.h \
     kstdatacollection.h \
     kstdataplugin.h \
     kstdatasource.h \
(Continue reading)

Permalink | Reply | 0 comments |
headers
George Staikos | 1 Oct 2007 20:48
Picon
Favicon

branches/work/kst/portto4/kst/src/kst

SVN commit 719707 by staikos:

add missing libs required on Win32

 M  +2 -0      kst.pro  

--- branches/work/kst/portto4/kst/src/kst/kst.pro #719706:719707
 <at>  <at>  -21,3 +21,5  <at>  <at> 

 RESOURCES += \
     $$TOPLEVELDIR/src/images/images.qrc
+
+win32:QT += xml svg opengl qt3support
Permalink | Reply | 0 comments |
headers
Mike Fenton | 1 Oct 2007 20:56

branches/work/kst/portto4/kst/src/libkst

SVN commit 719710 by fenton:

Updating header information to properly include UBC.

 M  +1 -0      editablematrix.cpp  
 M  +1 -0      editablematrix.h  
 M  +1 -0      editablevector.cpp  
 M  +1 -0      editablevector.h  

--- branches/work/kst/portto4/kst/src/libkst/editablematrix.cpp #719709:719710
 <at>  <at>  -1,6 +1,7  <at>  <at> 
 /***************************************************************************
  *                                                                         *
  *   copyright : (C) 2007 The University of Toronto                        *
+ *   copyright : (C) 2005  University of British Columbia                        *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
--- branches/work/kst/portto4/kst/src/libkst/editablematrix.h #719709:719710
 <at>  <at>  -1,6 +1,7  <at>  <at> 
 /***************************************************************************
  *                                                                         *
  *   copyright : (C) 2007 The University of Toronto                        *
+ *   copyright : (C) 2005  University of British Columbia                        *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
--- branches/work/kst/portto4/kst/src/libkst/editablevector.cpp #719709:719710
 <at>  <at>  -1,6 +1,7  <at>  <at> 
 /***************************************************************************
(Continue reading)

Permalink | Reply | 0 comments |
headers
George Staikos | 1 Oct 2007 21:01
Picon
Favicon

branches/work/kst/portto4/kst/src/widgets

SVN commit 719711 by staikos:

and now kst.exe builds

 M  +1 -0      widgets.pro  

--- branches/work/kst/portto4/kst/src/widgets/widgets.pro #719710:719711
 <at>  <at>  -7,6 +7,7  <at>  <at> 
 OBJECTS_DIR = tmp
 MOC_DIR = tmp
 TARGET = kstwidgets
+win32:CONFIG += staticlib

 target.path = $$[QT_INSTALL_PLUGINS]/designer
 INSTALLS += target
Permalink | Reply | 0 comments |
headers
George Staikos | 1 Oct 2007 21:07
Picon
Favicon

branches/work/kst/portto4/kst/tests

SVN commit 719712 by staikos:

Make these compile and restore unix line endings

 M  +1 -0      testcsd.cpp  
 M  +1 -0      testdatasource.cpp  
 M  +1 -0      testeditablematrix.cpp  
 M  +8 -16     testeqparser.cpp  
 M  +1 -0      testmatrix.cpp  
 M  +5 -14     testscalar.cpp  

--- branches/work/kst/portto4/kst/tests/testcsd.cpp #719711:719712
 <at>  <at>  -13,6 +13,7  <at>  <at> 

 #include <QtTest>

+#include <kstmath.h>
 #include <kstobject.h>
 #include <qdir.h>
 #include <qfile.h>
--- branches/work/kst/portto4/kst/tests/testdatasource.cpp #719711:719712
 <at>  <at>  -18,6 +18,7  <at>  <at> 
 #include <QSettings>
 #include <QTemporaryFile>

+#include <kstmath.h>
 #include <kstrvector.h>
 #include <kstdatacollection.h>
 #include <kstdataobjectcollection.h>
--- branches/work/kst/portto4/kst/tests/testeditablematrix.cpp #719711:719712
(Continue reading)

Permalink | Reply | 0 comments |

Gmane