lp:~toshaevil/stellarium/new-keybindings

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:stellarium at revision 5600

Alexander Wolf: Approve on 2012-09-08

Diff: 7123 lines (+3926/-1168)

44 files modified

data/CMakeLists.txt (+1/-1)
data/default_shortcuts.json (+893/-0)
data/gui/guiRes.qrc (+1/-0)
data/gui/normalStyle.css (+8/-0)
plugins/AngleMeasure/src/AngleMeasure.cpp (+26/-29)
plugins/CompassMarks/src/CompassMarks.cpp (+8/-8)
plugins/Exoplanets/src/Exoplanets.cpp (+6/-10)
plugins/Observability/src/Observability.cpp (+6/-9)
plugins/Oculars/resources/default_ocular.ini (+0/-6)
plugins/Oculars/src/Oculars.cpp (+62/-90)
plugins/Oculars/src/gui/OcularDialog.cpp (+24/-24)
plugins/Pulsars/src/Pulsars.cpp (+3/-6)
plugins/Quasars/src/Quasars.cpp (+3/-6)
plugins/RendererStatistics/src/RendererStatistics.cpp (+2/-3)
plugins/Satellites/src/Satellites.cpp (+53/-58)
plugins/Satellites/src/gui/SatellitesDialog.cpp (+13/-13)
plugins/Supernovae/src/Supernovae.cpp (+3/-6)
plugins/TelescopeControl/src/TelescopeControl.cpp (+54/-54)
po/stellarium/POTFILES.in (+1/-0)
src/CMakeLists.txt (+11/-1)
src/core/StelApp.cpp (+13/-6)
src/core/StelApp.hpp (+7/-2)
src/core/StelGuiBase.cpp (+0/-43)
src/core/StelGuiBase.hpp (+1/-16)
src/core/StelJsonParser.cpp (+3/-5)
src/core/StelShortcutGroup.cpp (+265/-0)
src/core/StelShortcutGroup.hpp (+129/-0)
src/core/StelShortcutMgr.cpp (+520/-0)
src/core/StelShortcutMgr.hpp (+100/-0)
src/gui/ConfigurationDialog.cpp (+2/-3)
src/gui/HelpDialog.cpp (+63/-168)
src/gui/HelpDialog.hpp (+2/-27)
src/gui/ShortcutsDialog.cpp (+446/-0)
src/gui/ShortcutsDialog.hpp (+132/-0)
src/gui/SkyGui.cpp (+7/-7)
src/gui/StelGui.cpp (+397/-474)
src/gui/StelGui.hpp (+9/-13)
src/gui/ViewDialog.cpp (+39/-39)
src/gui/configurationDialog.ui (+30/-6)
src/gui/helpDialogGui.ui (+2/-4)
src/gui/shortcutsDialog.ui (+414/-0)
src/scripting/StelScriptMgr.cpp (+42/-29)
src/scripting/StelScriptMgr.hpp (+9/-2)
src/translations.h (+116/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

5351. By Anton Samoylov on 2012-09-08

merge with trunk; fix little bug with adding telescope plugins shortcuts

5350. By Anton Samoylov on 2012-08-27

merge

5349. By Anton Samoylov on 2012-08-27

use qobject_cast instead of static_cast; get rid of qDebug()s (shortcutsDialog)

5348. By Anton Samoylov on 2012-08-26

add prefix-free shortcuts collision checking

5347. By Anton Samoylov on 2012-08-26

add edit shortcuts button to configuration dialog

5346. By Anton Samoylov on 2012-08-26

merge with trunk

5345. By Anton Samoylov on 2012-08-26

add shortcuts dialog ui to translations

5344. By Anton Samoylov on 2012-08-24

add string for translation

5343. By Anton Samoylov on 2012-08-23

changes for translations

5342. By Anton Samoylov on 2012-08-21

telescope plugin shortcuts; refactor addGuiAction() method all around the code