Commit 150060ff authored by Jasem Mutlaq's avatar Jasem Mutlaq

Remove Device Manager from toolbar as it might cause confusion for new users...

Remove Device Manager from toolbar as it might cause confusion for new users looking for Ekos. Remove INDI and Windows KStars UI files as using one file is sufficient
parent a67ea5fd
......@@ -601,14 +601,6 @@ ecm_install_icons(${KDE_INSTALL_ICONDIR})
install( PROGRAMS org.kde.kstars.desktop DESTINATION ${KDE_INSTALL_APPDIR} )
install( FILES kstars.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR} )
install( FILES kstars.knsrc DESTINATION ${KDE_INSTALL_CONFDIR} )
if (INDI_FOUND)
install( FILES kstarsui-indi.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kstars RENAME kstarsui.rc)
else (INDI_FOUND)
install( FILES kstarsui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kstars )
endif(INDI_FOUND)
install( FILES fitsviewer.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kstars )
if (WIN32)
install( FILES kstarsui-win.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/kstars )
endif (WIN32)
install(FILES kstars.notifyrc DESTINATION ${KNOTIFYRC_INSTALL_DIR})
install( FILES kstars.notifyrc DESTINATION ${KNOTIFYRC_INSTALL_DIR})
......@@ -237,18 +237,7 @@ void KStars::slotINDIToolBar()
#ifdef HAVE_INDI
KToggleAction *a = (KToggleAction*)sender();
if ( a == actionCollection()->action( "show_device_manager" ) )
{
if (a->isChecked())
{
DriverManager::Instance()->raise();
DriverManager::Instance()->activateWindow();
DriverManager::Instance()->showNormal();
}
else
DriverManager::Instance()->hide();
}
else if ( a == actionCollection()->action( "show_control_panel" ) )
if ( a == actionCollection()->action( "show_control_panel" ) )
{
if (a->isChecked())
{
......
<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
<kpartgui name="KStars" version="3">
<MenuBar noMerge="1">
<Menu name="file" noMerge="1"><text>&amp;File</text>
<Action name="new_window" />
<Action name="close_window" />
<Separator />
<Action name="open_file" />
<Action name="export_image" />
<Action name="run_script" />
<Separator />
<Action name="printing_wizard" />
<Action name="print" />
<Separator />
<Action name="quit"/>
</Menu>
<Menu name="time" noMerge="1"><text>T&amp;ime</text>
<Action name="time_to_now" />
<Action name="time_dialog" />
<Separator />
<Action name="time_step_backward" />
<Action name="clock_startstop" />
<Action name="time_step_forward" />
</Menu>
<Menu name="focus" noMerge="1"><text>&amp;Pointing</text>
<Action name="zenith" />
<Action name="north" />
<Action name="east" />
<Action name="south" />
<Action name="west" />
<Separator />
<Action name="manual_focus" />
<Separator />
<Action name="find_object" />
<Action name="track_object" />
</Menu>
<Menu name="view" noMerge="1"><text>&amp;View</text>
<Action name="zoom_in" />
<Action name="zoom_out" />
<Action name="zoom_default" />
<Action name="zoom_set" />
<Separator />
<Action name="fullscreen" />
<Separator />
<Action name="coordsys" />
<Menu name="projection"><text>&amp;Projection</text>
<Action name="project_lambert"/>
<Action name="project_azequidistant"/>
<Action name="project_orthographic"/>
<Action name="project_equirectangular"/>
<Action name="project_stereographic"/>
<Action name="project_gnomonic"/>
</Menu>
</Menu>
<Menu name="tools" noMerge="1"><text>&amp;Tools</text>
<Action name="astrocalculator" />
<Menu name="devices" noMerge="1"><text>&amp;Devices</text>
<Action name="telescope_wizard" />
<Action name="device_manager" />
<Separator />
<Action name="indi_cpl" />
</Menu>
<Action name="skycalendar" />
<Action name="moonphasetool" />
<Action name="altitude_vs_time" />
<Action name="whats_up_tonight" />
<Action name="whats_interesting" />
<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>&amp;Data</text>
<Action name="get_data" />
<Menu name="updates"><text>&amp;Updates</text>
<Action name="update_comets" />
<Action name="update_asteroids" />
<Action name="update_satellites" />
<Action name="update_supernovae" />
</Menu>
</Menu>
<Menu name="observation" noMerge="1"><text>&amp;Observation</text>
<Action name="obslist" />
<Action name="execute" />
</Menu>
<Menu name="settings" noMerge="1"><text>&amp;Settings</text>
<Menu name="infopanel"><text>&amp;Info Boxes</text>
<Action name="show_boxes"/>
<Separator />
<Action name="show_time_box" />
<Action name="show_focus_box" />
<Action name="show_location_box" />
</Menu>
<Merge name="StandardToolBarMenuHandler" />
<Menu name="statusbar"><text>&amp;Statusbar</text>
<Action name="show_statusBar" />
<Separator />
<Action name="show_sbAzAlt" />
<Action name="show_sbRADec" />
<Action name="show_sbJ2000RADec" />
</Menu>
<Action name="colorschemes" /> <!--This is a KMenuAction-->
<Action name="fovsymbols" /> <!-- This is a KMenuAction-->
<Action name="opengl" />
<Action name="artificialhorizon" />
<Separator />
<Menu name="config_oal"><text>Configure Observation &amp;Logging</text>
<Action name="equipmentwriter"/>
<Action name="manageobserver"/>
</Menu>
<Separator />
<Action name="geolocation" />
<Separator />
<Action name="options_configure_keybinding"/>
<Action name="options_configure_toolbars"/>
<Action name="configure" />
<Action name="startwizard" />
</Menu>
<Menu name="help"><text>&amp;Help</text>
<Action name="help_contents"/>
<Action name="help_tipofday"/>
<Action name="help_whats_this"/>
<Separator/>
<Action name="help_report_bug"/>
<Separator/>
<Action name="switch_application_language"/>
<Separator/>
<Action name="help_about_app"/>
<Action name="help_about_kde"/>
</Menu>
</MenuBar>
<ToolBar noMerge="1" name="kstarsToolBar" iconText="icononly">
<text>Main Toolbar</text>
<Action name="zoom_in" />
<Action name="zoom_out" />
<Action name="find_object" />
<Separator />
<Action name="geolocation" />
<Separator />
<Action name="time_dialog" />
<Action name="time_step_backward" />
<Action name="clock_startstop" />
<Action name="time_step_forward" />
<Action name="timestep_control" />
<Separator />
<Action name="fovsymbols" /> <!-- This is a KMenuAction-->
</ToolBar>
<ToolBar noMerge="1" name="viewToolBar" iconText="icononly">
<text>View Toolbar</text>
<Action name="show_stars" />
<Action name="show_deepsky" />
<Action name="show_planets" />
<Action name="show_supernovae" />
<Action name="show_satellites" />
<Action name="show_clines" />
<Action name="show_cnames" />
<Action name="show_constellationart" />
<Action name="show_cbounds" />
<Action name="show_mw" />
<Action name="show_equatorial_grid" />
<Action name="show_horizontal_grid" />
<Action name="show_horizon" />
</ToolBar>
<ToolBar noMerge="1" name="INDIToolBar" iconText="icononly">
<text>INDI Toolbar</text>
<Action name="show_ekos" />
<Action name="show_control_panel" />
<Action name="show_fits_viewer" />
<Action name="show_device_manager" />
</ToolBar>
</kpartgui>
<!DOCTYPE kpartgui SYSTEM "kpartgui.dtd">
<kpartgui name="KStars" version="3">
<MenuBar noMerge="1">
<Menu name="file" noMerge="1"><text>&amp;File</text>
<Action name="new_window" />
<Action name="close_window" />
<Separator />
<Action name="open_file" />
<Action name="export_image" />
<Action name="run_script" />
<Separator />
<Action name="printing_wizard" />
<Action name="print" />
<Separator />
<Action name="quit"/>
</Menu>
<Menu name="time" noMerge="1"><text>T&amp;ime</text>
<Action name="time_to_now" />
<Action name="time_dialog" />
<Separator />
<Action name="time_step_backward" />
<Action name="clock_startstop" />
<Action name="time_step_forward" />
</Menu>
<Menu name="focus" noMerge="1"><text>&amp;Pointing</text>
<Action name="zenith" />
<Action name="north" />
<Action name="east" />
<Action name="south" />
<Action name="west" />
<Separator />
<Action name="manual_focus" />
<Separator />
<Action name="find_object" />
<Action name="track_object" />
</Menu>
<Menu name="view" noMerge="1"><text>&amp;View</text>
<Action name="zoom_in" />
<Action name="zoom_out" />
<Action name="zoom_default" />
<Action name="zoom_set" />
<Separator />
<Action name="fullscreen" />
<Separator />
<Action name="coordsys" />
<Menu name="projection"><text>&amp;Projection</text>
<Action name="project_lambert"/>
<Action name="project_azequidistant"/>
<Action name="project_orthographic"/>
<Action name="project_equirectangular"/>
<Action name="project_stereographic"/>
<Action name="project_gnomonic"/>
</Menu>
</Menu>
<Menu name="tools" noMerge="1"><text>&amp;Tools</text>
<Action name="astrocalculator" />
<Menu name="devices" noMerge="1"><text>&amp;Devices</text>
<Action name="telescope_wizard" />
<Action name="device_manager" />
<Separator />
<Action name="indi_cpl" />
</Menu>
<Action name="skycalendar" />
<Action name="moonphasetool" />
<Action name="altitude_vs_time" />
<Action name="whats_up_tonight" />
<Action name="whats_interesting" />
<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>&amp;Data</text>
<Action name="get_data" />
<Menu name="updates"><text>&amp;Updates</text>
<Action name="update_comets" />
<Action name="update_asteroids" />
<Action name="update_satellites" />
<Action name="update_supernovae" />
</Menu>
</Menu>
<Menu name="observation" noMerge="1"><text>&amp;Observation</text>
<Action name="obslist" />
<Action name="execute" />
</Menu>
<Menu name="settings" noMerge="1"><text>&amp;Settings</text>
<Menu name="infopanel"><text>&amp;Info Boxes</text>
<Action name="show_boxes"/>
<Separator />
<Action name="show_time_box" />
<Action name="show_focus_box" />
<Action name="show_location_box" />
</Menu>
<Merge name="StandardToolBarMenuHandler" />
<Menu name="statusbar"><text>&amp;Statusbar</text>
<Action name="show_statusBar" />
<Separator />
<Action name="show_sbAzAlt" />
<Action name="show_sbRADec" />
<Action name="show_sbJ2000RADec" />
</Menu>
<Action name="colorschemes" /> <!--This is a KMenuAction-->
<Action name="fovsymbols" /> <!-- This is a KMenuAction-->
<Action name="opengl" />
<Action name="artificialhorizon" />
<Separator />
<Menu name="config_oal"><text>Configure Observation &amp;Logging</text>
<Action name="equipmentwriter"/>
<Action name="manageobserver"/>
</Menu>
<Separator />
<Action name="geolocation" />
<Separator />
<Action name="options_configure_keybinding"/>
<Action name="options_configure_toolbars"/>
<Action name="configure" />
<Action name="startwizard" />
</Menu>
<Menu name="help"><text>&amp;Help</text>
<Action name="help_contents"/>
<Action name="help_tipofday"/>
<Action name="help_whats_this"/>
<Separator/>
<Action name="help_report_bug"/>
<Separator/>
<Action name="switch_application_language"/>
<Separator/>
<Action name="help_about_app"/>
<Action name="help_about_kde"/>
</Menu>
</MenuBar>
<ToolBar noMerge="1" name="kstarsToolBar" iconText="icononly">
<text>Main Toolbar</text>
<Action name="zoom_in" />
<Action name="zoom_out" />
<Action name="find_object" />
<Separator />
<Action name="geolocation" />
<Separator />
<Action name="time_dialog" />
<Action name="time_step_backward" />
<Action name="clock_startstop" />
<Action name="time_step_forward" />
<Action name="timestep_control" />
<Separator />
<Action name="fovsymbols" /> <!-- This is a KMenuAction-->
</ToolBar>
<ToolBar noMerge="1" name="viewToolBar" iconText="icononly">
<text>View Toolbar</text>
<Action name="show_stars" />
<Action name="show_deepsky" />
<Action name="show_planets" />
<Action name="show_supernovae" />
<Action name="show_satellites" />
<Action name="show_clines" />
<Action name="show_cnames" />
<Action name="show_constellationart" />
<Action name="show_cbounds" />
<Action name="show_mw" />
<Action name="show_equatorial_grid" />
<Action name="show_horizontal_grid" />
<Action name="show_horizon" />
</ToolBar>
<ToolBar noMerge="1" name="INDIToolBar" iconText="icononly">
<text>INDI Toolbar</text>
<Action name="show_ekos" />
<Action name="show_control_panel" />
<Action name="show_fits_viewer" />
<Action name="show_device_manager" />
</ToolBar>
</kpartgui>
......@@ -2,168 +2,184 @@
<kpartgui name="KStars" version="3">
<MenuBar noMerge="1">
<Menu name="file" noMerge="1"><text>&amp;File</text>
<Action name="new_window" />
<Action name="close_window" />
<Separator />
<Action name="open_file" />
<Action name="export_image" />
<Action name="run_script" />
<Separator />
<Menu name="file" noMerge="1"><text>&amp;File</text>
<Action name="new_window" />
<Action name="close_window" />
<Separator />
<Action name="open_file" />
<Action name="export_image" />
<Action name="run_script" />
<Separator />
<Action name="printing_wizard" />
<Action name="print" />
<Separator />
<Action name="quit"/>
</Menu>
<Action name="print" />
<Separator />
<Action name="quit"/>
</Menu>
<Menu name="time" noMerge="1"><text>T&amp;ime</text>
<Action name="time_to_now" />
<Action name="time_dialog" />
<Separator />
<Action name="time_step_backward" />
<Action name="clock_startstop" />
<Action name="time_step_forward" />
</Menu>
<Menu name="time" noMerge="1"><text>T&amp;ime</text>
<Action name="time_to_now" />
<Action name="time_dialog" />
<Separator />
<Action name="time_step_backward" />
<Action name="clock_startstop" />
<Action name="time_step_forward" />
</Menu>
<Menu name="focus" noMerge="1"><text>&amp;Pointing</text>
<Action name="zenith" />
<Action name="north" />
<Action name="east" />
<Action name="south" />
<Action name="west" />
<Separator />
<Action name="manual_focus" />
<Separator />
<Action name="find_object" />
<Action name="track_object" />
</Menu>
<Menu name="focus" noMerge="1"><text>&amp;Pointing</text>
<Action name="zenith" />
<Action name="north" />
<Action name="east" />
<Action name="south" />
<Action name="west" />
<Separator />
<Action name="manual_focus" />
<Separator />
<Action name="find_object" />
<Action name="track_object" />
</Menu>
<Menu name="view" noMerge="1"><text>&amp;View</text>
<Action name="zoom_in" />
<Action name="zoom_out" />
<Action name="zoom_default" />
<Action name="zoom_set" />
<Separator />
<Action name="fullscreen" />
<Separator />
<Action name="coordsys" />
<Menu name="projection"><text>&amp;Projection</text>
<Action name="project_lambert"/>
<Action name="project_azequidistant"/>
<Action name="project_orthographic"/>
<Action name="project_equirectangular"/>
<Action name="project_stereographic"/>
<Action name="project_gnomonic"/>
</Menu>
</Menu>
<Menu name="view" noMerge="1"><text>&amp;View</text>
<Action name="zoom_in" />
<Action name="zoom_out" />
<Action name="zoom_default" />
<Action name="zoom_set" />
<Separator />
<Action name="fullscreen" />
<Separator />
<Action name="coordsys" />
<Menu name="projection"><text>&amp;Projection</text>
<Action name="project_lambert"/>
<Action name="project_azequidistant"/>
<Action name="project_orthographic"/>
<Action name="project_equirectangular"/>
<Action name="project_stereographic"/>
<Action name="project_gnomonic"/>
</Menu>
</Menu>
<Menu name="tools" noMerge="1"><text>&amp;Tools</text>
<Action name="astrocalculator" />
<Menu name="devices" noMerge="1"><text>&amp;Devices</text>
<Action name="telescope_wizard" />
<Action name="device_manager" />
<Separator />
<Action name="indi_cpl" />
</Menu>
<Menu name="tools" noMerge="1"><text>&amp;Tools</text>
<Action name="astrocalculator" />
<Action name="skycalendar" />
<Action name="moonphasetool" />
<Action name="altitude_vs_time" />
<Action name="whats_up_tonight" />
<Action name="whats_interesting" />
<Action name="glossary" />
<Action name="scriptbuilder" />
<Action name="solarsystem" />
<Action name="jmoontool" />
<Action name="moonphasetool" />
<Action name="altitude_vs_time" />
<Action name="whats_up_tonight" />
<Action name="whats_interesting" />
<Action name="glossary" />
<Action name="scriptbuilder" />
<Action name="solarsystem" />
<Action name="ekos" />
<Action name="jmoontool" />
<Action name="flagmanager" />
</Menu>
</Menu>
<Menu name="data" noMerge="1"><text>&amp;Data</text>
<Action name="get_data" />
<Menu name="updates"><text>&amp;Updates</text>
<Action name="update_comets" />
<Action name="update_asteroids" />
<Menu name="data" noMerge="1"><text>&amp;Data</text>
<Action name="get_data" />
<Menu name="updates"><text>&amp;Updates</text>
<Action name="update_comets" />
<Action name="update_asteroids" />
<Action name="update_satellites" />
<Action name="update_supernovae" />
</Menu>
</Menu>
<Menu name="observation" noMerge="1"><text>&amp;Observation</text>
<Action name="obslist" />
<Action name="execute" />
<Action name="update_supernovae" />
</Menu>
</Menu>
<Menu name="observation" noMerge="1"><text>&amp;Observation</text>
<Action name="obslist" />
<Action name="execute" />
</Menu>
<Menu name="settings" noMerge="1"><text>&amp;Settings</text>
<Menu name="infopanel"><text>&amp;Info Boxes</text>
<Action name="show_boxes"/>
<Separator />
<Action name="show_time_box" />
<Action name="show_focus_box" />
<Action name="show_location_box" />
</Menu>
<Menu name="settings" noMerge="1"><text>&amp;Settings</text>
<Menu name="infopanel"><text>&amp;Info Boxes</text>
<Action name="show_boxes"/>
<Separator />
<Action name="show_time_box" />
<Action name="show_focus_box" />
<Action name="show_location_box" />
</Menu>
<Merge name="StandardToolBarMenuHandler" />
<Menu name="statusbar"><text>&amp;Statusbar</text>
<Action name="show_statusBar" />
<Separator />
<Action name="show_sbAzAlt" />
<Action name="show_sbRADec" />
<Action name="show_sbJ2000RADec" />
</Menu>
<Action name="colorschemes" /> <!--This is a KMenuAction-->
<Action name="fovsymbols" /> <!-- This is a KMenuAction-->
<Action name="opengl" />
<Menu name="statusbar"><text>&amp;Statusbar</text>
<Action name="show_statusBar" />
<Separator />
<Action name="show_sbAzAlt" />
<Action name="show_sbRADec" />
<Action name="show_sbJ2000RADec" />
</Menu>
<Action name="colorschemes" /> <!--This is a KMenuAction-->
<Action name="fovsymbols" /> <!-- This is a KMenuAction-->
<Action name="opengl" />
<Action name="artificialhorizon" />
<Separator />
<Menu name="config_oal"><text>Configure Observation &amp;Logging</text>
<Action name="equipmentwriter"/>
<Action name="manageobserver"/>
</Menu>