changeset 83:19394162a39d

Automated merge with ssh://xanthippe.dyndns.org//home/dirk/Projekte/Python/Feedworm
author Dirk Olmes <dirk@xanthippe.ping.de>
date Sun, 22 Aug 2010 16:35:08 +0200
parents 050748b596a8 (current diff) 2dd6e6894772 (diff)
children bacf42da9e36
files
diffstat 1 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/MainWindow.py	Thu Aug 19 16:06:18 2010 +0200
+++ b/MainWindow.py	Sun Aug 22 16:35:08 2010 +0200
@@ -78,11 +78,15 @@
             self.openSelectedEntryInWebView()
             
     def openSelectedEntryInWebView(self):
+        message = "Open %s ..." % (self.selectedEntry.title)
+        self._updateStatusBar(message)
         url = QUrl(self.selectedEntry.link)
         self.ui.webView.load(url)
         self.ui.webView.show()
 
     def openSelectedEntryInBrowser(self):
+        message = "Open %s in external browser", (self.selectedEntry.title)
+        self._updateStatusBar(message)
         # TODO make browser configurable
         browser = "/usr/local/bin/opera"
         subprocess.Popen([browser, self.selectedEntry.link])
@@ -105,7 +109,7 @@
         
         if addFeed.exception is not None:
             message = "Error while adding feed: " + str(addFeed.exception)
-            self.ui.statusbar.showMessage(message, STATUS_MESSAGE_DISPLAY_MILLIS)
+            self._updateStatusBar(message)
         else:
             self.session.commit()
             self.updateFeedList()
@@ -118,4 +122,6 @@
         feedSettings = FeedSettings(self.session, self.selectedFeed)
         feedSettings.exec_()
         
+    def _updateStatusBar(self, message):
+        self.ui.statusbar.showMessage(message, STATUS_MESSAGE_DISPLAY_MILLIS)