[Kst] branches/work/kst/hierarchy/kst/src
Eli Fidler
eli at staikos.net
Tue Dec 5 17:53:39 CET 2006
SVN commit 610806 by fidler:
merge trunk changes 604960:609664 into hierarchy branch
many fixes for conflicts/bugs
M +1 -1 datasources/ascii/kstdata_ascii.desktop
M +1 -1 datasources/cdf/kstdata_cdf.desktop
M +1 -1 datasources/dirfile/kstdata_dirfile.desktop
M +1 -1 datasources/fitsimage/kstdata_fitsimage.desktop
M +1 -1 datasources/frame/kstdata_frame.desktop
M +1 -1 datasources/healpix/kstdata_healpix.desktop
M +1 -1 datasources/indirect/kstdata_indirect.desktop
M +1 -1 datasources/lfiio/kstdata_lfiio.desktop
M +1 -1 datasources/nad/kstdata_nad.desktop
M +1 -1 datasources/naddirect/kstdata_naddirect.desktop
M +1 -1 datasources/netcdf/kstdata_netcdf.desktop
M +1 -1 datasources/planck/kstdata_planck.desktop
M +1 -1 datasources/qimagesource/kstdata_qimagesource.desktop
M +1 -1 datasources/template/kstdata_template.desktop
M +9 -9 extensions/js/bind_plugin.cpp
M +2 -2 extensions/js/bind_plugin.h
M +6 -6 extensions/js/bind_plugincollection.cpp
M +1 -0 extensions/js/bind_pluginiocollection.cpp
M +1 -0 extensions/js/bind_point.cpp
M +2 -1 extensions/js/bind_vector.cpp
M +3 -0 extensions/js/js.cpp
M +6 -1 extensions/js/js_dataobject.cpp
M +2 -1 extensions/js/js_dataobject.h
M +1 -1 kst/Makefile.am
A kst/kstbasicplugin.desktop trunk/extragear/graphics/kst/src/kst/kstbasicplugin.desktop#609726
A kst/kstdataobjectplugin.desktop trunk/extragear/graphics/kst/src/kst/kstdataobjectplugin.desktop#609726
M +1 -1 kst/kstplugin.desktop
M +1 -0 kst/kstui.rc
M +3 -1 kst/pics/Makefile.am
M kst/pics/kst_changefile.png
M kst/pics/kst_changenpts.png
M kst/pics/kst_curvenew.png
A kst/pics/kst_equationedit.png trunk/extragear/graphics/kst/src/kst/pics/kst_equationedit.png#609726
M kst/pics/kst_equationnew.png
M kst/pics/kst_matrixedit.png
M kst/pics/kst_matrixnew.png
M kst/pics/kst_scalaredit.png
M kst/pics/kst_scalarnew.png
M kst/pics/kst_vectoredit.png
M kst/pics/kst_vectornew.png
M +83 -41 kst/pics/svg_icons/changefile.svg
M +171 -164 kst/pics/svg_icons/changefile2.svg
M +14 -19 kst/pics/svg_icons/changerange.svg
A kst/pics/svg_icons/edit_equation.svg trunk/extragear/graphics/kst/src/kst/pics/svg_icons/edit_equation.svg#609726
A kst/pics/svg_icons/edit_matrix.svg trunk/extragear/graphics/kst/src/kst/pics/svg_icons/edit_matrix.svg#609726
A kst/pics/svg_icons/edit_matrix2.svg trunk/extragear/graphics/kst/src/kst/pics/svg_icons/edit_matrix2.svg#609726
A kst/pics/svg_icons/edit_scalar.svg trunk/extragear/graphics/kst/src/kst/pics/svg_icons/edit_scalar.svg#609726
A kst/pics/svg_icons/edit_vector.svg trunk/extragear/graphics/kst/src/kst/pics/svg_icons/edit_vector.svg#609726
A kst/pics/svg_icons/new_curve.svg trunk/extragear/graphics/kst/src/kst/pics/svg_icons/new_curve.svg#609726
A kst/pics/svg_icons/new_curve2.svg trunk/extragear/graphics/kst/src/kst/pics/svg_icons/new_curve2.svg#609726
A kst/pics/svg_icons/new_equation.svg trunk/extragear/graphics/kst/src/kst/pics/svg_icons/new_equation.svg#609726
A kst/pics/svg_icons/new_matrix.svg trunk/extragear/graphics/kst/src/kst/pics/svg_icons/new_matrix.svg#609726
A kst/pics/svg_icons/new_scalar.svg trunk/extragear/graphics/kst/src/kst/pics/svg_icons/new_scalar.svg#609726
A kst/pics/svg_icons/new_vector.svg trunk/extragear/graphics/kst/src/kst/pics/svg_icons/new_vector.svg#609726
M +1 -0 libkst/Makefile.am
M +8 -59 libkst/kstavector.cpp
M +4 -2 libkst/kstavector.h
A libkst/kstdataplugin.h trunk/extragear/graphics/kst/src/libkst/kstdataplugin.h#609726 [License: GPL (v2+)]
M +29 -231 libkst/kstdatasource.cpp
M +4 -6 libkst/kstdatasource.h
M +43 -6 libkst/kstobject.h
M +50 -16 libkst/kstobjectcollection.h
M +5 -11 libkst/kstrvector.cpp
M +10 -8 libkst/kstsvector.cpp
M +3 -2 libkst/kstsvector.h
M +89 -5 libkst/kstvector.cpp
M +10 -3 libkst/kstvector.h
M +2 -0 libkstapp/Makefile.am
A libkstapp/basicdialogwidget.ui trunk/extragear/graphics/kst/src/libkstapp/basicdialogwidget.ui#609726
M +35 -16 libkstapp/changefiledialog.ui
M +75 -61 libkstapp/changenptsdialog.ui
M +102 -111 libkstapp/curvedialogwidget.ui
M +95 -214 libkstapp/datamanager.ui
M +1 -1 libkstapp/datawizard.ui.h
M +64 -18 libkstapp/dialoglauncher-gui.cpp
M +11 -9 libkstapp/dialoglauncher-gui.h
M +10 -14 libkstapp/kst.cpp
M +4 -1 libkstapp/kst.h
M +5 -5 libkstapp/kst2dplot.cpp
A libkstapp/kstbasicdialog_i.cpp trunk/extragear/graphics/kst/src/libkstapp/kstbasicdialog_i.cpp#609726 [License: GPL (v2+)]
A libkstapp/kstbasicdialog_i.h trunk/extragear/graphics/kst/src/libkstapp/kstbasicdialog_i.h#609726
M +10 -3 libkstapp/kstchangefiledialog_i.cpp
M +2 -2 libkstapp/kstchangefiledialog_i.h
M +9 -3 libkstapp/kstchangenptsdialog_i.cpp
M +1 -0 libkstapp/kstchangenptsdialog_i.h
M +2 -1 libkstapp/kstdatadialog.ui
M +15 -5 libkstapp/kstdatadialog.ui.h
M +119 -40 libkstapp/kstdatamanager_i.cpp
M +3 -0 libkstapp/kstdatamanager_i.h
M +13 -3 libkstapp/kstdoc.cpp
M +6 -1 libkstapp/ksteventmonitorentry.cpp
M +2 -1 libkstapp/ksteventmonitorentry.h
M +3 -3 libkstapp/kstfilterdialog_i.cpp
M +2 -2 libkstapp/kstfilterdialog_i.h
M +4 -4 libkstapp/kstfitdialog_i.cpp
M +2 -2 libkstapp/kstfitdialog_i.h
M +3 -3 libkstapp/kstiface_impl.cpp
M +19 -8 libkstapp/kstplugindialog_i.cpp
M +5 -3 libkstapp/kstplugindialog_i.h
M +3 -0 libkstapp/kstpsddialog_i.cpp
M +3 -0 libkstapp/kstviewarrow.cpp
M +3 -0 libkstapp/kstviewbox.cpp
M +3 -0 libkstapp/kstviewellipse.cpp
M +7 -7 libkstapp/kstviewfitsdialog_i.cpp
M +5 -4 libkstapp/kstviewlabel.cpp
M +3 -0 libkstapp/kstviewline.cpp
M +16 -8 libkstapp/kstviewobject.cpp
M +3 -0 libkstapp/kstviewpicture.cpp
M +2 -2 libkstapp/labelrenderer.cpp
M +2 -1 libkstmath/Makefile.am
M +24 -9 libkstmath/dialoglauncher.cpp
M +11 -9 libkstmath/dialoglauncher.h
M +2 -1 libkstmath/kstbasecurve.h
A libkstmath/kstbasicplugin.cpp trunk/extragear/graphics/kst/src/libkstmath/kstbasicplugin.cpp#609726 [License: GPL (v2+)]
A libkstmath/kstbasicplugin.h trunk/extragear/graphics/kst/src/libkstmath/kstbasicplugin.h#609726
A libkstmath/kstcplugin.cpp trunk/extragear/graphics/kst/src/libkstmath/kstcplugin.cpp#609726 [License: GPL (v2+)]
A libkstmath/kstcplugin.h trunk/extragear/graphics/kst/src/libkstmath/kstcplugin.h#609726
M +7 -2 libkstmath/kstcsd.cpp
M +2 -1 libkstmath/kstcsd.h
M +101 -8 libkstmath/kstdataobject.cpp
M +39 -2 libkstmath/kstdataobject.h
M +1 -1 libkstmath/kstdefaultnames.cpp
M +7 -2 libkstmath/kstequation.cpp
M +2 -1 libkstmath/kstequation.h
M +7 -2 libkstmath/ksthistogram.cpp
M +2 -1 libkstmath/ksthistogram.h
M +7 -2 libkstmath/kstimage.cpp
M +3 -2 libkstmath/kstimage.h
D libkstmath/kstplugin.cpp
D libkstmath/kstplugin.h
M +7 -2 libkstmath/kstpsd.cpp
M +2 -1 libkstmath/kstpsd.h
M +7 -2 libkstmath/kstvcurve.cpp
M +2 -1 libkstmath/kstvcurve.h
M +12 -3 libkstmath/plugincollection.cpp
M +8 -0 libkstmath/plugincollection.h
M +7 -17 widgets/matrixselector.ui
M +3 -1 widgets/matrixselector.ui.h
M +7 -16 widgets/scalarselector.ui
M +2 -0 widgets/scalarselector.ui.h
M +11 -19 widgets/vectorselector.ui
M +25 -5 widgets/vectorselector.ui.h
More information about the Kst
mailing list