Adding capturing of the log
[gonvert] / src / gonvert_qt.py
index 3aa6d85..9e1d9eb 100755 (executable)
@@ -53,9 +53,7 @@ class Gonvert(object):
 
        # @todo Persist settings
        # @todo Favorites
-       # @todo Fullscreen support (showFullscreen, showNormal)
-       # @todo Close Window / Quit keyboard shortcuts
-       # @todo Ctrl+l support
+       # @bug Fix the resurrecting window problem
        # @todo Unit conversion window: focus always on input, arrows switch units
 
        _DATA_PATHS = [
@@ -77,6 +75,8 @@ class Gonvert(object):
                        raise RuntimeError("UI Descriptor not found!")
                self._appIconPath = appIconPath
                self._recent = []
+               self._isFullscreen = False
+               self._clipboard = QtGui.QApplication.clipboard()
 
                self._jumpWindow = None
                self._recentWindow = None
@@ -96,6 +96,21 @@ class Gonvert(object):
                self._recentAction.setShortcut(QtGui.QKeySequence("CTRL+r"))
                self._recentAction.triggered.connect(self._on_recent_start)
 
+               self._fullscreenAction = QtGui.QAction(None)
+               self._fullscreenAction.setText("Toggle Fullscreen")
+               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"))
+               self._quitAction.triggered.connect(self._on_quit)
+
                self.request_category()
 
        def request_category(self):
@@ -149,6 +164,32 @@ class Gonvert(object):
        def recentAction(self):
                return self._recentAction
 
+       @property
+       def fullscreenAction(self):
+               return self._fullscreenAction
+
+       @property
+       def logAction(self):
+               return self._logAction
+
+       @property
+       def quitAction(self):
+               return self._quitAction
+
+       def _walk_children(self):
+               if self._catWindow is not None:
+                       yield self._catWindow
+               if self._jumpWindow is not None:
+                       yield self._jumpWindow
+               if self._recentWindow is not None:
+                       yield self._recentWindow
+
+       @misc_utils.log_exception(_moduleLogger)
+       def _on_toggle_fullscreen(self, checked = False):
+               self._isFullscreen = not self._isFullscreen
+               for window in self._walk_children():
+                       window.setFullscreen(self._isFullscreen)
+
        @misc_utils.log_exception(_moduleLogger)
        def _on_jump_start(self, checked = False):
                self.search_units()
@@ -157,6 +198,18 @@ class Gonvert(object):
        def _on_recent_start(self, checked = False):
                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()
+
 
 class CategoryWindow(object):
 
@@ -186,25 +239,52 @@ class CategoryWindow(object):
                self._window.setWindowIcon(QtGui.QIcon(self._app.appIconPath))
                self._window.setCentralWidget(centralWidget)
 
+               self._closeWindowAction = QtGui.QAction(None)
+               self._closeWindowAction.setText("Window")
+               self._closeWindowAction.setShortcut(QtGui.QKeySequence("CTRL+w"))
+               self._closeWindowAction.triggered.connect(self._on_close_window)
+
+               fileMenu = self._window.menuBar().addMenu("&File")
+               fileMenu.addAction(self._closeWindowAction)
+               fileMenu.addAction(self._app.quitAction)
+
                viewMenu = self._window.menuBar().addMenu("&View")
+               viewMenu.addAction(self._app.fullscreenAction)
+               viewMenu.addSeparator()
                viewMenu.addAction(self._app.jumpAction)
                viewMenu.addAction(self._app.recentAction)
 
+               self._window.addAction(self._app.logAction)
+
                self._window.show()
 
-       def close(self):
+       def walk_children(self):
                if self._unitWindow is not None:
-                       self._unitWindow.close()
-                       self._unitWindow = None
+                       yield self._unitWindow
+
+       def close(self):
+               for child in self.walk_children():
+                       child.close()
                self._window.close()
 
        def selectCategory(self, categoryName):
-               if self._unitWindow is not None:
-                       self._unitWindow.close()
-                       self._unitWindow = None
+               for child in self.walk_children():
+                       child.close()
                self._unitWindow = UnitWindow(self._window, categoryName, self._app)
                return self._unitWindow
 
+       def setFullscreen(self, isFullscreen):
+               if isFullscreen:
+                       self._window.showFullScreen()
+               else:
+                       self._window.showNormal()
+               for child in self.walk_children():
+                       child.setFullscreen(isFullscreen)
+
+       @misc_utils.log_exception(_moduleLogger)
+       def _on_close_window(self, checked = True):
+               self.close()
+
        @misc_utils.log_exception(_moduleLogger)
        def _on_category_clicked(self, item, columnIndex):
                categoryName = unicode(item.text(0))
@@ -246,11 +326,35 @@ class QuickJump(object):
                self._window.setWindowIcon(QtGui.QIcon(self._app.appIconPath))
                self._window.setCentralWidget(centralWidget)
 
+               self._closeWindowAction = QtGui.QAction(None)
+               self._closeWindowAction.setText("Window")
+               self._closeWindowAction.setShortcut(QtGui.QKeySequence("CTRL+w"))
+               self._closeWindowAction.triggered.connect(self._on_close_window)
+
+               fileMenu = self._window.menuBar().addMenu("&File")
+               fileMenu.addAction(self._closeWindowAction)
+               fileMenu.addAction(self._app.quitAction)
+
+               viewMenu = self._window.menuBar().addMenu("&View")
+               viewMenu.addAction(self._app.fullscreenAction)
+
+               self._window.addAction(self._app.logAction)
+
                self._window.show()
 
        def close(self):
                self._window.close()
 
+       def setFullscreen(self, isFullscreen):
+               if isFullscreen:
+                       self._window.showFullScreen()
+               else:
+                       self._window.showNormal()
+
+       @misc_utils.log_exception(_moduleLogger)
+       def _on_close_window(self, checked = True):
+               self.close()
+
        @misc_utils.log_exception(_moduleLogger)
        def _on_result_clicked(self, item, columnIndex):
                categoryName = unicode(item.text(0))
@@ -307,11 +411,35 @@ class Recent(object):
                        twi.setText(0, cat)
                        twi.setText(1, unit)
 
+               self._closeWindowAction = QtGui.QAction(None)
+               self._closeWindowAction.setText("Window")
+               self._closeWindowAction.setShortcut(QtGui.QKeySequence("CTRL+w"))
+               self._closeWindowAction.triggered.connect(self._on_close_window)
+
+               fileMenu = self._window.menuBar().addMenu("&File")
+               fileMenu.addAction(self._closeWindowAction)
+               fileMenu.addAction(self._app.quitAction)
+
+               viewMenu = self._window.menuBar().addMenu("&View")
+               viewMenu.addAction(self._app.fullscreenAction)
+
+               self._window.addAction(self._app.logAction)
+
                self._window.show()
 
        def close(self):
                self._window.close()
 
+       def setFullscreen(self, isFullscreen):
+               if isFullscreen:
+                       self._window.showFullScreen()
+               else:
+                       self._window.showNormal()
+
+       @misc_utils.log_exception(_moduleLogger)
+       def _on_close_window(self, checked = True):
+               self.close()
+
        @misc_utils.log_exception(_moduleLogger)
        def _on_result_clicked(self, item, columnIndex):
                categoryName = unicode(item.text(0))
@@ -374,6 +502,7 @@ class UnitModel(QtCore.QAbstractItemModel):
                for key in unit_data.get_units(self._categoryName):
                        conversion, unit, description = self._unitData[key]
                        self._children.append(UnitData(key, unit, description, conversion))
+               self._sortSettings = None
 
        @misc_utils.log_exception(_moduleLogger)
        def columnCount(self, parent):
@@ -399,6 +528,7 @@ class UnitModel(QtCore.QAbstractItemModel):
 
        @misc_utils.log_exception(_moduleLogger)
        def sort(self, column, order = QtCore.Qt.AscendingOrder):
+               self._sortSettings = column, order
                isReverse = order == QtCore.Qt.AscendingOrder
                if column == 0:
                        key_func = lambda item: item.name
@@ -481,11 +611,13 @@ class UnitModel(QtCore.QAbstractItemModel):
                        newValue = func.from_base(base, arg)
                        child.update_value(newValue)
 
+               if self._sortSettings is not None:
+                       self.sort(*self._sortSettings)
                self._all_changed()
 
        def _all_changed(self):
-               topLeft = self.createIndex(0, 1, self._children[0])
-               bottomRight = self.createIndex(len(self._children)-1, 2, self._children[-1])
+               topLeft = self.createIndex(0, 0, self._children[0])
+               bottomRight = self.createIndex(len(self._children)-1, len(UnitData.HEADERS)-1, self._children[-1])
                self.dataChanged.emit(topLeft, bottomRight)
 
        def _sanitize_value(self, userEntry):
@@ -568,7 +700,18 @@ class UnitWindow(object):
 
                self._sortByValueAction.setChecked(True)
 
+               self._closeWindowAction = QtGui.QAction(None)
+               self._closeWindowAction.setText("Close Window")
+               self._closeWindowAction.setShortcut(QtGui.QKeySequence("CTRL+w"))
+               self._closeWindowAction.triggered.connect(self._on_close_window)
+
+               fileMenu = self._window.menuBar().addMenu("&File")
+               fileMenu.addAction(self._closeWindowAction)
+               fileMenu.addAction(self._app.quitAction)
+
                viewMenu = self._window.menuBar().addMenu("&View")
+               viewMenu.addAction(self._app.fullscreenAction)
+               viewMenu.addSeparator()
                viewMenu.addAction(self._app.jumpAction)
                viewMenu.addAction(self._app.recentAction)
                viewMenu.addSeparator()
@@ -580,16 +723,28 @@ 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):
                self._window.close()
 
+       def setFullscreen(self, isFullscreen):
+               if isFullscreen:
+                       self._window.showFullScreen()
+               else:
+                       self._window.showNormal()
+
        def select_unit(self, unitName):
                index = self._unitsModel.index_unit(unitName)
                self._select_unit(index)
 
        @misc_utils.log_exception(_moduleLogger)
+       def _on_close_window(self, checked = True):
+               self.close()
+
+       @misc_utils.log_exception(_moduleLogger)
        def _on_sort_by_name(self, checked = False):
                self._unitsModel.sort(0, QtCore.Qt.DescendingOrder)