Skip to content

Commit e877ac0

Browse files
committed
Fix some windows bug, better messages for the graphics window
1 parent 3ce38bc commit e877ac0

4 files changed

Lines changed: 33 additions & 21 deletions

File tree

Extensions/Erik Temple/Kerkerkruip Glimmr Additions.i7x

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,7 @@ Rule for starting the virtual machine (this is the graphics support rule):
564564

565565
Section - Setting graphics preferences from the command line
566566

567-
The main menu graphics are an option. Understand "graphics" as the main menu graphics.
567+
The main menu graphics are an option. Understand "graphics" and "graphical menu" as the main menu graphics.
568568
Understand "menu [option]" as toggling.
569569

570570
Check toggling the main menu graphics:
@@ -574,24 +574,28 @@ Check toggling the main menu graphics:
574574
try enabling the main menu graphics;
575575

576576
Check enabling the main menu graphics:
577+
if full graphics support is false:
578+
say "Unfortunately your interpreter can't display the graphical menu." instead;
577579
if screen reader mode is enabled:
578-
say "Information panels are disabled in screen reader mode." instead;
580+
say "The graphical menu is disabled in screen reader mode." instead;
579581
if main menu graphics are enabled:
580-
say "The menu graphics are already turned on." instead;
582+
say "The graphical menu is already turned on." instead;
581583

582584
Check disabling the main menu graphics:
585+
if full graphics support is false:
586+
say "Unfortunately your interpreter can't display the graphical menu." instead;
583587
if screen reader mode is enabled:
584-
say "Information panels are disabled in screen reader mode." instead;
588+
say "The graphical menu is disabled in screen reader mode." instead;
585589
if main menu graphics are disabled:
586-
say "The menu graphics are already turned off." instead;
590+
say "The graphical menu is already turned off." instead;
587591

588592
Carry out enabling the main menu graphics:
589593
enable the main menu graphics flag;
590-
say "Graphics will be used to display the main menu." instead;
594+
say "The graphical menu is now turned on." instead;
591595

592596
Carry out disabling the main menu graphics:
593597
disable the main menu graphics flag;
594-
say "Graphics will no longer be used to display the main menu." instead;
598+
say "The graphical menu is now turned off." instead;
595599

596600

597601

Extensions/Erik Temple/Kerkerkruip Windows.i7x

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -357,10 +357,11 @@ Section - Events
357357

358358
Last when play begins (this is the check info panel capacity rule):
359359
if screen reader mode is enabled:
360-
stop;
360+
open up the status-window;
361+
make no decision;
361362
if window panels are disabled:
362363
say "[bracket]Information panels are disabled. Type PANELS to enable them.[close bracket][line break][run paragraph on]";
363-
if window panels are enabled:
364+
otherwise:
364365
if width of the main-window is less than 102 or height of the main-window is less than 30:
365366
say "[bracket]Your game window is too small for you to use the information panels comfortably. Maximize your window, then type PANELS to enable them.[close bracket][line break][run paragraph on]";
366367
disable window panels flag;

Extensions/Victor Gijsbers/Kerkerkruip Start and Finish.i7x

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ Before showing the title screen (this is the check screen reader rule):
7070
while 1 is 1:
7171
let key be the chosen letter;
7272
if key is 89 or key is 121: [Y]
73-
enable screen reader mode, table only;
7473
if menu hyperlinks are unset:
7574
enable menu hyperlinks, table only;
7675
disable main menu graphics flag, table only;
@@ -410,15 +409,15 @@ title order rule
410409
This is the toggle screen reader mode rule:
411410
toggle screen reader mode;
412411
if screen reader mode is enabled:
413-
hide option 20;
414-
show option 21;
415412
hide option 30;
416413
show option 31;
417414
otherwise:
418-
show option 20;
419-
hide option 21;
420415
show option 30;
421416
hide option 31;
417+
update graphical menu rows;
418+
419+
To update graphical menu rows:
420+
do nothing;
422421

423422
The update the disable the popover menu window setting rule is listed after the switch back to the main-window rule in the after displaying rules.
424423
Last after displaying rule (this is the update the disable the popover menu window setting rule):
@@ -433,16 +432,24 @@ Changed graphics option is a truth state variable.
433432

434433
Table of Options Menu (continued)
435434
title order rule
436-
"Menu graphics: [bold type][if main menu graphics flag are enabled]On[otherwise]Off[end if][roman type]" 20 the toggle menu graphics rule
437-
"Menu graphics: [italic type]Disabled by screen reader mode" 21 --
435+
"Graphical menu: [bold type][if main menu graphics flag are enabled]On[otherwise]Off[end if][roman type]" 20 the toggle menu graphics rule
436+
"Graphical menu: [italic type]Disabled in screen reader mode" 21 --
437+
"Graphical menu: [italic type]Not possible in this interpreter" 22 --
438438

439439
An entering a menu rule for the Table of Options Menu (this is the show graphics rows rule):
440+
update graphical menu rows;
441+
442+
To update graphical menu rows:
443+
hide option 20;
444+
hide option 21;
445+
hide option 22;
440446
if screen reader mode is enabled:
441-
hide option 20;
442447
show option 21;
443448
otherwise:
444-
show option 20;
445-
hide option 21;
449+
if full graphics support is true:
450+
show option 20;
451+
otherwise:
452+
show option 22;
446453

447454
This is the toggle menu graphics rule:
448455
toggle main menu graphics flag;
@@ -461,7 +468,7 @@ Section - Info panels
461468
Table of Options Menu (continued)
462469
title order rule
463470
"Information panels: [bold type][if window panels flag are disabled]Off[otherwise]On[end if]" 30 the toggle info panels rule
464-
"Information panels: [italic type]Disabled by screen reader mode" 31 --
471+
"Information panels: [italic type]Disabled in screen reader mode" 31 --
465472

466473
An entering a menu rule for the Table of Options Menu (this is the show panels rows rule):
467474
if screen reader mode is enabled:

Projects/Kerkerkruip.inform/Source/story.ni

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Use no status line.
3535

3636
[ Testing with Glimmr installed will be slower, due to compilation and graphics, so commits to story.ni would generally best be made with it commented out. It is not necessary to comment out Flexible Windows when Glimmr is commented in. ]
3737

38-
Include version 14/140416 of Flexible Windows by Jon Ingold.
38+
Include version 14/140419 of Flexible Windows by Jon Ingold.
3939

4040
Include Kerkerkruip Glimmr Additions by Erik Temple.
4141

0 commit comments

Comments
 (0)