évitement d'une collision de nom avec le module logging de python.

[minwii.git] / src / gui / PGUConfiguration.py

diff --git a/src/gui/PGUConfiguration.py b/src/gui/PGUConfiguration.py
index 214a347..d903c5a 100644 (file)
--- a/src/gui/PGUConfiguration.py
+++ b/src/gui/PGUConfiguration.py
@@ -111,7 +111,7 @@ class PGUConfiguration(pguGui.Desktop):
                     else :\r
                         label = self.createLabel(key)\r
                 elif self.file.endswith('.xml') :\r
                     else :\r
                         label = self.createLabel(key)\r
                 elif self.file.endswith('.xml') :\r

-                    self.song = musicXml2Song(self.file, printNotes=True)\r
+                    self.song = musicXml2Song(self.file, printNotes=False)\r

                     filename = os.path.basename(self.file)\r
                     label = self.createLabel(filename) \r
                 self.browseButton = pguGui.Button(label)\r
                     filename = os.path.basename(self.file)\r
                     label = self.createLabel(filename) \r
                 self.browseButton = pguGui.Button(label)\r


@@ -246,7 +246,7 @@ class PGUConfiguration(pguGui.Desktop):
                 self.easyMode = False\r
                 \r
             choice = InstrumentChoice(instruments, wiimotes, self.window, screen, clock, joys, portOffset,self.activeWiimotes, scaleFactor = songScaleFactor)\r
                 self.easyMode = False\r
                 \r
             choice = InstrumentChoice(instruments, wiimotes, self.window, screen, clock, joys, portOffset,self.activeWiimotes, scaleFactor = songScaleFactor)\r

-            play = SongPlayingScreen(choice, self.song,self.cascade, self.extendedScale,self.easyMode,self.alwaysDown)\r
+            play = SongPlayingScreen(choice, self)# self.song,self.cascade, self.extendedScale,self.easyMode,self.alwaysDown)\r

         \r
         else:\r
             \r
         \r
         else:\r
             \r


@@ -264,7 +264,7 @@ class PGUConfiguration(pguGui.Desktop):
                 self.cascade = True\r
                 \r
             choice = InstrumentChoice(instruments, wiimotes, self.window, screen, clock, joys, portOffset,self.activeWiimotes)\r
                 self.cascade = True\r
                 \r
             choice = InstrumentChoice(instruments, wiimotes, self.window, screen, clock, joys, portOffset,self.activeWiimotes)\r

-            play = PlayingScreen(choice, None,self.cascade, self.extendedScale)            \r
+            play = PlayingScreen(choice, self)#None,self.cascade, self.extendedScale)            \r

                 \r
         while play.backToInstrumentChoice == True :\r
             \r
                 \r
         while play.backToInstrumentChoice == True :\r
             \r


@@ -304,7 +304,7 @@ class PGUConfiguration(pguGui.Desktop):
 if __name__ == "__main__" :\r
     pygame.init()\r
     modeResolution = (1024,768)\r
 if __name__ == "__main__" :\r
     pygame.init()\r
     modeResolution = (1024,768)\r

-    window = pygame.display.set_mode(modeResolution,pygame.FULLSCREEN)\r
+    window = pygame.display.set_mode(modeResolution)#,pygame.FULLSCREEN)\r

     pgu = PGUConfiguration(window)\r
     pygame.quit()   \r
         \r
     pgu = PGUConfiguration(window)\r
     pygame.quit()   \r
         \r