Skip to content

Commit

Permalink
Fix some windows bug, better messages for the graphics window
Browse files Browse the repository at this point in the history
  • Loading branch information
curiousdannii committed Apr 19, 2014
1 parent 3ce38bc commit e877ac0
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 21 deletions.
18 changes: 11 additions & 7 deletions Extensions/Erik Temple/Kerkerkruip Glimmr Additions.i7x
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@ Rule for starting the virtual machine (this is the graphics support rule):

Section - Setting graphics preferences from the command line

The main menu graphics are an option. Understand "graphics" as the main menu graphics.
The main menu graphics are an option. Understand "graphics" and "graphical menu" as the main menu graphics.
Understand "menu [option]" as toggling.

Check toggling the main menu graphics:
Expand All @@ -574,24 +574,28 @@ Check toggling the main menu graphics:
try enabling the main menu graphics;

Check enabling the main menu graphics:
if full graphics support is false:
say "Unfortunately your interpreter can't display the graphical menu." instead;
if screen reader mode is enabled:
say "Information panels are disabled in screen reader mode." instead;
say "The graphical menu is disabled in screen reader mode." instead;
if main menu graphics are enabled:
say "The menu graphics are already turned on." instead;
say "The graphical menu is already turned on." instead;

Check disabling the main menu graphics:
if full graphics support is false:
say "Unfortunately your interpreter can't display the graphical menu." instead;
if screen reader mode is enabled:
say "Information panels are disabled in screen reader mode." instead;
say "The graphical menu is disabled in screen reader mode." instead;
if main menu graphics are disabled:
say "The menu graphics are already turned off." instead;
say "The graphical menu is already turned off." instead;

Carry out enabling the main menu graphics:
enable the main menu graphics flag;
say "Graphics will be used to display the main menu." instead;
say "The graphical menu is now turned on." instead;

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



Expand Down
5 changes: 3 additions & 2 deletions Extensions/Erik Temple/Kerkerkruip Windows.i7x
Original file line number Diff line number Diff line change
Expand Up @@ -357,10 +357,11 @@ Section - Events

Last when play begins (this is the check info panel capacity rule):
if screen reader mode is enabled:
stop;
open up the status-window;
make no decision;
if window panels are disabled:
say "[bracket]Information panels are disabled. Type PANELS to enable them.[close bracket][line break][run paragraph on]";
if window panels are enabled:
otherwise:
if width of the main-window is less than 102 or height of the main-window is less than 30:
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]";
disable window panels flag;
Expand Down
29 changes: 18 additions & 11 deletions Extensions/Victor Gijsbers/Kerkerkruip Start and Finish.i7x
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ Before showing the title screen (this is the check screen reader rule):
while 1 is 1:
let key be the chosen letter;
if key is 89 or key is 121: [Y]
enable screen reader mode, table only;
if menu hyperlinks are unset:
enable menu hyperlinks, table only;
disable main menu graphics flag, table only;
Expand Down Expand Up @@ -410,15 +409,15 @@ title order rule
This is the toggle screen reader mode rule:
toggle screen reader mode;
if screen reader mode is enabled:
hide option 20;
show option 21;
hide option 30;
show option 31;
otherwise:
show option 20;
hide option 21;
show option 30;
hide option 31;
update graphical menu rows;

To update graphical menu rows:
do nothing;

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.
Last after displaying rule (this is the update the disable the popover menu window setting rule):
Expand All @@ -433,16 +432,24 @@ Changed graphics option is a truth state variable.

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

An entering a menu rule for the Table of Options Menu (this is the show graphics rows rule):
update graphical menu rows;

To update graphical menu rows:
hide option 20;
hide option 21;
hide option 22;
if screen reader mode is enabled:
hide option 20;
show option 21;
otherwise:
show option 20;
hide option 21;
if full graphics support is true:
show option 20;
otherwise:
show option 22;

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

An entering a menu rule for the Table of Options Menu (this is the show panels rows rule):
if screen reader mode is enabled:
Expand Down
2 changes: 1 addition & 1 deletion Projects/Kerkerkruip.inform/Source/story.ni
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Use no status line.

[ 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. ]

Include version 14/140416 of Flexible Windows by Jon Ingold.
Include version 14/140419 of Flexible Windows by Jon Ingold.

Include Kerkerkruip Glimmr Additions by Erik Temple.

Expand Down

0 comments on commit e877ac0

Please sign in to comment.