~stellarium/stellarium/textures-cleanup

« back to all changes in this revision

Viewing changes to plugins/TextUserInterface/src/TextUserInterface.cpp

Committer: Guillaume Chereau
Date: 2013-10-12 05:09:30 UTC
mfrom: (6265.1.47 trunk)
Revision ID: guillaume.chereau@gmail.com-20131012050930-fb5f1stm1sm6912k

merge from trunk

files added:
plugins/Oculars/resources/CelestronMicroGuide.png

plugins/Oculars/resources/CelestronMicroGuide.svg

files modified:
CMakeLists.txt

data/Info.plist

data/default_config.ini

doc/codingConventions.doxygen

nebulae/default/ngc2000names.dat

plugins/AngleMeasure/src/AngleMeasure.cpp

plugins/AngleMeasure/src/CMakeLists.txt

plugins/CompassMarks/src/CMakeLists.txt

plugins/CompassMarks/src/CompassMarks.cpp

plugins/Exoplanets/CMakeLists.txt

plugins/Exoplanets/src/CMakeLists.txt

plugins/Exoplanets/src/Exoplanet.cpp

plugins/Exoplanets/src/Exoplanet.hpp

plugins/Exoplanets/src/Exoplanets.cpp

plugins/Exoplanets/src/gui/ExoplanetsDialog.cpp

plugins/Exoplanets/src/gui/ExoplanetsDialog.hpp

plugins/Exoplanets/src/gui/exoplanetsDialog.ui

plugins/Exoplanets/util/exoplanets.pl

plugins/Novae/src/CMakeLists.txt

plugins/Novae/src/Nova.cpp

plugins/Novae/src/Novae.cpp

plugins/Observability/src/CMakeLists.txt

plugins/Observability/src/Observability.cpp

plugins/Oculars/resources/Oculars.qrc

plugins/Oculars/src/CMakeLists.txt

plugins/Oculars/src/Oculars.cpp

plugins/Oculars/src/Oculars.hpp

plugins/Oculars/src/gui/OcularsGuiPanel.cpp

plugins/Oculars/src/gui/ocularDialog.ui

plugins/Pulsars/src/CMakeLists.txt

plugins/Pulsars/src/Pulsar.cpp

plugins/Pulsars/src/Pulsars.cpp

plugins/Quasars/src/CMakeLists.txt

plugins/Quasars/src/Quasar.cpp

plugins/Quasars/src/Quasars.cpp

plugins/Satellites/src/CMakeLists.txt

plugins/Satellites/src/Satellite.cpp

plugins/Satellites/src/Satellites.cpp

plugins/Satellites/src/gsatellite/sgp4unit.cpp

plugins/SolarSystemEditor/src/CMakeLists.txt

plugins/Supernovae/src/CMakeLists.txt

plugins/Supernovae/src/Supernova.cpp

plugins/Supernovae/src/Supernovae.cpp

plugins/TelescopeControl/src/CMakeLists.txt

plugins/TelescopeControl/src/TelescopeControl.cpp

plugins/TextUserInterface/src/CMakeLists.txt

plugins/TextUserInterface/src/TextUserInterface.cpp

plugins/TimeZoneConfiguration/src/CMakeLists.txt

po/stellarium-skycultures/stellarium-skycultures.pot

po/stellarium/stellarium.pot

src/CMakeLists.txt

src/StelMainView.cpp

src/StelMainView.hpp

src/core/RefractionExtinction.cpp

src/core/RefractionExtinction.hpp

src/core/StelActionMgr.cpp

src/core/StelActionMgr.hpp

src/core/StelApp.cpp

src/core/StelApp.hpp

src/core/StelCore.cpp

src/core/StelCore.hpp

src/core/StelMovementMgr.cpp

src/core/StelObject.cpp

src/core/StelPainter.cpp

src/core/StelProjector.cpp

src/core/StelProjector.hpp

src/core/StelSkyDrawer.cpp

src/core/StelSkyDrawer.hpp

src/core/StelSkyImageTile.cpp

src/core/StelUtils.cpp

src/core/modules/ConstellationMgr.cpp

src/core/modules/GridLinesMgr.cpp

src/core/modules/LabelMgr.cpp

src/core/modules/Landscape.hpp

src/core/modules/LandscapeMgr.cpp

src/core/modules/LandscapeMgr.hpp

src/core/modules/NebulaMgr.cpp

src/core/modules/Planet.cpp

src/core/modules/SolarSystem.cpp

src/core/modules/Star.cpp

src/core/modules/Star.hpp

src/core/modules/StarMgr.cpp

src/core/modules/StarMgr.hpp

src/core/modules/StarWrapper.cpp

src/core/modules/StarWrapper.hpp

src/core/modules/ZoneArray.cpp

src/core/modules/ZoneArray.hpp

src/core/modules/ZoneData.hpp

src/gui/ShortcutsDialog.cpp

src/gui/StelGuiItems.cpp

src/main.cpp

src/tests/testDates.cpp

stellarium.iss.cmake

Show diffs side-by-side

added added

removed removed

plugins/TextUserInterface/src/TextUserInterface.cpp

496

QSettings* conf = StelApp::getInstance().getSettings();

497

Q_ASSERT(conf);

498

499

font.setPointSize(conf->value("tui/tui_font_size", 11).toInt());

499

font.setPixelSize(conf->value("tui/tui_font_size", 15).toInt());

500

tuiDateTime = conf->value("tui/flag_show_tui_datetime", false).toBool();

501

tuiObjInfo = conf->value("tui/flag_show_tui_short_obj_info", false).toBool();

502

tuiGravityUi = conf->value("tui/flag_show_gravity_ui", false).toBool();

Older »