Changeset 2566 for trunk/src/netlabs/macros/newmenu.e

Timestamp:

Dec 30, 2012, 9:37:11 PM (12 years ago)

Author:

Andreas Schnellbacher

Message:

• Renamed FindWord command to FindToken. Added FindWord.
• Added menu item for FindWord.
• Moved mark commands from MOUSE.E to KEYS.E.
• Removed double function for FindMark when no mark exists.
• Changed keys: Alt+W = MarkToken, Alt+Sh+W = MarkWord, Ctrl+W = FindToken, Ctrl+Sh+W = FindWord and Ctrl+Sh+M = FindMark.
• Made 'Using help' menu item work.
• Added comment about bugs of 'xcom l'.

File:

• trunk/src/netlabs/macros/newmenu.e (modified) (8 diffs)

trunk/src/netlabs/macros/newmenu.e ¶

@@ -1066 +1066 @@
                                    \1'Create a line mark between two cursor positions',
                                    MIS_TEXT, 0
+   i = i + 1; call SetAVar( 'mid_marktoken', i);
+   buildmenuitem menuname, mid, i, 'Mark ~identifier'MenuAccelString( 'MarkToken'),                      -- Mark identifier
+                                   'MarkToken' ||
+                                   \1'Mark identifier (C-style word) under cursor',
+                                   MIS_TEXT, 0
    i = i + 1; call SetAVar( 'mid_markword', i);
    buildmenuitem menuname, mid, i, 'Mark ~word'MenuAccelString( 'MarkWord'),                             -- Mark word
                                    'MarkWord' ||
                                    \1'Mark word under cursor',
-                                   MIS_TEXT, 0
-   i = i + 1; call SetAVar( 'mid_marktoken', i);
-   buildmenuitem menuname, mid, i, 'Mark ~identifier'MenuAccelString( 'MarkToken'),                      -- Mark identifier
-                                   'MarkToken' ||
-                                   \1'Mark identifier (C-style word) under cursor',
                                    MIS_TEXT, 0
    i = i + 1;
@@ -1648 +1648 @@
                                    MIS_SEPARATOR, 0
    i = i + 1;
-   buildmenuitem menuname, mid, i, 'Find ~indentifier'MenuAccelString( 'FindWord'),                -- Find identifier
+   buildmenuitem menuname, mid, i, 'Find ~indentifier'MenuAccelString( 'FindToken'),               -- Find identifier
+                                   'FindToken' ||
+                                   \1'Find identifier (C-style word) under cursor',
+                                   MIS_TEXT, 0
+   i = i + 1;
+   buildmenuitem menuname, mid, i, 'Find ~word'MenuAccelString( 'FindWord'),                       -- Find word
                                    'FindWord' ||
-                                   \1'Find identifier (C-style word) under cursor',
+                                   \1'Find word under cursor',
                                    MIS_TEXT, 0
    i = i + 1; call SetAVar( 'mid_findmark', i);
-   buildmenuitem menuname, mid, i, 'Find ~mark/word'MenuAccelString( 'FindMark'),                  -- Find mark
+   buildmenuitem menuname, mid, i, 'Find ~mark'MenuAccelString( 'FindMark'),                       -- Find mark
                                    'FindMark' ||
                                    \1'Find marked string else word under cursor',
@@ -2687 +2692 @@
 
    i = i + 1; call SetAVar( 'mid_directories', i);
-   buildmenuitem menuname, mid, i, 'Director~ies',                                                 -- Directories >
+   buildmenuitem menuname, mid, i, 'Director~ies',                                                 -- Directories  >
                                    '',
                                    MIS_TEXT + MIS_SUBMENU, 0
@@ -3069 +3074 @@
                                    MIS_TEXT, 0
    i = i + 1;
-   buildmenuitem menuname, mid, i, 'Commandline current ~line'MenuAccelString( 'CommandDlgLine'),  -- Commandline current line
+   buildmenuitem menuname, mid, i, 'Command line current ~line'MenuAccelString( 'CommandDlgLine'),  -- Command line current line
                                    'CommandDlgLine' ||
-                                   \1'Open line under cursor in commandline window',
+                                   \1'Open line under cursor in command dialog',
                                    MIS_TEXT, 0
    i = i + 1;
@@ -3122 +3127 @@
    i = i + 1;
    buildmenuitem menuname, mid, i, HELP_HELP_MENU__MSG,                                            -- Using help
-                                   'helpmenu 64027' ||
+                                   'helpmenu 0'/*64027*/ ||
                                    HELP_HELP_MENUP__MSG,
                                    0, mpfrom2short(HP_HELP_HELP, 0)
@@ -3494 +3499 @@
 ;   SetMenuAttribute( GetAVar('mid_toggledirection'),  MIA_DISABLED, c <> '')               -- Toggle direction OK if not blank
    on = FileIsMarked()
-   if on then
-      SetMenuText( GetAVar('mid_findmark'), 'Find ~mark')
-   else
-      SetMenuText( GetAVar('mid_findmark'), 'Find ~word')
-   endif
+   SetMenuAttribute( GetAVar('mid_findmark'), MIA_DISABLED, on)
    -- Menu for CUA keys doesn't have a Backward item
    if GetKeyDef() = '-none-' then
@@ -5059 +5060 @@
       new = args
       if new = '' then
-         'ma'  -- Open commandline with current .margins value
+         'ma'  -- Open command line with current .margins value
          return
       endif
@@ -5068 +5069 @@
       if new = '' then
          old = NepmdQueryConfigValue( nepmd_hini, KeyPath)
-         'commandline set_ReflowMargins' old  -- Open commandline with current value
+         'commandline set_ReflowMargins' old  -- Open command line with current value
          return
       endif