Re-arranged things
[gonvert] / src / gonvert_qt.py
index d8a5846..eae4dd6 100755 (executable)
@@ -291,24 +291,30 @@ class Gonvert(object):
                        window.close()
 
 
-class CategoryWindow(object):
+class QuickJump(object):
+
+       MINIMAL_ENTRY = 3
 
        def __init__(self, parent, app):
                self._app = app
-               self._unitWindow = None
-               self._favoritesWindow = None
 
-               self._categories = QtGui.QTreeWidget()
-               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)
+               self._searchLabel = QtGui.QLabel("Search:")
+               self._searchEntry = QtGui.QLineEdit("")
+               self._searchEntry.textEdited.connect(self._on_search_edited)
+
+               self._entryLayout = QtGui.QHBoxLayout()
+               self._entryLayout.addWidget(self._searchLabel)
+               self._entryLayout.addWidget(self._searchEntry)
+
+               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._categories)
+               self._layout.addLayout(self._entryLayout)
+               self._layout.addWidget(self._resultsBox)
 
                centralWidget = QtGui.QWidget()
                centralWidget.setLayout(self._layout)
@@ -317,150 +323,83 @@ class CategoryWindow(object):
                self._window.setAttribute(QtCore.Qt.WA_DeleteOnClose, True)
                if parent is not None:
                        self._window.setWindowModality(QtCore.Qt.WindowModal)
-               self._window.setWindowTitle("%s - Categories" % constants.__pretty_app_name__)
+               self._window.setWindowTitle("%s - Quick Jump" % constants.__pretty_app_name__)
                self._window.setWindowIcon(QtGui.QIcon(self._app.appIconPath))
                self._window.setCentralWidget(centralWidget)
 
-               self._chooseFavoritesAction = QtGui.QAction(None)
-               self._chooseFavoritesAction.setText("Select Favorites")
-               self._chooseFavoritesAction.setShortcut(QtGui.QKeySequence("CTRL+f"))
-               self._chooseFavoritesAction.triggered.connect(self._on_choose_favorites)
-
-               self._app.showFavoritesAction.toggled.connect(self._on_show_favorites)
-
                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("&Units")
-               fileMenu.addAction(self._chooseFavoritesAction)
                fileMenu.addAction(self._closeWindowAction)
                fileMenu.addAction(self._app.quitAction)
 
                viewMenu = self._window.menuBar().addMenu("&View")
-               viewMenu.addAction(self._app.showFavoritesAction)
-               viewMenu.addSeparator()
-               viewMenu.addAction(self._app.jumpAction)
-               viewMenu.addAction(self._app.recentAction)
-               viewMenu.addSeparator()
                viewMenu.addAction(self._app.fullscreenAction)
 
                self._window.addAction(self._app.logAction)
 
-               self._update_favorites()
                self._window.show()
 
        @property
        def window(self):
                return self._window
 
-       def walk_children(self):
-               if self._unitWindow is not None:
-                       yield self._unitWindow
-               if self._favoritesWindow is not None:
-                       yield self._favoritesWindow
-
        def close(self):
-               for child in self.walk_children():
-                       child.close()
                self._window.close()
 
-       def select_category(self, categoryName):
-               for child in self.walk_children():
-                       child.close()
-               self._unitWindow = UnitWindow(self._window, categoryName, self._app)
-               self._unitWindow.window.destroyed.connect(self._on_child_close)
-               # @todo Add scroll to category
-               return self._unitWindow
-
        def set_fullscreen(self, isFullscreen):
                if isFullscreen:
                        self._window.showFullScreen()
                else:
                        self._window.showNormal()
-               for child in self.walk_children():
-                       child.set_fullscreen(isFullscreen)
-
-       def _update_favorites(self):
-               if self._app.showFavoritesAction.isChecked():
-                       assert self._categories.topLevelItemCount() == len(unit_data.UNIT_CATEGORIES)
-                       for i, catName in enumerate(unit_data.UNIT_CATEGORIES):
-                               if catName in self._app.hiddenCategories:
-                                       self._categories.setRowHidden(i, self._categories.rootIndex(), True)
-                               else:
-                                       self._categories.setRowHidden(i, self._categories.rootIndex(), False)
-               else:
-                       for i in xrange(self._categories.topLevelItemCount()):
-                               self._categories.setRowHidden(i, self._categories.rootIndex(), False)
-
-       @misc_utils.log_exception(_moduleLogger)
-       def _on_choose_favorites(self, obj = None):
-               assert self._favoritesWindow is None
-               self._favoritesWindow = FavoriteCategoriesWindow(
-                       self._window,
-                       self._app,
-                       unit_data.UNIT_CATEGORIES,
-                       self._app.hiddenCategories
-               )
-               self._favoritesWindow.window.destroyed.connect(self._on_close_favorites)
-               return self._favoritesWindow
-
-       @misc_utils.log_exception(_moduleLogger)
-       def _on_show_favorites(self, checked = True):
-               if checked:
-                       assert self._categories.topLevelItemCount() == len(unit_data.UNIT_CATEGORIES)
-                       for i, catName in enumerate(unit_data.UNIT_CATEGORIES):
-                               if catName in self._app.hiddenCategories:
-                                       self._categories.setRowHidden(i, self._categories.rootIndex(), True)
-               else:
-                       for i in xrange(self._categories.topLevelItemCount()):
-                               self._categories.setRowHidden(i, self._categories.rootIndex(), False)
-
-       @misc_utils.log_exception(_moduleLogger)
-       def _on_close_favorites(self, obj = None):
-               self._favoritesWindow = None
-               self._update_favorites()
-
-       @misc_utils.log_exception(_moduleLogger)
-       def _on_child_close(self, obj = None):
-               self._unitWindow = None
 
        @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):
+       def _on_result_clicked(self, item, columnIndex):
                categoryName = unicode(item.text(0))
-               self.select_category(categoryName)
+               unitName = unicode(item.text(1))
+               catWindow = self._app.request_category()
+               unitsWindow = catWindow.select_category(categoryName)
+               unitsWindow.select_unit(unitName)
+               self.close()
 
+       @misc_utils.log_exception(_moduleLogger)
+       def _on_search_edited(self, *args):
+               userInput = self._searchEntry.text()
+               if len(userInput) <  self.MINIMAL_ENTRY:
+                       return
 
-class FavoriteCategoriesWindow(object):
+               self._resultsBox.clear()
+               lowerInput = str(userInput).lower()
+               for catIndex, category in enumerate(unit_data.UNIT_CATEGORIES):
+                       units = unit_data.get_units(category)
+                       for unitIndex, unit in enumerate(units):
+                               loweredUnit = unit.lower()
+                               if lowerInput in loweredUnit:
+                                       twi = QtGui.QTreeWidgetItem(self._resultsBox)
+                                       twi.setText(0, category)
+                                       twi.setText(1, unit)
 
-       # @todo Add All, None, and Invert actions
 
-       def __init__(self, parent, app, source, hidden):
+class Recent(object):
+
+       def __init__(self, parent, app):
                self._app = app
-               self._source = list(source)
-               self._hidden = hidden
 
-               self._categories = QtGui.QTreeWidget()
-               self._categories.setHeaderLabels(["Categories"])
-               self._categories.setHeaderHidden(True)
-               self._categories.setAlternatingRowColors(True)
-               self._categories.setSelectionBehavior(QtGui.QAbstractItemView.SelectRows)
-               self._categories.setSelectionMode(QtGui.QAbstractItemView.MultiSelection)
-               for catName in self._source:
-                       twi = QtGui.QTreeWidgetItem(self._categories)
-                       twi.setText(0, catName)
-                       if catName not in self._hidden:
-                               self._categories.setItemSelected(twi, True)
-               self._selection = self._categories.selectionModel()
-               self._selection.selectionChanged.connect(self._on_selection_changed)
+               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._categories)
+               self._layout.addWidget(self._resultsBox)
 
                centralWidget = QtGui.QWidget()
                centralWidget.setLayout(self._layout)
@@ -469,10 +408,15 @@ class FavoriteCategoriesWindow(object):
                self._window.setAttribute(QtCore.Qt.WA_DeleteOnClose, True)
                if parent is not None:
                        self._window.setWindowModality(QtCore.Qt.WindowModal)
-               self._window.setWindowTitle("%s - Favorites" % constants.__pretty_app_name__)
+               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"))
@@ -503,45 +447,44 @@ class FavoriteCategoriesWindow(object):
                        self._window.showNormal()
 
        @misc_utils.log_exception(_moduleLogger)
-       def _on_selection_changed(self, selected, deselected):
-               self._hidden.clear()
-               selectedNames = set(
-                       str(item.text(0))
-                       for item in self._categories.selectedItems()
-               )
-               for name in self._source:
-                       if name not in selectedNames:
-                               self._hidden.add(name)
+       def _on_close_window(self, checked = True):
+               self.close()
 
        @misc_utils.log_exception(_moduleLogger)
-       def _on_close_window(self, checked = True):
+       def _on_result_clicked(self, item, columnIndex):
+               categoryName = unicode(item.text(0))
+               unitName = unicode(item.text(1))
+               catWindow = self._app.request_category()
+               unitsWindow = catWindow.select_category(categoryName)
+               unitsWindow.select_unit(unitName)
                self.close()
 
 
-class QuickJump(object):
+class FavoriteCategoriesWindow(object):
 
-       MINIMAL_ENTRY = 3
+       # @todo Add All, None, and Invert actions
 
-       def __init__(self, parent, app):
+       def __init__(self, parent, app, source, hidden):
                self._app = app
+               self._source = list(source)
+               self._hidden = hidden
 
-               self._searchLabel = QtGui.QLabel("Search:")
-               self._searchEntry = QtGui.QLineEdit("")
-               self._searchEntry.textEdited.connect(self._on_search_edited)
-
-               self._entryLayout = QtGui.QHBoxLayout()
-               self._entryLayout.addWidget(self._searchLabel)
-               self._entryLayout.addWidget(self._searchEntry)
-
-               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._categories = QtGui.QTreeWidget()
+               self._categories.setHeaderLabels(["Categories"])
+               self._categories.setHeaderHidden(True)
+               self._categories.setAlternatingRowColors(True)
+               self._categories.setSelectionBehavior(QtGui.QAbstractItemView.SelectRows)
+               self._categories.setSelectionMode(QtGui.QAbstractItemView.MultiSelection)
+               for catName in self._source:
+                       twi = QtGui.QTreeWidgetItem(self._categories)
+                       twi.setText(0, catName)
+                       if catName not in self._hidden:
+                               self._categories.setItemSelected(twi, True)
+               self._selection = self._categories.selectionModel()
+               self._selection.selectionChanged.connect(self._on_selection_changed)
 
                self._layout = QtGui.QVBoxLayout()
-               self._layout.addLayout(self._entryLayout)
-               self._layout.addWidget(self._resultsBox)
+               self._layout.addWidget(self._categories)
 
                centralWidget = QtGui.QWidget()
                centralWidget.setLayout(self._layout)
@@ -550,7 +493,7 @@ class QuickJump(object):
                self._window.setAttribute(QtCore.Qt.WA_DeleteOnClose, True)
                if parent is not None:
                        self._window.setWindowModality(QtCore.Qt.WindowModal)
-               self._window.setWindowTitle("%s - Quick Jump" % constants.__pretty_app_name__)
+               self._window.setWindowTitle("%s - Favorites" % constants.__pretty_app_name__)
                self._window.setWindowIcon(QtGui.QIcon(self._app.appIconPath))
                self._window.setCentralWidget(centralWidget)
 
@@ -584,49 +527,39 @@ class QuickJump(object):
                        self._window.showNormal()
 
        @misc_utils.log_exception(_moduleLogger)
-       def _on_close_window(self, checked = True):
-               self.close()
+       def _on_selection_changed(self, selected, deselected):
+               self._hidden.clear()
+               selectedNames = set(
+                       str(item.text(0))
+                       for item in self._categories.selectedItems()
+               )
+               for name in self._source:
+                       if name not in selectedNames:
+                               self._hidden.add(name)
 
        @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.select_category(categoryName)
-               unitsWindow.select_unit(unitName)
+       def _on_close_window(self, checked = True):
                self.close()
 
-       @misc_utils.log_exception(_moduleLogger)
-       def _on_search_edited(self, *args):
-               userInput = self._searchEntry.text()
-               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)
-                       for unitIndex, unit in enumerate(units):
-                               loweredUnit = unit.lower()
-                               if lowerInput in loweredUnit:
-                                       twi = QtGui.QTreeWidgetItem(self._resultsBox)
-                                       twi.setText(0, category)
-                                       twi.setText(1, unit)
-
 
-class Recent(object):
+class CategoryWindow(object):
 
        def __init__(self, parent, app):
                self._app = app
+               self._unitWindow = None
+               self._favoritesWindow = None
 
-               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._categories = QtGui.QTreeWidget()
+               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)
 
                self._layout = QtGui.QVBoxLayout()
-               self._layout.addWidget(self._resultsBox)
+               self._layout.addWidget(self._categories)
 
                centralWidget = QtGui.QWidget()
                centralWidget.setLayout(self._layout)
@@ -635,14 +568,16 @@ class Recent(object):
                self._window.setAttribute(QtCore.Qt.WA_DeleteOnClose, True)
                if parent is not None:
                        self._window.setWindowModality(QtCore.Qt.WindowModal)
-               self._window.setWindowTitle("%s - Recent" % constants.__pretty_app_name__)
+               self._window.setWindowTitle("%s - Categories" % 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._chooseFavoritesAction = QtGui.QAction(None)
+               self._chooseFavoritesAction.setText("Select Favorites")
+               self._chooseFavoritesAction.setShortcut(QtGui.QKeySequence("CTRL+f"))
+               self._chooseFavoritesAction.triggered.connect(self._on_choose_favorites)
+
+               self._app.showFavoritesAction.toggled.connect(self._on_show_favorites)
 
                self._closeWindowAction = QtGui.QAction(None)
                self._closeWindowAction.setText("Window")
@@ -650,41 +585,106 @@ class Recent(object):
                self._closeWindowAction.triggered.connect(self._on_close_window)
 
                fileMenu = self._window.menuBar().addMenu("&Units")
+               fileMenu.addAction(self._chooseFavoritesAction)
                fileMenu.addAction(self._closeWindowAction)
                fileMenu.addAction(self._app.quitAction)
 
                viewMenu = self._window.menuBar().addMenu("&View")
+               viewMenu.addAction(self._app.showFavoritesAction)
+               viewMenu.addSeparator()
+               viewMenu.addAction(self._app.jumpAction)
+               viewMenu.addAction(self._app.recentAction)
+               viewMenu.addSeparator()
                viewMenu.addAction(self._app.fullscreenAction)
 
                self._window.addAction(self._app.logAction)
 
+               self._update_favorites()
                self._window.show()
 
        @property
        def window(self):
                return self._window
 
+       def walk_children(self):
+               if self._unitWindow is not None:
+                       yield self._unitWindow
+               if self._favoritesWindow is not None:
+                       yield self._favoritesWindow
+
        def close(self):
+               for child in self.walk_children():
+                       child.close()
                self._window.close()
 
+       def select_category(self, categoryName):
+               for child in self.walk_children():
+                       child.close()
+               self._unitWindow = UnitWindow(self._window, categoryName, self._app)
+               self._unitWindow.window.destroyed.connect(self._on_child_close)
+               # @todo Add scroll to category
+               return self._unitWindow
+
        def set_fullscreen(self, isFullscreen):
                if isFullscreen:
                        self._window.showFullScreen()
                else:
                        self._window.showNormal()
+               for child in self.walk_children():
+                       child.set_fullscreen(isFullscreen)
+
+       def _update_favorites(self):
+               if self._app.showFavoritesAction.isChecked():
+                       assert self._categories.topLevelItemCount() == len(unit_data.UNIT_CATEGORIES)
+                       for i, catName in enumerate(unit_data.UNIT_CATEGORIES):
+                               if catName in self._app.hiddenCategories:
+                                       self._categories.setRowHidden(i, self._categories.rootIndex(), True)
+                               else:
+                                       self._categories.setRowHidden(i, self._categories.rootIndex(), False)
+               else:
+                       for i in xrange(self._categories.topLevelItemCount()):
+                               self._categories.setRowHidden(i, self._categories.rootIndex(), False)
+
+       @misc_utils.log_exception(_moduleLogger)
+       def _on_choose_favorites(self, obj = None):
+               assert self._favoritesWindow is None
+               self._favoritesWindow = FavoriteCategoriesWindow(
+                       self._window,
+                       self._app,
+                       unit_data.UNIT_CATEGORIES,
+                       self._app.hiddenCategories
+               )
+               self._favoritesWindow.window.destroyed.connect(self._on_close_favorites)
+               return self._favoritesWindow
+
+       @misc_utils.log_exception(_moduleLogger)
+       def _on_show_favorites(self, checked = True):
+               if checked:
+                       assert self._categories.topLevelItemCount() == len(unit_data.UNIT_CATEGORIES)
+                       for i, catName in enumerate(unit_data.UNIT_CATEGORIES):
+                               if catName in self._app.hiddenCategories:
+                                       self._categories.setRowHidden(i, self._categories.rootIndex(), True)
+               else:
+                       for i in xrange(self._categories.topLevelItemCount()):
+                               self._categories.setRowHidden(i, self._categories.rootIndex(), False)
+
+       @misc_utils.log_exception(_moduleLogger)
+       def _on_close_favorites(self, obj = None):
+               self._favoritesWindow = None
+               self._update_favorites()
+
+       @misc_utils.log_exception(_moduleLogger)
+       def _on_child_close(self, obj = None):
+               self._unitWindow = None
 
        @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):
+       def _on_category_clicked(self, item, columnIndex):
                categoryName = unicode(item.text(0))
-               unitName = unicode(item.text(1))
-               catWindow = self._app.request_category()
-               unitsWindow = catWindow.select_category(categoryName)
-               unitsWindow.select_unit(unitName)
-               self.close()
+               self.select_category(categoryName)
 
 
 class UnitData(object):