mirror of
https://github.com/QB64Official/qb64.git
synced 2024-05-12 12:00:14 +00:00
Improved IdeMessageBox.
- Modified the welcome screen to get rid of the "scary" (and most likely invalid) message - at the very least it is never good advice to encourage people to disable anti-virus. - Updated IdeMessageBox so that the horizontal bar that is in QB is now included. - Modified the About dialog to match new Welcome dialog. - Removed build.bat (.gitignore'd).
This commit is contained in:
Cory Smith
parent
f77cee413f
commit
72d05300d7
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -17,3 +17,4 @@ internal/c/qbx[2-9].cpp
|
||||||
/qb64
|
/qb64
|
||||||
.fake
|
.fake
|
||||||
.vscode
|
.vscode
|
||||||
|
build.cmd
|
||||||
|
|
|
||||||
|
|
@ -1,3 +0,0 @@
|
||||||
@echo off
|
|
||||||
qb64.exe -x source\qb64.bas -o qb64-dev.exe
|
|
||||||
qb64-dev.exe
|
|
||||||
|
|
@ -1168,13 +1168,11 @@ FUNCTION ide2 (ignore)
|
||||||
END IF 'skipdisplay
|
END IF 'skipdisplay
|
||||||
|
|
||||||
IF WhiteListQB64FirstTimeMsg = 0 THEN
|
IF WhiteListQB64FirstTimeMsg = 0 THEN
|
||||||
IF INSTR(_OS$, "WIN") THEN whiteListProcess$ = "and the process 'qb64.exe' " ELSE whiteListProcess$ = ""
|
'IF INSTR(_OS$, "WIN") THEN whiteListProcess$ = "and the process 'qb64.exe' " ELSE whiteListProcess$ = ""
|
||||||
result = idemessagebox("Welcome to QB64", "QB64 is an independently distributed program, and as such" + CHR$(10) + _
|
result = idemessagebox("", "Welcome to QB64.com's QB64" + CHR$(10) + _
|
||||||
"both 'qb64" + extension$ + "' and the programs you create with it may" + CHR$(10) + _
|
CHR$(10) + _
|
||||||
"eventually be flagged as false positives by your" + CHR$(10) + _
|
"Copyright (C) The QB64.com Community, 2007-2022." + CHR$(10) + _
|
||||||
"antivirus/antimalware software." + CHR$(10) + CHR$(10) + _
|
"All rights reserved.", "#OK;#Don't show this again")
|
||||||
"It is advisable to whitelist your whole QB64 folder" + CHR$(10) + _
|
|
||||||
whiteListProcess$ + "to avoid operation errors.", "#OK;#Don't show this again")
|
|
||||||
|
|
||||||
PCOPY 3, 0: SCREEN , , 3, 0
|
PCOPY 3, 0: SCREEN , , 3, 0
|
||||||
IF result = 2 THEN
|
IF result = 2 THEN
|
||||||
|
|
@ -3451,9 +3449,9 @@ FUNCTION ide2 (ignore)
|
||||||
END IF
|
END IF
|
||||||
IF ideunsaved = 1 AND ideprogname <> "" THEN
|
IF ideunsaved = 1 AND ideprogname <> "" THEN
|
||||||
PCOPY 3, 0
|
PCOPY 3, 0
|
||||||
r$ = idesavenow
|
r$ = IdeSaveNow$
|
||||||
PCOPY 3, 0: SCREEN , , 3, 0
|
PCOPY 3, 0: SCREEN , , 3, 0
|
||||||
IF r$ = "C" THEN CLOSE #150: GOTO skipundo
|
IF r$ = "C" OR r$ = "H" THEN CLOSE #150: GOTO skipundo
|
||||||
IF r$ = "Y" THEN
|
IF r$ = "Y" THEN
|
||||||
idesave idepath$ + idepathsep$ + ideprogname$
|
idesave idepath$ + idepathsep$ + ideprogname$
|
||||||
END IF
|
END IF
|
||||||
|
|
@ -5207,13 +5205,17 @@ FUNCTION ide2 (ignore)
|
||||||
IF menu$(m, s) = "#About..." THEN
|
IF menu$(m, s) = "#About..." THEN
|
||||||
helpabout:
|
helpabout:
|
||||||
PCOPY 2, 0
|
PCOPY 2, 0
|
||||||
m$ = "QB64 Version " + Version$ '+ CHR$(10) + DevChannel$
|
'm$ = "QB64 Version " + Version$ '+ CHR$(10) + DevChannel$
|
||||||
IF LEN(AutoBuildMsg$) THEN
|
m$ = "QB64.com's QB64" + CHR$(10) + _
|
||||||
m$ = m$ + CHR$(10) + AutoBuildMsg$
|
"Version " + Version$ + CHR$(10) + _
|
||||||
ELSE
|
"Copyright (C) The QB64.com Community, 2007-2022."
|
||||||
m$ = m$ + CHR$(10) + DevChannel$
|
'IF LEN(AutoBuildMsg$) THEN
|
||||||
END IF
|
' m$ = m$ + CHR$(10) + AutoBuildMsg$
|
||||||
result = idemessagebox("About", m$, "")
|
'ELSE
|
||||||
|
' m$ = m$ + CHR$(10) + DevChannel$
|
||||||
|
'END IF
|
||||||
|
'result = idemessagebox("About", m$, "")
|
||||||
|
result = idemessagebox("", m$, "")
|
||||||
PCOPY 3, 0: SCREEN , , 3, 0
|
PCOPY 3, 0: SCREEN , , 3, 0
|
||||||
GOTO ideloop
|
GOTO ideloop
|
||||||
END IF
|
END IF
|
||||||
|
|
@ -6090,9 +6092,9 @@ FUNCTION ide2 (ignore)
|
||||||
PCOPY 2, 0
|
PCOPY 2, 0
|
||||||
quickexit:
|
quickexit:
|
||||||
IF ideunsaved = 1 THEN
|
IF ideunsaved = 1 THEN
|
||||||
r$ = idesavenow
|
r$ = IdeSaveNow$
|
||||||
PCOPY 3, 0: SCREEN , , 3, 0
|
PCOPY 3, 0: SCREEN , , 3, 0
|
||||||
IF r$ = "C" THEN GOTO ideloop
|
IF r$ = "C" OR r$ = "H" THEN GOTO ideloop
|
||||||
IF r$ = "Y" THEN
|
IF r$ = "Y" THEN
|
||||||
IF ideprogname = "" THEN
|
IF ideprogname = "" THEN
|
||||||
ProposedTitle$ = FindProposedTitle$
|
ProposedTitle$ = FindProposedTitle$
|
||||||
|
|
@ -6118,9 +6120,9 @@ FUNCTION ide2 (ignore)
|
||||||
PCOPY 2, 0
|
PCOPY 2, 0
|
||||||
ctrlNew:
|
ctrlNew:
|
||||||
IF ideunsaved = 1 THEN
|
IF ideunsaved = 1 THEN
|
||||||
r$ = idesavenow
|
r$ = IdeSaveNow$
|
||||||
PCOPY 3, 0: SCREEN , , 3, 0
|
PCOPY 3, 0: SCREEN , , 3, 0
|
||||||
IF r$ = "C" THEN GOTO ideloop
|
IF r$ = "C" OR r$ = "H" THEN GOTO ideloop
|
||||||
IF r$ = "Y" THEN
|
IF r$ = "Y" THEN
|
||||||
IF ideprogname = "" THEN
|
IF ideprogname = "" THEN
|
||||||
ProposedTitle$ = FindProposedTitle$
|
ProposedTitle$ = FindProposedTitle$
|
||||||
|
|
@ -6225,9 +6227,9 @@ FUNCTION ide2 (ignore)
|
||||||
PCOPY 2, 0
|
PCOPY 2, 0
|
||||||
ctrlOpen:
|
ctrlOpen:
|
||||||
IF ideunsaved THEN
|
IF ideunsaved THEN
|
||||||
r$ = idesavenow
|
r$ = IdeSaveNow$
|
||||||
PCOPY 3, 0: SCREEN , , 3, 0
|
PCOPY 3, 0: SCREEN , , 3, 0
|
||||||
IF r$ = "C" THEN GOTO ideloop
|
IF r$ = "C" OR r$ = "H" THEN GOTO ideloop
|
||||||
IF r$ = "Y" THEN
|
IF r$ = "Y" THEN
|
||||||
IF ideprogname = "" THEN
|
IF ideprogname = "" THEN
|
||||||
ProposedTitle$ = FindProposedTitle$
|
ProposedTitle$ = FindProposedTitle$
|
||||||
|
|
@ -12351,13 +12353,12 @@ SUB idesave (f$)
|
||||||
ideunsaved = 0
|
ideunsaved = 0
|
||||||
END SUB
|
END SUB
|
||||||
|
|
||||||
FUNCTION idesavenow$
|
FUNCTION IdeSaveNow$
|
||||||
m$ = "Program is not saved. Save it now?"
|
SELECT CASE IdeMessageBox("", "Loaded file is not saved. Save it now?", "#Yes;#No;#Cancel") ' "#Yes;#No;#Cancel;#Help"
|
||||||
result = idemessagebox("", m$, "#Yes;#No;#Cancel")
|
CASE 1: IdeSaveNow$ = "Y"
|
||||||
SELECT CASE result
|
CASE 2: IdeSaveNow$ = "N"
|
||||||
CASE 1: idesavenow$ = "Y"
|
'CASE 4: IdeSaveNow$ = "H"
|
||||||
CASE 2: idesavenow$ = "N"
|
CASE ELSE: IdeSaveNow$ = "C"
|
||||||
CASE 0, 3: idesavenow$ = "C"
|
|
||||||
END SELECT
|
END SELECT
|
||||||
END FUNCTION
|
END FUNCTION
|
||||||
|
|
||||||
|
|
@ -15291,7 +15292,7 @@ FUNCTION ideadvancedbox
|
||||||
ideadvancedbox = 0
|
ideadvancedbox = 0
|
||||||
END FUNCTION
|
END FUNCTION
|
||||||
|
|
||||||
FUNCTION idemessagebox (titlestr$, messagestr$, buttons$)
|
FUNCTION IdeMessageBox (titleStr$, messageStr$, buttons$)
|
||||||
|
|
||||||
'-------- generic dialog box header --------
|
'-------- generic dialog box header --------
|
||||||
PCOPY 0, 2
|
PCOPY 0, 2
|
||||||
|
|
@ -15338,11 +15339,11 @@ FUNCTION idemessagebox (titlestr$, messagestr$, buttons$)
|
||||||
IF w < w2 THEN w = w2
|
IF w < w2 THEN w = w2
|
||||||
IF w < buttonsLen THEN w = buttonsLen
|
IF w < buttonsLen THEN w = buttonsLen
|
||||||
IF w > idewx - 4 THEN w = idewx - 4
|
IF w > idewx - 4 THEN w = idewx - 4
|
||||||
idepar p, w, 3 + MessageLines, titlestr$
|
idepar p, w, 4 + MessageLines, titlestr$
|
||||||
|
|
||||||
i = i + 1
|
i = i + 1
|
||||||
o(i).typ = 3
|
o(i).typ = 3
|
||||||
o(i).y = 3 + MessageLines
|
o(i).y = 4 + MessageLines
|
||||||
o(i).txt = idenewtxt(StrReplace$(buttons$, ";", sep))
|
o(i).txt = idenewtxt(StrReplace$(buttons$, ";", sep))
|
||||||
o(i).dft = 1
|
o(i).dft = 1
|
||||||
'-------- end of init --------
|
'-------- end of init --------
|
||||||
|
|
@ -15353,9 +15354,9 @@ FUNCTION idemessagebox (titlestr$, messagestr$, buttons$)
|
||||||
|
|
||||||
DO 'main loop
|
DO 'main loop
|
||||||
|
|
||||||
|
|
||||||
'-------- generic display dialog box & objects --------
|
'-------- generic display dialog box & objects --------
|
||||||
idedrawpar p
|
idedrawpar p
|
||||||
|
COLOR 0, 7: _PRINTSTRING (p.x, p.y + p.h - 1), CHR$(195) + STRING$(p.w, 196) + CHR$(180)
|
||||||
f = 1: cx = 0: cy = 0
|
f = 1: cx = 0: cy = 0
|
||||||
FOR i = 1 TO 100
|
FOR i = 1 TO 100
|
||||||
IF o(i).typ THEN
|
IF o(i).typ THEN
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue