[Kstars-devel] [kstars] kstars: Reorganize menus in KStars.
Akarsh Simha
akarsh.simha at kdemail.net
Tue May 14 05:34:58 UTC 2013
Git commit 0c48734a8c13467bb40be38f49e8d3daf576ef11 by Akarsh Simha.
Committed on 14/05/2013 at 07:19.
Pushed by asimha into branch 'master'.
Reorganize menus in KStars.
+ Created the "Data" menu and moved "Download New Data" (GHNS / KNS3)
and "Updates" (which provides options to update comet / asteroid /
supernova data) under it.
+ Moved the Observation Planner to the "Observation" menu.
+ Changed internal name of the Observation Menu from oal to
observation.
+ Indentation improvements
CCMAIL: kstars-devel at kde.org
M +22 -21 kstars/kstarsui-indi.rc
M +20 -20 kstars/kstarsui-win.rc
M +19 -19 kstars/kstarsui.rc
http://commits.kde.org/kstars/0c48734a8c13467bb40be38f49e8d3daf576ef11
diff --git a/kstars/kstarsui-indi.rc b/kstars/kstarsui-indi.rc
index 7f248cd..bb44f88 100644
--- a/kstars/kstarsui-indi.rc
+++ b/kstars/kstarsui-indi.rc
@@ -6,8 +6,6 @@
<Action name="new_window" />
<Action name="close_window" />
<Separator />
- <Action name="get_data" />
- <Separator />
<Action name="open_file" />
<Action name="export_image" />
<Action name="run_script" />
@@ -22,9 +20,9 @@
<Action name="time_to_now" />
<Action name="time_dialog" />
<Separator />
- <Action name="time_step_backward" />
+ <Action name="time_step_backward" />
<Action name="clock_startstop" />
- <Action name="time_step_forward" />
+ <Action name="time_step_forward" />
</Menu>
<Menu name="focus" noMerge="1"><text>&Pointing</text>
@@ -59,6 +57,8 @@
</Menu>
</Menu>
+ <Menu name="tools" noMerge="1"><text>&Tools</text>
+ <Action name="astrocalculator" />
<Menu name="devices" noMerge="1"><text>&Devices</text>
<Action name="telescope_wizard" />
<Action name="device_manager" />
@@ -66,11 +66,8 @@
<Action name="indi_cpl" />
</Menu>
- <Menu name="tools" noMerge="1"><text>&Tools</text>
- <Action name="astrocalculator" />
<Action name="skycalendar" />
<Action name="moonphasetool" />
- <Action name="obslist" />
<Action name="altitude_vs_time" />
<Action name="whats_up_tonight" />
<Action name="whats_interesting" />
@@ -78,10 +75,24 @@
<Action name="glossary" />
<Action name="scriptbuilder" />
<Action name="solarsystem" />
+ <Action name="ekos" />
<Action name="jmoontool" />
<Action name="flagmanager" />
</Menu>
+ <Menu name="data" noMerge="1"><text>&Data</text>
+ <Action name="get_data" />
+ <Menu name="updates"><text>&Updates</text>
+ <Action name="update_comets" />
+ <Action name="update_asteroids" />
+ <Action name="update_supernovae" />
+ </Menu>
+ </Menu>
+ <Menu name="observation" noMerge="1"><text>&Observation</text>
+ <Action name="obslist" />
+ <Action name="execute" />
+ </Menu>
+
<Menu name="settings" noMerge="1"><text>&Settings</text>
<Menu name="infopanel"><text>&Info Boxes</text>
<Action name="show_boxes"/>
@@ -101,14 +112,8 @@
<Action name="fovsymbols" /> <!-- This is a KMenuAction-->
<Action name="opengl" />
<Separator />
- <Menu name="updates"><text>&Updates</text>
- <Action name="update_comets" />
- <Action name="update_asteroids" />
- <Action name="update_supernovae" />
- </Menu>
- <Separator />
- <Action name="ewriter"/>
- <Action name="obsadd"/>
+ <Action name="ewriter"/>
+ <Action name="obsadd"/>
<Separator />
<Action name="geolocation" />
<Separator />
@@ -118,10 +123,6 @@
<Action name="startwizard" />
</Menu>
- <Menu name="oal" noMerge="1"><text>&Observation</text>
- <Action name="execute"/>
- </Menu>
-
<Menu name="help"><text>&Help</text>
<Action name="help_contents"/>
<Action name="help_tipofday"/>
@@ -142,9 +143,9 @@
<Action name="zoom_out" />
<Action name="find_object" />
<Separator />
- <Action name="time_step_backward" />
+ <Action name="time_step_backward" />
<Action name="clock_startstop" />
- <Action name="time_step_forward" />
+ <Action name="time_step_forward" />
<Action name="timestep_control" />
</ToolBar>
diff --git a/kstars/kstarsui-win.rc b/kstars/kstarsui-win.rc
index 1c35b4b..63982a6 100644
--- a/kstars/kstarsui-win.rc
+++ b/kstars/kstarsui-win.rc
@@ -6,8 +6,6 @@
<Action name="new_window" />
<Action name="close_window" />
<Separator />
- <Action name="get_data" />
- <Separator />
<Action name="open_file" />
<Action name="export_image" />
<Action name="run_script" />
@@ -22,9 +20,9 @@
<Action name="time_to_now" />
<Action name="time_dialog" />
<Separator />
- <Action name="time_step_backward" />
+ <Action name="time_step_backward" />
<Action name="clock_startstop" />
- <Action name="time_step_forward" />
+ <Action name="time_step_forward" />
</Menu>
<Menu name="focus" noMerge="1"><text>&Pointing</text>
@@ -63,7 +61,6 @@
<Action name="astrocalculator" />
<Action name="skycalendar" />
<Action name="moonphasetool" />
- <Action name="obslist" />
<Action name="altitude_vs_time" />
<Action name="whats_up_tonight" />
<Action name="whats_interesting" />
@@ -74,6 +71,19 @@
<Action name="flagmanager" />
</Menu>
+ <Menu name="data" noMerge="1"><text>&Data</text>
+ <Action name="get_data" />
+ <Menu name="updates"><text>&Updates</text>
+ <Action name="update_comets" />
+ <Action name="update_asteroids" />
+ <Action name="update_supernovae" />
+ </Menu>
+ </Menu>
+ <Menu name="observation" noMerge="1"><text>&Observation</text>
+ <Action name="obslist" />
+ <Action name="execute" />
+ </Menu>
+
<Menu name="settings" noMerge="1"><text>&Settings</text>
<Menu name="infopanel"><text>&Info Boxes</text>
<Action name="show_boxes"/>
@@ -98,25 +108,15 @@
<Action name="fovsymbols" /> <!-- This is a KMenuAction-->
<Action name="opengl" />
<Separator />
- <Menu name="updates"><text>&Updates</text>
- <Action name="update_comets" />
- <Action name="update_asteroids" />
- <Action name="update_supernovae" />
- </Menu>
- <Separator />
- <Action name="ewriter"/>
- <Action name="obsadd"/>
+ <Action name="ewriter"/>
+ <Action name="obsadd"/>
<Separator />
<Action name="geolocation" />
- <Separator />
+ <Separator />
<Action name="configure" />
<Action name="startwizard" />
</Menu>
- <Menu name="oal" noMerge="1"><text>&Observation</text>
- <Action name="execute"/>
- </Menu>
-
<Menu name="help"><text>&Help</text>
<Action name="help_contents"/>
<Action name="help_tipofday"/>
@@ -137,9 +137,9 @@
<Action name="zoom_out" />
<Action name="find_object" />
<Separator />
- <Action name="time_step_backward" />
+ <Action name="time_step_backward" />
<Action name="clock_startstop" />
- <Action name="time_step_forward" />
+ <Action name="time_step_forward" />
<Action name="timestep_control" />
</ToolBar>
diff --git a/kstars/kstarsui.rc b/kstars/kstarsui.rc
index cd2b2db..1438246 100644
--- a/kstars/kstarsui.rc
+++ b/kstars/kstarsui.rc
@@ -6,8 +6,6 @@
<Action name="new_window" />
<Action name="close_window" />
<Separator />
- <Action name="get_data" />
- <Separator />
<Action name="open_file" />
<Action name="export_image" />
<Action name="run_script" />
@@ -22,9 +20,9 @@
<Action name="time_to_now" />
<Action name="time_dialog" />
<Separator />
- <Action name="time_step_backward" />
+ <Action name="time_step_backward" />
<Action name="clock_startstop" />
- <Action name="time_step_forward" />
+ <Action name="time_step_forward" />
</Menu>
<Menu name="focus" noMerge="1"><text>&Pointing</text>
@@ -63,7 +61,6 @@
<Action name="astrocalculator" />
<Action name="skycalendar" />
<Action name="moonphasetool" />
- <Action name="obslist" />
<Action name="altitude_vs_time" />
<Action name="whats_up_tonight" />
<Action name="whats_interesting" />
@@ -74,6 +71,19 @@
<Action name="flagmanager" />
</Menu>
+ <Menu name="data" noMerge="1"><text>&Data</text>
+ <Action name="get_data" />
+ <Menu name="updates"><text>&Updates</text>
+ <Action name="update_comets" />
+ <Action name="update_asteroids" />
+ <Action name="update_supernovae" />
+ </Menu>
+ </Menu>
+ <Menu name="observation" noMerge="1"><text>&Observation</text>
+ <Action name="obslist" />
+ <Action name="execute" />
+ </Menu>
+
<Menu name="settings" noMerge="1"><text>&Settings</text>
<Menu name="infopanel"><text>&Info Boxes</text>
<Action name="show_boxes"/>
@@ -93,14 +103,8 @@
<Action name="fovsymbols" /> <!-- This is a KMenuAction-->
<Action name="opengl" />
<Separator />
- <Menu name="updates"><text>&Updates</text>
- <Action name="update_comets" />
- <Action name="update_asteroids" />
- <Action name="update_supernovae" />
- </Menu>
- <Separator />
- <Action name="ewriter"/>
- <Action name="obsadd"/>
+ <Action name="ewriter"/>
+ <Action name="obsadd"/>
<Separator />
<Action name="geolocation" />
<Separator />
@@ -110,10 +114,6 @@
<Action name="startwizard" />
</Menu>
- <Menu name="oal" noMerge="1"><text>&Observation</text>
- <Action name="execute"/>
- </Menu>
-
<Menu name="help"><text>&Help</text>
<Action name="help_contents"/>
<Action name="help_tipofday"/>
@@ -134,9 +134,9 @@
<Action name="zoom_out" />
<Action name="find_object" />
<Separator />
- <Action name="time_step_backward" />
+ <Action name="time_step_backward" />
<Action name="clock_startstop" />
- <Action name="time_step_forward" />
+ <Action name="time_step_forward" />
<Action name="timestep_control" />
</ToolBar>
More information about the Kstars-devel
mailing list