Changeset 3898

Timestamp:

Mar 6, 2020, 8:46:20 PM (5 years ago)

Author:

Andreas Schnellbacher

Message:

• Added option for the search dialog: If file is marked, activate search in mark and from top.

Location:

trunk/src/netlabs

Files:

• bin/defaults.cfg (modified) (1 diff)
• macros/locate.e (modified) (1 diff)
• macros/newmenu.e (modified) (5 diffs)

trunk/src/netlabs/bin/defaults.cfg ¶

@@ -193 +193 @@
 \NEPMD\User\RexxProfile = 1
 
-; Edit window
+; Windows and dialogs
 \NEPMD\User\EditWindow\ClickOnlyGivesFocus = 1
+\NEPMD\User\SearchDialog\SearchMarkIfMarked = 1
 
 ; Readonly

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

@@ -1290 +1290 @@
    -- If file is marked, activate search in mark
    -- and from top, if B or T is not already set.
-   if FileIsMarked() then
+   KeyPath = '\NEPMD\User\SearchDialog\SearchMarkIfMarked'
+   on = QueryConfigKey( KeyPath, 1)
+   if FileIsMarked() & on then
       SetCheckValue( hWndParent, 5303, 1)  -- Options: Marked area
       if not fTopIsDefault & not fBottomIsDefault then

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

@@ -3780 +3780 @@
    DefNextItemStartsSubMenu()
    DefMenuItem( 'toolbar',                                                    -- Toolbar   >
-                'T~oolbar',
+                '~Toolbar',
                 '',
                 '',
@@ -3857 +3857 @@
                 nodismiss)
    DefNextItemStartsSubMenu()
-   DefMenuItem( 'editwindow',                                                 -- Edit window   >
-                'Edi~t window',
+   DefMenuItem( 'windowsanddialogs',                                          -- Windows and dialogs   >
+                'Wind~ows and dialogs',
+                '',
+                '',
+                '',
+                nodismiss)
+   DefNextItemStartsSubMenu()
+   DefMenuItem( 'editwindow',                                                       -- Edit window   >
+                '~Edit Window',
                 '',
                 '',
@@ -3864 +3871 @@
                 nodismiss)
    DefNextItemEndsSubMenu()
-   DefMenuItem( 'clickonlygivesfocus',                                              -- Click only gives focus
+   DefMenuItem( 'clickonlygivesfocus',                                                    -- Click only gives focus
                 '~Click only gives focus',
                 'toggle_ClickOnlyGivesFocus',
                 'When enabled, the cursor is placed at the second click only',
+                '',
+                nodismiss)
+   DefNextItemStartsSubMenu()
+   DefNextItemEndsSubMenu()
+   DefMenuItem( 'searchdialog',                                                     -- Search dialog   >
+                '~Search dialog',
+                '',
+                '',
+                '',
+                nodismiss)
+   DefNextItemEndsSubMenu()
+   DefMenuItem( 'searchinmark',                                                           -- Search in mark if file is marked
+                '~Search in mark if file is marked',
+                'toggle_SearchMarkIfMarked',
+                'If file is marked, activate search in mark and from top',
                 '',
                 nodismiss)
@@ -5543 +5565 @@
    SetMenuAttribute( 'clickonlygivesfocus', MIA_CHECKED, not on)
 
+defc menuinit_searchdialog
+   KeyPath = '\NEPMD\User\SearchDialog\SearchMarkIfMarked'
+   on = QueryConfigKey( KeyPath)
+dprintf( 'menuinit_searchdialog: on = 'on)
+   SetMenuAttribute( 'searchinmark', MIA_CHECKED, not on)
+
 defc menuinit_cursorstyle
    universal menuloaded
@@ -5898 +5926 @@
       -- Set MIA_CHECKED attribute for the case MIA_NODISMISS attribute is on
       SetMenuAttribute( 'clickonlygivesfocus', MIA_CHECKED, not on)
+   endif
+
+; ---------------------------------------------------------------------------
+defc toggle_SearchMarkIfMarked
+   universal menuloaded
+
+   KeyPath = '\NEPMD\User\SearchDialog\SearchMarkIfMarked'
+   on = QueryConfigKey( KeyPath)
+   on = not on
+   WriteConfigKey( KeyPath, on)
+   if menuloaded then
+      -- Set MIA_CHECKED attribute for the case MIA_NODISMISS attribute is on
+      SetMenuAttribute( 'searchinmark', MIA_CHECKED, not on)
    endif