More Info

Revision 1214504

(Back to digest)

Features in Educational

Victor Carbune committed changes in /branches/kstars/carbonix/kstars:

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.

File Changes

Added 31 files

/branches/kstars/carbonix/kstars/kstars

/.gitignore

/more-messages.cpp

/projections

/skyglpainter.cpp

/skyglpainter.h

/skymapdrawabstract.cpp

/skymapdrawabstract.h

/skymapgldraw.cpp

/skymapgldraw.h

/skymapqdraw.cpp

/skymapqdraw.h

/skypainter.cpp

/skypainter.h

/skyqpainter.cpp

/skyqpainter.h

/targetlistcomponent.cpp

/targetlistcomponent.h

/texture.cpp

/texture.h

/texturemanager.cpp

/texturemanager.h

/data/textures

/skycomponents/targetlistcomponent.cpp

/skycomponents/targetlistcomponent.h

/tools/moonphasetool.cpp

/tools/moonphasetool.h

/tools/starhopper.cpp

/tools/starhopper.h

/widgets/genericcalendarwidget.cpp

/widgets/genericcalendarwidget.h

/widgets/genericcalendarwidget.ui

Deleted 49 files

/branches/kstars/carbonix/kstars/kstars

/skymapdraw.cpp

/data/jupiter.png

/data/mars.png

/data/mercury.png

/data/moon00.png

/data/moon01.png

/data/moon02.png

/data/moon03.png

/data/moon04.png

/data/moon05.png

/data/moon06.png

/data/moon07.png

/data/moon08.png

/data/moon09.png

/data/moon10.png

/data/moon11.png

/data/moon12.png

/data/moon13.png

/data/moon14.png

/data/moon15.png

/data/moon16.png

/data/moon17.png

/data/moon18.png

/data/moon19.png

/data/moon20.png

/data/moon21.png

/data/moon22.png

/data/moon23.png

/data/moon24.png

/data/moon25.png

/data/moon26.png

/data/moon27.png

/data/moon28.png

/data/moon29.png

/data/moon30.png

/data/moon31.png

/data/moon32.png

/data/moon33.png

/data/moon34.png

/data/moon35.png

/data/neptune.png

/data/pluto.png

/data/saturn.png

/data/sun.png

/data/uranus.png

/data/venus.png

/indi/telescopeprop.cpp

/indi/telescopeprop.h

/indi/telescopeprop.ui

Modified 202 files

/branches/kstars/carbonix/kstars

/CMakeLists.txt

/README.customize

/kstars/CMakeLists.txt

/kstars/colorscheme.cpp

/kstars/dms.cpp

/kstars/hisc-app-kstars.svgz

/kstars/kspopupmenu.cpp

/kstars/kspopupmenu.h

/kstars/kstars.cpp

/kstars/kstars.desktop

/kstars/kstars.h

/kstars/kstars.kcfg

/kstars/kstarsactions.cpp

/kstars/kstarsdata.cpp

/kstars/kstarsdata.h

/kstars/kstarsdatetime.h

/kstars/kstarsdcop.cpp

/kstars/kstarsinit.cpp

/kstars/kstarsui-indi.rc

/kstars/kstarsui-win.rc

/kstars/kstarsui.rc

/kstars/ksutils.h

/kstars/kswizard.cpp

/kstars/main.cpp

/kstars/Messages.sh

/kstars/simclock.cpp

/kstars/simclock.h

/kstars/skymap.cpp

/kstars/skymap.h

/kstars/skymapevents.cpp

/kstars/data/Cities.dat

/kstars/data/CMakeLists.txt

/kstars/data/cnames.dat

/kstars/dialogs/addcatdialog.cpp

/kstars/dialogs/detaildialog.cpp

/kstars/dialogs/finddialog.cpp

/kstars/dialogs/finddialog.h

/kstars/dialogs/locationdialog.cpp

/kstars/dialogs/locationdialog.ui

/kstars/dialogs/wizlocation.ui

/kstars/htmesh/HTMesh.h

/kstars/htmesh/HtmRange.cpp

/kstars/htmesh/HtmRange.h

/kstars/htmesh/SkipListElement.h

/kstars/icons/hi22-action-kstars_flag.png

/kstars/icons/hi32-action-kstars_clines.png

/kstars/icons/hi32-action-kstars_cnames.png

/kstars/icons/hi32-action-kstars_deepsky.png

/kstars/icons/hi32-action-kstars_flag.png

/kstars/icons/hi32-action-kstars_grid.png

/kstars/icons/hi32-action-kstars_horizon.png

/kstars/icons/hi32-action-kstars_mw.png

/kstars/icons/hi32-action-kstars_planets.png

/kstars/icons/hi32-action-kstars_stars.png

/kstars/icons/hi48-action-kstars_clines.png

/kstars/icons/hi48-action-kstars_cnames.png

/kstars/icons/hi48-action-kstars_deepsky.png

/kstars/icons/hi48-action-kstars_flag.png

/kstars/icons/hi48-action-kstars_grid.png

/kstars/icons/hi48-action-kstars_horizon.png

/kstars/icons/hi48-action-kstars_mw.png

/kstars/icons/hi48-action-kstars_planets.png

/kstars/icons/hi48-action-kstars_stars.png

/kstars/icons/hi64-action-kstars_cbound.png

/kstars/icons/hi64-action-kstars_clines.png

/kstars/icons/hi64-action-kstars_cnames.png

/kstars/icons/hi64-action-kstars_deepsky.png

/kstars/icons/hi64-action-kstars_flag.png

/kstars/icons/hi64-action-kstars_grid.png

/kstars/icons/hi64-action-kstars_horizon.png

/kstars/icons/hi64-action-kstars_mw.png

/kstars/icons/hi64-action-kstars_planets.png

/kstars/icons/hi64-action-kstars_stars.png

/kstars/icons/hi64-action-kstars_xplanet.png

/kstars/icons/hisc-action-kstars_cbound.svgz

/kstars/icons/hisc-action-kstars_clines.svgz

/kstars/icons/hisc-action-kstars_cnames.svgz

/kstars/icons/hisc-action-kstars_deepsky.svgz

/kstars/icons/hisc-action-kstars_flag.svg

/kstars/icons/hisc-action-kstars_grid.svgz

/kstars/icons/hisc-action-kstars_horizon.svgz

/kstars/icons/hisc-action-kstars_mw.svgz

/kstars/icons/hisc-action-kstars_planets.svgz

/kstars/icons/hisc-action-kstars_stars.svgz

/kstars/indi/devicemanager.cpp

/kstars/indi/devicemanager.h

/kstars/indi/indidevice.cpp

/kstars/indi/indidevice.h

/kstars/indi/indidriver.cpp

/kstars/indi/indidriver.h

/kstars/indi/indimenu.cpp

/kstars/indi/indimenu.h

/kstars/indi/indiproperty.cpp

/kstars/indi/indiproperty.h

/kstars/indi/indistd.cpp

/kstars/indi/indistd.h

/kstars/indi/telescopewizard.ui

/kstars/indi/telescopewizardprocess.cpp

/kstars/indi/telescopewizardprocess.h

/kstars/oal/equipmentwriter.cpp

/kstars/oal/equipmentwriter.h

/kstars/oal/equipmentwriter.ui

/kstars/oal/log.cpp

/kstars/oal/scope.h

/kstars/options/opsguides.cpp

/kstars/options/opsguides.h

/kstars/skycomponents/asteroidscomponent.cpp

/kstars/skycomponents/asteroidscomponent.h

/kstars/skycomponents/cometscomponent.cpp

/kstars/skycomponents/cometscomponent.h

/kstars/skycomponents/constellationboundarylines.cpp

/kstars/skycomponents/constellationboundarylines.h

/kstars/skycomponents/constellationlines.cpp

/kstars/skycomponents/constellationlines.h

/kstars/skycomponents/constellationnamescomponent.cpp

/kstars/skycomponents/constellationnamescomponent.h

/kstars/skycomponents/coordinategrid.cpp

/kstars/skycomponents/coordinategrid.h

/kstars/skycomponents/customcatalogcomponent.cpp

/kstars/skycomponents/customcatalogcomponent.h

/kstars/skycomponents/deepskycomponent.cpp

/kstars/skycomponents/deepskycomponent.h

/kstars/skycomponents/deepstarcomponent.cpp

/kstars/skycomponents/deepstarcomponent.h

/kstars/skycomponents/ecliptic.cpp

/kstars/skycomponents/ecliptic.h

/kstars/skycomponents/equator.cpp

/kstars/skycomponents/equator.h

/kstars/skycomponents/flagcomponent.cpp

/kstars/skycomponents/flagcomponent.h

/kstars/skycomponents/horizoncomponent.cpp

/kstars/skycomponents/horizoncomponent.h

/kstars/skycomponents/linelistindex.cpp

/kstars/skycomponents/linelistindex.h

/kstars/skycomponents/linelistlabel.cpp

/kstars/skycomponents/linelistlabel.h

/kstars/skycomponents/milkyway.cpp

/kstars/skycomponents/milkyway.h

/kstars/skycomponents/planetmoonscomponent.cpp

/kstars/skycomponents/planetmoonscomponent.h

/kstars/skycomponents/satellitecomponent.cpp

/kstars/skycomponents/skycomponent.cpp

/kstars/skycomponents/skycomponent.h

/kstars/skycomponents/skycomposite.cpp

/kstars/skycomponents/skycomposite.h

/kstars/skycomponents/skylabeler.cpp

/kstars/skycomponents/skylabeler.h

/kstars/skycomponents/skymapcomposite.cpp

/kstars/skycomponents/skymapcomposite.h

/kstars/skycomponents/skymesh.cpp

/kstars/skycomponents/skymesh.h

/kstars/skycomponents/solarsystemcomposite.cpp

/kstars/skycomponents/solarsystemcomposite.h

/kstars/skycomponents/solarsystemlistcomponent.cpp

/kstars/skycomponents/solarsystemlistcomponent.h

/kstars/skycomponents/solarsystemsinglecomponent.cpp

/kstars/skycomponents/solarsystemsinglecomponent.h

/kstars/skycomponents/starcomponent.cpp

/kstars/skycomponents/starcomponent.h

/kstars/skycomponents/typedef.h

/kstars/skyobjects/deepskyobject.cpp

/kstars/skyobjects/deepskyobject.h

/kstars/skyobjects/ksmoon.cpp

/kstars/skyobjects/ksmoon.h

/kstars/skyobjects/ksplanet.cpp

/kstars/skyobjects/ksplanetbase.cpp

/kstars/skyobjects/ksplanetbase.h

/kstars/skyobjects/kssun.cpp

/kstars/skyobjects/skyobject.cpp

/kstars/skyobjects/skyobject.h

/kstars/skyobjects/skypoint.cpp

/kstars/skyobjects/skypoint.h

/kstars/skyobjects/starobject.cpp

/kstars/skyobjects/starobject.h

/kstars/skyobjects/trailobject.cpp

/kstars/skyobjects/trailobject.h

/kstars/tools/argloadcolorscheme.ui

/kstars/tools/astrocalc.cpp

/kstars/tools/conjunctions.cpp

/kstars/tools/lcgenerator.cpp

/kstars/tools/modcalcaltaz.cpp

/kstars/tools/modcalcaltaz.h

/kstars/tools/modcalcaltaz.ui

/kstars/tools/modcalcangdist.cpp

/kstars/tools/modcalcangdist.h

/kstars/tools/modcalcangdist.ui

/kstars/tools/modcalcapcoord.cpp

/kstars/tools/modcalcapcoord.h

/kstars/tools/modcalcapcoord.ui

/kstars/tools/modcalcplanets.ui

/kstars/tools/modcalcvlsr.ui

/kstars/tools/objectlist.h

/kstars/tools/observinglist.cpp

/kstars/tools/observinglist.h

/kstars/tools/observinglist.ui

/kstars/tools/obslistwizard.cpp

/kstars/tools/obslistwizard.h

/kstars/tools/obslistwizard.ui

/kstars/tools/scriptbuilder.cpp

/kstars/widgets/infoboxwidget.cpp

/kstars/xplanet/opsxplanet.ui

282 files changed in total