[Kstars-devel] branches/kstars/carbonix/kstars
Victor Carbune
victor.carbune at gmail.com
Sat Jan 15 00:43:49 CET 2011
SVN commit 1214504 by vcarbune:
Successfully merged revisions in trunk in this branch!
We have OpenGL and database compiling and running OK together.
More work on the database coming soon.
CCMAIL: kstars-devel at kde.org
_M . (directory)
M +5 -1 CMakeLists.txt
M +19 -1 README.customize
A kstars/.gitignore trunk/KDE/kdeedu/kstars/kstars/.gitignore#1213667
M +50 -11 kstars/CMakeLists.txt
M +1 -1 kstars/Messages.sh
M +9 -5 kstars/colorscheme.cpp
M +55 -8 kstars/data/CMakeLists.txt
M +22 -7 kstars/data/Cities.dat
M +3 -3 kstars/data/cnames.dat
D kstars/data/jupiter.png
D kstars/data/mars.png
D kstars/data/mercury.png
D kstars/data/moon00.png
D kstars/data/moon01.png
D kstars/data/moon02.png
D kstars/data/moon03.png
D kstars/data/moon04.png
D kstars/data/moon05.png
D kstars/data/moon06.png
D kstars/data/moon07.png
D kstars/data/moon08.png
D kstars/data/moon09.png
D kstars/data/moon10.png
D kstars/data/moon11.png
D kstars/data/moon12.png
D kstars/data/moon13.png
D kstars/data/moon14.png
D kstars/data/moon15.png
D kstars/data/moon16.png
D kstars/data/moon17.png
D kstars/data/moon18.png
D kstars/data/moon19.png
D kstars/data/moon20.png
D kstars/data/moon21.png
D kstars/data/moon22.png
D kstars/data/moon23.png
D kstars/data/moon24.png
D kstars/data/moon25.png
D kstars/data/moon26.png
D kstars/data/moon27.png
D kstars/data/moon28.png
D kstars/data/moon29.png
D kstars/data/moon30.png
D kstars/data/moon31.png
D kstars/data/moon32.png
D kstars/data/moon33.png
D kstars/data/moon34.png
D kstars/data/moon35.png
D kstars/data/neptune.png
D kstars/data/pluto.png
D kstars/data/saturn.png
D kstars/data/sun.png
A kstars/data/textures (directory)
D kstars/data/uranus.png
D kstars/data/venus.png
M +17 -14 kstars/dialogs/addcatdialog.cpp
M +13 -99 kstars/dialogs/detaildialog.cpp
M +14 -1 kstars/dialogs/finddialog.cpp
M +2 -0 kstars/dialogs/finddialog.h
M +16 -16 kstars/dialogs/locationdialog.cpp
M +1 -6 kstars/dialogs/locationdialog.ui
M +1 -6 kstars/dialogs/wizlocation.ui
M +1 -4 kstars/dms.cpp
_M kstars/hisc-app-kstars.svgz
M +8 -1 kstars/htmesh/HTMesh.h
M +7 -450 kstars/htmesh/HtmRange.cpp
M +3 -34 kstars/htmesh/HtmRange.h
M +1 -1 kstars/htmesh/SkipListElement.h
_M kstars/icons/hi22-action-kstars_flag.png
_M kstars/icons/hi32-action-kstars_clines.png
_M kstars/icons/hi32-action-kstars_cnames.png
_M kstars/icons/hi32-action-kstars_deepsky.png
_M kstars/icons/hi32-action-kstars_flag.png
_M kstars/icons/hi32-action-kstars_grid.png
_M kstars/icons/hi32-action-kstars_horizon.png
_M kstars/icons/hi32-action-kstars_mw.png
_M kstars/icons/hi32-action-kstars_planets.png
_M kstars/icons/hi32-action-kstars_stars.png
_M kstars/icons/hi48-action-kstars_clines.png
_M kstars/icons/hi48-action-kstars_cnames.png
_M kstars/icons/hi48-action-kstars_deepsky.png
_M kstars/icons/hi48-action-kstars_flag.png
_M kstars/icons/hi48-action-kstars_grid.png
_M kstars/icons/hi48-action-kstars_horizon.png
_M kstars/icons/hi48-action-kstars_mw.png
_M kstars/icons/hi48-action-kstars_planets.png
_M kstars/icons/hi48-action-kstars_stars.png
_M kstars/icons/hi64-action-kstars_cbound.png
_M kstars/icons/hi64-action-kstars_clines.png
_M kstars/icons/hi64-action-kstars_cnames.png
_M kstars/icons/hi64-action-kstars_deepsky.png
_M kstars/icons/hi64-action-kstars_flag.png
_M kstars/icons/hi64-action-kstars_grid.png
_M kstars/icons/hi64-action-kstars_horizon.png
_M kstars/icons/hi64-action-kstars_mw.png
_M kstars/icons/hi64-action-kstars_planets.png
_M kstars/icons/hi64-action-kstars_stars.png
_M kstars/icons/hi64-action-kstars_xplanet.png
_M kstars/icons/hisc-action-kstars_cbound.svgz
_M kstars/icons/hisc-action-kstars_clines.svgz
_M kstars/icons/hisc-action-kstars_cnames.svgz
_M kstars/icons/hisc-action-kstars_deepsky.svgz
_M kstars/icons/hisc-action-kstars_flag.svg
_M kstars/icons/hisc-action-kstars_grid.svgz
_M kstars/icons/hisc-action-kstars_horizon.svgz
_M kstars/icons/hisc-action-kstars_mw.svgz
_M kstars/icons/hisc-action-kstars_planets.svgz
_M kstars/icons/hisc-action-kstars_stars.svgz
M +39 -12 kstars/indi/devicemanager.cpp
M +2 -0 kstars/indi/devicemanager.h
M +38 -21 kstars/indi/indidevice.cpp
M +1 -3 kstars/indi/indidevice.h
M +190 -154 kstars/indi/indidriver.cpp
M +16 -5 kstars/indi/indidriver.h
M +1 -1 kstars/indi/indimenu.cpp
M +0 -4 kstars/indi/indimenu.h
M +41 -62 kstars/indi/indiproperty.cpp
M +2 -0 kstars/indi/indiproperty.h
M +130 -128 kstars/indi/indistd.cpp
M +10 -6 kstars/indi/indistd.h
D kstars/indi/telescopeprop.cpp
D kstars/indi/telescopeprop.h
D kstars/indi/telescopeprop.ui
M +10 -0 kstars/indi/telescopewizard.ui
M +25 -1 kstars/indi/telescopewizardprocess.cpp
M +1 -0 kstars/indi/telescopewizardprocess.h
M +7 -4 kstars/kspopupmenu.cpp
M +15 -14 kstars/kspopupmenu.h
M +10 -4 kstars/kstars.cpp
MM +6 -1 kstars/kstars.desktop
M +0 -3 kstars/kstars.h
M +32 -21 kstars/kstars.kcfg
M +10 -14 kstars/kstarsactions.cpp
M +7 -1 kstars/kstarsdata.cpp
M +7 -2 kstars/kstarsdata.h
M +0 -15 kstars/kstarsdatetime.h
M +4 -2 kstars/kstarsdcop.cpp
M +20 -7 kstars/kstarsinit.cpp
M +3 -2 kstars/kstarsui-indi.rc
M +3 -0 kstars/kstarsui-win.rc
M +6 -1 kstars/kstarsui.rc
M +14 -5 kstars/ksutils.h
M +12 -11 kstars/kswizard.cpp
M +2 -2 kstars/main.cpp
A kstars/more-messages.cpp trunk/KDE/kdeedu/kstars/kstars/more-messages.cpp#1213667 [License: UNKNOWN]
M +31 -4 kstars/oal/equipmentwriter.cpp
M +1 -1 kstars/oal/equipmentwriter.h
M +46 -33 kstars/oal/equipmentwriter.ui
M +14 -3 kstars/oal/log.cpp
M +3 -1 kstars/oal/scope.h
M +22 -10 kstars/options/opsguides.cpp
M +3 -2 kstars/options/opsguides.h
A kstars/projections (directory)
M +5 -24 kstars/simclock.cpp
M +5 -29 kstars/simclock.h
M +8 -22 kstars/skycomponents/asteroidscomponent.cpp
M +1 -1 kstars/skycomponents/asteroidscomponent.h
M +10 -29 kstars/skycomponents/cometscomponent.cpp
M +1 -1 kstars/skycomponents/cometscomponent.h
M +4 -3 kstars/skycomponents/constellationboundarylines.cpp
M +1 -1 kstars/skycomponents/constellationboundarylines.h
M +4 -3 kstars/skycomponents/constellationlines.cpp
M +1 -1 kstars/skycomponents/constellationlines.h
M +12 -10 kstars/skycomponents/constellationnamescomponent.cpp
M +1 -1 kstars/skycomponents/constellationnamescomponent.h
M +4 -3 kstars/skycomponents/coordinategrid.cpp
M +1 -1 kstars/skycomponents/coordinategrid.h
M +55 -30 kstars/skycomponents/customcatalogcomponent.cpp
M +8 -2 kstars/skycomponents/customcatalogcomponent.h
M +24 -56 kstars/skycomponents/deepskycomponent.cpp
M +3 -3 kstars/skycomponents/deepskycomponent.h
M +50 -10 kstars/skycomponents/deepstarcomponent.cpp
M +32 -1 kstars/skycomponents/deepstarcomponent.h
M +9 -20 kstars/skycomponents/ecliptic.cpp
M +2 -6 kstars/skycomponents/ecliptic.h
M +10 -19 kstars/skycomponents/equator.cpp
M +3 -7 kstars/skycomponents/equator.h
M +5 -1 kstars/skycomponents/flagcomponent.cpp
M +1 -1 kstars/skycomponents/flagcomponent.h
M +48 -18 kstars/skycomponents/horizoncomponent.cpp
M +2 -2 kstars/skycomponents/horizoncomponent.h
M +13 -67 kstars/skycomponents/linelistindex.cpp
M +14 -11 kstars/skycomponents/linelistindex.h
M +14 -10 kstars/skycomponents/linelistlabel.cpp
M +4 -5 kstars/skycomponents/linelistlabel.h
M +12 -10 kstars/skycomponents/milkyway.cpp
M +2 -2 kstars/skycomponents/milkyway.h
M +14 -31 kstars/skycomponents/planetmoonscomponent.cpp
M +2 -2 kstars/skycomponents/planetmoonscomponent.h
M +2 -2 kstars/skycomponents/satellitecomponent.cpp
M +1 -2 kstars/skycomponents/skycomponent.cpp
M +4 -4 kstars/skycomponents/skycomponent.h
M +2 -2 kstars/skycomponents/skycomposite.cpp
M +1 -1 kstars/skycomponents/skycomposite.h
M +127 -67 kstars/skycomponents/skylabeler.cpp
M +54 -25 kstars/skycomponents/skylabeler.h
M +54 -23 kstars/skycomponents/skymapcomposite.cpp
M +8 -3 kstars/skycomponents/skymapcomposite.h
M +3 -0 kstars/skycomponents/skymesh.cpp
M +6 -1 kstars/skycomponents/skymesh.h
M +2 -3 kstars/skycomponents/solarsystemcomposite.cpp
M +1 -1 kstars/skycomponents/solarsystemcomposite.h
M +2 -3 kstars/skycomponents/solarsystemlistcomponent.cpp
M +1 -1 kstars/skycomponents/solarsystemlistcomponent.h
M +11 -72 kstars/skycomponents/solarsystemsinglecomponent.cpp
M +2 -2 kstars/skycomponents/solarsystemsinglecomponent.h
M +64 -57 kstars/skycomponents/starcomponent.cpp
M +18 -6 kstars/skycomponents/starcomponent.h
A kstars/skycomponents/targetlistcomponent.cpp trunk/KDE/kdeedu/kstars/kstars/skycomponents/targetlistcomponent.cpp#1213667 [License: GPL (v2+)]
A kstars/skycomponents/targetlistcomponent.h trunk/KDE/kdeedu/kstars/kstars/skycomponents/targetlistcomponent.h#1213667 [License: GPL (v2+)]
M +2 -0 kstars/skycomponents/typedef.h
A kstars/skyglpainter.cpp trunk/KDE/kdeedu/kstars/kstars/skyglpainter.cpp#1213667 [License: GPL (v2+)]
A kstars/skyglpainter.h trunk/KDE/kdeedu/kstars/kstars/skyglpainter.h#1213667 [License: GPL (v2+)]
M +215 -337 kstars/skymap.cpp
M +65 -183 kstars/skymap.h
D kstars/skymapdraw.cpp
A kstars/skymapdrawabstract.cpp trunk/KDE/kdeedu/kstars/kstars/skymapdrawabstract.cpp#1213667 [License: GPL (v2+)]
A kstars/skymapdrawabstract.h trunk/KDE/kdeedu/kstars/kstars/skymapdrawabstract.h#1213667 [License: GPL (v2+)]
M +23 -78 kstars/skymapevents.cpp
A kstars/skymapgldraw.cpp trunk/KDE/kdeedu/kstars/kstars/skymapgldraw.cpp#1213667 [License: GPL (v2+)]
A kstars/skymapgldraw.h trunk/KDE/kdeedu/kstars/kstars/skymapgldraw.h#1213667 [License: GPL (v2+)]
A kstars/skymapqdraw.cpp trunk/KDE/kdeedu/kstars/kstars/skymapqdraw.cpp#1213667 [License: GPL (v2+)]
A kstars/skymapqdraw.h trunk/KDE/kdeedu/kstars/kstars/skymapqdraw.h#1213667 [License: GPL (v2+)]
M +23 -283 kstars/skyobjects/deepskyobject.cpp
M +32 -27 kstars/skyobjects/deepskyobject.h
M +6 -8 kstars/skyobjects/ksmoon.cpp
M +12 -2 kstars/skyobjects/ksmoon.h
M +7 -7 kstars/skyobjects/ksplanet.cpp
M +4 -21 kstars/skyobjects/ksplanetbase.cpp
M +5 -12 kstars/skyobjects/ksplanetbase.h
M +1 -1 kstars/skyobjects/kssun.cpp
M +3 -49 kstars/skyobjects/skyobject.cpp
M +1 -19 kstars/skyobjects/skyobject.h
M +29 -12 kstars/skyobjects/skypoint.cpp
M +24 -5 kstars/skyobjects/skypoint.h
M +6 -129 kstars/skyobjects/starobject.cpp
M +3 -19 kstars/skyobjects/starobject.h
M +9 -44 kstars/skyobjects/trailobject.cpp
M +3 -1 kstars/skyobjects/trailobject.h
A kstars/skypainter.cpp trunk/KDE/kdeedu/kstars/kstars/skypainter.cpp#1213667 [License: GPL (v2+)]
A kstars/skypainter.h trunk/KDE/kdeedu/kstars/kstars/skypainter.h#1213667 [License: GPL (v2+)]
A kstars/skyqpainter.cpp trunk/KDE/kdeedu/kstars/kstars/skyqpainter.cpp#1213667 [License: GPL (v2+)]
A kstars/skyqpainter.h trunk/KDE/kdeedu/kstars/kstars/skyqpainter.h#1213667 [License: GPL (v2+)]
A kstars/targetlistcomponent.cpp trunk/KDE/kdeedu/kstars/kstars/targetlistcomponent.cpp#1213667 [License: GPL (v2+)]
A kstars/targetlistcomponent.h trunk/KDE/kdeedu/kstars/kstars/targetlistcomponent.h#1213667 [License: GPL (v2+)]
A kstars/texture.cpp trunk/KDE/kdeedu/kstars/kstars/texture.cpp#1213667 [License: GPL (v2+)]
A kstars/texture.h trunk/KDE/kdeedu/kstars/kstars/texture.h#1213667 [License: GPL (v2+)]
A kstars/texturemanager.cpp trunk/KDE/kdeedu/kstars/kstars/texturemanager.cpp#1213667 [License: GPL (v2+)]
A kstars/texturemanager.h trunk/KDE/kdeedu/kstars/kstars/texturemanager.h#1213667 [License: GPL (v2+)]
M +1 -10 kstars/tools/argloadcolorscheme.ui
M +2 -0 kstars/tools/astrocalc.cpp
M +2 -1 kstars/tools/conjunctions.cpp
M +0 -1 kstars/tools/lcgenerator.cpp
M +1 -16 kstars/tools/modcalcaltaz.cpp
M +0 -2 kstars/tools/modcalcaltaz.h
M +10 -18 kstars/tools/modcalcaltaz.ui
M +1 -17 kstars/tools/modcalcangdist.cpp
M +0 -2 kstars/tools/modcalcangdist.h
M +8 -14 kstars/tools/modcalcangdist.ui
M +1 -17 kstars/tools/modcalcapcoord.cpp
M +0 -2 kstars/tools/modcalcapcoord.h
M +12 -20 kstars/tools/modcalcapcoord.ui
M +53 -16 kstars/tools/modcalcplanets.ui
M +6 -0 kstars/tools/modcalcvlsr.ui
A kstars/tools/moonphasetool.cpp trunk/KDE/kdeedu/kstars/kstars/tools/moonphasetool.cpp#1213667 [License: GPL (v2+)]
A kstars/tools/moonphasetool.h trunk/KDE/kdeedu/kstars/kstars/tools/moonphasetool.h#1213667 [License: GPL (v2+)]
M +1 -0 kstars/tools/objectlist.h
M +171 -246 kstars/tools/observinglist.cpp
M +20 -6 kstars/tools/observinglist.h
M +1 -1 kstars/tools/observinglist.ui
M +296 -83 kstars/tools/obslistwizard.cpp
M +3 -2 kstars/tools/obslistwizard.h
M +123 -259 kstars/tools/obslistwizard.ui
M +11 -10 kstars/tools/scriptbuilder.cpp
A kstars/tools/starhopper.cpp trunk/KDE/kdeedu/kstars/kstars/tools/starhopper.cpp#1213667 [License: GPL (v2+)]
A kstars/tools/starhopper.h trunk/KDE/kdeedu/kstars/kstars/tools/starhopper.h#1213667 [License: GPL (v2+)]
A kstars/widgets/genericcalendarwidget.cpp trunk/KDE/kdeedu/kstars/kstars/widgets/genericcalendarwidget.cpp#1213667 [License: GPL (v2+)]
A kstars/widgets/genericcalendarwidget.h trunk/KDE/kdeedu/kstars/kstars/widgets/genericcalendarwidget.h#1213667 [License: GPL (v2+)]
A kstars/widgets/genericcalendarwidget.ui trunk/KDE/kdeedu/kstars/kstars/widgets/genericcalendarwidget.ui#1213667
M +2 -2 kstars/widgets/infoboxwidget.cpp
U kstars/xplanet/opsxplanet.ui
http://websvn.kde.org/?view=rev&revision=1214504
More information about the Kstars-devel
mailing list