Activation du mode plein écran. Ajout des métadonnées de l'application.

git-svn-id: https://svn.cri.ensmp.fr/svn/minwii/trunk@196 fe552daf-6dbe-4428-90eb-1537e0879342

diff --git a/setup_win_exe.py b/setup_win_exe.py
index 39cf87e..e2d81c8 100755 (executable)
--- a/setup_win_exe.py
+++ b/setup_win_exe.py
@@ -107,15 +107,15 @@ class BuildExe:
         self.project_version = "0.0"
 
         #License of the program
         self.project_version = "0.0"
 
         #License of the program

-        self.license = "MyApps License"
+        self.license = "GPL"

 
         #Auhor of program
 
         #Auhor of program

-        self.author_name = "Me"
-        self.author_email = "example@example.com"
-        self.copyright = "Copyright (c) 2009 Me."
+        self.author_name = "Samuel Benveniste"
+        self.author_email = "samuel.benveniste@gmail.com"
+        self.copyright = "Copyright 2010 MINES-ParisTech"

 
         #Description
 
         #Description

-        self.project_description = "MyApps Description"
+        self.project_description = "Musicothérapie Interractive avec la Wii"

 
         #Icon file (None will use pygame default icon)
         self.icon_file = None
 
         #Icon file (None will use pygame default icon)
         self.icon_file = None


@@ -163,12 +163,12 @@ class BuildExe:
             license = self.license,
 
             # targets to build
             license = self.license,
 
             # targets to build

-            #windows = [{
-            #    'script': self.script,
-            #    'icon_resources': [(0, self.icon_file)],
-            #    'copyright': self.copyright
-            #}],
-            console = [self.script],
+            windows = [{
+                'script': self.script,
+                'icon_resources': [(0, self.icon_file)],
+                'copyright': self.copyright
+            }],
+            #console = [self.script],

             options = {'py2exe': {#'optimize': 2,
                                   #'bundle_files': 1,
                                   #'compressed': True,
             options = {'py2exe': {#'optimize': 2,
                                   #'bundle_files': 1,
                                   #'compressed': True,

diff --git a/src/minwii/app.py b/src/minwii/app.py
index 076ca38..dad8f6b 100755 (executable)
--- a/src/minwii/app.py
+++ b/src/minwii/app.py
@@ -23,9 +23,10 @@ from minwii.log import console, LOG_FORMAT_VERSION, envLogger
 
 class MinWii(object):
     
 
 class MinWii(object):
     

-    def __init__(self, wiimoteSupport=True) :
+    def __init__(self, wiimoteSupport=True, fullscreen=False) :

         envLogger.info('winwii log format version : %s', LOG_FORMAT_VERSION)
         self.wiimoteSupport = wiimoteSupport
         envLogger.info('winwii log format version : %s', LOG_FORMAT_VERSION)
         self.wiimoteSupport = wiimoteSupport

+        self.fullscreen = fullscreen

         LaunchScreen()
         self.app = Desktop()
         self.synth = Synth()
         LaunchScreen()
         self.app = Desktop()
         self.synth = Synth()


@@ -48,8 +49,10 @@ class MinWii(object):
 
     def run(self) :
         "séquençage de l'affichage des écrans"
 
     def run(self) :
         "séquençage de l'affichage des écrans"

-
-        pygame.display.set_mode(self.screenResolution)
+        displayFlags = 0
+        if self.fullscreen :
+            displayFlags = displayFlags | pygame.FULLSCREEN
+        pygame.display.set_mode(self.screenResolution, displayFlags)

         pygame.display.set_caption('MinWii')
         WT = self.WT
 
         pygame.display.set_caption('MinWii')
         WT = self.WT
 

diff --git a/src/minwii/start_win.py b/src/minwii/start_win.py
index 6eb8d18..54314ce 100755 (executable)
--- a/src/minwii/start_win.py
+++ b/src/minwii/start_win.py
@@ -11,11 +11,11 @@ import pygame
 from minwii.app import MinWii
 
 
 from minwii.app import MinWii
 
 

-def main(wiimoteSupport) :
+def main(wiimoteSupport, fullscreen) :

     pygame.init()
     pygame.init()

-    minwii = MinWii(wiimoteSupport=wiimoteSupport)
+    minwii = MinWii(wiimoteSupport=wiimoteSupport, fullscreen=fullscreen)

     minwii.run()
     pygame.quit()   
 
 if __name__ == "__main__" :
     minwii.run()
     pygame.quit()   
 
 if __name__ == "__main__" :

-    main(True)
+    main(True, True)