Merge remote-tracking branch 'origin/interface2' into kinetic_text

game/scripts/gui/main_menu.rpy

@@ -296,12 +296,24 @@ screen navigation():
     default category = "save"
     default subcategory = None
     default page = 0
+    default navigation_atl = navigation_show
+    default navigation_last_frame_atl = navigation_last_frame_show
+    default navigation_exit = False
+    default page_right_atl = None
+    default page_left_atl = None
 
-    add last_frame at navigation_blackout
+    add last_frame at navigation_last_frame_atl
     # add "gui_fade_both" at gui_fade
 
+    if navigation_exit:
+        timer 0.4 action Return()
+
     frame:
-        at navigation_showhide
+        # We need to use a 'hacky' way to set transforms and
+        # set the exit timer because events aren't correctly passed to
+        # the children when exitting upper context
+        # from (what I assume) is a transient screen.
+        at navigation_atl
         vbox:
             style_prefix "navigation_tabs"
 
@@ -310,14 +322,14 @@ screen navigation():
             textbutton "Settings" action [SetLocalVariable("subcategory", "general"), SetLocalVariable("category", "settings")] at navigation_tabs
             textbutton "Main Menu" action MainMenu() at navigation_tabs
             null height 35
-            textbutton "Return" action Return() at navigation_tabs
+            textbutton "Return" action [SetScreenVariable("navigation_last_frame_atl", navigation_last_frame_hide), SetScreenVariable("navigation_atl", navigation_hide), SetScreenVariable("navigation_exit", True)] keysym "game_menu" at navigation_tabs
 
         if category == "save":
             vbox:
                 style_prefix "navigation_subtabs"
 
-                textbutton "Autosaves" action FilePage("auto") at navigation_tabs
+                textbutton "A.Saves" action FilePage("auto") at navigation_tabs
-                textbutton "QuickSaves" action FilePage("quick") at navigation_tabs
+                textbutton "Q.Saves" action FilePage("quick") at navigation_tabs
                 null height 35
                 textbutton "Next" action FilePageNext() at navigation_tabs
                 textbutton "Previous" action FilePagePrevious() at navigation_tabs
@@ -327,8 +339,8 @@ screen navigation():
             vbox:
                 style_prefix "navigation_subtabs"
 
-                textbutton "Autosaves" action FilePage("auto") at navigation_tabs
+                textbutton "A.Saves" action FilePage("auto") at navigation_tabs
-                textbutton "QuickSaves" action FilePage("quick") at navigation_tabs
+                textbutton "Q.Saves" action FilePage("quick") at navigation_tabs
                 null height 35
                 textbutton "Next" action FilePageNext() at navigation_tabs
                 textbutton "Previous" action FilePagePrevious() at navigation_tabs
@@ -341,7 +353,7 @@ screen navigation():
                 textbutton "General" action SetLocalVariable("subcategory", "general") at navigation_tabs
                 textbutton "Display" action SetLocalVariable("subcategory", "display") at navigation_tabs
                 textbutton "Audio" action SetLocalVariable("subcategory", "audio") at navigation_tabs
-                textbutton "Accessibility" action SetLocalVariable("subcategory", "accessibility") at navigation_tabs
+                textbutton "Other" action SetLocalVariable("subcategory", "accessibility") at navigation_tabs
 
             if subcategory == "audio":
                 use preferences_sound
@@ -360,22 +372,22 @@ transform navigation_tabs:
         easein 0.1 xzoom 1.1
         easeout 0.1 xzoom 1.0
 
-transform navigation_blackout:
+transform navigation_last_frame_show:
     matrixcolor SaturationMatrix(1.0)
-    on start:
     easein 1.0 matrixcolor SaturationMatrix(0.33)
-    on hide:
+
+transform navigation_last_frame_hide:
+    matrixcolor SaturationMatrix(0.33)
     easeout 0.4 matrixcolor SaturationMatrix(1.0)
 
-transform navigation_showhide:
+transform navigation_show:
     subpixel True
-
-    on show:
     zoom 0.0
     alpha 0.0
     easein_back 0.4 zoom 1.0 alpha 1.0
 
-    on hide:
+transform navigation_hide:
+    subpixel True
     zoom 1.0
     alpha 1.0
     easeout_back 0.4 zoom 0.0 alpha 0.0

game/scripts/gui/preferences.rpy

@@ -66,7 +66,7 @@ screen preferences_general():
 
                 text _("Skipping")
                 textbutton _("Skip Unseen Text") action Preference("skip", "toggle")
-                textbutton _("Until dialog menu") action InvertSelected(Preference("after choices", "toggle"))
+                textbutton _("Skip Until dialog menu") action InvertSelected(Preference("after choices", "toggle"))
 
                 text _("Text Speed")
                 bar value Preference("text speed") style "navigation_bar"
@@ -158,7 +158,7 @@ screen preferences_sound():
 screen preferences_accessibility():
     frame style "navigation_page_left":
         vbox:
-            label _("Accessibility")
+            label _("Other")
 
             text _("Text Font")
             vbox:

game/scripts/options.rpy

@@ -129,7 +129,7 @@ define config.default_sfx_volume = 1.0
 
 # Transitions
 define config.enter_transition = None
-define config.exit_transition = pause_trans(0.4)
+define config.exit_transition = None
 define config.intra_transition = d1
 define config.main_game_transition = f3
 define config.game_main_transition = f3