From ef669a681b8acf1ebce04e69208c77d9a29734d2 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Thu, 3 Jun 2010 20:41:55 -0500 Subject: [PATCH 1/1] Adding capturing of the log --- src/gonvert_qt.py | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/src/gonvert_qt.py b/src/gonvert_qt.py index 515d4ab..9e1d9eb 100755 --- a/src/gonvert_qt.py +++ b/src/gonvert_qt.py @@ -54,7 +54,6 @@ class Gonvert(object): # @todo Persist settings # @todo Favorites # @bug Fix the resurrecting window problem - # @todo Ctrl+l support # @todo Unit conversion window: focus always on input, arrows switch units _DATA_PATHS = [ @@ -77,6 +76,7 @@ class Gonvert(object): self._appIconPath = appIconPath self._recent = [] self._isFullscreen = False + self._clipboard = QtGui.QApplication.clipboard() self._jumpWindow = None self._recentWindow = None @@ -101,6 +101,11 @@ class Gonvert(object): self._fullscreenAction.setShortcut(QtGui.QKeySequence("CTRL+Enter")) self._fullscreenAction.triggered.connect(self._on_toggle_fullscreen) + self._logAction = QtGui.QAction(None) + self._logAction.setText("Log") + self._logAction.setShortcut(QtGui.QKeySequence("CTRL+l")) + self._logAction.triggered.connect(self._on_log) + self._quitAction = QtGui.QAction(None) self._quitAction.setText("Quit") self._quitAction.setShortcut(QtGui.QKeySequence("CTRL+q")) @@ -164,6 +169,10 @@ class Gonvert(object): return self._fullscreenAction @property + def logAction(self): + return self._logAction + + @property def quitAction(self): return self._quitAction @@ -190,6 +199,13 @@ class Gonvert(object): self.show_recent() @misc_utils.log_exception(_moduleLogger) + def _on_log(self, checked = False): + with open(constants._user_logpath_, "r") as f: + logLines = f.xreadlines() + log = "".join(logLines) + self._clipboard.setText(log) + + @misc_utils.log_exception(_moduleLogger) def _on_quit(self, checked = False): for window in self._walk_children(): window.close() @@ -238,6 +254,8 @@ class CategoryWindow(object): viewMenu.addAction(self._app.jumpAction) viewMenu.addAction(self._app.recentAction) + self._window.addAction(self._app.logAction) + self._window.show() def walk_children(self): @@ -320,6 +338,8 @@ class QuickJump(object): viewMenu = self._window.menuBar().addMenu("&View") viewMenu.addAction(self._app.fullscreenAction) + self._window.addAction(self._app.logAction) + self._window.show() def close(self): @@ -403,6 +423,8 @@ class Recent(object): viewMenu = self._window.menuBar().addMenu("&View") viewMenu.addAction(self._app.fullscreenAction) + self._window.addAction(self._app.logAction) + self._window.show() def close(self): @@ -701,6 +723,8 @@ class UnitWindow(object): self._sortByValueAction.triggered.connect(self._on_sort_by_value) self._sortByUnitAction.triggered.connect(self._on_sort_by_unit) + self._window.addAction(self._app.logAction) + self._window.show() def close(self): -- 1.7.9.5