[Pymoul-svn] SF.net SVN: pymoul: [82] pymoul/trunk

[<ti...@us...>]

Revision: 82
          http://pymoul.svn.sourceforge.net/pymoul/?rev=82&view=rev
Author:   tiran
Date:     2007-01-26 07:15:00 -0800 (Fri, 26 Jan 2007)

Log Message:
-----------
Fixed exe build
Check for isMoulRunning inside QT ui

Modified Paths:
--------------
    pymoul/trunk/setup_win32.py
    pymoul/trunk/src/moul/log.py
    pymoul/trunk/src/moul/osdependent/__init__.py
    pymoul/trunk/src/moul/qt/moulqt.py

Modified: pymoul/trunk/setup_win32.py
===================================================================
--- pymoul/trunk/setup_win32.py	2007-01-26 14:55:52 UTC (rev 81)
+++ pymoul/trunk/setup_win32.py	2007-01-26 15:15:00 UTC (rev 82)
@@ -68,11 +68,12 @@
     pexe = kw['options'].setdefault('py2exe', {})
     pexe['compressed'] = 100 # compress zip file
     pexe['optimize'] = 0 # 0,1,2
-    pexe['includes'] = ['sip', 'PyQt4', 'encodings', 'encodings.*']
+    pexe['includes'] = ['sip', 'PyQt4', 'encodings', 'encodings.*',
+        'moul.osdependent.win32', 'moul.osdependent.win32.*']
     # SSL currently not in use but imported by socket
     pexe['excludes'] = ['_ssl']
     # added by platform but not yet required
-    pexe['excludes'].extend(('win32pipe', 'win32api', 'win32con', 'win32evtlog'))
+    #pexe['excludes'].extend(('win32pipe', 'win32api', 'win32con', 'win32evtlog'))
     # added by logging.handlers.SMTPHandler but not yet required
     pexe['excludes'].append('smtplib')
     # UPX

Modified: pymoul/trunk/src/moul/log.py
===================================================================
--- pymoul/trunk/src/moul/log.py	2007-01-26 14:55:52 UTC (rev 81)
+++ pymoul/trunk/src/moul/log.py	2007-01-26 15:15:00 UTC (rev 82)
@@ -113,12 +113,12 @@
     #_systemInfo()
 else:
     _installMemoryHdlr()
-    # Redirect stdout and stderr to logger when running as frozen app
-    sys.stdout = LoggingStdout(getLogger('stdout').info)
-    sys.stderr = LoggingStdout(getLogger('stderr').error)
     _systemInfo()
     _installFileHdlr()
     _removeMemoryHdlr()
+    # Redirect stdout and stderr to logger when running as frozen app
+    #sys.stdout = LoggingStdout(getLogger('stdout').info)
+    #sys.stderr = LoggingStdout(getLogger('stderr').error)
 
 __LOG_SIGNALS__ = not __FROZEN__
 def signalLogDecorator(__logger__):

Modified: pymoul/trunk/src/moul/osdependent/__init__.py
===================================================================
--- pymoul/trunk/src/moul/osdependent/__init__.py	2007-01-26 14:55:52 UTC (rev 81)
+++ pymoul/trunk/src/moul/osdependent/__init__.py	2007-01-26 15:15:00 UTC (rev 82)
@@ -35,7 +35,10 @@
 
 import os
 import sys
+from moul.log import getLogger
 
+LOG = getLogger('moul.osdependent')
+
 # a program under py2exe is sys.frozen
 __FROZEN__ = bool(getattr(sys, 'frozen', False))
 # OS stuff

Modified: pymoul/trunk/src/moul/qt/moulqt.py
===================================================================
--- pymoul/trunk/src/moul/qt/moulqt.py	2007-01-26 14:55:52 UTC (rev 81)
+++ pymoul/trunk/src/moul/qt/moulqt.py	2007-01-26 15:15:00 UTC (rev 82)
@@ -29,21 +29,34 @@
 from moul.qt.mainwindow import MainWindow
 from moul.osdependent.singleapp import SimpleSingleApp
 from moul.config import getPyMoulDataDir
+from moul.osdependent import isMoulRunning
 
+def critical(self, title, text):
+    """Critical warning!
+    """
+    mb = QtGui.QMessageBox()
+    mb.setWindowIcon(QtGui.QIcon(":/resources/uru_icon_32x32.png"))
+    mb.setIcon(QtGui.QMessageBox.Critical)
+    mb.setWindowTitle(self.trUtf8(title))
+    mb.setText(self.trUtf8(text))
+    mb.setStandardButtons(QtGui.QMessageBox.Close)
+    return mb
+
 def main(*args):
     app = QtGui.QApplication(*args)
     singleapp = SimpleSingleApp('pymoulqt', path=getPyMoulDataDir())
     try:
         singleapp.acquire()
     except OSError:
-        mb = QtGui.QMessageBox()
-        mb.setWindowIcon(QtGui.QIcon(":/resources/uru_icon_32x32.png"))
-        mb.setIcon(QtGui.QMessageBox.Critical)
-        mb.setWindowTitle(app.trUtf8("Already running"))
-        mb.setText(app.trUtf8("""An instance of pyMoul QT is already running!"""))
-        mb.setStandardButtons(QtGui.QMessageBox.Close)
+        mb = critical(app, "pyMoul QT already running",
+                """An instance of pyMoul QT is already running!""")
         mb.exec_()
         sys.exit(1)
+    if isMoulRunning():
+        mb = critical(app, "URU is running",
+                """URU is running! Please close Uru or Uru Launcher first.""")
+        mb.exec_()
+        sys.exit(2)
 
     mainWindow = MainWindow()
     mainWindow.show()


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.