Making this todo more clear
[gonvert] / src / gonvert_qt.py
index 11cfc27..3aa6d85 100755 (executable)
@@ -51,6 +51,13 @@ def split_number(number):
 
 class Gonvert(object):
 
+       # @todo Persist settings
+       # @todo Favorites
+       # @todo Fullscreen support (showFullscreen, showNormal)
+       # @todo Close Window / Quit keyboard shortcuts
+       # @todo Ctrl+l support
+       # @todo Unit conversion window: focus always on input, arrows switch units
+
        _DATA_PATHS = [
                os.path.dirname(__file__),
                os.path.join(os.path.dirname(__file__), "../data"),
@@ -69,8 +76,10 @@ class Gonvert(object):
                else:
                        raise RuntimeError("UI Descriptor not found!")
                self._appIconPath = appIconPath
+               self._recent = []
 
                self._jumpWindow = None
+               self._recentWindow = None
                self._catWindow = None
 
                self._jumpAction = QtGui.QAction(None)
@@ -78,6 +87,14 @@ class Gonvert(object):
                self._jumpAction.setStatusTip("Search for a unit and jump straight to it")
                self._jumpAction.setToolTip("Search for a unit and jump straight to it")
                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.request_category()
 
@@ -95,6 +112,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
@@ -103,6 +145,18 @@ class Gonvert(object):
        def jumpAction(self):
                return self._jumpAction
 
+       @property
+       def recentAction(self):
+               return self._recentAction
+
+       @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()
+
 
 class CategoryWindow(object):
 
@@ -114,6 +168,7 @@ class CategoryWindow(object):
                self._categories.setHeaderLabels(["Categories"])
                self._categories.itemClicked.connect(self._on_category_clicked)
                self._categories.setHeaderHidden(True)
+               self._categories.setAlternatingRowColors(True)
                for catName in unit_data.UNIT_CATEGORIES:
                        twi = QtGui.QTreeWidgetItem(self._categories)
                        twi.setText(0, catName)
@@ -131,13 +186,16 @@ class CategoryWindow(object):
                self._window.setWindowIcon(QtGui.QIcon(self._app.appIconPath))
                self._window.setCentralWidget(centralWidget)
 
-               self._app.jumpAction.triggered.connect(self._on_jump_start)
                viewMenu = self._window.menuBar().addMenu("&View")
                viewMenu.addAction(self._app.jumpAction)
+               viewMenu.addAction(self._app.recentAction)
 
                self._window.show()
 
        def close(self):
+               if self._unitWindow is not None:
+                       self._unitWindow.close()
+                       self._unitWindow = None
                self._window.close()
 
        def selectCategory(self, categoryName):
@@ -148,10 +206,6 @@ class CategoryWindow(object):
                return self._unitWindow
 
        @misc_utils.log_exception(_moduleLogger)
-       def _on_jump_start(self, checked = False):
-               self._app.search_units()
-
-       @misc_utils.log_exception(_moduleLogger)
        def _on_category_clicked(self, item, columnIndex):
                categoryName = unicode(item.text(0))
                self.selectCategory(categoryName)
@@ -175,6 +229,7 @@ class QuickJump(object):
                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()
@@ -203,6 +258,7 @@ class QuickJump(object):
                catWindow = self._app.request_category()
                unitsWindow = catWindow.selectCategory(categoryName)
                unitsWindow.select_unit(unitName)
+               self.close()
 
        @misc_utils.log_exception(_moduleLogger)
        def _on_search_edited(self, *args):
@@ -210,6 +266,7 @@ class QuickJump(object):
                if len(userInput) <  self.MINIMAL_ENTRY:
                        return
 
+               self._resultsBox.clear()
                lowerInput = str(userInput).lower()
                for catIndex, category in enumerate(unit_data.UNIT_CATEGORIES):
                        units = unit_data.get_units(category)
@@ -221,6 +278,50 @@ 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._window.show()
+
+       def close(self):
+               self._window.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"]
@@ -426,6 +527,7 @@ class UnitWindow(object):
                self._unitsView.header().setSortIndicatorShown(True)
                self._unitsView.header().setClickable(True)
                self._unitsView.setSortingEnabled(True)
+               self._unitsView.setAlternatingRowColors(True)
                if True:
                        self._unitsView.setHeaderHidden(True)
 
@@ -443,11 +545,40 @@ 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)
+               self._sortByNameAction = QtGui.QAction(self._sortActionGroup)
+               self._sortByNameAction.setText("Sort By Name")
+               self._sortByNameAction.setStatusTip("Sort the units by name")
+               self._sortByNameAction.setToolTip("Sort the units by name")
+               self._sortByValueAction = QtGui.QAction(self._sortActionGroup)
+               self._sortByValueAction.setText("Sort By Value")
+               self._sortByValueAction.setStatusTip("Sort the units by value")
+               self._sortByValueAction.setToolTip("Sort the units by value")
+               self._sortByUnitAction = QtGui.QAction(self._sortActionGroup)
+               self._sortByUnitAction.setText("Sort By Unit")
+               self._sortByUnitAction.setStatusTip("Sort the units by unit")
+               self._sortByUnitAction.setToolTip("Sort the units by unit")
+
+               self._sortByValueAction.setChecked(True)
 
-               self._app.jumpAction.triggered.connect(self._on_jump_start)
                viewMenu = self._window.menuBar().addMenu("&View")
                viewMenu.addAction(self._app.jumpAction)
+               viewMenu.addAction(self._app.recentAction)
+               viewMenu.addSeparator()
+               viewMenu.addAction(self._sortByNameAction)
+               viewMenu.addAction(self._sortByValueAction)
+               viewMenu.addAction(self._sortByUnitAction)
+
+               self._sortByNameAction.triggered.connect(self._on_sort_by_name)
+               self._sortByValueAction.triggered.connect(self._on_sort_by_value)
+               self._sortByUnitAction.triggered.connect(self._on_sort_by_unit)
 
                self._window.show()
 
@@ -459,8 +590,16 @@ class UnitWindow(object):
                self._select_unit(index)
 
        @misc_utils.log_exception(_moduleLogger)
-       def _on_jump_start(self, checked = False):
-               self._app.search_units()
+       def _on_sort_by_name(self, checked = False):
+               self._unitsModel.sort(0, QtCore.Qt.DescendingOrder)
+
+       @misc_utils.log_exception(_moduleLogger)
+       def _on_sort_by_value(self, checked = False):
+               self._unitsModel.sort(1)
+
+       @misc_utils.log_exception(_moduleLogger)
+       def _on_sort_by_unit(self, checked = False):
+               self._unitsModel.sort(3, QtCore.Qt.DescendingOrder)
 
        @misc_utils.log_exception(_moduleLogger)
        def _on_unit_clicked(self, index):
@@ -480,6 +619,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():