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

game/scripts/gui/about.rpy

@@ -15,24 +15,24 @@ screen about():
     ## This use statement includes the game_menu screen inside this one. The
     ## vbox child is then included inside the viewport inside the game_menu
     ## screen.
-    use game_menu(_("About"), scroll="viewport"):
+    # use game_menu(_("About"), scroll="viewport"):
 
-        style_prefix gui.theme("about")
+    #     style_prefix gui.theme("about")
 
-        vbox:
+    #     vbox:
-            spacing gui.pref_spacing
+    #         spacing gui.pref_spacing
 
-            if config.window_title:
+    #         if config.window_title:
-                label "[config.window_title]"
+    #             label "[config.window_title]"
-            else:
+    #         else:
-                label "[config.name!t]"
+    #             label "[config.name!t]"
-            #text _("Version [config.version!t]\n")
+    #         #text _("Version [config.version!t]\n")
 
-            ## gui.about is usually set in options.rpy.
+    #         ## gui.about is usually set in options.rpy.
-            if gui.about:
+    #         if gui.about:
-                text "[gui.about!t]\n"
+    #             text "[gui.about!t]\n"
 
-            text _("Made with {a=https://www.renpy.org/}Ren'Py{/a} [renpy.version_only].\n\n[renpy.license!t]") size 12
+    #         text _("Made with {a=https://www.renpy.org/}Ren'Py{/a} [renpy.version_only].\n\n[renpy.license!t]") size 12
 
 
 style about_label is gui_label

game/scripts/gui/help.rpy

@@ -4,34 +4,34 @@ init offset = -1
 screen help(page='tutorials'):
     tag menu
 
-    use game_menu(_("Help"), scroll="viewport"):
+    # use game_menu(_("Help"), scroll="viewport"):
 
-        style_prefix "help"
+    #     style_prefix "help"
 
-        vbox:
+    #     vbox:
-            spacing 8
+    #         spacing 8
-            null # Tab margin
+    #         null # Tab margin
 
-            if page == 'tutorials':
+    #         if page == 'tutorials':
-                use tutorials_help
+    #             use tutorials_help
-            elif page == "controls":
+    #         elif page == "controls":
-                use controls_help
+    #             use controls_help
-            elif page == "gamepad":
+    #         elif page == "gamepad":
-                use gamepad_help
+    #             use gamepad_help
-            elif page == "about":
+    #         elif page == "about":
-                use about_help
+    #             use about_help
 
-    hbox:
+    # hbox:
-        style_prefix gui.theme("tab")
+    #     style_prefix gui.theme("tab")
-        pos (25 + 15, 100)
+    #     pos (25 + 15, 100)
-        yanchor 0.5
+    #     yanchor 0.5
 
-        textbutton _("Tutorials") action [SelectedIf(page == 'tutorials'), Show("help", config.intra_transition, "tutorials")]
+    #     textbutton _("Tutorials") action [SelectedIf(page == 'tutorials'), Show("help", config.intra_transition, "tutorials")]
-        if not renpy.mobile:
+    #     if not renpy.mobile:
-            textbutton _("Controls") action [SelectedIf(page == 'controls'), Show("help", config.intra_transition, "controls")]
+    #         textbutton _("Controls") action [SelectedIf(page == 'controls'), Show("help", config.intra_transition, "controls")]
-        if GamepadExists():
+    #     if GamepadExists():
-            textbutton _("Gamepad") action [SelectedIf(page == 'gamepad'), Show("help", config.intra_transition, "gamepad")]
+    #         textbutton _("Gamepad") action [SelectedIf(page == 'gamepad'), Show("help", config.intra_transition, "gamepad")]
-        textbutton _("About") action [SelectedIf(page == 'about'), Show("help", config.intra_transition, "about")]
+    #     textbutton _("About") action [SelectedIf(page == 'about'), Show("help", config.intra_transition, "about")]
 
 screen tutorials_help():
     for entry, tutorial in tutorial_dict.items():

game/scripts/gui/history.rpy

@@ -16,47 +16,47 @@ screen history():
     # Avoid predicting this screen, as it can be very large
     predict False
 
-    use game_menu(_("History"), scroll=("vpgrid" if gui.history_height else "viewport"), yinitial=1.0):
+    # use game_menu(_("History"), scroll=("vpgrid" if gui.history_height else "viewport"), yinitial=1.0):
 
-        style_prefix gui.theme("history")
+    #     style_prefix gui.theme("history")
 
-        has vbox
+    #     has vbox
-        spacing 12
+    #     spacing 12
 
-        default last_who = ""
+    #     default last_who = ""
 
-        for entry in _history_list:
+    #     for entry in _history_list:
-            vbox:
+    #         vbox:
-                xfill True
+    #             xfill True
-                spacing 12
+    #             spacing 12
 
-                if not last_who == entry.who:
+    #             if not last_who == entry.who:
-                    hbox:
+    #                 hbox:
-                        spacing 12
+    #                     spacing 12
 
-                        if "icon" in entry.show_args:
+    #                     if "icon" in entry.show_args:
-                            $ icon = entry.show_args["icon"]
+    #                         $ icon = entry.show_args["icon"]
-                            add Fixed(gui.format("interface/achievements/{}/iconbox.webp"), Transform(f"interface/icons/head/{icon}.webp", xzoom=-1, size=(40, 40), align=(0.5, 0.5)), fit_first=True)
+    #                         add Fixed(gui.format("interface/achievements/{}/iconbox.webp"), Transform(f"interface/icons/head/{icon}.webp", xzoom=-1, size=(40, 40), align=(0.5, 0.5)), fit_first=True)
 
-                        if entry.who:
+    #                     if entry.who:
-                            text entry.who:
+    #                         text entry.who:
-                                style "history_name"
+    #                             style "history_name"
-                                substitute False
+    #                             substitute False
 
-                                if "color" in entry.who_args:
+    #                             if "color" in entry.who_args:
-                                    color entry.who_args["color"]
+    #                                 color entry.who_args["color"]
 
-                vbox:
+    #             vbox:
-                    spacing 6
+    #                 spacing 6
-                    $ what = renpy.filter_text_tags(entry.what, allow=gui.history_allow_tags)
+    #                 $ what = renpy.filter_text_tags(entry.what, allow=gui.history_allow_tags)
 
-                    text what:
+    #                 text what:
-                        substitute False
+    #                     substitute False
 
-            $ last_who = entry.who
+    #         $ last_who = entry.who
 
-        if not _history_list:
+    #     if not _history_list:
-            label _("The dialogue history is empty.")
+    #         label _("The dialogue history is empty.")
 
 
 # Tags that are allowed to be displayed on the history screen