Bump to 1.1.3
[gonvert] / src / gonvert_qt.py
index 0d3f46d..d2c0792 100755 (executable)
@@ -1,6 +1,9 @@
 #!/usr/bin/env python
 # -*- coding: UTF8 -*-
 
+#@todo Research Fn
+#@todo Research optimizations
+
 from __future__ import with_statement
 
 import sys
@@ -18,18 +21,17 @@ from util import misc as misc_utils
 import unit_data
 
 
-_moduleLogger = logging.getLogger("gonvert_glade")
+_moduleLogger = logging.getLogger(__name__)
 
 
 IS_MAEMO = True
 
 
-def change_menu_label(widgets, labelname, newtext):
-       item_label = widgets.get_widget(labelname).get_children()[0]
-       item_label.set_text(newtext)
-
-
 def split_number(number):
+       if number == 0.0:
+               # Optimize the startup case
+               return "0.", "0"
+
        try:
                fractional, integer = math.modf(number)
        except TypeError:
@@ -41,15 +43,16 @@ def split_number(number):
                if "e+" in integerDisplay:
                        integerDisplay = number
                        fractionalDisplay = ""
-               elif "e-" in fractionalDisplay and 0.0 < integer:
-                       integerDisplay = number
-                       fractionalDisplay = ""
                elif "e-" in fractionalDisplay:
-                       integerDisplay = ""
-                       fractionalDisplay = number
+                       if 0.0 < integer:
+                               integerDisplay = number
+                               fractionalDisplay = ""
+                       else:
+                               integerDisplay = ""
+                               fractionalDisplay = number
                else:
-                       integerDisplay = integerDisplay.split(".", 1)[0] + "."
-                       fractionalDisplay = fractionalDisplay.rsplit(".", 1)[-1]
+                       integerDisplay = integerDisplay[0:-2] + "."
+                       fractionalDisplay = fractionalDisplay[2:]
 
        return integerDisplay, fractionalDisplay
 
@@ -120,6 +123,25 @@ class Gonvert(object):
                self._showFavoritesAction.setCheckable(True)
                self._showFavoritesAction.setText("Favorites Only")
 
+               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._sortByNameAction.setCheckable(True)
+               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._sortByValueAction.setCheckable(True)
+               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._sortByUnitAction.setCheckable(True)
+
+               self._sortByNameAction.setChecked(True)
+
                self._logAction = QtGui.QAction(None)
                self._logAction.setText("Log")
                self._logAction.setShortcut(QtGui.QKeySequence("CTRL+l"))
@@ -138,22 +160,28 @@ class Gonvert(object):
                        self._mainWindow.select_category(self._recent[-1][0])
 
        def request_category(self):
-               if self._mainWindow is not None:
-                       self._mainWindow.hide()
 
                if self._condensedAction.isChecked():
+                       if self._catWindow is not None:
+                               self._catWindow.hide()
+
                        if self._quickWindow is None:
                                self._quickWindow = QuickConvert(None, self)
                                self._quickWindow.window.destroyed.connect(self._on_quick_close)
                        else:
                                self._quickWindow.show()
+
                        self._mainWindow = self._quickWindow
                else:
+                       if self._quickWindow is not None:
+                               self._quickWindow.hide()
+
                        if self._catWindow is None:
                                self._catWindow = CategoryWindow(None, self)
                                self._catWindow.window.destroyed.connect(self._on_cat_close)
                        else:
                                self._catWindow.window.show()
+
                        self._mainWindow = self._catWindow
 
                return self._mainWindow
@@ -161,14 +189,12 @@ class Gonvert(object):
        def search_units(self):
                jumpWindow = QuickJump(None, self)
                jumpWindow.window.destroyed.connect(self._on_jump_close)
-               self._fake_close_windows()
                self._jumpWindow = jumpWindow
                return self._jumpWindow
 
        def show_recent(self):
                recentWindow = Recent(None, self)
                recentWindow.window.destroyed.connect(self._on_recent_close)
-               self._fake_close_windows()
                self._recentWindow = recentWindow
                return self._recentWindow
 
@@ -219,6 +245,25 @@ class Gonvert(object):
 
                self._fullscreenAction.setChecked(settings.get("isFullScreen", False))
 
+               sortBy = settings.get("sortBy", "name")
+               if sortBy not in ["name", "value", "unit"]:
+                       _moduleLogger.info("Setting sortBy is not a valid value: %s" % sortBy)
+                       sortBy = "name"
+               if sortBy == "name":
+                       self._sortByNameAction.setChecked(True)
+                       self._sortByValueAction.setChecked(False)
+                       self._sortByUnitAction.setChecked(False)
+               elif sortBy == "value":
+                       self._sortByNameAction.setChecked(False)
+                       self._sortByValueAction.setChecked(True)
+                       self._sortByUnitAction.setChecked(False)
+               elif sortBy == "unit":
+                       self._sortByNameAction.setChecked(False)
+                       self._sortByValueAction.setChecked(False)
+                       self._sortByUnitAction.setChecked(True)
+               else:
+                       raise RuntimeError("How did this sortBy come about? %s" % sortBy)
+
                recent = settings.get("recent", self._recent)
                for category, unit in recent:
                        self.add_recent(category, unit)
@@ -234,6 +279,14 @@ class Gonvert(object):
                self._condensedAction.setChecked(settings.get("useQuick", self._condensedAction.isChecked()))
 
        def save_settings(self):
+               if self._sortByNameAction.isChecked():
+                       sortBy = "name"
+               elif self._sortByValueAction.isChecked():
+                       sortBy = "value"
+               elif self._sortByUnitAction.isChecked():
+                       sortBy = "unit"
+               else:
+                       raise RuntimeError("Unknown sorting value")
                settings = {
                        "isFullScreen": self._fullscreenAction.isChecked(),
                        "recent": self._recent,
@@ -244,6 +297,7 @@ class Gonvert(object):
                        ),
                        "showFavorites": self._showFavoritesAction.isChecked(),
                        "useQuick": self._condensedAction.isChecked(),
+                       "sortBy": sortBy,
                }
                with open(constants._user_settings_, "w") as settingsFile:
                        simplejson.dump(settings, settingsFile)
@@ -269,6 +323,18 @@ class Gonvert(object):
                return self._condensedAction
 
        @property
+       def sortByNameAction(self):
+               return self._sortByNameAction
+
+       @property
+       def sortByValueAction(self):
+               return self._sortByValueAction
+
+       @property
+       def sortByUnitAction(self):
+               return self._sortByUnitAction
+
+       @property
        def logAction(self):
                return self._logAction
 
@@ -290,35 +356,21 @@ class Gonvert(object):
                if self._recentWindow is not None:
                        yield self._recentWindow
 
-       def _fake_close_windows(self):
-               if self._catWindow is not None:
-                       self._catWindow.hide()
-               if self._quickWindow is not None:
-                       self._quickWindow.hide()
-               if self._jumpWindow is not None:
-                       self._jumpWindow.disconnect(self._on_jump_close)
-                       self._jumpWindow.close()
-                       self._jumpWindow = None
-               if self._recentWindow is not None:
-                       self._recentWindow.disconnect(self._on_recent_close)
-                       self._recentWindow.close()
-                       self._recentWindow = None
-
        def _close_windows(self):
                if self._catWindow is not None:
-                       self._catWindow.disconnect(self._on_cat_close)
+                       self._catWindow.window.destroyed.disconnect(self._on_cat_close)
                        self._catWindow.close()
                        self._catWindow = None
                if self._quickWindow is not None:
-                       self._quickWindow.disconnect(self._on_quick_close)
+                       self._quickWindow.window.destroyed.disconnect(self._on_quick_close)
                        self._quickWindow.close()
                        self._quickWindow = None
                if self._jumpWindow is not None:
-                       self._jumpWindow.disconnect(self._on_jump_close)
+                       self._jumpWindow.window.destroyed.disconnect(self._on_jump_close)
                        self._jumpWindow.close()
                        self._jumpWindow = None
                if self._recentWindow is not None:
-                       self._recentWindow.disconnect(self._on_recent_close)
+                       self._recentWindow.window.destroyed.disconnect(self._on_recent_close)
                        self._recentWindow.close()
                        self._recentWindow = None
 
@@ -570,11 +622,13 @@ class QuickConvert(object):
                self._favoritesWindow = None
 
                self._inputUnitValue = QtGui.QLineEdit()
-               self._inputUnitValue.setInputMethodHints(QtCore.Qt.ImhPreferNumbers)
+               maeqt.mark_numbers_preferred(self._inputUnitValue)
                self._inputUnitValue.textEdited.connect(self._on_value_edited)
                self._inputUnitSymbol = QtGui.QLabel()
 
-               self._outputUnitValue = QtGui.QLabel()
+               self._outputUnitValue = QtGui.QLineEdit()
+               maeqt.mark_numbers_preferred(self._outputUnitValue)
+               self._outputUnitValue.textEdited.connect(self._on_output_value_edited)
                self._outputUnitSymbol = QtGui.QLabel()
 
                self._conversionLayout = QtGui.QHBoxLayout()
@@ -712,6 +766,39 @@ class QuickConvert(object):
                        self._window.showNormal()
 
        def select_category(self, categoryName):
+               self._select_category(categoryName)
+
+               i = unit_data.UNIT_CATEGORIES.index(categoryName)
+               rootIndex = self._categoryView.rootIndex()
+               currentIndex = self._categoryView.model().index(i, 0, rootIndex)
+               self._categoryView.scrollTo(currentIndex)
+               self._categoryView.setItemSelected(self._categoryView.topLevelItem(i), True)
+
+               return self
+
+       def select_unit(self, name):
+               self.select_input(name)
+               return self
+
+       def select_input(self, name):
+               self._select_input(name)
+
+               i = self._unitNames.index(name)
+               rootIndex = self._inputView.rootIndex()
+               currentIndex = self._inputView.model().index(i, 0, rootIndex)
+               self._inputView.scrollTo(currentIndex)
+               self._inputView.setItemSelected(self._inputView.topLevelItem(i), True)
+
+       def select_output(self, name):
+               self._select_output(name)
+
+               i = self._unitNames.index(name)
+               rootIndex = self._outputView.rootIndex()
+               currentIndex = self._outputView.model().index(i, 0, rootIndex)
+               self._outputView.scrollTo(currentIndex)
+               self._outputView.setItemSelected(self._outputView.topLevelItem(i), True)
+
+       def _select_category(self, categoryName):
                self._inputUnitName = ""
                self._outputUnitName = ""
                self._inputUnitValue.setText("")
@@ -728,8 +815,7 @@ class QuickConvert(object):
                self._unitNames.sort()
                for key in self._unitNames:
                        conversion, unit, description = unitData[key]
-                       if not unit:
-                               unit = key
+                       unit = key
 
                        twi = QtGui.QTreeWidgetItem(self._inputView)
                        twi.setText(0, unit)
@@ -739,11 +825,6 @@ class QuickConvert(object):
                        twi.setText(0, unit)
                        twi.setText(1, key)
 
-               i = unit_data.UNIT_CATEGORIES.index(categoryName)
-               rootIndex = self._categoryView.rootIndex()
-               currentIndex = self._categoryView.model().index(i, 0, rootIndex)
-               self._categoryView.scrollTo(currentIndex)
-
                defaultInputUnitName = self._app.get_recent_unit(categoryName)
                if defaultInputUnitName:
                        self.select_input(defaultInputUnitName)
@@ -751,12 +832,7 @@ class QuickConvert(object):
                        assert defaultOutputUnitName
                        self.select_output(defaultOutputUnitName)
 
-               return self
-
-       def select_unit(self, name):
-               self.select_input(name)
-
-       def select_input(self, name):
+       def _select_input(self, name):
                self._app.add_recent(self._categoryName, name)
                self._inputUnitName = name
 
@@ -765,15 +841,10 @@ class QuickConvert(object):
 
                self._inputUnitSymbol.setText(unit if unit else name)
 
-               i = self._unitNames.index(name)
-               rootIndex = self._inputView.rootIndex()
-               currentIndex = self._inputView.model().index(i, 0, rootIndex)
-               self._inputView.scrollTo(currentIndex)
-
                if "" not in [self._categoryName, self._inputUnitName, self._outputUnitName]:
-                       self._update_conversion()
+                       self._update_output()
 
-       def select_output(self, name):
+       def _select_output(self, name):
                # Add the output to recent but don't make things weird by making it the most recent
                self._app.add_recent(self._categoryName, name)
                self._app.add_recent(self._categoryName, self._inputUnitName)
@@ -784,13 +855,8 @@ class QuickConvert(object):
 
                self._outputUnitSymbol.setText(unit if unit else name)
 
-               i = self._unitNames.index(name)
-               rootIndex = self._outputView.rootIndex()
-               currentIndex = self._outputView.model().index(i, 0, rootIndex)
-               self._outputView.scrollTo(currentIndex)
-
                if "" not in [self._categoryName, self._inputUnitName, self._outputUnitName]:
-                       self._update_conversion()
+                       self._update_output()
 
        def _sanitize_value(self, userEntry):
                if self._categoryName == "Computer Numbers":
@@ -805,7 +871,7 @@ class QuickConvert(object):
                                value = float(userEntry)
                return value
 
-       def _update_conversion(self):
+       def _update_output(self):
                assert self._categoryName
                assert self._inputUnitName
                assert self._outputUnitName
@@ -824,6 +890,25 @@ class QuickConvert(object):
                newValue = func.from_base(base, arg)
                self._outputUnitValue.setText(str(newValue))
 
+       def _update_input(self):
+               assert self._categoryName
+               assert self._inputUnitName
+               assert self._outputUnitName
+
+               userOutput = str(self._outputUnitValue.text())
+               value = self._sanitize_value(userOutput)
+
+               unitData = unit_data.UNIT_DESCRIPTIONS[self._categoryName]
+               inputConversion, _, _ = unitData[self._inputUnitName]
+               outputConversion, _, _ = unitData[self._outputUnitName]
+
+               func, arg = outputConversion
+               base = func.to_base(value, arg)
+
+               func, arg = inputConversion
+               newValue = func.from_base(base, arg)
+               self._inputUnitValue.setText(str(newValue))
+
        def _update_favorites(self):
                if self._app.showFavoritesAction.isChecked():
                        assert self._categoryView.topLevelItemCount() == len(unit_data.UNIT_CATEGORIES)
@@ -903,7 +988,11 @@ class QuickConvert(object):
 
        @misc_utils.log_exception(_moduleLogger)
        def _on_value_edited(self, *args):
-               self._update_conversion()
+               self._update_output()
+
+       @misc_utils.log_exception(_moduleLogger)
+       def _on_output_value_edited(self, *args):
+               self._update_input()
 
        @misc_utils.log_exception(_moduleLogger)
        def _on_category_selection_changed(self, selected, deselected):
@@ -912,7 +1001,7 @@ class QuickConvert(object):
                        for item in self._categoryView.selectedItems()
                ]
                assert len(selectedNames) == 1
-               self.select_category(selectedNames[0])
+               self._select_category(selectedNames[0])
 
        @misc_utils.log_exception(_moduleLogger)
        def _on_input_selection_changed(self, selected, deselected):
@@ -923,7 +1012,7 @@ class QuickConvert(object):
                if selectedNames:
                        assert len(selectedNames) == 1
                        name = selectedNames[0]
-                       self.select_input(name)
+                       self._select_input(name)
                else:
                        pass
 
@@ -936,7 +1025,7 @@ class QuickConvert(object):
                if selectedNames:
                        assert len(selectedNames) == 1
                        name = selectedNames[0]
-                       self.select_output(name)
+                       self._select_output(name)
                else:
                        pass
 
@@ -951,19 +1040,19 @@ class FavoritesWindow(object):
                self._categories = QtGui.QTreeWidget()
                self._categories.setHeaderLabels(["Categories"])
                self._categories.setHeaderHidden(True)
+               self._categories.setSelectionMode(QtGui.QAbstractItemView.NoSelection)
                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)
+                       if catName in self._hidden:
+                               twi.setCheckState(0, QtCore.Qt.Unchecked)
+                       else:
+                               twi.setCheckState(0, QtCore.Qt.Checked)
+               self._categories.itemChanged.connect(self._on_item_changed)
 
                self._allButton = QtGui.QPushButton("All")
                self._allButton.clicked.connect(self._on_select_all)
@@ -1036,29 +1125,36 @@ class FavoritesWindow(object):
        @misc_utils.log_exception(_moduleLogger)
        def _on_select_all(self, checked = False):
                for child in self._childWidgets:
-                       self._categories.setItemSelected(child, True)
+                       child.setCheckState(0, QtCore.Qt.Checked)
 
        @misc_utils.log_exception(_moduleLogger)
        def _on_invert_selection(self, checked = False):
                for child in self._childWidgets:
-                       isSelected = self._categories.isItemSelected(child)
-                       self._categories.setItemSelected(child, not isSelected)
+                       state = child.checkState(0)
+                       if state == QtCore.Qt.Unchecked:
+                               newState = QtCore.Qt.Checked
+                       elif state == QtCore.Qt.Checked:
+                               newState = QtCore.Qt.Unchecked
+                       else:
+                               raise RuntimeError("Bad check state %r" % state)
+                       child.setCheckState(0, newState)
 
        @misc_utils.log_exception(_moduleLogger)
        def _on_select_none(self, checked = False):
                for child in self._childWidgets:
-                       self._categories.setItemSelected(child, False)
+                       child.setCheckState(0, QtCore.Qt.Unchecked)
 
        @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_item_changed(self, item, column):
+               state = item.checkState(column)
+               if state == QtCore.Qt.Unchecked:
+                       name = str(item.text(column))
+                       self._hidden.add(name)
+               elif state == QtCore.Qt.Checked:
+                       name = str(item.text(column))
+                       self._hidden.remove(name)
+               else:
+                       raise RuntimeError("Bad check state %r" % state)
 
        @misc_utils.log_exception(_moduleLogger)
        def _on_close_window(self, checked = True):
@@ -1156,9 +1252,9 @@ class CategoryWindow(object):
                        yield self._favoritesWindow
 
        def show(self):
+               self._window.show()
                for child in self.walk_children():
                        child.show()
-               self._window.show()
 
        def hide(self):
                for child in self.walk_children():
@@ -1172,16 +1268,13 @@ class CategoryWindow(object):
                self._window.close()
 
        def select_category(self, categoryName):
-               for child in self.walk_children():
-                       child.window.destroyed.disconnect(self._on_child_close)
-                       child.close()
-               self._unitWindow = UnitWindow(self._window, categoryName, self._app)
-               self._unitWindow.window.destroyed.connect(self._on_child_close)
+               self._select_category(categoryName)
 
                i = unit_data.UNIT_CATEGORIES.index(categoryName)
                rootIndex = self._categories.rootIndex()
                currentIndex = self._categories.model().index(i, 0, rootIndex)
                self._categories.scrollTo(currentIndex)
+               self._categories.setItemSelected(self._categories.topLevelItem(i), True)
                return self._unitWindow
 
        def set_fullscreen(self, isFullscreen):
@@ -1192,6 +1285,13 @@ class CategoryWindow(object):
                for child in self.walk_children():
                        child.set_fullscreen(isFullscreen)
 
+       def _select_category(self, categoryName):
+               for child in self.walk_children():
+                       child.window.destroyed.disconnect(self._on_child_close)
+                       child.close()
+               self._unitWindow = UnitWindow(self._window, categoryName, self._app)
+               self._unitWindow.window.destroyed.connect(self._on_child_close)
+
        def _update_favorites(self):
                if self._app.showFavoritesAction.isChecked():
                        assert self._categories.topLevelItemCount() == len(unit_data.UNIT_CATEGORIES)
@@ -1255,6 +1355,11 @@ class UnitData(object):
        VALUE_COLUMN_1 = 2
        UNIT_COLUMN = 3
 
+       __slots__ = [
+               "_name", "_unit", "_description", "_conversion",
+               "_value", "_integerDisplay", "_fractionalDisplay",
+       ]
+
        def __init__(self, name, unit, description, conversion):
                self._name = name
                self._unit = unit
@@ -1297,6 +1402,10 @@ class UnitModel(QtCore.QAbstractItemModel):
                super(UnitModel, self).__init__(parent)
                self._categoryName = categoryName
                self._unitData = unit_data.UNIT_DESCRIPTIONS[self._categoryName]
+               if self._categoryName == "Computer Numbers":
+                       self._sanitize_value = self._sanitize_alpha_value
+               else:
+                       self._sanitize_value = self._sanitize_numeric_value
 
                self._children = []
                for key in unit_data.get_units(self._categoryName):
@@ -1313,19 +1422,20 @@ class UnitModel(QtCore.QAbstractItemModel):
 
        @misc_utils.log_exception(_moduleLogger)
        def data(self, index, role):
-               if not index.isValid():
-                       return None
+               #if not index.isValid():
+               #       return None
+
+               if role == QtCore.Qt.DisplayRole:
+                       item = index.internalPointer()
+                       if isinstance(item, UnitData):
+                               return item.data(index.column())
+                       elif item is UnitData.HEADERS:
+                               return item[index.column()]
                elif role == QtCore.Qt.TextAlignmentRole:
                        return UnitData.ALIGNMENT[index.column()]
-               elif role != QtCore.Qt.DisplayRole:
+               else:
                        return None
 
-               item = index.internalPointer()
-               if isinstance(item, UnitData):
-                       return item.data(index.column())
-               elif item is UnitData.HEADERS:
-                       return item[index.column()]
-
        @misc_utils.log_exception(_moduleLogger)
        def sort(self, column, order = QtCore.Qt.AscendingOrder):
                self._sortSettings = column, order
@@ -1356,11 +1466,10 @@ class UnitModel(QtCore.QAbstractItemModel):
 
        @misc_utils.log_exception(_moduleLogger)
        def index(self, row, column, parent):
-               if not self.hasIndex(row, column, parent):
-                       return QtCore.QModelIndex()
-
-               if parent.isValid():
-                       return QtCore.QModelIndex()
+               #if not self.hasIndex(row, column, parent):
+               #       return QtCore.QModelIndex()
+               #elif parent.isValid():
+               #       return QtCore.QModelIndex()
 
                parentItem = UnitData.HEADERS
                childItem = self._children[row]
@@ -1410,8 +1519,6 @@ class UnitModel(QtCore.QAbstractItemModel):
                func, arg = self._children[fromIndex].conversion
                base = func.to_base(value, arg)
                for i, child in enumerate(self._children):
-                       if i == fromIndex:
-                               continue
                        func, arg = child.conversion
                        newValue = func.from_base(base, arg)
                        child.update_value(newValue)
@@ -1422,8 +1529,10 @@ class UnitModel(QtCore.QAbstractItemModel):
                ):
                        # Sort takes care of marking everything as changed
                        self.sort(*self._sortSettings)
+                       return True
                else:
                        self._values_changed()
+                       return False
 
        def __len__(self):
                return len(self._children)
@@ -1438,17 +1547,18 @@ class UnitModel(QtCore.QAbstractItemModel):
                bottomRight = self.createIndex(len(self._children)-1, len(UnitData.HEADERS)-1, self._children[-1])
                self.dataChanged.emit(topLeft, bottomRight)
 
-       def _sanitize_value(self, userEntry):
-               if self._categoryName == "Computer Numbers":
-                       if userEntry == '':
-                               value = '0'
-                       else:
-                               value = userEntry
+       def _sanitize_alpha_value(self, userEntry):
+               if userEntry:
+                       value = userEntry
                else:
-                       if userEntry == '':
-                               value = 0.0
-                       else:
-                               value = float(userEntry)
+                       value = '0'
+               return value
+
+       def _sanitize_numeric_value(self, userEntry):
+               if userEntry:
+                       value = float(userEntry)
+               else:
+                       value = 0.0
                return value
 
 
@@ -1465,6 +1575,10 @@ class UnitWindow(object):
                self._selectedUnitValue.textEdited.connect(self._on_value_edited)
                maeqt.mark_numbers_preferred(self._selectedUnitValue)
                self._selectedUnitSymbol = QtGui.QLabel()
+               self._updateDelayTimer = QtCore.QTimer()
+               self._updateDelayTimer.setInterval(100)
+               self._updateDelayTimer.setSingleShot(True)
+               self._updateDelayTimer.timeout.connect(self._on_value_edited_delayed)
 
                self._selectedUnitLayout = QtGui.QHBoxLayout()
                self._selectedUnitLayout.addWidget(self._selectedUnitName)
@@ -1474,17 +1588,15 @@ class UnitWindow(object):
                self._unitsModel = UnitModel(self._categoryName)
                self._unitsView = QtGui.QTreeView()
                self._unitsView.setModel(self._unitsModel)
-               self._unitsView.clicked.connect(self._on_unit_clicked)
                self._unitsView.setUniformRowHeights(True)
                self._unitsView.setSortingEnabled(True)
-               self._unitsView.setTextElideMode(QtCore.Qt.ElideNone)
                self._unitsView.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
                self._unitsView.setSelectionBehavior(QtGui.QAbstractItemView.SelectRows)
                self._unitsView.setSelectionMode(QtGui.QAbstractItemView.SingleSelection)
+               self._unitsView.setHeaderHidden(True)
+               self._unitsView.clicked.connect(self._on_unit_clicked)
                if not IS_MAEMO:
                        self._unitsView.setAlternatingRowColors(True)
-               if True:
-                       self._unitsView.setHeaderHidden(True)
 
                viewHeader = self._unitsView.header()
                viewHeader.setSortIndicatorShown(True)
@@ -1497,10 +1609,10 @@ class UnitWindow(object):
                viewHeader.setStretchLastSection(False)
 
                # Trying to make things faster by locking in the initial size of the immutable columns
-               nameSize = min(viewHeader.sectionSize(UnitData.NAME_COLUMN), 125)
+               nameSize = min(viewHeader.sectionSize(UnitData.NAME_COLUMN), 300)
                viewHeader.setResizeMode(UnitData.NAME_COLUMN, QtGui.QHeaderView.Fixed)
                viewHeader.resizeSection(UnitData.NAME_COLUMN, nameSize)
-               unitSize = min(viewHeader.sectionSize(UnitData.UNIT_COLUMN), 125)
+               unitSize = min(viewHeader.sectionSize(UnitData.UNIT_COLUMN), 150)
                viewHeader.setResizeMode(UnitData.UNIT_COLUMN, QtGui.QHeaderView.Fixed)
                viewHeader.resizeSection(UnitData.UNIT_COLUMN, unitSize)
 
@@ -1525,27 +1637,17 @@ class UnitWindow(object):
                else:
                        self._select_unit(0)
 
-               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._sortByNameAction.setCheckable(True)
-               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._sortByValueAction.setCheckable(True)
-               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._sortByUnitAction.setCheckable(True)
-
-               if UnitData.NAME_COLUMN != 0:
+               if self._app.sortByNameAction.isChecked():
+                       sortColumn = UnitData.NAME_COLUMN
+               elif self._app.sortByValueAction.isChecked():
+                       sortColumn = UnitData.VALUE_COLUMN_0
+               elif self._app.sortByUnitAction.isChecked():
+                       sortColumn = UnitData.UNIT_COLUMN
+               else:
+                       raise RuntimeError("No sort column selected")
+               if sortColumn != 0:
                        # By default it sorts by he first column (name)
-                       self._unitsModel.sort(UnitData.NAME_COLUMN)
-               self._sortByNameAction.setChecked(True)
+                       self._unitsModel.sort(sortColumn)
 
                self._chooseFavoritesAction = QtGui.QAction(None)
                self._chooseFavoritesAction.setText("Select Favorites")
@@ -1581,9 +1683,9 @@ class UnitWindow(object):
                        viewMenu.addAction(self._app.showFavoritesAction)
                        viewMenu.addAction(self._app.condensedAction)
                        viewMenu.addSeparator()
-                       viewMenu.addAction(self._sortByNameAction)
-                       viewMenu.addAction(self._sortByValueAction)
-                       viewMenu.addAction(self._sortByUnitAction)
+                       viewMenu.addAction(self._app.sortByNameAction)
+                       viewMenu.addAction(self._app.sortByValueAction)
+                       viewMenu.addAction(self._app.sortByUnitAction)
                        viewMenu.addSeparator()
                        viewMenu.addAction(self._app.jumpAction)
                        viewMenu.addAction(self._app.recentAction)
@@ -1597,18 +1699,18 @@ class UnitWindow(object):
                        viewMenu.addAction(self._app.showFavoritesAction)
                        viewMenu.addAction(self._app.condensedAction)
                        viewMenu.addSeparator()
-                       viewMenu.addAction(self._sortByNameAction)
-                       viewMenu.addAction(self._sortByValueAction)
-                       viewMenu.addAction(self._sortByUnitAction)
+                       viewMenu.addAction(self._app.sortByNameAction)
+                       viewMenu.addAction(self._app.sortByValueAction)
+                       viewMenu.addAction(self._app.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)
-               self._sortByUnitAction.triggered.connect(self._on_sort_by_unit)
+               self._app.sortByNameAction.triggered.connect(self._on_sort_by_name)
+               self._app.sortByValueAction.triggered.connect(self._on_sort_by_value)
+               self._app.sortByUnitAction.triggered.connect(self._on_sort_by_unit)
 
                self._window.addAction(self._app.logAction)
                self._window.addAction(self._nextUnitAction)
@@ -1649,6 +1751,9 @@ class UnitWindow(object):
                index = self._unitsModel.index_unit(unitName)
                self._select_unit(index)
 
+               qindex = self._unitsModel.createIndex(index, 0, self._unitsModel.get_unit(index))
+               self._unitsView.scrollTo(qindex)
+
        def walk_children(self):
                if self._favoritesWindow is not None:
                        yield self._favoritesWindow
@@ -1724,9 +1829,15 @@ class UnitWindow(object):
 
        @misc_utils.log_exception(_moduleLogger)
        def _on_value_edited(self, *args):
-               userInput = self._selectedUnitValue.text()
-               self._unitsModel.update_values(self._selectedIndex, str(userInput))
-               self._update_favorites()
+               if not self._updateDelayTimer.isActive():
+                       self._updateDelayTimer.start()
+
+       @misc_utils.log_exception(_moduleLogger)
+       def _on_value_edited_delayed(self, *args):
+               userInput = str(self._selectedUnitValue.text())
+               orderChanged = self._unitsModel.update_values(self._selectedIndex, userInput)
+               if orderChanged:
+                       self._update_favorites()
 
        def _select_unit(self, index):
                unit = self._unitsModel.get_unit(index)
@@ -1735,15 +1846,16 @@ class UnitWindow(object):
                self._selectedUnitSymbol.setText(unit.unit)
 
                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():
        app = QtGui.QApplication([])
        handle = Gonvert(app)
-       return app.exec_()
+       if constants.PROFILE_STARTUP:
+               return 0
+       else:
+               return app.exec_()
 
 
 if __name__ == "__main__":