Changeset 780:1687ac1948d0 in hatta-dev for hatta_qticon.py

Timestamp:

07/16/10 20:18:33 (22 months ago)

Author:

Cezary Krzyżanowski <cezary.krzyzanowski@…>

Branch:

default

Message:

Moved ui and png to resources. Get the png packed. Make dialog find it's icon while debugging and when frozen.

File:

• hatta_qticon.py (modified) (5 diffs)

hatta_qticon.py

@@ -39 +39 @@
 from error_dialog import ErrorDialog
 
+def module_path():
+    """ This will get us the program's directory,
+    even if we are frozen using py2exe"""
+
+    if we_are_frozen():
+        return os.path.dirname(unicode(
+            sys.executable, sys.getfilesystemencoding()))
+
+    return os.path.dirname(unicode(__file__, sys.getfilesystemencoding()))
+
+
 def we_are_frozen():
     """Returns whether we are frozen via py2exe.
@@ -44 +55 @@
 
     return hasattr(sys, "frozen") and sys.frozen == "windows_exe"
-
-
-def module_path():
-    """ This will get us the program's directory,
-    even if we are frozen using py2exe"""
-
-    if we_are_frozen():
-        return os.path.dirname(unicode(
-            sys.executable, sys.getfilesystemencoding()))
-
-    return os.path.dirname(unicode(__file__, sys.getfilesystemencoding()))
-
 
 class HattaThread(QThread):
@@ -278 +277 @@
         # First setup tray icon and display inform user about starting
         self.hatta_icon = QIcon(QPixmap(
-            self.dist_icon if os.path.isfile(self.dist_icon) else 
+            self.dist_icon if os.path.isfile(self.dist_icon) else
             self.debug_icon))
         self.menu = QMenu(QString(_(u'Hatta Wiki menu')))
@@ -594 +593 @@
             quote(error_dialog.get_bug_dump()))
         webbrowser.open(link)
-    QApplication.exit()
+    #QApplication.exit()
 
 if __name__ == '__main__':
@@ -613 +612 @@
             app = QApplication(sys.argv)
             QApplication.setQuitOnLastWindowClosed(False)
-            error_dialog = ErrorDialog()
+            error_dialog = ErrorDialog(module_path())
             status_icon = HattaTrayIcon()
+            raise AttributeError("DUPA")
             app.exec_()
         except Exception as e: