Fixing some column sizes and some optimizations
[gonvert] / src / gonvert_qt.py
index d8a5846..44677cf 100755 (executable)
@@ -20,6 +20,9 @@ import unit_data
 _moduleLogger = logging.getLogger("gonvert_glade")
 
 
+IS_MAEMO = True
+
+
 def change_menu_label(widgets, labelname, newtext):
        item_label = widgets.get_widget(labelname).get_children()[0]
        item_label.set_text(newtext)
@@ -52,6 +55,9 @@ def split_number(number):
 
 class Gonvert(object):
 
+       # @todo get subwindows working
+       # @todo rotation support
+
        _DATA_PATHS = [
                os.path.dirname(__file__),
                os.path.join(os.path.dirname(__file__), "../data"),
@@ -74,7 +80,6 @@ class Gonvert(object):
                self._recent = []
                self._hiddenCategories = set()
                self._hiddenUnits = {}
-               self._isFullscreen = False
                self._clipboard = QtGui.QApplication.clipboard()
 
                self._jumpWindow = None
@@ -96,10 +101,10 @@ class Gonvert(object):
                self._recentAction.triggered.connect(self._on_recent_start)
 
                self._fullscreenAction = QtGui.QAction(None)
-               self._fullscreenAction.setText("Toggle Fullscreen")
-               # @todo Make this checkable
+               self._fullscreenAction.setText("Fullscreen")
+               self._fullscreenAction.setCheckable(True)
                self._fullscreenAction.setShortcut(QtGui.QKeySequence("CTRL+Enter"))
-               self._fullscreenAction.triggered.connect(self._on_toggle_fullscreen)
+               self._fullscreenAction.toggled.connect(self._on_toggle_fullscreen)
 
                self._showFavoritesAction = QtGui.QAction(None)
                self._showFavoritesAction.setCheckable(True)
@@ -184,7 +189,7 @@ class Gonvert(object):
                        _moduleLogger.info("Settings were corrupt")
                        settings = {}
 
-               self._isFullscreen = settings.get("isFullScreen", self._isFullscreen)
+               self._fullscreenAction.setChecked(settings.get("isFullScreen", False))
 
                recent = settings.get("recent", self._recent)
                for category, unit in recent:
@@ -198,14 +203,12 @@ class Gonvert(object):
 
                self._showFavoritesAction.setChecked(settings.get("showFavorites", True))
 
-               for window in self._walk_children():
-                       window.set_fullscreen(self._isFullscreen)
                if self._recent:
                        self._catWindow.select_category(self._recent[-1][0])
 
        def save_settings(self):
                settings = {
-                       "isFullScreen": self._isFullscreen,
+                       "isFullScreen": self._fullscreenAction.isChecked(),
                        "recent": self._recent,
                        "hiddenCategories": list(self._hiddenCategories),
                        "hiddenUnits": dict(
@@ -266,9 +269,8 @@ class Gonvert(object):
 
        @misc_utils.log_exception(_moduleLogger)
        def _on_toggle_fullscreen(self, checked = False):
-               self._isFullscreen = not self._isFullscreen
                for window in self._walk_children():
-                       window.set_fullscreen(self._isFullscreen)
+                       window.set_fullscreen(checked)
 
        @misc_utils.log_exception(_moduleLogger)
        def _on_jump_start(self, checked = False):
@@ -291,24 +293,31 @@ 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)
+               if not IS_MAEMO:
+                       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 +326,90 @@ 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.setText("Close")
                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)
+               if IS_MAEMO:
+                       self._window.addAction(self._closeWindowAction)
+                       self._window.addAction(self._app.quitAction)
+                       self._window.addAction(self._app.fullscreenAction)
+               else:
+                       fileMenu = self._window.menuBar().addMenu("&Units")
+                       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)
+                       viewMenu = self._window.menuBar().addMenu("&View")
+                       viewMenu.addAction(self._app.fullscreenAction)
 
                self._window.addAction(self._app.logAction)
 
-               self._update_favorites()
+               self.set_fullscreen(self._app.fullscreenAction.isChecked())
                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
 
+               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 FavoriteCategoriesWindow(object):
 
-       # @todo Add All, None, and Invert actions
+class Recent(object):
 
-       def __init__(self, parent, app, source, hidden):
+       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)
+               if not IS_MAEMO:
+                       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,24 +418,35 @@ 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.setText("Close")
                self._closeWindowAction.setShortcut(QtGui.QKeySequence("CTRL+w"))
                self._closeWindowAction.triggered.connect(self._on_close_window)
 
-               fileMenu = self._window.menuBar().addMenu("&Units")
-               fileMenu.addAction(self._closeWindowAction)
-               fileMenu.addAction(self._app.quitAction)
+               if IS_MAEMO:
+                       self._window.addAction(self._closeWindowAction)
+                       self._window.addAction(self._app.quitAction)
+                       self._window.addAction(self._app.fullscreenAction)
+               else:
+                       fileMenu = self._window.menuBar().addMenu("&Units")
+                       fileMenu.addAction(self._closeWindowAction)
+                       fileMenu.addAction(self._app.quitAction)
 
-               viewMenu = self._window.menuBar().addMenu("&View")
-               viewMenu.addAction(self._app.fullscreenAction)
+                       viewMenu = self._window.menuBar().addMenu("&View")
+                       viewMenu.addAction(self._app.fullscreenAction)
 
                self._window.addAction(self._app.logAction)
 
+               self.set_fullscreen(self._app.fullscreenAction.isChecked())
                self._window.show()
 
        @property
@@ -503,45 +463,58 @@ 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)
-
-       @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.select_category(categoryName)
+               unitsWindow.select_unit(unitName)
+               self.close()
 
-class QuickJump(object):
 
-       MINIMAL_ENTRY = 3
+class FavoriteCategoriesWindow(object):
 
-       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._categories = QtGui.QTreeWidget()
+               self._categories.setHeaderLabels(["Categories"])
+               self._categories.setHeaderHidden(True)
+               if not IS_MAEMO:
+                       self._categories.setAlternatingRowColors(True)
+               self._categories.setSelectionBehavior(QtGui.QAbstractItemView.SelectRows)
+               self._categories.setSelectionMode(QtGui.QAbstractItemView.MultiSelection)
+               self._childWidgets = []
+               for catName in self._source:
+                       twi = QtGui.QTreeWidgetItem(self._categories)
+                       twi.setText(0, catName)
+                       self._childWidgets.append(twi)
+                       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._entryLayout = QtGui.QHBoxLayout()
-               self._entryLayout.addWidget(self._searchLabel)
-               self._entryLayout.addWidget(self._searchEntry)
+               self._allButton = QtGui.QPushButton("All")
+               self._allButton.clicked.connect(self._on_select_all)
+               self._invertButton = QtGui.QPushButton("Invert")
+               self._invertButton.clicked.connect(self._on_invert_selection)
+               self._noneButton = QtGui.QPushButton("None")
+               self._noneButton.clicked.connect(self._on_select_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._buttonLayout = QtGui.QHBoxLayout()
+               self._buttonLayout.addWidget(self._allButton)
+               self._buttonLayout.addWidget(self._invertButton)
+               self._buttonLayout.addWidget(self._noneButton)
 
                self._layout = QtGui.QVBoxLayout()
-               self._layout.addLayout(self._entryLayout)
-               self._layout.addWidget(self._resultsBox)
+               self._layout.addWidget(self._categories)
+               self._layout.addLayout(self._buttonLayout)
 
                centralWidget = QtGui.QWidget()
                centralWidget.setLayout(self._layout)
@@ -550,24 +523,30 @@ 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)
 
                self._closeWindowAction = QtGui.QAction(None)
-               self._closeWindowAction.setText("Window")
+               self._closeWindowAction.setText("Close")
                self._closeWindowAction.setShortcut(QtGui.QKeySequence("CTRL+w"))
                self._closeWindowAction.triggered.connect(self._on_close_window)
 
-               fileMenu = self._window.menuBar().addMenu("&Units")
-               fileMenu.addAction(self._closeWindowAction)
-               fileMenu.addAction(self._app.quitAction)
+               if IS_MAEMO:
+                       self._window.addAction(self._closeWindowAction)
+                       self._window.addAction(self._app.quitAction)
+                       self._window.addAction(self._app.fullscreenAction)
+               else:
+                       fileMenu = self._window.menuBar().addMenu("&Units")
+                       fileMenu.addAction(self._closeWindowAction)
+                       fileMenu.addAction(self._app.quitAction)
 
-               viewMenu = self._window.menuBar().addMenu("&View")
-               viewMenu.addAction(self._app.fullscreenAction)
+                       viewMenu = self._window.menuBar().addMenu("&View")
+                       viewMenu.addAction(self._app.fullscreenAction)
 
                self._window.addAction(self._app.logAction)
 
+               self.set_fullscreen(self._app.fullscreenAction.isChecked())
                self._window.show()
 
        @property
@@ -584,49 +563,56 @@ class QuickJump(object):
                        self._window.showNormal()
 
        @misc_utils.log_exception(_moduleLogger)
-       def _on_close_window(self, checked = True):
-               self.close()
+       def _on_select_all(self, checked = False):
+               for child in self._childWidgets:
+                       self._categories.setItemSelected(child, True)
 
        @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)
-               self.close()
+       def _on_invert_selection(self, checked = False):
+               for child in self._childWidgets:
+                       isSelected = self._categories.isItemSelected(child)
+                       self._categories.setItemSelected(child, not isSelected)
 
        @misc_utils.log_exception(_moduleLogger)
-       def _on_search_edited(self, *args):
-               userInput = self._searchEntry.text()
-               if len(userInput) <  self.MINIMAL_ENTRY:
-                       return
+       def _on_select_none(self, checked = False):
+               for child in self._childWidgets:
+                       self._categories.setItemSelected(child, False)
 
-               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)
+       @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)
 
+       @misc_utils.log_exception(_moduleLogger)
+       def _on_close_window(self, checked = True):
+               self.close()
 
-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)
+               if not IS_MAEMO:
+                       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,56 +621,142 @@ 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")
+               self._closeWindowAction.setText("Close")
                self._closeWindowAction.setShortcut(QtGui.QKeySequence("CTRL+w"))
                self._closeWindowAction.triggered.connect(self._on_close_window)
 
-               fileMenu = self._window.menuBar().addMenu("&Units")
-               fileMenu.addAction(self._closeWindowAction)
-               fileMenu.addAction(self._app.quitAction)
+               if IS_MAEMO:
+                       fileMenu = self._window.menuBar().addMenu("&Units")
+                       fileMenu.addAction(self._chooseFavoritesAction)
+
+                       viewMenu = self._window.menuBar().addMenu("&View")
+                       viewMenu.addAction(self._app.showFavoritesAction)
+                       viewMenu.addSeparator()
+                       viewMenu.addAction(self._app.jumpAction)
+                       viewMenu.addAction(self._app.recentAction)
 
-               viewMenu = self._window.menuBar().addMenu("&View")
-               viewMenu.addAction(self._app.fullscreenAction)
+                       self._window.addAction(self._closeWindowAction)
+                       self._window.addAction(self._app.quitAction)
+                       self._window.addAction(self._app.fullscreenAction)
+               else:
+                       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.set_fullscreen(self._app.fullscreenAction.isChecked())
                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)
+
+               i = unit_data.UNIT_CATEGORIES.index(categoryName)
+               rootIndex = self._categories.rootIndex()
+               currentIndex = self._categories.model().index(i, 0, rootIndex)
+               self._categories.scrollTo(currentIndex)
+               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):
@@ -857,13 +929,23 @@ class UnitModel(QtCore.QAbstractItemModel):
                        newValue = func.from_base(base, arg)
                        child.update_value(newValue)
 
-               if self._sortSettings is not None:
+               if (
+                       self._sortSettings is not None and
+                       self._sortSettings[0]  in [UnitData.VALUE_COLUMN_0, UnitData.VALUE_COLUMN_1]
+               ):
                        self.sort(*self._sortSettings)
-               self._all_changed()
+                       self._all_changed()
+               else:
+                       self._values_changed()
 
        def __len__(self):
                return len(self._children)
 
+       def _values_changed(self):
+               topLeft = self.createIndex(0, UnitData.VALUE_COLUMN_0, self._children[0])
+               bottomRight = self.createIndex(len(self._children)-1, UnitData.VALUE_COLUMN_1, self._children[-1])
+               self.dataChanged.emit(topLeft, bottomRight)
+
        def _all_changed(self):
                topLeft = self.createIndex(0, 0, self._children[0])
                bottomRight = self.createIndex(len(self._children)-1, len(UnitData.HEADERS)-1, self._children[-1])
@@ -906,13 +988,32 @@ class UnitWindow(object):
                self._unitsView.setModel(self._unitsModel)
                self._unitsView.clicked.connect(self._on_unit_clicked)
                self._unitsView.setUniformRowHeights(True)
-               self._unitsView.header().setSortIndicatorShown(True)
-               self._unitsView.header().setClickable(True)
                self._unitsView.setSortingEnabled(True)
-               self._unitsView.setAlternatingRowColors(True)
+               self._unitsView.setTextElideMode(QtCore.Qt.ElideNone)
+               self._unitsView.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
+               if not IS_MAEMO:
+                       self._unitsView.setAlternatingRowColors(True)
                if True:
                        self._unitsView.setHeaderHidden(True)
 
+               viewHeader = self._unitsView.header()
+               viewHeader.setSortIndicatorShown(True)
+               viewHeader.setClickable(True)
+
+               viewHeader.setResizeMode(UnitData.NAME_COLUMN, QtGui.QHeaderView.ResizeToContents)
+               viewHeader.setResizeMode(UnitData.VALUE_COLUMN_0, QtGui.QHeaderView.ResizeToContents)
+               viewHeader.setResizeMode(UnitData.VALUE_COLUMN_1, QtGui.QHeaderView.ResizeToContents)
+               viewHeader.setResizeMode(UnitData.UNIT_COLUMN, QtGui.QHeaderView.ResizeToContents)
+               viewHeader.setStretchLastSection(False)
+
+               # Trying to make things faster by locking in the initial size of the immutable columns
+               nameSize = viewHeader.sectionSize(UnitData.NAME_COLUMN)
+               viewHeader.setResizeMode(UnitData.NAME_COLUMN, QtGui.QHeaderView.Fixed)
+               viewHeader.resizeSection(UnitData.NAME_COLUMN, nameSize)
+               unitSize = viewHeader.sectionSize(UnitData.UNIT_COLUMN)
+               viewHeader.setResizeMode(UnitData.UNIT_COLUMN, QtGui.QHeaderView.Fixed)
+               viewHeader.resizeSection(UnitData.UNIT_COLUMN, unitSize)
+
                self._layout = QtGui.QVBoxLayout()
                self._layout.addLayout(self._selectedUnitLayout)
                self._layout.addWidget(self._unitsView)
@@ -933,7 +1034,7 @@ class UnitWindow(object):
                        self.select_unit(defaultUnitName)
                else:
                        self._select_unit(0)
-               self._unitsModel.sort(UnitData.VALUE_COLUMN_0)
+               self._unitsModel.sort(UnitData.NAME_COLUMN)
 
                self._sortActionGroup = QtGui.QActionGroup(None)
                self._sortByNameAction = QtGui.QAction(self._sortActionGroup)
@@ -976,22 +1077,40 @@ class UnitWindow(object):
                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._sortByNameAction)
-               viewMenu.addAction(self._sortByValueAction)
-               viewMenu.addAction(self._sortByUnitAction)
-               viewMenu.addSeparator()
-               viewMenu.addAction(self._app.jumpAction)
-               viewMenu.addAction(self._app.recentAction)
-               viewMenu.addSeparator()
-               viewMenu.addAction(self._app.fullscreenAction)
+               if IS_MAEMO:
+                       self._window.addAction(self._closeWindowAction)
+                       self._window.addAction(self._app.quitAction)
+                       self._window.addAction(self._app.fullscreenAction)
+
+                       fileMenu = self._window.menuBar().addMenu("&Units")
+                       fileMenu.addAction(self._chooseFavoritesAction)
+
+                       viewMenu = self._window.menuBar().addMenu("&View")
+                       viewMenu.addAction(self._app.showFavoritesAction)
+                       viewMenu.addSeparator()
+                       viewMenu.addAction(self._sortByNameAction)
+                       viewMenu.addAction(self._sortByValueAction)
+                       viewMenu.addAction(self._sortByUnitAction)
+                       viewMenu.addSeparator()
+                       viewMenu.addAction(self._app.jumpAction)
+                       viewMenu.addAction(self._app.recentAction)
+               else:
+                       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._sortByNameAction)
+                       viewMenu.addAction(self._sortByValueAction)
+                       viewMenu.addAction(self._sortByUnitAction)
+                       viewMenu.addSeparator()
+                       viewMenu.addAction(self._app.jumpAction)
+                       viewMenu.addAction(self._app.recentAction)
+                       viewMenu.addSeparator()
+                       viewMenu.addAction(self._app.fullscreenAction)
 
                self._sortByNameAction.triggered.connect(self._on_sort_by_name)
                self._sortByValueAction.triggered.connect(self._on_sort_by_value)
@@ -1003,6 +1122,7 @@ class UnitWindow(object):
                self._window.addAction(self._chooseFavoritesAction)
 
                self._update_favorites()
+               self.set_fullscreen(self._app.fullscreenAction.isChecked())
                self._window.show()
 
        @property
@@ -1010,6 +1130,8 @@ class UnitWindow(object):
                return self._window
 
        def close(self):
+               for child in self.walk_children():
+                       child.close()
                self._window.close()
 
        def set_fullscreen(self, isFullscreen):
@@ -1026,7 +1148,7 @@ class UnitWindow(object):
                if self._favoritesWindow is not None:
                        yield self._favoritesWindow
 
-       def _update_favorites(self):
+       def _update_favorites(self, force = False):
                if self._app.showFavoritesAction.isChecked():
                        unitNames = list(self._unitsModel.get_unit_names())
                        for i, unitName in enumerate(unitNames):
@@ -1035,8 +1157,9 @@ class UnitWindow(object):
                                else:
                                        self._unitsView.setRowHidden(i, self._unitsView.rootIndex(), False)
                else:
-                       for i in xrange(len(self._unitsModel)):
-                               self._unitsView.setRowHidden(i, self._unitsView.rootIndex(), False)
+                       if force:
+                               for i in xrange(len(self._unitsModel)):
+                                       self._unitsView.setRowHidden(i, self._unitsView.rootIndex(), False)
 
        @misc_utils.log_exception(_moduleLogger)
        def _on_choose_favorites(self, obj = None):
@@ -1064,7 +1187,7 @@ class UnitWindow(object):
        @misc_utils.log_exception(_moduleLogger)
        def _on_close_favorites(self, obj = None):
                self._favoritesWindow = None
-               self._update_favorites()
+               self._update_favorites(force=True)
 
        @misc_utils.log_exception(_moduleLogger)
        def _on_previous_unit(self, checked = True):
@@ -1098,6 +1221,7 @@ class UnitWindow(object):
        def _on_value_edited(self, *args):
                userInput = self._selectedUnitValue.text()
                self._unitsModel.update_values(self._selectedIndex, str(userInput))
+               self._update_favorites()
 
        def _select_unit(self, index):
                unit = self._unitsModel.get_unit(index)