Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix "Export As" menu state #473

Merged
merged 2 commits into from
Mar 19, 2024
Merged

Fix "Export As" menu state #473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a04b6f
Fix "Export As" menu state
RhoSigma-QB64 Mar 18, 2024
be46dc8
Fix tests
RhoSigma-QB64 Mar 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions source/ide/ide_methods.bas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,7 @@ FUNCTION ide2 (ignore)
END IF

m = 1: i = 0
IdeMakeFileMenu
IdeMakeFileMenu 0

m = m + 1: i = 0
ideeditmenuID = m
Expand Down Expand Up @@ -6361,7 +6361,7 @@ FUNCTION ide2 (ignore)
IF r$ = "Y" THEN
fh = FREEFILE
OPEN ".\internal\temp\recent.bin" FOR OUTPUT AS #fh: CLOSE #fh
IdeMakeFileMenu
IdeMakeFileMenu LEFT$(menu$(1, FileMenuExportAs), 1) <> "~"
PCOPY 3, 0: SCREEN , , 3, 0
GOTO ideloop
ELSE
Expand All @@ -6386,8 +6386,7 @@ FUNCTION ide2 (ignore)
IF r$ = "Y" THEN
fh = FREEFILE
OPEN ".\internal\temp\recent.bin" FOR OUTPUT AS #fh: CLOSE #fh
IdeMakeFileMenu
IF ideautolayout <> 0 THEN menu$(1, FileMenuExportAs) = "#Export As... " + CHR$(16)
IdeMakeFileMenu LEFT$(menu$(1, FileMenuExportAs), 1) <> "~"
PCOPY 3, 0: SCREEN , , 3, 0
GOTO ideloop
END IF
Expand Down Expand Up @@ -6583,7 +6582,7 @@ FUNCTION ide2 (ignore)
END IF

ERASE RecentFilesList
IdeMakeFileMenu
IdeMakeFileMenu LEFT$(menu$(1, FileMenuExportAs), 1) <> "~"
RETURN

redrawItAll:
Expand Down Expand Up @@ -18304,7 +18303,7 @@ END FUNCTION



SUB IdeMakeFileMenu
SUB IdeMakeFileMenu (eaa%) 'ExportAs activation (boolean)
m = 1: i = 0
menu$(m, i) = "File": i = i + 1
menu$(m, i) = "#New Ctrl+N": i = i + 1
Expand All @@ -18316,8 +18315,8 @@ SUB IdeMakeFileMenu
menu$(m, i) = "Save #As...": i = i + 1
menuDesc$(m, i - 1) = "Saves current program with specified name"
menu$(m, i) = "-": i = i + 1
FileMenuExportAs = i
menu$(m, i) = "~#Export As... " + CHR$(16): i = i + 1
FileMenuExportAs = i: IF eaa% THEN eaa$ = "": ELSE eaa$ = "~"
menu$(m, i) = eaa$ + "#Export As... " + CHR$(16): i = i + 1
menuDesc$(m, i - 1) = "Export current program into various formats"
fh = FREEFILE
OPEN ".\internal\temp\recent.bin" FOR BINARY AS #fh: a$ = SPACE$(LOF(fh)): GET #fh, , a$
Expand Down Expand Up @@ -18350,7 +18349,7 @@ SUB IdeMakeFileMenu
END IF
NEXT
CLOSE #fh
IF menu$(m, i - 1) <> "#Recent..." AND menu$(m, i - 1) <> "~#Export As... " + CHR$(16) THEN
IF menu$(m, i - 1) <> "#Recent..." AND menu$(m, i - 1) <> eaa$ + "#Export As... " + CHR$(16) THEN
menu$(m, i) = "#Clear Recent...": i = i + 1
menuDesc$(m, i - 1) = "Clears list of recently loaded files"
ELSE
Expand Down Expand Up @@ -18803,7 +18802,7 @@ SUB IdeAddRecent (f2$)
END IF
PUT #fh, 1, a$
CLOSE #fh
IdeMakeFileMenu
IdeMakeFileMenu LEFT$(menu$(1, FileMenuExportAs), 1) <> "~"
END SUB

FUNCTION removeDoubleSlashes$(f$)
Expand Down
2 changes: 1 addition & 1 deletion tests/compile_tests/http/http_error.bas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Print h&

' This gives back a 404, but the connection is still successful in that
' situation.
h& = _OpenClient("https://www.example.com/unknownUrl")
h& = _OpenClient("https://qb64phoenix.com/fake")
Print h&
Print _StatusCode(h&)

Expand Down