1
1
Fork 0
mirror of https://github.com/QB64-Phoenix-Edition/QB64pe.git synced 2024-06-29 10:30:36 +00:00

Shows search flags when no match is found (F3).

This commit is contained in:
FellippeHeitor 2021-01-18 04:28:38 -03:00
parent 525de822d1
commit 8fd038be44

View file

@ -1674,7 +1674,7 @@ FUNCTION ide2 (ignore)
GOSUB UpdateSearchBar GOSUB UpdateSearchBar
IF KSHIFT THEN idefindinvert = 1 IF KSHIFT THEN idefindinvert = 1
IdeAddSearched idefindtext IdeAddSearched idefindtext
idefindagain idefindagain -1
ELSE ELSE
GOTO idefindjmp GOTO idefindjmp
END IF END IF
@ -5545,7 +5545,7 @@ FUNCTION ide2 (ignore)
PCOPY 3, 0 PCOPY 3, 0
result = idemessagebox("Search complete", "No changes made.", "") result = idemessagebox("Search complete", "No changes made.", "")
ELSE ELSE
idenomatch idenomatch -1
END IF END IF
PCOPY 3, 0: SCREEN , , 3, 0: idewait4mous: idewait4alt PCOPY 3, 0: SCREEN , , 3, 0: idewait4mous: idewait4alt
GOTO ideloop GOTO ideloop
@ -6448,7 +6448,7 @@ FUNCTION idechange$
PCOPY 1, 0 PCOPY 1, 0
IF changed = 0 THEN IF changed = 0 THEN
idenomatch idenomatch 0
ELSE ELSE
idechanged changed: idechangemade = 1 idechanged changed: idechangemade = 1
END IF END IF
@ -7144,7 +7144,7 @@ FUNCTION idefind$
s$ = idetxt(o(1).txt) s$ = idetxt(o(1).txt)
idefindtext$ = s$ idefindtext$ = s$
IdeAddSearched idefindtext IdeAddSearched idefindtext
idefindagain idefindagain 0
EXIT FUNCTION EXIT FUNCTION
END IF END IF
@ -7176,7 +7176,7 @@ FUNCTION idefind$
LOOP LOOP
END FUNCTION END FUNCTION
SUB idefindagain SUB idefindagain (showFlags AS _BYTE)
DIM comment AS _BYTE, quote AS _BYTE DIM comment AS _BYTE, quote AS _BYTE
IF idefindinvert THEN IF idefindinvert THEN
@ -7281,7 +7281,7 @@ SUB idefindagain
IF idefindbackwards THEN IF idefindbackwards THEN
y = y - 1 y = y - 1
IF y = start - 1 AND looped = 1 THEN IF y = start - 1 AND looped = 1 THEN
idenomatch idenomatch showFlags
IF idefindinvert THEN IF idefindinvert THEN
IF idefindbackwards = 0 THEN idefindbackwards = 1 ELSE idefindbackwards = 0 IF idefindbackwards = 0 THEN idefindbackwards = 1 ELSE idefindbackwards = 0
idefindinvert = 0 idefindinvert = 0
@ -7293,7 +7293,7 @@ SUB idefindagain
ELSE ELSE
y = y + 1 y = y + 1
IF y = start + 1 AND looped = 1 THEN IF y = start + 1 AND looped = 1 THEN
idenomatch idenomatch showFlags
IF idefindinvert THEN IF idefindinvert THEN
IF idefindbackwards = 0 THEN idefindbackwards = 1 ELSE idefindbackwards = 0 IF idefindbackwards = 0 THEN idefindbackwards = 1 ELSE idefindbackwards = 0
idefindinvert = 0 idefindinvert = 0
@ -7660,8 +7660,20 @@ FUNCTION idenewtxt (a$)
idenewtxt = idetxtlast idenewtxt = idetxtlast
END FUNCTION END FUNCTION
SUB idenomatch SUB idenomatch (showFlags AS _BYTE)
result = idemessagebox("Search complete", "Match not found.", "") msg$ = "Match not found."
c$ = ", "
IF showFlags THEN
IF idefindcasesens THEN flags$ = flags$ + "match case": flagset = flagset + 1
IF idefindwholeword THEN flags$ = flags$ + LEFT$(c$, ABS(flagset) * 2) + "whole word": flagset = flagset + 1
IF idefindnocomments THEN flags$ = flags$ + LEFT$(c$, ABS(flagset) * 2) + "no comments": flagset = flagset + 1
IF idefindonlycomments THEN flags$ = flags$ + LEFT$(c$, ABS(flagset) * 2) + "only comments": flagset = flagset + 1
IF idefindnostrings THEN flags$ = flags$ + LEFT$(c$, ABS(flagset) * 2) + "no strings": flagset = flagset + 1
IF idefindonlystrings THEN flags$ = flags$ + LEFT$(c$, ABS(flagset) * 2) + "only strings": flagset = flagset + 1
IF flagset > 1 THEN pl$ = "s"
IF flagset THEN msg$ = msg$ + "\n(Flag" + pl$ + ": " + flags$ + ")"
END IF
result = idemessagebox("Search complete", msg$, "")
END SUB END SUB
FUNCTION idefiledialog$(programname$, mode AS _BYTE) FUNCTION idefiledialog$(programname$, mode AS _BYTE)