Adding capturing of the log
[gonvert] / src / gonvert_qt.py
index 51d2c36..9e1d9eb 100755 (executable)
@@ -51,12 +51,9 @@ def split_number(number):
 
 class Gonvert(object):
 
-       # @todo Remember last selection
-       # @todo Recent
+       # @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,8 +74,12 @@ class Gonvert(object):
                else:
                        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
                self._catWindow = None
 
                self._jumpAction = QtGui.QAction(None)
@@ -88,6 +89,28 @@ class Gonvert(object):
                self._jumpAction.setShortcut(QtGui.QKeySequence("CTRL+j"))
                self._jumpAction.triggered.connect(self._on_jump_start)
 
+               self._recentAction = QtGui.QAction(None)
+               self._recentAction.setText("Recent Units")
+               self._recentAction.setStatusTip("View the recent units")
+               self._recentAction.setToolTip("View the recent units")
+               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):
@@ -104,6 +127,31 @@ class Gonvert(object):
                self._jumpWindow = QuickJump(None, self)
                return self._jumpWindow
 
+       def show_recent(self):
+               if self._recentWindow is not None:
+                       self._recentWindow.close()
+                       self._recentWindow = None
+               self._recentWindow = Recent(None, self)
+               return self._recentWindow
+
+       def add_recent(self, categoryName, unitName):
+               catUnit = categoryName, unitName
+               try:
+                       self._recent.remove(catUnit)
+               except ValueError:
+                       pass # ignore if its not already in the recent history
+               self._recent.append(catUnit)
+
+       def get_recent_unit(self, categoryName):
+               for catName, unitName in reversed(self._recent):
+                       if catName == categoryName:
+                               return unitName
+               else:
+                       return ""
+
+       def get_recent(self):
+               return reversed(self._recent)
+
        @property
        def appIconPath(self):
                return self._appIconPath
@@ -112,10 +160,56 @@ class Gonvert(object):
        def jumpAction(self):
                return self._jumpAction
 
+       @property
+       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()
 
+       @misc_utils.log_exception(_moduleLogger)
+       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):
 
@@ -145,24 +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))
@@ -204,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))
@@ -236,6 +382,74 @@ class QuickJump(object):
                                        twi.setText(1, unit)
 
 
+class Recent(object):
+
+       def __init__(self, parent, app):
+               self._app = app
+
+               self._resultsBox = QtGui.QTreeWidget()
+               self._resultsBox.setHeaderLabels(["Categories", "Units"])
+               self._resultsBox.setHeaderHidden(True)
+               self._resultsBox.setAlternatingRowColors(True)
+               self._resultsBox.itemClicked.connect(self._on_result_clicked)
+
+               self._layout = QtGui.QVBoxLayout()
+               self._layout.addWidget(self._resultsBox)
+
+               centralWidget = QtGui.QWidget()
+               centralWidget.setLayout(self._layout)
+
+               self._window = QtGui.QMainWindow(parent)
+               if parent is not None:
+                       self._window.setWindowModality(QtCore.Qt.WindowModal)
+               self._window.setWindowTitle("%s - Recent" % constants.__pretty_app_name__)
+               self._window.setWindowIcon(QtGui.QIcon(self._app.appIconPath))
+               self._window.setCentralWidget(centralWidget)
+
+               for cat, unit in self._app.get_recent():
+                       twi = QtGui.QTreeWidgetItem(self._resultsBox)
+                       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))
+               unitName = unicode(item.text(1))
+               catWindow = self._app.request_category()
+               unitsWindow = catWindow.selectCategory(categoryName)
+               unitsWindow.select_unit(unitName)
+               self.close()
+
+
 class UnitData(object):
 
        HEADERS = ["Name", "Value", "", "Unit"]
@@ -288,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):
@@ -313,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
@@ -395,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):
@@ -459,7 +677,11 @@ class UnitWindow(object):
                self._window.setWindowIcon(QtGui.QIcon(app.appIconPath))
                self._window.setCentralWidget(centralWidget)
 
-               self._select_unit(0)
+               defaultUnitName = self._app.get_recent_unit(self._categoryName)
+               if defaultUnitName:
+                       self.select_unit(defaultUnitName)
+               else:
+                       self._select_unit(0)
                self._unitsModel.sort(1)
 
                self._sortActionGroup = QtGui.QActionGroup(None)
@@ -478,8 +700,20 @@ 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()
                viewMenu.addAction(self._sortByNameAction)
                viewMenu.addAction(self._sortByValueAction)
@@ -489,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)
 
@@ -528,6 +774,7 @@ class UnitWindow(object):
                self._selectedIndex = index
                qindex = self._unitsModel.createIndex(index, 0, self._unitsModel.get_unit(index))
                self._unitsView.scrollTo(qindex)
+               self._app.add_recent(self._categoryName, self._unitsModel.get_unit(index).name)
 
 
 def run_gonvert():