Bump to 1.1.3
[gonvert] / src / gonvert_glade.py
index c15ba8d..5dd5580 100755 (executable)
@@ -1,6 +1,8 @@
 #!/usr/bin/env python
 # -*- coding: UTF8 -*-
 
+from __future__ import with_statement
+
 import os
 import math
 import pickle
@@ -14,6 +16,7 @@ import gtk.gdk
 
 import constants
 import hildonize
+import gtk_toolbox
 import unit_data
 
 try:
@@ -25,9 +28,8 @@ else:
        _ = gettext.gettext
 
 
-_moduleLogger = logging.getLogger("gonvert_glade")
-PROFILE_STARTUP = False
-FORCE_HILDON_LIKE = False
+_moduleLogger = logging.getLogger(__name__)
+
 
 if gettext is not None:
        gettext.bindtextdomain('gonvert', '/usr/share/locale')
@@ -69,9 +71,8 @@ class Gonvert(object):
        _glade_files = [
                os.path.join(os.path.dirname(__file__), "gonvert.glade"),
                os.path.join(os.path.dirname(__file__), "../data/gonvert.glade"),
-               os.path.join(os.path.dirname(__file__), "../lib/gonvert.glade"),
+               os.path.join(os.path.dirname(__file__), "../share/gonvert.glade"),
                '/usr/share/gonvert/gonvert.glade',
-               '/usr/lib/gonvert/gonvert.glade',
        ]
 
        UNITS_NAME_IDX = 0
@@ -85,6 +86,7 @@ class Gonvert(object):
                self._unit_sort_direction = False
                self._value_sort_direction = False
                self._units_sort_direction = False
+               self.__isPortrait = False
                self._isFullScreen = False
                self._clipboard = gtk.clipboard_get()
 
@@ -115,7 +117,6 @@ class Gonvert(object):
                change_menu_label(widgets, 'exitMenuItem', _('Exit'))
                change_menu_label(widgets, 'helpMenuItem', _('Help'))
                change_menu_label(widgets, 'aboutMenuItem', _('About'))
-               change_menu_label(widgets, 'findButton', _('Find'))
 
                self._categorySelectionButton = widgets.get_widget("categorySelectionButton")
                self._categoryView = widgets.get_widget('categoryView')
@@ -139,10 +140,11 @@ class Gonvert(object):
                self._findEntry = widgets.get_widget('findEntry')
                self._findLabel = widgets.get_widget('findLabel')
                self._findButton = widgets.get_widget('findButton')
+               self._closeSearchButton = widgets.get_widget('closeSearchButton')
 
                self._unitsNameRenderer = gtk.CellRendererText()
                self._unitsNameRenderer.set_property("scale", 0.75)
-               if FORCE_HILDON_LIKE:
+               if constants.FORCE_HILDON_LIKE:
                        self._unitsNameRenderer.set_property("ellipsize", pango.ELLIPSIZE_END)
                        self._unitsNameRenderer.set_property("width-chars", 5)
                self._unitNameColumn = gtk.TreeViewColumn(_('Name'), self._unitsNameRenderer)
@@ -215,7 +217,7 @@ class Gonvert(object):
                        self._categoryModel.append(row)
 
                #--------- connections to GUI ----------------
-               self._mainWindow.connect("delete-event", self._on_user_exit)
+               self._mainWindow.connect("destroy", self._on_user_exit)
                self._mainWindow.connect("key-press-event", self._on_key_press)
                self._mainWindow.connect("window-state-event", self._on_window_state_change)
                self._categorySelectionButton.connect("clicked", self._on_category_selector_clicked)
@@ -223,11 +225,15 @@ class Gonvert(object):
                self._findButton.connect("clicked", self._on_find_activate)
                self._findEntry.connect("activate", self._on_find_activate)
                self._findEntry.connect("changed", self._on_findEntry_changed)
+               self._closeSearchButton.connect("clicked", self._on_toggle_search)
                self._previousUnitValue.connect("changed", self._on_previous_unit_value_changed)
                self._unitValue.connect("changed", self._on_unit_value_changed)
+               self._unitValue.connect("key-press-event", self._on_browse_key_press)
                self._unitsView.connect("cursor-changed", self._on_click_unit)
+               self._unitsView.connect("key-press-event", self._on_browse_key_press)
                if hildonize.GTK_MENU_USED:
                        widgets.get_widget("aboutMenuItem").connect("activate", self._on_about_clicked)
+                       widgets.get_widget("searchMenuItem").connect("activate", self._on_toggle_search)
                        widgets.get_widget("exitMenuItem").connect("activate", self._on_user_exit)
 
                for scrollingWidgetName in (
@@ -235,9 +241,11 @@ class Gonvert(object):
                ):
                        scrollingWidget = widgets.get_widget(scrollingWidgetName)
                        assert scrollingWidget is not None, scrollingWidgetName
-                       hildonize.hildonize_scrollwindow_with_viewport(scrollingWidget)
+                       scroller = hildonize.hildonize_scrollwindow(scrollingWidget)
+                       scroller.show_all()
 
-               if hildonize.IS_HILDON_SUPPORTED or FORCE_HILDON_LIKE:
+               # Simplify the UI
+               if hildonize.IS_HILDON_SUPPORTED or constants.FORCE_HILDON_LIKE:
                        self._categoryView.get_parent().hide()
                        self._unitsView.set_headers_visible(False)
                        self._previousUnitName.get_parent().hide()
@@ -245,18 +253,41 @@ class Gonvert(object):
                else:
                        self._categorySelectionButton.hide()
 
-               replacementButtons = []
                menu = hildonize.hildonize_menu(
                        self._mainWindow,
                        widgets.get_widget("mainMenuBar"),
-                       replacementButtons
                )
+               if not hildonize.GTK_MENU_USED:
+                       button = gtk.Button("Search")
+                       button.connect("clicked", self._on_toggle_search)
+                       menu.append(button)
+
+                       button = hildonize.hildon.GtkRadioButton(gtk.HILDON_SIZE_AUTO, None)
+                       button.set_label("Name")
+                       menu.add_filter(button)
+                       button.connect("clicked", self._on_click_menu_filter, self._unitNameColumn)
+                       button.set_mode(False)
+                       filterGroup = button
+
+                       button = hildonize.hildon.GtkRadioButton(gtk.HILDON_SIZE_AUTO, filterGroup)
+                       button.set_label("Value")
+                       menu.add_filter(button)
+                       button.connect("clicked", self._on_click_menu_filter, self._unitIntegerColumn)
+                       button.set_mode(False)
+
+                       button = hildonize.hildon.GtkRadioButton(gtk.HILDON_SIZE_AUTO, filterGroup)
+                       button.set_label("Unit")
+                       menu.add_filter(button)
+                       button.connect("clicked", self._on_click_menu_filter, self._unitSymbolColumn)
+                       button.set_mode(False)
+
+                       menu.show_all()
 
                if not hildonize.IS_HILDON_SUPPORTED:
                        _moduleLogger.info("No hildonization support")
 
-               hildonize.set_application_title(
-                       self._mainWindow, "%s - Unit Conversion Utility" % constants.__pretty_app_name__
+               hildonize.set_application_name(
+                       "%s - Unit Conversion Utility" % constants.__pretty_app_name__
                )
                iconPath = pixmapspath + '/gonvert.png'
                if os.path.exists(iconPath):
@@ -278,6 +309,24 @@ class Gonvert(object):
                                pass
                        else:
                                self._mainWindow.resize(a, b)
+                       try:
+                               isFullscreen = saved_window["isFullscreen"]
+                       except KeyError:
+                               pass
+                       else:
+                               if isFullscreen:
+                                       self._mainWindow.fullscreen()
+                       try:
+                               isPortrait = saved_window["isPortrait"]
+                       except KeyError:
+                               pass
+                       else:
+                               if isPortrait ^ self.__isPortrait:
+                                       if isPortrait:
+                                               orientation = gtk.ORIENTATION_VERTICAL
+                                       else:
+                                               orientation = gtk.ORIENTATION_HORIZONTAL
+                                       self.set_orientation(orientation)
 
                #Restore selections from previously saved settings if it exists and is valid.
                categoryIndex = 0
@@ -329,7 +378,9 @@ class Gonvert(object):
 
                #Get last size of app and save it
                window_settings = {
-                       'size': self._mainWindow.get_size()
+                       'size': self._mainWindow.get_size(),
+                       "isFullscreen": self._isFullScreen,
+                       "isPortrait": self.__isPortrait,
                }
                windowDatPath = "/".join((constants._data_path_, "window.dat"))
                pickle.dump(window_settings, open(windowDatPath, 'w'))
@@ -472,7 +523,7 @@ class Gonvert(object):
                        nameLength = max(nameLength, len(key))
                self._sortedUnitModel.sort_column_changed()
 
-               if FORCE_HILDON_LIKE:
+               if constants.FORCE_HILDON_LIKE:
                        maxCatCharWidth = int(nameLength * 0.75)
                        maxCharWidth = int(len("nibble | hexit | quadbit") * 0.75)
                        charWidth = min(maxCatCharWidth, maxCharWidth)
@@ -538,233 +589,268 @@ class Gonvert(object):
                                value = float(userEntry)
                return value
 
+       def _select_sort_column(self, col):
+               #Determine which column requires sorting
+               columns = self._get_column_sort_stuff()
+               for columnIndex, (maybeCol, directionName, col_cmp) in enumerate(columns):
+                       if col is maybeCol:
+                               direction = getattr(self, directionName)
+                               gtkDirection = gtk.SORT_ASCENDING if direction else gtk.SORT_DESCENDING
+
+                               # cause a sort
+                               self._sortedUnitModel.set_sort_column_id(columnIndex, gtkDirection)
+
+                               # set the visual for sorting
+                               col.set_sort_indicator(True)
+                               col.set_sort_order(not direction)
+
+                               setattr(self, directionName, not direction)
+                               break
+                       else:
+                               maybeCol.set_sort_indicator(False)
+               else:
+                       assert False, "Unknown column: %s" % (col.get_title(), )
+
+       def set_orientation(self, orientation):
+               if orientation == gtk.ORIENTATION_VERTICAL:
+                       hildonize.window_to_portrait(self._mainWindow)
+                       self.__isPortrait = True
+               elif orientation == gtk.ORIENTATION_HORIZONTAL:
+                       hildonize.window_to_landscape(self._mainWindow)
+                       self.__isPortrait = False
+               else:
+                       raise NotImplementedError(orientation)
+
+       def get_orientation(self):
+               return gtk.ORIENTATION_VERTICAL if self.__isPortrait else gtk.ORIENTATION_HORIZONTAL
+
+       def _toggle_rotate(self):
+               if self.__isPortrait:
+                       self.set_orientation(gtk.ORIENTATION_HORIZONTAL)
+               else:
+                       self.set_orientation(gtk.ORIENTATION_VERTICAL)
+
+       @gtk_toolbox.log_exception(_moduleLogger)
        def _on_key_press(self, widget, event, *args):
                """
                @note Hildon specific
                """
                RETURN_TYPES = (gtk.keysyms.Return, gtk.keysyms.ISO_Enter, gtk.keysyms.KP_Enter)
-               try:
-                       if (
-                               event.keyval == gtk.keysyms.F6 or
-                               event.keyval in RETURN_TYPES and event.get_state() & gtk.gdk.CONTROL_MASK
-                       ):
-                               if self._isFullScreen:
-                                       self._mainWindow.unfullscreen()
-                               else:
-                                       self._mainWindow.fullscreen()
-                       elif event.keyval == gtk.keysyms.f and event.get_state() & gtk.gdk.CONTROL_MASK:
+               if (
+                       event.keyval == gtk.keysyms.F6 or
+                       event.keyval in RETURN_TYPES and event.get_state() & gtk.gdk.CONTROL_MASK
+               ):
+                       if self._isFullScreen:
+                               self._mainWindow.unfullscreen()
+                       else:
+                               self._mainWindow.fullscreen()
+               elif event.keyval == gtk.keysyms.f and event.get_state() & gtk.gdk.CONTROL_MASK:
+                       if not hildonize.GTK_MENU_USED:
                                self._toggle_find()
-                       elif event.keyval == gtk.keysyms.p and event.get_state() & gtk.gdk.CONTROL_MASK:
-                               self._find_previous()
-                       elif event.keyval == gtk.keysyms.n and event.get_state() & gtk.gdk.CONTROL_MASK:
-                               self._find_next()
-                       elif event.keyval == ord("l") and event.get_state() & gtk.gdk.CONTROL_MASK:
-                               with open(constants._user_logpath_, "r") as f:
-                                       logLines = f.xreadlines()
-                                       log = "".join(logLines)
-                                       self._clipboard.set_text(str(log))
-               except Exception, e:
-                       _moduleLogger.exception("_on_key_press")
-
+               elif event.keyval == gtk.keysyms.p and event.get_state() & gtk.gdk.CONTROL_MASK:
+                       self._find_previous()
+               elif event.keyval == gtk.keysyms.n and event.get_state() & gtk.gdk.CONTROL_MASK:
+                       self._find_next()
+               elif event.keyval == gtk.keysyms.o and event.get_state() & gtk.gdk.CONTROL_MASK:
+                       self._toggle_rotate()
+               elif (
+                       event.keyval in (gtk.keysyms.w, gtk.keysyms.q) and
+                       event.get_state() & gtk.gdk.CONTROL_MASK
+               ):
+                       self._mainWindow.destroy()
+               elif event.keyval == gtk.keysyms.l and event.get_state() & gtk.gdk.CONTROL_MASK:
+                       with open(constants._user_logpath_, "r") as f:
+                               logLines = f.xreadlines()
+                               log = "".join(logLines)
+                               self._clipboard.set_text(str(log))
+
+       @gtk_toolbox.log_exception(_moduleLogger)
+       def _on_toggle_search(self, *args):
+               self._toggle_find()
+
+       @gtk_toolbox.log_exception(_moduleLogger)
+       def _on_browse_key_press(self, widget, event, *args):
+               if event.keyval == gtk.keysyms.uparrow or event.keyval == gtk.keysyms.Up:
+                       index, column = self._unitsView.get_cursor()
+                       newIndex = max(index[0]-1, 0)
+                       path = (newIndex, )
+                       self._unitsView.set_cursor(path, column, True)
+                       self._unitsView.scroll_to_cell(path, column, False, 0, 0)
+                       return True # override default behavior
+               elif event.keyval == gtk.keysyms.downarrow or event.keyval == gtk.keysyms.Down:
+                       index, column = self._unitsView.get_cursor()
+                       newIndex = min(index[0]+1, len(self._unitModel)-1)
+                       path = (newIndex, )
+                       self._unitsView.set_cursor(path, column, True)
+                       self._unitsView.scroll_to_cell(path, column, False, 0, 0)
+                       return True # override default behavior
+
+       @gtk_toolbox.log_exception(_moduleLogger)
        def _on_window_state_change(self, widget, event, *args):
                """
                @note Hildon specific
                """
-               try:
-                       if event.new_window_state & gtk.gdk.WINDOW_STATE_FULLSCREEN:
-                               self._isFullScreen = True
-                       else:
-                               self._isFullScreen = False
-               except Exception, e:
-                       _moduleLogger.exception("_on_window_state_change")
+               if event.new_window_state & gtk.gdk.WINDOW_STATE_FULLSCREEN:
+                       self._isFullScreen = True
+               else:
+                       self._isFullScreen = False
 
+       @gtk_toolbox.log_exception(_moduleLogger)
        def _on_findEntry_changed(self, *args):
                """
                Clear out find results since the user wants to look for something new
                """
-               try:
-                       self._clear_find()
-               except Exception:
-                       _moduleLogger.exception("_on_findEntry_changed")
+               self._clear_find()
 
+       @gtk_toolbox.log_exception(_moduleLogger)
        def _on_find_activate(self, *args):
-               try:
-                       self._find_next()
-                       self._findButton.grab_focus()
-               except Exception:
-                       _moduleLogger.exception("_on_find_activate")
+               self._find_next()
+               self._findButton.grab_focus()
+
+       @gtk_toolbox.log_exception(_moduleLogger)
+       def _on_click_menu_filter(self, button, col):
+               self._select_sort_column(col)
 
+       @gtk_toolbox.log_exception(_moduleLogger)
        def _on_click_unit_column(self, col):
                """
                Sort the contents of the col when the user clicks on the title.
                """
-               try:
-                       #Determine which column requires sorting
-                       columns = self._get_column_sort_stuff()
-                       for columnIndex, (maybeCol, directionName, col_cmp) in enumerate(columns):
-                               if col is maybeCol:
-                                       direction = getattr(self, directionName)
-                                       gtkDirection = gtk.SORT_ASCENDING if direction else gtk.SORT_DESCENDING
-
-                                       # cause a sort
-                                       self._sortedUnitModel.set_sort_column_id(columnIndex, gtkDirection)
-
-                                       # set the visual for sorting
-                                       col.set_sort_indicator(True)
-                                       col.set_sort_order(not direction)
-
-                                       setattr(self, directionName, not direction)
-                                       break
-                               else:
-                                       maybeCol.set_sort_indicator(False)
-                       else:
-                               assert False, "Unknown column: %s" % (col.get_title(), )
-               except Exception:
-                       _moduleLogger.exception("_on_click_unit_column")
+               self._select_sort_column(col)
 
+       @gtk_toolbox.log_exception(_moduleLogger)
        def _on_category_selector_clicked(self, *args):
-               try:
-                       currenntIndex = unit_data.UNIT_CATEGORIES.index(self._selectedCategoryName)
-                       newIndex = hildonize.touch_selector(
-                               self._mainWindow,
-                               "Categories",
-                               unit_data.UNIT_CATEGORIES,
-                               currenntIndex,
-                       )
+               currenntIndex = unit_data.UNIT_CATEGORIES.index(self._selectedCategoryName)
+               newIndex = hildonize.touch_selector(
+                       self._mainWindow,
+                       "Categories",
+                       unit_data.UNIT_CATEGORIES,
+                       currenntIndex,
+               )
 
-                       selectedCategoryName = unit_data.UNIT_CATEGORIES[newIndex]
-                       self._categorySelectionButton.set_label(selectedCategoryName)
-                       self._categoryView.set_cursor(newIndex, self._categoryColumn, False)
-                       self._categoryView.grab_focus()
-               except Exception:
-                       _moduleLogger.exception("_on_category_selector_clicked")
+               selectedCategoryName = unit_data.UNIT_CATEGORIES[newIndex]
+               self._categorySelectionButton.get_child().set_markup("<big>%s</big>" % selectedCategoryName)
+               self._switch_category(selectedCategoryName)
 
+       @gtk_toolbox.log_exception(_moduleLogger)
        def _on_click_category(self, *args):
-               try:
-                       selected, iter = self._categoryView.get_selection().get_selected()
-                       if iter is None:
-                               # User is typing in an invalid string, not selecting any category
-                               return
-                       selectedCategory = self._categoryModel.get_value(iter, 0)
-                       self._switch_category(selectedCategory)
-               except Exception:
-                       _moduleLogger.exception("_on_click_category")
+               selected, iter = self._categoryView.get_selection().get_selected()
+               if iter is None:
+                       # User is typing in an invalid string, not selecting any category
+                       return
+               selectedCategory = self._categoryModel.get_value(iter, 0)
+               self._switch_category(selectedCategory)
 
+       @gtk_toolbox.log_exception(_moduleLogger)
        def _on_click_unit(self, *args):
-               try:
-                       selected, iter = self._unitsView.get_selection().get_selected()
-                       selected_unit = selected.get_value(iter, self.UNITS_NAME_IDX)
-                       unit_spec = self._unitDataInCategory[selected_unit]
+               selected, iter = self._unitsView.get_selection().get_selected()
+               selected_unit = selected.get_value(iter, self.UNITS_NAME_IDX)
+               unit_spec = self._unitDataInCategory[selected_unit]
 
-                       showSymbol = False
+               showSymbol = False
 
-                       if self._unitName.get_text() != selected_unit:
-                               self._previousUnitName.set_text(self._unitName.get_text())
-                               self._previousUnitValue.set_text(self._unitValue.get_text())
-                               self._previousUnitSymbol.set_text(self._unitSymbol.get_text())
-                               if self._unitSymbol.get_text():
-                                       showSymbol = True
-
-                       self._unitName.set_text(selected_unit)
-                       self._unitValue.set_text(selected.get_value(iter, self.UNITS_VALUE_IDX))
-                       buffer = self._unitDescription.get_buffer()
-                       buffer.set_text(unit_spec[2])
-                       self._unitSymbol.set_text(unit_spec[1]) # put units into label text
-                       if unit_spec[1]:
+               if self._unitName.get_text() != selected_unit:
+                       self._previousUnitName.set_text(self._unitName.get_text())
+                       self._previousUnitValue.set_text(self._unitValue.get_text())
+                       self._previousUnitSymbol.set_text(self._unitSymbol.get_text())
+                       if self._unitSymbol.get_text():
                                showSymbol = True
-                       else:
-                               showSymbol = False
 
-                       if showSymbol:
-                               self._unitSymbol.show()
-                               self._previousUnitSymbol.show()
+               self._unitName.set_text(selected_unit)
+               self._unitValue.set_text(selected.get_value(iter, self.UNITS_VALUE_IDX))
+               buffer = self._unitDescription.get_buffer()
+               buffer.set_text(unit_spec[2])
+               self._unitSymbol.set_text(unit_spec[1]) # put units into label text
+               if unit_spec[1]:
+                       showSymbol = True
+               else:
+                       showSymbol = False
+
+               if showSymbol:
+                       self._unitSymbol.show()
+                       self._previousUnitSymbol.show()
+               else:
+                       self._unitSymbol.hide()
+                       self._previousUnitSymbol.hide()
+
+               if self._unitValue.get_text() == '':
+                       if self._selectedCategoryName == "Computer Numbers":
+                               self._unitValue.set_text("0")
                        else:
-                               self._unitSymbol.hide()
-                               self._previousUnitSymbol.hide()
-
-                       if self._unitValue.get_text() == '':
-                               if self._selectedCategoryName == "Computer Numbers":
-                                       self._unitValue.set_text("0")
-                               else:
-                                       self._unitValue.set_text("0.0")
-
-                       self._defaultUnitForCategory[self._selectedCategoryName] = [
-                               self._unitName.get_text(), self._previousUnitName.get_text()
-                       ]
-
-                       # select the text so user can start typing right away
-                       self._unitValue.grab_focus()
-                       self._unitValue.select_region(0, -1)
-               except Exception:
-                       _moduleLogger.exception("_on_click_unit")
+                               self._unitValue.set_text("0.0")
+
+               self._defaultUnitForCategory[self._selectedCategoryName] = [
+                       self._unitName.get_text(), self._previousUnitName.get_text()
+               ]
+
+               # select the text so user can start typing right away
+               self._unitValue.grab_focus()
+               self._unitValue.select_region(0, -1)
 
+       @gtk_toolbox.log_exception(_moduleLogger)
        def _on_unit_value_changed(self, *args):
-               try:
-                       if self._unitName.get_text() == '':
-                               return
-                       if not self._unitValue.is_focus():
-                               return
-
-                       #retrieve the conversion function and value from the selected unit
-                       value = self._sanitize_value(self._unitValue.get_text())
-                       func, arg = self._unitDataInCategory[self._unitName.get_text()][0]
-                       base = func.to_base(value, arg)
-
-                       #point to the first row
-                       for row in self._unitModel:
-                               func, arg = self._unitDataInCategory[row[self.UNITS_NAME_IDX]][0]
-                               newValue = func.from_base(base, arg)
-
-                               newValueDisplay = str(newValue)
-                               integerDisplay, fractionalDisplay = split_number(newValue)
-
-                               row[self.UNITS_VALUE_IDX] = newValueDisplay
-                               row[self.UNITS_INTEGER_IDX] = integerDisplay
-                               row[self.UNITS_FRACTION_IDX] = fractionalDisplay
-
-                       # Update the secondary unit entry
-                       if self._previousUnitName.get_text() != '':
-                               func, arg = self._unitDataInCategory[self._previousUnitName.get_text()][0]
-                               self._previousUnitValue.set_text(str(func.from_base(base, arg, )))
-
-                       self._sortedUnitModel.sort_column_changed()
-                       self._refresh_columns()
-               except Exception:
-                       _moduleLogger.exception("_on_unit_value_changed")
+               if self._unitName.get_text() == '':
+                       return
+               if not self._unitValue.is_focus():
+                       return
 
-       def _on_previous_unit_value_changed(self, *args):
-               try:
-                       if self._previousUnitName.get_text() == '':
-                               return
-                       if not self._previousUnitValue.is_focus():
-                               return
+               #retrieve the conversion function and value from the selected unit
+               value = self._sanitize_value(self._unitValue.get_text())
+               func, arg = self._unitDataInCategory[self._unitName.get_text()][0]
+               base = func.to_base(value, arg)
+
+               #point to the first row
+               for row in self._unitModel:
+                       func, arg = self._unitDataInCategory[row[self.UNITS_NAME_IDX]][0]
+                       newValue = func.from_base(base, arg)
+
+                       newValueDisplay = str(newValue)
+                       integerDisplay, fractionalDisplay = split_number(newValue)
 
-                       #retrieve the conversion function and value from the selected unit
-                       value = self._sanitize_value(self._previousUnitValue.get_text())
+                       row[self.UNITS_VALUE_IDX] = newValueDisplay
+                       row[self.UNITS_INTEGER_IDX] = integerDisplay
+                       row[self.UNITS_FRACTION_IDX] = fractionalDisplay
+
+               # Update the secondary unit entry
+               if self._previousUnitName.get_text() != '':
                        func, arg = self._unitDataInCategory[self._previousUnitName.get_text()][0]
-                       base = func.to_base(value, arg)
+                       self._previousUnitValue.set_text(str(func.from_base(base, arg, )))
+
+               self._sortedUnitModel.sort_column_changed()
+               self._refresh_columns()
+
+       @gtk_toolbox.log_exception(_moduleLogger)
+       def _on_previous_unit_value_changed(self, *args):
+               if self._previousUnitName.get_text() == '':
+                       return
+               if not self._previousUnitValue.is_focus():
+                       return
 
-                       #point to the first row
-                       for row in self._unitModel:
-                               func, arg = self._unitDataInCategory[row[self.UNITS_NAME_IDX]][0]
-                               newValue = func.from_base(base, arg)
+               #retrieve the conversion function and value from the selected unit
+               value = self._sanitize_value(self._previousUnitValue.get_text())
+               func, arg = self._unitDataInCategory[self._previousUnitName.get_text()][0]
+               base = func.to_base(value, arg)
 
-                               newValueDisplay = str(newValue)
-                               integerDisplay, fractionalDisplay = split_number(newValue)
+               #point to the first row
+               for row in self._unitModel:
+                       func, arg = self._unitDataInCategory[row[self.UNITS_NAME_IDX]][0]
+                       newValue = func.from_base(base, arg)
 
-                               row[self.UNITS_VALUE_IDX] = newValueDisplay
-                               row[self.UNITS_INTEGER_IDX] = integerDisplay
-                               row[self.UNITS_FRACTION_IDX] = fractionalDisplay
+                       newValueDisplay = str(newValue)
+                       integerDisplay, fractionalDisplay = split_number(newValue)
 
-                       # Update the primary unit entry
-                       func, arg = self._unitDataInCategory[self._unitName.get_text()][0]
-                       self._unitValue.set_text(str(func.from_base(base, arg, )))
+                       row[self.UNITS_VALUE_IDX] = newValueDisplay
+                       row[self.UNITS_INTEGER_IDX] = integerDisplay
+                       row[self.UNITS_FRACTION_IDX] = fractionalDisplay
 
-                       self._sortedUnitModel.sort_column_changed()
-                       self._refresh_columns()
-               except Exception:
-                       _moduleLogger.exception("_on_previous_unit_value_changed")
+               # Update the primary unit entry
+               func, arg = self._unitDataInCategory[self._unitName.get_text()][0]
+               self._unitValue.set_text(str(func.from_base(base, arg, )))
+
+               self._sortedUnitModel.sort_column_changed()
+               self._refresh_columns()
 
+       @gtk_toolbox.log_exception(_moduleLogger)
        def _on_about_clicked(self, a):
                dlg = gtk.AboutDialog()
                dlg.set_name(constants.__pretty_app_name__)
@@ -772,15 +858,16 @@ class Gonvert(object):
                dlg.set_copyright("Copyright 2009 - GPL")
                dlg.set_comments("")
                dlg.set_website("http://unihedron.com/projects/gonvert/gonvert.php")
-               dlg.set_authors(["Anthony Tekatch <anthony@unihedron.com>", "Ed Page <edpage@byu.net>"])
+               dlg.set_authors(["Anthony Tekatch <anthony@unihedron.com>", "Ed Page <eopage@byu.net> (Blame him for the most recent bugs)"])
                dlg.run()
                dlg.destroy()
 
+       @gtk_toolbox.log_exception(_moduleLogger)
        def _on_user_exit(self, *args):
                try:
                        self._save_settings()
                except Exception:
-                       _moduleLogger.exception("_on_user_exit")
+                       pass
                finally:
                        gtk.main_quit()
 
@@ -790,7 +877,7 @@ def run_gonvert():
        if hildonize.IS_HILDON_SUPPORTED:
                gtk.set_application_name(constants.__pretty_app_name__)
        handle = Gonvert()
-       if not PROFILE_STARTUP:
+       if not constants.PROFILE_STARTUP:
                gtk.main()