Changeset 776:3fb8fdccbf45 in hatta-dev

Timestamp:

07/13/10 13:59:48 (19 months ago)

Author:

Cezary Krzyżanowski <cezary.krzyzanowski@…>

Branch:

default

Message:

Make global exception catching and showing work. Preferences shortcut made portable.

File:

• hatta_qticon.py (modified) (7 diffs)

hatta_qticon.py

@@ -61 +61 @@
 
     # For passing multithread exception in Qt.
-    exception_signal = pyqtSignal(int, str)
+    exception_signal = pyqtSignal(str)
 
     def __init__(self, config, error_handler):
@@ -83 +83 @@
         try:
             return self.wiki.application(*args, **kwargs)
-        except e:
-            print e
-#        except Exception as (errno, strerror):
-#            self.exception_signal.emit(errno, strerror)
+        except Exception as e:
+            self.exception_signal.emit(unicode(e))
 
     def quit(self):
@@ -299 +297 @@
         self.should_announce = bool(self.config.get_bool('announce', 1))
 
-        self.preferences_window = PreferenceWindow(self, self.hatta_icon, 
+        self.preferences_window = PreferenceWindow(self, self.hatta_icon,
                                                    self.config)
         self.preferences_window.config_change.connect(
@@ -322 +320 @@
 
         self._prepare_default_menu()
+        self.menu.addActions(self.default_actions)
 
         # Start Zeroconf thread
@@ -346 +345 @@
         action = QAction(_(u'&Preferences'), self)
         action.setToolTip(_(u'Lets you configure the wiki.'))
-        if sys.platform == 'darwin':
-            action.setShortcut(Qt.CTRL + Qt.Key_Comma)
+        action.setShortcut(QKeySequence.Preferences)
         action.triggered.connect(self.preferences_window.show)
         self.default_actions.append(action)
@@ -384 +382 @@
         app.quit()
 
-    pyqtSlot(int, str)
-    def on_error(self, errno, strerror):
+    pyqtSlot(str)
+    def on_error(self, strerror):
         """Displays errors from exceptions."""
         QMessageBox.critical(None, 'Exception',
-            _(u'Error %(error_number)d: %(error_string)s') %
-                dict(error_number=errno, error_string=strerror), 1, 2)
+            _(u'Error: %(error_string)s') %
+                dict(error_string=strerror), 1, 2)
 
     def _make_discovery_action(self, name, host, port):
@@ -587 +585 @@
         setlocale(LC_ALL, '')
         lang = str(QLocale.system().name()).split('_')[0]
-        
+
         localedir = os.path.join(module_path(), 'locale')
         if not os.path.isdir(localedir):