Changeset 3529

Timestamp:

Mar 18, 2019, 6:31:47 PM (6 years ago)

Author:

Andreas Schnellbacher

Message:

• Added header width configuration macros.
• Added header width menu item to Format -> Center, Box and Draw.
• Removed it from InitModeConfig in MODECFG.E.
• Changed first reflow margins selection to always use header width as right margin and removed configuration for that.
• The text for the menu item 'Reflow margins' > 'Configure selected' is now changed, according to the selected dimension.
• Minor fixes and text improvements.

Location:

trunk/src/netlabs/macros

Files:

• config.e (modified) (2 diffs)
• newmenu.e (modified) (14 diffs)

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

@@ -2075 +2075 @@
    call DeleteConfigTree( '\NEPMD\User\Mouse\Mark\Workaround')
    call DeleteConfigTree( '\NEPMD\User\Mouse\Url\Browser')
+   call DeleteConfigTree( '\NEPMD\User\Reflow\Margins1')
+   call DeleteConfigTree( '\NEPMD\User\Reflow\Margins\1')
 
    call RenameConfigTree( '\NEPMD\User\Mode',         '\NEPMD\Var\Mode')
@@ -2094 +2096 @@
    call RenameConfigTree( '\NEPMD\User\Keys\AddKeyDefs\Selected',   '\NEPMD\User\Keysets\AddKeyDefs\Selected')
    call RenameConfigTree( '\NEPMD\User\Reflow\MarginsItem',         '\NEPMD\User\Reflow\Margins\Selected')
-   call RenameConfigTree( '\NEPMD\User\Reflow\Margins1',            '\NEPMD\User\Reflow\Margins\1')
    call RenameConfigTree( '\NEPMD\User\Reflow\Margins2',            '\NEPMD\User\Reflow\Margins\2')
    call RenameConfigTree( '\NEPMD\User\Search\LastFindDefButton',      '\NEPMD\Var\Search\LastFindDefButton')

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

@@ -716 +716 @@
                 'Delete from cursor until begin of next word',
                 '')
-;
-; x      Box   used in: CustEpm
-; x      Draw  used in: CustEpm
-;        Fill
-;        Center
-; x      Sort
-; x      Sum
-;        ?Math
-; x      Expand > First
-; x      Expand > Second
-;        Syntax expansion in header
-;
    DefMenuSep()                                                               --------------------
 
@@ -1322 +1310 @@
    DefMenuSep()                                                                     --------------------
 
+   DefMenuItem( 'headerwidth',                                                      -- Header width: []
+                'Header ~width: []...',
+                'DefaultHeaderWidth',
+                'Configure default header width used for boxes, center and syntax expansion',
+                '')
+   DefMenuSep()                                                                     --------------------
+
    DefMenuItem( 'draw',                                                             -- Draw lines
                 '~Draw lines',
@@ -1382 +1377 @@
                 'Reformat current email',
                 '')
-   DefMenuSep()                                                                     --------------------
-
    DefMenuItem( '',                                                                 -- Select reflow type...
                 '~Select reflow type...',
                 'SelectReflowType',
-                '',
+                'No other type defined yet',
                 '',
                 'disabled')
@@ -1411 +1404 @@
                 'Margins/right margin for wrap and reflow actions',
                 '')
-   DefMenuItem( 'reflowmargins1',                                                   -- 1:
-                '~1: []',
+   DefMenuItem( 'reflowmargins1',                                                   -- 1: [] (header width)
+                '~1: [] (header width)',
                 'ReflowmarginsSelect 1',
                 'Select specified value(s) as reflow margins',
                 '',
                 NoDismiss)
-   DefMenuItem( 'reflowmargins2',                                                   -- 2:
+   DefMenuItem( 'reflowmargins2',                                                   -- 2: []
                 '~2: []',
                 'ReflowmarginsSelect 2',
@@ -1423 +1416 @@
                 '',
                 NoDismiss)
-   DefMenuItem( 'reflowmargins3',                                                   -- 3: rightmargin
-                '~3: []',
+   DefMenuItem( 'reflowmargins3',                                                   -- 3: [] (margins)
+                '~3: [] (margins)',
                 'ReflowmarginsSelect 3',
                 'Select file''s margins as reflow margins',
@@ -1435 +1428 @@
                 '~Configure selected...',
                 'Set_ReflowMargins',
-                'Configure selected reflow-margins item...',
+                'Configure selected reflow margins item...',
                 '')
    DefMenuSep()                                                               --------------------
@@ -3915 +3908 @@
    KeyPath = '\NEPMD\User\Reflow\Margins\Selected'
    i = QueryConfigKey( KeyPath)
-   if i = 3 then
+   if i = 1 then
+      reflowmargins = '1 'GetDefaultHeaderWidth()' 1'
+   elseif i = 3 then
       reflowmargins = .margins
    else
@@ -3952 +3947 @@
 defc menuinit_reflowmargins
    KeyPath = '\NEPMD\User\Reflow\Margins\1'
-   new = QueryConfigKey( KeyPath)
+   new = '1 'GetDefaultHeaderWidth()' 1'
    SetMenuVarText( 'reflowmargins1', new)
 
@@ -3967 +3962 @@
    SetMenuAttribute( GetAVar( 'mid_reflowmargins2'), MIA_CHECKED, not (i = 2))
    SetMenuAttribute( GetAVar( 'mid_reflowmargins3'), MIA_CHECKED, not (i = 3))
+
+   if i = 1 then
+      text = '~Configure header width...'
+   elseif i = 2 then
+      text = '~Configure selected...'
+   elseif i = 3 then
+      text = '~Configure margins...'
+   endif
+   SetMenuText( 'mid_reflowmarginsconfig', text)
 
 defc menuinit_linebreaks
@@ -4106 +4110 @@
    endif
    SetMenuVarText( 'selectboxstyle', new)
+   new = GetDefaultHeaderWidth()
+   SetMenuVarText( 'headerwidth', new)
    KeyPath = '\NEPMD\User\Format\DrawStyle'
    new = QueryConfigKey( KeyPath)
@@ -6271 +6277 @@
    args = arg(1)
    parse value args with lma rma parma
-   if lma > '' then
+   if lma <> '' then
       if rma = '' then
          args = 1 args  -- default value for lma is 1
@@ -6282 +6288 @@
    KeyPath = '\NEPMD\User\Reflow\Margins\Selected'
    i   = QueryConfigKey( KeyPath)
-   if i = 3 then
-      new = args
-      if new = '' then
-         'ma'  -- Open command line with current .margins value
-         return
-      endif
-      reflowmargins = .margins
+   if i = 1 then
+      'DefaultHeaderWidth'
+      return
+   elseif i = 3 then
+      'ma'  -- Open command line with current .margins value
+      return
    else
       KeyPath = '\NEPMD\User\Reflow\Margins\'i
@@ -6310 +6315 @@
    KeyPath = '\NEPMD\User\Reflow\Margins\Selected'
    WriteConfigKey( KeyPath, i)
-   if i = 3 then
+   if i = 1 then
+      reflowmargins = '1 'GetDefaultHeaderWidth()' 1'
+   elseif i = 3 then
       reflowmargins = .margins
    else
@@ -6321 +6328 @@
    new = reflowmargins
    SetMenuVarText( 'reflowmargins', new)
+   if i = 1 then
+      text = '~Configure header width...'
+   elseif i = 2 then
+      text = '~Configure selected...'
+   elseif i = 3 then
+      text = '~Configure margins...'
+   endif
+   SetMenuText( 'mid_reflowmarginsconfig', text)
 
 ; ---------------------------------------------------------------------------