menu name consistency, reformat updates submenu, fix "extramenu" messy

This commit is contained in:
tick bumley 2021-07-16 16:42:58 -05:00
parent 8c4177438b
commit 38e62a4814
1 changed files with 19 additions and 28 deletions

View File

@ -356,7 +356,7 @@ screen navigation():
textbutton _("Load") action ShowMenu("load")
textbutton _("Delete") action ShowMenu("delete")
textbutton _("Options") action ShowMenu("preferences")
textbutton _("Extras") action ShowMenu("extras")
#textbutton _("Extras") action ShowMenu("extras")
textbutton _("Return") action Return()
@ -441,7 +441,7 @@ screen main_menu():
[ "Start", Start() ], \
[ "Load", ShowMenu("load") ], \
[ "Options", ShowMenu("preferences") ], \
[ "Extra", ShowMenu("extras") ], \
[ "Extras", ShowMenu("extras") ], \
[ "Quit", Quit(confirm=not main_menu) ] \
] )
on "show" action renpy.start_predict_screen("cg_gallery")
@ -647,7 +647,6 @@ screen about():
screen updates():
tag menu
style_prefix "main_menu"
add gui.main_menu_background
@ -661,48 +660,40 @@ screen updates():
## contents of the main menu are in the navigation screen.
vbox:
xpos 1140
ypos 900
label _("{color=#5D009C}[config.name!t]{/color}")
text _("{color=#5D009C}Your Version is [config.version!t]\n{/color}")
yalign 0.00
yoffset 100
xoffset 80
xmaximum 1100
label "[config.name!t]"
text _("Version [config.version!t]\n")
if updater.can_update():
label _("{color=#5D009C}{size=26}Update directory exists, updating is possible!{/size}{/color}")
label _("{color=#00FF00}Update directory exists, updating is possible!{/color}")
else:
label _("{color=#5D009C}{size=26}Update directory does not exist or is corrupt!{/size}")
label _("{color=#FF0000}Update directory does not exist or is corrupt!{/color}")
textbutton _("Enable Automatic Updates") action [Notify("Toggling Automatic Updates..."), ToggleVariable("persistent.autoup", True, False)]
text _("{color=#5D009C}Automatic Updates: [persistent.autoup!t]\n{/color}")
text _("Automatic Updates: [persistent.autoup!t]\n")
textbutton _("Check for Update!") action [Notify("Checking for update..."), Function(UpdateCheck)]
label _("{color=#5D009C}Update Check Result:\n{/color}")
text _("{color=#5D009C}[persistent.updateresult!t]\n{/color}")
label _("Update Check Result:\n")
text _("[persistent.updateresult!t]\n")
if persistent.updateresult != "No new version is available":
textbutton _("Update Now!") action updater.Update(persistent.updateWebServer, force=False)
else:
textbutton _("Update Now!") action Notify("Nothing to update to!")
label _("{color=#5D009C}Update Server:\n{/color}")
label _("Update Server:\n")
default input_on = False
button:
key_events True
if input_on:
input:
default "[persistent.updateWebServer!t]" size 20 color '#FFFFFF'
default "[persistent.updateWebServer!t]" size 24 color '#FFFFFF'
value FieldInputValue(persistent, 'updateWebServer')
length 49
copypaste True
else:
text persistent.updateWebServer size 20 color '#FFFF00'
text persistent.updateWebServer size 24 color '#FFFF00'
action ToggleScreenVariable('input_on')
textbutton "Back to Extras" action ShowMenu("extras")
vbox:
xpos 1942
# xalign 1.0
yalign 0.95
use extrasnavigation
style_prefix "quick"
use extrasnavigation
## Load and Save screens #######################################################
##
@ -854,7 +845,7 @@ screen preferences():
tag menu
use game_menu(_("Preferences"), scroll="viewport"):
use game_menu(_("Options"), scroll="viewport"):
vbox: