Changeset 3623

Timestamp:

Jul 28, 2019, 3:57:37 PM (6 years ago)

Author:

Andreas Schnellbacher

Message:

• Changed const CLICK_ONLY_GIVES_FOCUS to a setting.
• Added menu item Preferences -> Appearance -> Edit window -> Click only gives focus.
• Cleaned up consts, also a few more unused ones.
• Cleaned up some universals.

Location:

trunk/src/netlabs

Files:

• bin/defaults.cfg (modified) (1 diff)
• macros/config.e (modified) (1 diff)
• macros/init.e (modified) (2 diffs)
• macros/mouse.e (modified) (2 diffs)
• macros/obsolete.e (modified) (1 diff)
• mode/e/e.hil (modified) (1 diff)

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

@@ -191 +191 @@
 ; Toolbar
 \NEPMD\User\Toolbar\Name = Newbar
+
+; Edit window
+\NEPMD\User\EditWindow\ClickOnlyGivesFocus = 1
 
 ; Readonly

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

@@ -1148 +1148 @@
    universal msgfont
    universal statfont
-   universal vautosave_path
    universal cursoreverywhere
    universal cua_menu_accel

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

@@ -153 +153 @@
 compile endif
 
-   -- Allow pressing tab in insert mode to insert spaces to next tab stop in
-   -- line mode as well as in stream mode.
-compile if not defined( WANT_TAB_INSERTION_TO_SPACE)
-   -- for line mode only
-   WANT_TAB_INSERTION_TO_SPACE = 0
-compile endif
-
 compile if not defined( WORD_MARK_TYPE)
    -- Bug using 'BLOCK':
@@ -280 +273 @@
    universal vdesktopcolor
    universal menu_prompt
-   universal enterkey, a_enterkey, c_enterkey, s_enterkey
-   universal padenterkey, a_padenterkey, c_padenterkey, s_padenterkey
    universal ring_enabled
    universal epm_utility_array_id, defaultmenu

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

@@ -40 +40 @@
    TOP_OF_FILE_VALID = 1       -- Can be '0', '1', or 'STREAM' (dependant on STREAM_MODE)
 compile endif
-compile if not defined( CLICK_ONLY_GIVES_FOCUS)  -- Can be 0, ADVANCED, CUA, or 1
-   CLICK_ONLY_GIVES_FOCUS = 'ADVANCED'
-compile endif
 
 ; ---------------------------------------------------------------------------
@@ -812 +809 @@
    universal windowhadfocus
 
+   KeyPath = '\NEPMD\User\EditWindow\ClickOnlyGivesFocus'
+   ClickOnlyGivesFocus = QueryConfigKey( KeyPath)
+
    fIgnore = 0
    if windowhadfocus = 0 then
       if cua_marking_switch then
-         fIgnore = (CLICK_ONLY_GIVES_FOCUS = 1 | CLICK_ONLY_GIVES_FOCUS = 'CUA')
+         fIgnore = (ClickOnlyGivesFocus = 1 | ClickOnlyGivesFocus = 'CUA')
       else
-         fIgnore = (CLICK_ONLY_GIVES_FOCUS = 1 | CLICK_ONLY_GIVES_FOCUS = 'ADVANCED')
+         fIgnore = (ClickOnlyGivesFocus = 1 | ClickOnlyGivesFocus = 'ADVANCED')
       endif
    endif

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

@@ -313 +313 @@
 compile endif
    WPS_SUPPORT = 0
+compile if not defined( WANT_TAB_INSERTION_TO_SPACE)
+   WANT_TAB_INSERTION_TO_SPACE = 0
+compile endif
+compile if not defined( CLICK_ONLY_GIVES_FOCUS)
+   CLICK_ONLY_GIVES_FOCUS = 1
+compile endif
 
 ; No effect in standard EPM

trunk/src/netlabs/mode/e/e.hil ¶

@@ -987 +987 @@
 CALL_USER_FTO
 CHECK_FOR_LEXAM
-CLICK_ONLY_GIVES_FOCUS
 COMPILER_ERROR_COLOR
 CORE_STUFF