1
1
Fork 0
mirror of https://github.com/QB64-Phoenix-Edition/QB64pe.git synced 2024-07-24 05:25:14 +00:00

Rename 'New Dialogs' to 'GUI Dialogs', Persist setting

The 'New Dialogs' menu option was renamed to 'GUI Dialogs' to better
explain what it does. Additionally the setting of which dialogs to use
is saved to the config.ini file so that it presists across multiple runs
of QB64-PE.
This commit is contained in:
Matthew Kilgore 2022-11-15 21:51:19 -05:00
parent 2147911ec3
commit 65cfbda3b7
4 changed files with 16 additions and 12 deletions

View file

@ -27,6 +27,7 @@ DIM SHARED StripDebugSymbols AS _UNSIGNED LONG
DIM SHARED OptimizeCppProgram AS _UNSIGNED LONG DIM SHARED OptimizeCppProgram AS _UNSIGNED LONG
DIM SHARED UseMiniaudioBackend AS _UNSIGNED LONG DIM SHARED UseMiniaudioBackend AS _UNSIGNED LONG
DIM SHARED GenerateLicenseFile AS _UNSIGNED LONG DIM SHARED GenerateLicenseFile AS _UNSIGNED LONG
DIM SHARED UseGuiDialogs AS _UNSIGNED LONG
ConfigFile$ = "internal/config.ini" ConfigFile$ = "internal/config.ini"
iniFolderIndex$ = STR$(tempfolderindex) iniFolderIndex$ = STR$(tempfolderindex)
@ -231,6 +232,7 @@ IF ReadConfigSetting(generalSettingsSection$, "WikiBaseAddress", value$) THEN
ELSE WriteConfigSetting generalSettingsSection$, "WikiBaseAddress", wikiBaseAddress$ ELSE WriteConfigSetting generalSettingsSection$, "WikiBaseAddress", wikiBaseAddress$
END IF END IF
UseGuiDialogs = ReadWriteBooleanSettingValue%(generalSettingsSection$, "UseGuiDialogs", -1)
'Mouse settings --------------------------------------------------------------- 'Mouse settings ---------------------------------------------------------------
result = ReadConfigSetting(mouseSettingsSection$, "SwapMouseButton", value$) result = ReadConfigSetting(mouseSettingsSection$, "SwapMouseButton", value$)
@ -540,5 +542,6 @@ ExtraLinkerFlags = ReadWriteStringSettingValue$(compilerSettingsSection$, "Extra
UseMiniaudioBackend = ReadWriteBooleanSettingValue%(compilerSettingsSection$, "UseMiniaudioBackend", -1) UseMiniaudioBackend = ReadWriteBooleanSettingValue%(compilerSettingsSection$, "UseMiniaudioBackend", -1)
GenerateLicenseFile = ReadWriteBooleanSettingValue%(compilerSettingsSection$, "GenerateLicenseFile", 0) GenerateLicenseFile = ReadWriteBooleanSettingValue%(compilerSettingsSection$, "GenerateLicenseFile", 0)
'End of initial settings ------------------------------------------------------ 'End of initial settings ------------------------------------------------------

View file

@ -223,6 +223,7 @@ DIM SHARED ViewMenuShowSeparatorID AS INTEGER, ViewMenuShowBGID AS INTEGER
DIM SHARED ViewMenuCompilerWarnings AS INTEGER DIM SHARED ViewMenuCompilerWarnings AS INTEGER
DIM SHARED RunMenuID AS INTEGER, RunMenuSaveExeWithSource AS INTEGER, brackethighlight AS INTEGER DIM SHARED RunMenuID AS INTEGER, RunMenuSaveExeWithSource AS INTEGER, brackethighlight AS INTEGER
DIM SHARED GenerateLicenseEnableMenu AS INTEGER DIM SHARED GenerateLicenseEnableMenu AS INTEGER
DIM SHARED OptionsMenuGuiDialogs AS INTEGER
DIM SHARED DebugMenuID AS INTEGER, DebugMenuCallStack AS INTEGER, DebugMenuWatchListToConsole AS INTEGER DIM SHARED DebugMenuID AS INTEGER, DebugMenuCallStack AS INTEGER, DebugMenuWatchListToConsole AS INTEGER
DIM SHARED DebugMenuAutoAddCommand AS INTEGER DIM SHARED DebugMenuAutoAddCommand AS INTEGER
DIM SHARED multihighlight AS INTEGER, keywordHighlight AS INTEGER DIM SHARED multihighlight AS INTEGER, keywordHighlight AS INTEGER

View file

@ -447,10 +447,10 @@ FUNCTION ide2 (ignore)
menuDesc$(m, i - 1) = "Toggles display of warning messages (unused variables, etc)" menuDesc$(m, i - 1) = "Toggles display of warning messages (unused variables, etc)"
IF IgnoreWarnings THEN menu$(OptionsMenuID, OptionsMenuIgnoreWarnings) = CHR$(7) + "Ignore #Warnings" IF IgnoreWarnings THEN menu$(OptionsMenuID, OptionsMenuIgnoreWarnings) = CHR$(7) + "Ignore #Warnings"
OptionsMenuNewDialogs = i OptionsMenuGuiDialogs = i
menu$(m, i) = "New Dialogs": i = i + 1 menu$(m, i) = "GUI Dialogs": i = i + 1
menuDesc$(m, i - 1) = "Uses New File Dialog Windows" menuDesc$(m, i - 1) = "Uses GUI-based File Dialog Windows"
IF NewDialogs THEN IF UseGuiDialogs THEN
menu$(OptionsMenuID, i - 1) = CHR$(7) + menu$(OptionsMenuID, i - 1) menu$(OptionsMenuID, i - 1) = CHR$(7) + menu$(OptionsMenuID, i - 1)
END IF END IF
@ -5052,16 +5052,17 @@ FUNCTION ide2 (ignore)
GOTO ideloop GOTO ideloop
END IF END IF
IF RIGHT$(menu$(m, s), 11) = "New Dialogs" THEN IF RIGHT$(menu$(m, s), 11) = "GUI Dialogs" THEN
PCOPY 2, 0 PCOPY 2, 0
UseGuiDialogs = NOT UseGuiDialogs
WriteConfigSetting generalSettingsSection$, "UseGuiDialogs", BoolToTFString$(UseGuiDialogs)
IF NewDialogs = 0 THEN IF UseGuiDialogs THEN
NewDialogs = -1 menu$(OptionsMenuID, OptionsMenuGuiDialogs) = CHR$(7) + "GUI Dialogs"
menu$(OptionsMenuID, OptionsMenuNewDialogs) = CHR$(7) + "New Dialogs"
ELSE ELSE
NewDialogs = 0 menu$(OptionsMenuID, OptionsMenuGuiDialogs) = "GUI Dialogs"
menu$(OptionsMenuID, OptionsMenuNewDialogs) = "New Dialogs"
END IF END IF
idechangemade = 1 idechangemade = 1
startPausedPending = 0 startPausedPending = 0
PCOPY 3, 0: SCREEN , , 3, 0 PCOPY 3, 0: SCREEN , , 3, 0
@ -6284,7 +6285,7 @@ FUNCTION ide2 (ignore)
PCOPY 3, 0: SCREEN , , 3, 0 PCOPY 3, 0: SCREEN , , 3, 0
END IF '"Y" END IF '"Y"
END IF 'unsaved END IF 'unsaved
IF NewDialogs Then IF UseGuiDialogs Then
r$ = OpenFile$ (IdeOpenFile$) 'for new dialog file open routine. r$ = OpenFile$ (IdeOpenFile$) 'for new dialog file open routine.
ELSE ELSE
r$ = idefiledialog$("", 1) 'for old dialog file open routine. r$ = idefiledialog$("", 1) 'for old dialog file open routine.

View file

@ -74,7 +74,6 @@ IF INSTR(_OS$, "32BIT") THEN UserDefine(1, 5) = "-1": UserDefine(1, 6) = "0" ELS
UserDefine(1, 7) = Version$ UserDefine(1, 7) = Version$
DIM SHARED QB64_uptime! DIM SHARED QB64_uptime!
DIM SHARED AS INTEGER NewDialogs, OptionsMenuNewDialogs: NewDialogs = -1
QB64_uptime! = TIMER QB64_uptime! = TIMER