mirror of
https://github.com/QB64Official/qb64.git
synced 2024-07-07 19:10:25 +00:00
Adds "Enable quick navigation" option in the Search menu. +
Allows disabling the Back arrow when navigating a program.
This commit is contained in:
parent
1b7867fd1d
commit
d710b9acce
|
@ -10,7 +10,7 @@ DIM SHARED IDE_Index$
|
||||||
DIM SHARED LoadedIDESettings AS INTEGER
|
DIM SHARED LoadedIDESettings AS INTEGER
|
||||||
DIM SHARED MouseButtonSwapped AS _BYTE
|
DIM SHARED MouseButtonSwapped AS _BYTE
|
||||||
DIM SHARED PasteCursorAtEnd AS _BYTE
|
DIM SHARED PasteCursorAtEnd AS _BYTE
|
||||||
DIM SHARED SaveExeWithSource AS _BYTE
|
DIM SHARED SaveExeWithSource AS _BYTE, EnableQuickNav AS _BYTE
|
||||||
DIM SHARED IDEShowErrorsImmediately AS _BYTE
|
DIM SHARED IDEShowErrorsImmediately AS _BYTE
|
||||||
DIM SHARED ShowLineNumbersSeparator AS _BYTE, ShowLineNumbersUseBG AS _BYTE
|
DIM SHARED ShowLineNumbersSeparator AS _BYTE, ShowLineNumbersUseBG AS _BYTE
|
||||||
|
|
||||||
|
@ -179,6 +179,19 @@ IF LoadedIDESettings = 0 THEN
|
||||||
SaveExeWithSource = 0
|
SaveExeWithSource = 0
|
||||||
END IF
|
END IF
|
||||||
|
|
||||||
|
result = ReadConfigSetting("EnableQuickNav", value$)
|
||||||
|
IF result THEN
|
||||||
|
IF value$ = "TRUE" OR VAL(value$) = -1 THEN
|
||||||
|
EnableQuickNav = -1
|
||||||
|
ELSE
|
||||||
|
EnableQuickNav = 0
|
||||||
|
WriteConfigSetting "'[GENERAL SETTINGS]", "EnableQuickNav", "FALSE"
|
||||||
|
END IF
|
||||||
|
ELSE
|
||||||
|
WriteConfigSetting "'[GENERAL SETTINGS]", "EnableQuickNav", "TRUE"
|
||||||
|
EnableQuickNav = -1
|
||||||
|
END IF
|
||||||
|
|
||||||
result = ReadConfigSetting("IDE_SortSUBs", value$)
|
result = ReadConfigSetting("IDE_SortSUBs", value$)
|
||||||
IF result THEN
|
IF result THEN
|
||||||
IF value$ = "TRUE" OR VAL(value$) = -1 THEN
|
IF value$ = "TRUE" OR VAL(value$) = -1 THEN
|
||||||
|
|
|
@ -167,6 +167,7 @@ DIM SHARED EnteringRGB AS _BYTE
|
||||||
DIM SHARED ActiveINCLUDELink AS LONG
|
DIM SHARED ActiveINCLUDELink AS LONG
|
||||||
DIM SHARED ActiveINCLUDELinkFile AS STRING
|
DIM SHARED ActiveINCLUDELinkFile AS STRING
|
||||||
DIM SHARED HideCurrentLineHighlight AS _BYTE, ShowLineNumbers AS _BYTE
|
DIM SHARED HideCurrentLineHighlight AS _BYTE, ShowLineNumbers AS _BYTE
|
||||||
|
DIM SHARED SearchMenuEnableQuickNav AS INTEGER
|
||||||
DIM SHARED idegotobox_LastLineNum AS LONG, maxLineNumberLength AS LONG
|
DIM SHARED idegotobox_LastLineNum AS LONG, maxLineNumberLength AS LONG
|
||||||
|
|
||||||
'--------------------------------------------------------------------------------
|
'--------------------------------------------------------------------------------
|
||||||
|
@ -204,7 +205,7 @@ DIM SHARED ideautorun
|
||||||
DIM SHARED menu$(1 TO 10, 0 TO 20)
|
DIM SHARED menu$(1 TO 10, 0 TO 20)
|
||||||
DIM SHARED menusize(1 TO 10)
|
DIM SHARED menusize(1 TO 10)
|
||||||
DIM SHARED menus AS INTEGER, idecontextualmenuID AS INTEGER
|
DIM SHARED menus AS INTEGER, idecontextualmenuID AS INTEGER
|
||||||
DIM SHARED ideeditmenuID AS INTEGER
|
DIM SHARED ideeditmenuID AS INTEGER, SearchMenuID AS INTEGER
|
||||||
DIM SHARED OptionsMenuID AS INTEGER, OptionsMenuSwapMouse AS INTEGER, OptionsMenuPasteCursor AS INTEGER
|
DIM SHARED OptionsMenuID AS INTEGER, OptionsMenuSwapMouse AS INTEGER, OptionsMenuPasteCursor AS INTEGER
|
||||||
DIM SHARED OptionsMenuShowErrorsImmediately AS INTEGER
|
DIM SHARED OptionsMenuShowErrorsImmediately AS INTEGER
|
||||||
DIM SHARED ViewMenuID AS INTEGER, ViewMenuShowLineNumbersSubMenuID AS INTEGER
|
DIM SHARED ViewMenuID AS INTEGER, ViewMenuShowLineNumbersSubMenuID AS INTEGER
|
||||||
|
|
|
@ -255,7 +255,7 @@ FUNCTION ide2 (ignore)
|
||||||
menu$(m, i) = "#Line numbers " + CHR$(16): i = i + 1
|
menu$(m, i) = "#Line numbers " + CHR$(16): i = i + 1
|
||||||
menusize(m) = i - 1
|
menusize(m) = i - 1
|
||||||
|
|
||||||
m = m + 1: i = 0
|
m = m + 1: i = 0: SearchMenuID = m
|
||||||
menu$(m, i) = "Search": i = i + 1
|
menu$(m, i) = "Search": i = i + 1
|
||||||
menu$(m, i) = "#Find... Ctrl+F3": i = i + 1
|
menu$(m, i) = "#Find... Ctrl+F3": i = i + 1
|
||||||
menu$(m, i) = "#Repeat Last Find (Shift+) F3": i = i + 1
|
menu$(m, i) = "#Repeat Last Find (Shift+) F3": i = i + 1
|
||||||
|
@ -263,6 +263,13 @@ FUNCTION ide2 (ignore)
|
||||||
menu$(m, i) = "-": i = i + 1
|
menu$(m, i) = "-": i = i + 1
|
||||||
menu$(m, i) = "Clear search #history...": i = i + 1
|
menu$(m, i) = "Clear search #history...": i = i + 1
|
||||||
menu$(m, i) = "-": i = i + 1
|
menu$(m, i) = "-": i = i + 1
|
||||||
|
|
||||||
|
SearchMenuEnableQuickNav = i
|
||||||
|
menu$(m, i) = "Enable #quick navigation (back arrow)": i = i + 1
|
||||||
|
IF EnableQuickNav THEN
|
||||||
|
menu$(SearchMenuID, SearchMenuEnableQuickNav) = CHR$(7) + menu$(SearchMenuID, SearchMenuEnableQuickNav)
|
||||||
|
END IF
|
||||||
|
menu$(m, i) = "-": i = i + 1
|
||||||
menu$(m, i) = "Add/Remove #Bookmark Alt+Left": i = i + 1
|
menu$(m, i) = "Add/Remove #Bookmark Alt+Left": i = i + 1
|
||||||
menu$(m, i) = "#Next Bookmark Alt+Down": i = i + 1
|
menu$(m, i) = "#Next Bookmark Alt+Down": i = i + 1
|
||||||
menu$(m, i) = "#Previous Bookmark Alt+Up": i = i + 1
|
menu$(m, i) = "#Previous Bookmark Alt+Up": i = i + 1
|
||||||
|
@ -863,7 +870,7 @@ FUNCTION ide2 (ignore)
|
||||||
GOSUB UpdateTitleOfMainWindow
|
GOSUB UpdateTitleOfMainWindow
|
||||||
|
|
||||||
'Draw navigation buttons (QuickNav)
|
'Draw navigation buttons (QuickNav)
|
||||||
GOSUB DrawQuickNav
|
IF EnableQuickNav THEN GOSUB DrawQuickNav
|
||||||
|
|
||||||
'update search bar
|
'update search bar
|
||||||
GOSUB UpdateSearchBar
|
GOSUB UpdateSearchBar
|
||||||
|
@ -1242,7 +1249,7 @@ FUNCTION ide2 (ignore)
|
||||||
END IF
|
END IF
|
||||||
|
|
||||||
'Hover/click (QuickNav)
|
'Hover/click (QuickNav)
|
||||||
IF IdeSystem = 1 AND QuickNavTotal > 0 THEN
|
IF IdeSystem = 1 AND QuickNavTotal > 0 AND EnableQuickNav THEN
|
||||||
IF mY = 2 THEN
|
IF mY = 2 THEN
|
||||||
IF mX >= 4 AND mX <= 6 THEN
|
IF mX >= 4 AND mX <= 6 THEN
|
||||||
QuickNavHover = -1
|
QuickNavHover = -1
|
||||||
|
@ -4573,6 +4580,20 @@ FUNCTION ide2 (ignore)
|
||||||
GOTO ideloop
|
GOTO ideloop
|
||||||
END IF
|
END IF
|
||||||
|
|
||||||
|
IF MID$(menu$(m, s), 1, 24) = "Enable #quick navigation" OR MID$(menu$(m, s), 2, 24) = "Enable #quick navigation" THEN
|
||||||
|
PCOPY 2, 0
|
||||||
|
EnableQuickNav = NOT EnableQuickNav
|
||||||
|
IF EnableQuickNav THEN
|
||||||
|
WriteConfigSetting "'[GENERAL SETTINGS]", "EnableQuickNav", "TRUE"
|
||||||
|
menu$(SearchMenuID, SearchMenuEnableQuickNav) = CHR$(7) + "Enable #quick navigation (back arrow)"
|
||||||
|
ELSE
|
||||||
|
WriteConfigSetting "'[GENERAL SETTINGS]", "EnableQuickNav", "FALSE"
|
||||||
|
menu$(SearchMenuID, SearchMenuEnableQuickNav) = "Enable #quick navigation (back arrow)"
|
||||||
|
END IF
|
||||||
|
PCOPY 3, 0: SCREEN , , 3, 0: idewait4mous: idewait4alt
|
||||||
|
GOTO ideloop
|
||||||
|
END IF
|
||||||
|
|
||||||
IF menu$(m, s) = "#Code layout..." THEN
|
IF menu$(m, s) = "#Code layout..." THEN
|
||||||
PCOPY 2, 0
|
PCOPY 2, 0
|
||||||
retval = idelayoutbox
|
retval = idelayoutbox
|
||||||
|
|
Loading…
Reference in a new issue