re-organized the help menu

added a link to the new User Manual wiki page


git-svn-id: https://pycam.svn.sourceforge.net/svnroot/pycam/trunk@895 bbaffbd6-741e-11dd-a85d-61de82d9cad9

share/ui/menubar.xml

@@ -28,7 +28,9 @@
       <menuitem action="ToggleProcessPoolWindow"/>
     </menu>
     <menu action="HelpMenu">
+      <menuitem action="HelpUserManual"/>
       <menuitem action="HelpIntroduction"/>
+      <menu action="HelpMenuMisc">
         <menuitem action="HelpSupportedFormats"/>
         <menuitem action="HelpModelTransformations"/>
         <menuitem action="HelpGCodeExport"/>
@@ -37,11 +39,13 @@
         <menuitem action="HelpServerMode"/>
         <menuitem action="HelpCommandLine"/>
         <menuitem action="HelpHotkeys"/>
-      <separator />
+      </menu>
+      <menu action="HelpMenuGUI">
         <menuitem action="HelpToolTypes"/>
         <menuitem action="HelpProcessSettings"/>
         <menuitem action="HelpBoundsSettings"/>
         <menuitem action="HelpTaskSetup"/>
+      </menu>
       <separator />
       <menuitem action="ProjectWebsite"/>
       <menuitem action="Forum"/>

share/ui/pycam-project.ui

@@ -6749,6 +6749,15 @@ Any selected group of dimensions will be scaled accordingly.</property>
   <object class="GtkAction" id="HelpMenu">
     <property name="label">_Help</property>
   </object>
+  <object class="GtkAction" id="HelpMenuMisc">
+    <property name="label">Miscellaneous</property>
+  </object>
+  <object class="GtkAction" id="HelpMenuGUI">
+    <property name="label">_GUI description</property>
+  </object>
+  <object class="GtkAction" id="HelpUserManual">
+    <property name="label">User _Manual: Overview</property>
+  </object>
   <object class="GtkAction" id="HelpIntroduction">
     <property name="label">_Introduction</property>
   </object>

src/pycam/Gui/Project.py

@@ -303,7 +303,8 @@ class ProjectGui:
                 ("ToggleLogWindow", self.toggle_log_window, None, "<Control>l"),
                 ("ToggleProcessPoolWindow", self.toggle_process_pool_window, None, None),
                 ("ShowFontDialog", self.toggle_font_dialog_window, None, "<Control><Shift>t"),
-                ("HelpIntroduction", self.show_help, "Introduction", "F1"),
+                ("HelpUserManual", self.show_help, "User_Manual", "F1"),
+                ("HelpIntroduction", self.show_help, "Introduction", None),
                 ("HelpSupportedFormats", self.show_help, "SupportedFormats", None),
                 ("HelpModelTransformations", self.show_help, "ModelTransformations", None),
                 ("HelpToolTypes", self.show_help, "ToolTypes", None),
@@ -314,7 +315,6 @@ class ProjectGui:
                 ("HelpSimulation", self.show_help, "Simulation", None),
                 ("Help3DView", self.show_help, "3D_View", None),
                 ("HelpServerMode", self.show_help, "ServerMode", None),
-                # TODO: write a general wiki page about the commandline usage (not just examples)
                 ("HelpCommandLine", self.show_help, "CommandlineExamples", None),
                 ("HelpHotkeys", self.show_help, "KeyboardShortcuts", None),
                 ("ProjectWebsite", self.show_help, "http://pycam.sourceforge.net", None),