Bump version.

The various layouts now change the mouse to the gamemenu or mainmenu
mouse, as appropriate.
2009-07-30 21:24:55 -04:00 · 2009-07-30 21:13:34 -04:00 · 2009-07-30 21:04:06 -04:00 · 2009-07-29 23:36:02 -04:00 · 2009-07-29 23:33:06 -04:00 · 2009-07-28 22:23:33 -04:00
20 changed files with 53 additions and 26 deletions
@@ -41,6 +41,10 @@ Allow config.layer_clipping to specify layers that are larger than the
 screen.


+The various layouts now change the mouse to the gamemenu or mainmenu
+mouse, as appropriate.
+
+
 This distribution include a new NVL-mode tutorial, teaching people how
 to make NVL-mode games.

@@ -75,7 +75,7 @@ init python:
                ui.close()

                _joystick_get_binding()
-                binding = ui.interact()
+                binding = ui.interact(mouse="gamemenu")
                _joystick_take_binding(binding, key)
                
                return True
@@ -100,7 +100,7 @@ label joystick_preferences_screen:
        python:
            layout.navigation("joystick_preferences")
            _joystick_preferences()
-            ui.interact()
+            ui.interact(mouse="gamemenu")

            
        
@@ -291,7 +291,7 @@ init python:
            ui.close() # slots
            ui.close() # whole thing

-            result = ui.interact()
+            result = ui.interact(mouse="gamemenu")
            type, value = result

            if type == "return":
@@ -50,7 +50,7 @@ label main_menu_screen:

        ui.close()

-        ui.interact()
+        ui.interact(mouse="mainmenu")
        
    return
            
@@ -54,7 +54,7 @@ init python:

        ui.close()

-        ui.interact()
+        ui.interact(mouse="gamemenu")

    class _Preference(object):
        """
@@ -49,7 +49,7 @@ init python hide:
        ui.close()
        ui.close()

-        rv = ui.interact()
+        rv = ui.interact(mouse="gamemenu")
        renpy.transition(config.intra_transition)
        return rv

@@ -62,7 +62,7 @@ label main_menu_screen:
            
        ui.close() # outer box

-        ui.interact()
+        ui.interact(mouse="mainmenu")
        
    return
            
@@ -289,7 +289,7 @@ init python:

            ime.close()
                
-            result = ui.interact()
+            result = ui.interact(mouse="gamemenu")
            type, value = result

            if type == "return":
@@ -32,7 +32,8 @@ label main_menu_screen:
        rv = renpy.imagemap(
            config.main_menu_ground,
            config.main_menu_selected,
-            config.main_menu_hotspots)
+            config.main_menu_hotspots,
+            mouse="mainmenu")

        for e in config.main_menu:
            name = e[0]
@@ -127,7 +127,7 @@ init python:
        ime.bar("Voice Volume", 128, int(_preferences.get_volume('voice') * 128), set_voice)

        ime.close()
-        ui.interact()
+        ui.interact(mouse="gamemenu")
        
 label preferences_screen:

@@ -33,7 +33,7 @@ init python hide:
        
        layout.prompt(message, "yesno")

-        rv = ui.interact()
+        rv = ui.interact(mouse="gamemenu")
        renpy.transition(config.intra_transition)
        return rv

@@ -182,7 +182,7 @@ init python:
        ui.add(DynamicDisplayable(_file_picker_thumbnail))

        try:
-            rv = ui.interact()
+            rv = ui.interact(mouse="gamemenu")
        finally:
            __session.scrollbar_position = adj.value
            __session.thumbnail = None
@@ -130,8 +130,11 @@ init python:

            dirs[:] = [ i for i in dirs if include(i, is_root) ]

+        rv = [ (a.replace("\\", "/"), b.replace("\\", "/")) for a, b in rv ]
+                                                            
        return rv

+    
    def make_zip(t, filename, files, file_data):
        """
         This creates `filename`.zip, containing `files`, placed in the
@@ -386,8 +389,11 @@ label distribute:
        ######################################################################
        # Multi files.

-        rb = config.renpy_base + "/"
-        
+        rb = config.renpy_base.replace("\\", "/") + "/"
+
+          
+
+               
        # Project files.
        multi_files.extend(tree(project.path, "/", root=True, exclude_suffix=ignore_extensions))
        multi_files.append((rb + "renpy.py",  "/" + executable_name + ".py"))
@@ -509,7 +515,6 @@ label distribute:
                                break
                else:
                    macapp_files.append((fn, an))
-                        
                    
            make_zip(
                _(u"Building Macintosh..."),
@@ -26,7 +26,12 @@ init python:
    # Should we set up the editor? How about the transient editor?
    set_editor = "RENPY_EDITOR" not in os.environ
    set_editor_transient = "RENPY_EDITOR_TRANSIENT" not in os.environ
-    
+
+    if set_editor and not set_editor_transient:
+        config.editor_transient = config.editor
+        os.environ['RENPY_EDITOR_TRANSIENT'] = config.editor
+        set_editor_transient = False
+
    def scan_editor(ef):
        """
         Scans a single editor file to get the meta-information. If it
@@ -84,6 +89,9 @@ init python:
         Sets the system up to respect the value containined in
         persistent.editor.
         """
+
+        if not set_editor:
+            return
        
        ef = None
        
@@ -100,7 +108,7 @@ init python:
            "persistent" : persistent,
            "base" : os.path.dirname(ef),
            }
-
+        
        execfile(ef, ctx, ctx)

        if set_editor:
@@ -9,8 +9,11 @@ label options:

        title(_(u"Launcher Options"))

+        editor = persistent.editor
+        if not set_editor:
+            editor = _(u"Using RENPY_EDITOR")
        
-        text_variable(_("Text Editor"), persistent.editor, "editor",
+        text_variable(_("Text Editor"), editor, "editor",
                      _(u"Change the default text editor."))

        ui.null(height=15)
@@ -269,7 +269,8 @@ label lint:
        lf = file("lint.txt", "w+")

        if hasattr(sys, "winver") and sys.argv[0].lower().endswith(".exe"):
-            proc = subprocess.Popen([config.renpy_base + "/console.exe", "--lint", project.path], stdin=lf, stdout=lf, stderr=lf)
+            CREATE_NO_WINDOW=0x08000000
+            proc = subprocess.Popen([config.renpy_base + "/console.exe", "--lint", project.path], stdin=lf, stdout=lf, stderr=lf, creationflags=CREATE_NO_WINDOW)
        else:
            proc = subprocess.Popen([sys.executable, sys.argv[0], "--lint", project.path], stdout=lf)

@@ -1,7 +1,8 @@
 init python:

+    import os
    import subprocess
-    
+
    try:
        import EasyDialogs
    except ImportError:
@@ -37,8 +38,12 @@ label choose_projects_directory:

            try:

+                env = os.environ.copy()
+                if 'RENPY_OLD_LD_LIBRARY_PATH' in env:
+                    env['LD_LIBRARY_PATH'] = env['RENPY_OLD_LD_LIBRARY_PATH']
+                
                zen = subprocess.Popen([ "zenity", "--title=Select Projects Directory", "--file-selection", "--directory", "--filename=" + path ],
-                                       stdout=subprocess.PIPE)
+                                       env=env, stdout=subprocess.PIPE)

                choice = zen.stdout.read()        
                zen.wait()
@@ -27,7 +27,7 @@
 # ***** ***** ***** ***** ***** ***** **** ***** ***** ***** *****
 # Be sure to change script_version in launcher/script_version.rpy, too!
 # Also check to see if we have to update renpy.py.
-version = "Ren'Py 6.9.3a"
+version = "Ren'Py 6.9.3b"
 script_version = 5003000
 savegame_suffix = "-LT1.save"

@@ -509,7 +509,7 @@ def say(who, what, interact=True):


 def imagemap(ground, selected, hotspots, unselected=None, overlays=False,
-             style='imagemap', with_none=None, **properties):
+             style='imagemap', mouse='imagemap', with_none=None, **properties):
    """
    Displays an imagemap. An image map consists of two images and a
    list of hotspots that are defined on that image. When the user
@@ -552,7 +552,7 @@ def imagemap(ground, selected, hotspots, unselected=None, overlays=False,
    
    rv = renpy.ui.interact(suppress_overlay=(not overlays),
                           type='imagemap',
-                           mouse='imagemap',
+                           mouse=mouse,
                           roll_forward=roll_forward)

    renpy.exports.checkpoint(rv)
@@ -1,9 +1,9 @@
-executable_name = 'the_question'
 documentation_extensions = 'txt html'
 description = "A simple and complete Ren'Py game."
 build_mac = True
+build_all = True
 build_windows = False
 distribution_base = 'the_question-1.0'
 ignore_extensions = '~ .bak'
 build_linux = False
-build_all = False
+executable_name = 'the_question'
Author	SHA1	Message	Date
Tom Rothamel	4c7bdede29	Bump version.	2009-07-30 21:24:55 -04:00
Tom Rothamel	4208836d77	The various layouts now change the mouse to the gamemenu or mainmenu mouse, as appropriate.	2009-07-30 21:13:34 -04:00
Tom Rothamel	592341f5b1	Editor selection tweaks. (Respects RENPY_EDITOR)	2009-07-30 21:04:06 -04:00
Tom Rothamel	bc41ebadce	Hide console on lint.	2009-07-29 23:36:02 -04:00
Tom Rothamel	0deadb41ee	Reset LD_LIBRARY_PATH before running zenity.	2009-07-29 23:33:06 -04:00
Tom Rothamel	076624c4c2	Normalize filenames when building distributions. This prevents duplicates and ensures that we can properly replace file data. For example, on Windows, this was preventing Info.plist from being replaced.	2009-07-28 22:23:33 -04:00