Some cleanup

[gonvert] / src / gonvert_qt.py

diff --git a/src/gonvert_qt.py b/src/gonvert_qt.py
index 11cfc27..f416cab 100755 (executable)
--- a/src/gonvert_qt.py
+++ b/src/gonvert_qt.py
@@ -51,6 +51,14 @@ def split_number(number):
 
 class Gonvert(object):
 
+       # @todo Remember last selection
+       # @todo Recent
+       # @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"),
@@ -78,6 +86,7 @@ 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.request_category()
 
@@ -103,6 +112,10 @@ class Gonvert(object):
        def jumpAction(self):
                return self._jumpAction
 
+       @misc_utils.log_exception(_moduleLogger)
+       def _on_jump_start(self, checked = False):
+               self.search_units()
+
 
 class CategoryWindow(object):
 
@@ -114,6 +127,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 +145,15 @@ 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)
 
                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 +164,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 +187,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()
@@ -426,6 +439,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)
 
@@ -444,10 +458,34 @@ class UnitWindow(object):
                self._window.setCentralWidget(centralWidget)
 
                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.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 +497,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):