Commits

Daniel Poelzleithner  committed e2134d3

cleanup of menu structure. refs #262

  • Participants
  • Parent commits b8ba181

Comments (0)

Files changed (10)

File pida/editors/emacs/uidef/emacs.xml

             <placeholder name="tools" />
             <separator />
             <placeholder name="panes">
-            <separator />
-            <menuitem action="focus_editor" name="focus_editor" />
-            <separator />
             </placeholder>
             <separator />
             <placeholder name="prefs" />

File pida/editors/mooedit/uidef/mooedit.xml

             <placeholder name="tools" />
             <separator />
             <placeholder name="panes">
-            <separator />
-            <menuitem action="focus_editor" name="focus_editor" />
-            <separator />
             </placeholder>
             <placeholder name="prefs">
             <menuitem name="mooedit_preferences" action="mooedit_preferences" />

File pida/editors/vim/uidef/vim.xml

             <placeholder name="tools" />
             <separator />
             <placeholder name="panes">
-            <separator />
-            <menuitem action="focus_editor" name="focus_editor" />
-            <separator />
             </placeholder>
             <separator />
             <placeholder name="prefs" />

File pida/resources/uidef/base.xml

         </menu>
         
         <menu name="ViewMenu" action="ViewMenu">
+            <placeholder name="tools" />
+            <separator />
+            <placeholder name="panes">
+            </placeholder>
+            <separator />
+            <placeholder name="prefs" />
         </menu>
 
         <placeholder name="AddMenu" />

File pida/services/buffer/uidef/buffer.xml

             <menuitem name="switch_prev_buffer" action="switch_prev_buffer" />
             <separator />
             </placeholder>
-            <placeholder name="perms">
-                <menuitem name="show_buffer_list" action="show_buffer_list" />
-            </placeholder>
         </menu>
 
         <placeholder name="AddMenu" /> 

File pida/services/commander/commander.py

             # or new document
             return
         for term in self._terminals:
-            if term._stick_button.child.get_active() and \
+            if hasattr(term, '_stick_button') and \
+               term._stick_button.child.get_active() and \
                term._term.window.is_visible():
                 term.chdir(document.directory)
 

File pida/services/filemanager/uidef/filemanager.xml

             <placeholder name="tools" />
             <separator />
             <placeholder name="perms">
-                <menuitem name="show_filebrowser" action="show_filebrowser" />
             </placeholder>
-            <separator />
-            <placeholder name="panes" />
         </menu>
 
         <placeholder name="AddMenu" /> 

File pida/services/notify/uidef/notify.xml

 
         <menu name="DebugMenu" action="DebugMenu">
         </menu>
-
         
         <menu name="ToolsMenu" action="ToolsMenu">
         </menu>
         
         <menu name="ViewMenu" action="ViewMenu">
-            <placeholder name="tools" />
-            <separator />
-            <placeholder name="perms">
-				<menuitem action="show_notify" name="show_notify"/>
-            </placeholder>
-            <separator />
-            <placeholder name="panes" />
+        <placeholder name="tools">
+            <menuitem action="show_notify" name="show_notify"/>
+        </placeholder>
         </menu>
 
         <placeholder name="AddMenu" />

File pida/services/openwith/uidef/openwith.xml

             <placeholder name="toolstools"/>
             <separator />
             <placeholder name="toolstools2">
-            <menuitem name="show_openwith" action="show_openwith" />
             </placeholder>
             <separator />
             <menu name="ToolsDebug" action="ToolsDebug">
         </menu>
         
         <menu name="ViewMenu" action="ViewMenu">
+            <placeholder name="prefs">
+            <menuitem name="show_openwith" action="show_openwith" />
+            </placeholder>
         </menu>
 
         <placeholder name="AddMenu" /> 

File pida/services/window/uidef/window.xml

             <placeholder name="tools" />
             <separator />
             <placeholder name="panes">
-            <menuitem action="switch_next_term" name="switch_next_term" />
-            <menuitem action="switch_prev_term" name="switch_prev_term" />
-            <menuitem action="focus_terminal" name="focus_terminal" />
-            <separator />
-            <menuitem action="fullscreen" name="fullscreen" />
-            <menuitem action="show_toolbar" name="show_toolbar" />
-            <menuitem action="show_menubar" name="show_menubar" />
+                <menuitem action="switch_next_term" name="switch_next_term" />
+                <menuitem action="switch_prev_term" name="switch_prev_term" />
+                <menuitem action="focus_terminal" name="focus_terminal" />
+                <separator />
+                <menuitem action="fullscreen" name="fullscreen" />
+                <menuitem action="show_toolbar" name="show_toolbar" />
+                <menuitem action="show_menubar" name="show_menubar" />
+                <placeholder name="add_panes" />
             </placeholder>
         </menu>