Fixing up some packaging issues
[gonvert] / src / gonvert_glade.py
index de293ea..8034d58 100755 (executable)
@@ -1,26 +1,49 @@
 #!/usr/bin/env python
 # -*- coding: UTF8 -*-
 
+"""
+@todo Look into using two columns for displaying the value, split by the
+decimal place.  The left one would be right aligned and the right would be left
+aligned (only if not in exponential notation
+OR display everything in engineering notation
+
+@tood Add a unit description dialog for when hildonized
+
+@todo Add support for custom units
+
+@todo Add support for compound units
+"""
+
 import os
 import pickle
-import string
-import gettext
 import logging
 
+import pango
 import gobject
 import gtk
 import gtk.glade
 import gtk.gdk
 
 import constants
+import hildonize
 import unit_data
 
+try:
+       import gettext
+except ImportError:
+       _ = lambda x: x
+       gettext = None
+else:
+       _ = gettext.gettext
+
 
 _moduleLogger = logging.getLogger("gonvert_glade")
+PROFILE_STARTUP = False
+FORCE_HILDON_LIKE = False
 
-gettext.bindtextdomain('gonvert', '/usr/share/locale')
-gettext.textdomain('gonvert')
-_ = gettext.gettext
+if gettext is not None:
+       gettext.bindtextdomain('gonvert', '/usr/share/locale')
+       gettext.textdomain('gonvert')
 
 
 def change_menu_label(widgets, labelname, newtext):
@@ -34,9 +57,14 @@ class Gonvert(object):
                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"),
+               '/usr/share/gonvert/gonvert.glade',
                '/usr/lib/gonvert/gonvert.glade',
        ]
 
+       UNITS_NAME_IDX = 0
+       UNITS_VALUE_IDX = 1
+       UNITS_SYMBOL_IDX = 2
+
        def __init__(self):
                self._unitDataInCategory = None
                self._unit_sort_direction = False
@@ -47,7 +75,7 @@ class Gonvert(object):
                self._find_result = [] # empty find result list
                self._findIndex = 0 # default to find result number zero
 
-               self._selectedCategory = '' # preset to no selected category
+               self._selectedCategoryName = '' # preset to no selected category
                self._defaultUnitForCategory = {} # empty dictionary for later use
 
                #check to see if glade file is in current directory (user must be
@@ -64,12 +92,13 @@ class Gonvert(object):
                        return
 
                self._mainWindow = widgets.get_widget('mainWindow')
+               self._app = hildonize.get_app_class()()
+               self._mainWindow = hildonize.hildonize_window(self._app, self._mainWindow)
 
                change_menu_label(widgets, 'fileMenuItem', _('File'))
                change_menu_label(widgets, 'exitMenuItem', _('Exit'))
                change_menu_label(widgets, 'toolsMenuItem', _('Tools'))
                change_menu_label(widgets, 'clearSelectionMenuItem', _('Clear selections'))
-               change_menu_label(widgets, 'writeUnitsMenuItem', _('Write Units'))
                change_menu_label(widgets, 'helpMenuItem', _('Help'))
                change_menu_label(widgets, 'aboutMenuItem', _('About'))
                change_menu_label(widgets, 'findButton', _('Find'))
@@ -77,6 +106,7 @@ class Gonvert(object):
                self._shortlistcheck = widgets.get_widget('shortlistcheck')
                self._toggleShortList = widgets.get_widget('toggleShortList')
 
+               self._categorySelectionButton = widgets.get_widget("categorySelectionButton")
                self._categoryView = widgets.get_widget('categoryView')
 
                self._unitsView = widgets.get_widget('unitsView')
@@ -87,8 +117,6 @@ class Gonvert(object):
                self._unitValue = widgets.get_widget('unitValue')
                self._previousUnitName = widgets.get_widget('previousUnitName')
                self._previousUnitValue = widgets.get_widget('previousUnitValue')
-               messagebox = widgets.get_widget('msgbox')
-               messageboxtext = widgets.get_widget('msgboxtext')
 
                self._unitSymbol = widgets.get_widget('unitSymbol')
                self._previousUnitSymbol = widgets.get_widget('previousUnitSymbol')
@@ -100,33 +128,44 @@ class Gonvert(object):
                self._findEntry = widgets.get_widget('findEntry')
                self._findLabel = widgets.get_widget('findLabel')
                self._findButton = widgets.get_widget('findButton')
-               ToolTips = gtk.Tooltips()
-               ToolTips.set_tip(self._findButton, _(u'Find unit (F6)'))
 
                #insert a self._categoryColumnumn into the units list even though the heading will not be seen
                renderer = gtk.CellRendererText()
-               self._unitNameColumn = gtk.TreeViewColumn(_('Unit Name'), renderer)
+               renderer.set_property("ellipsize", pango.ELLIPSIZE_END)
+               renderer.set_property("width-chars", len("grams per cubic cm plus some"))
+               hildonize.set_cell_thumb_selectable(renderer)
+               self._unitNameColumn = gtk.TreeViewColumn(_('Name'), renderer)
                self._unitNameColumn.set_property('resizable', 1)
-               self._unitNameColumn.add_attribute(renderer, 'text', 0)
+               self._unitNameColumn.add_attribute(renderer, 'text', self.UNITS_NAME_IDX)
                self._unitNameColumn.set_clickable(True)
                self._unitNameColumn.connect("clicked", self._on_click_unit_column)
                self._unitsView.append_column(self._unitNameColumn)
 
+               renderer = gtk.CellRendererText()
+               hildonize.set_cell_thumb_selectable(renderer)
                self._unitValueColumn = gtk.TreeViewColumn(_('Value'), renderer)
                self._unitValueColumn.set_property('resizable', 1)
-               self._unitValueColumn.add_attribute(renderer, 'text', 1)
+               self._unitValueColumn.add_attribute(renderer, 'text', self.UNITS_VALUE_IDX)
                self._unitValueColumn.set_clickable(True)
                self._unitValueColumn.connect("clicked", self._on_click_unit_column)
                self._unitsView.append_column(self._unitValueColumn)
 
+               renderer = gtk.CellRendererText()
+               renderer.set_property("ellipsize", pango.ELLIPSIZE_END)
+               renderer.set_property("width-chars", len("G ohm plus some"))
+               hildonize.set_cell_thumb_selectable(renderer)
                self._unitSymbolColumn = gtk.TreeViewColumn(_('Units'), renderer)
                self._unitSymbolColumn.set_property('resizable', 1)
-               self._unitSymbolColumn.add_attribute(renderer, 'text', 2)
+               self._unitSymbolColumn.add_attribute(renderer, 'text', self.UNITS_SYMBOL_IDX)
                self._unitSymbolColumn.set_clickable(True)
                self._unitSymbolColumn.connect("clicked", self._on_click_unit_column)
                self._unitsView.append_column(self._unitSymbolColumn)
 
-               self._unitModel = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING)
+               self._unitModel = gtk.ListStore(
+                       gobject.TYPE_STRING, # UNITS_NAME_IDX
+                       gobject.TYPE_STRING, # UNITS_VALUE_IDX
+                       gobject.TYPE_STRING, # UNITS_SYMBOL_IDX
+               )
                self._sortedUnitModel = gtk.TreeModelSort(self._unitModel)
                columns = self._get_column_sort_stuff()
                for columnIndex, (column, sortDirection, col_cmp) in enumerate(columns):
@@ -147,32 +186,56 @@ class Gonvert(object):
 
                #Populate the catagories list
                for key in unit_data.UNIT_CATEGORIES:
-                       iter = self._categoryModel.append()
-                       self._categoryModel.set(iter, 0, key)
+                       row = (key, )
+                       self._categoryModel.append(row)
 
                #--------- connections to GUI ----------------
-               dic = {
-                       "on_exit_menu_activate": self._on_user_exit,
-                       "on_main_window_destroy": self._on_user_exit,
-                       "on_categoryView_select_row": self._on_click_category,
-                       "on_unitValue_changed": self._on_unit_value_changed,
-                       "on_previousUnitValue_changed": self._on_previous_unit_value_changed,
-                       "on_writeUnitsMenuItem_activate": self._on_user_write_units,
-                       "on_findButton_clicked": self._on_find_activate,
-                       "on_findEntry_activated": self._on_find_activate,
-                       "on_findEntry_changed": self._on_findEntry_changed,
-                       "on_aboutMenuItem_activate": self._on_about_clicked,
-                       "on_messagebox_ok_clicked": self.messagebox_ok_clicked,
-                       "on_clearSelectionMenuItem_activate": self._on_user_clear_selections,
-                       "on_unitsView_cursor_changed": self._on_click_unit,
-                       "on_shortlistcheck_toggled": self._on_shortlist_changed,
-                       "on_toggleShortList_activate": self._on_edit_shortlist,
-               }
-               widgets.signal_autoconnect(dic)
+               self._mainWindow.connect("delete-event", 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)
+               self._categoryView.connect("cursor-changed", self._on_click_category)
+               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._previousUnitValue.connect("changed", self._on_previous_unit_value_changed)
+               self._shortlistcheck.connect("toggled", self._on_shortlist_changed)
+               self._unitValue.connect("changed", self._on_unit_value_changed)
+               self._unitsView.connect("cursor-changed", self._on_click_unit)
+               if hildonize.GTK_MENU_USED:
+                       widgets.get_widget("aboutMenuItem").connect("activate", self._on_about_clicked)
+                       widgets.get_widget("clearSelectionMenuItem").connect("activate", self._on_user_clear_selections)
+                       widgets.get_widget("editShortListMenuItem").connect("activate", self._on_edit_shortlist)
+                       widgets.get_widget("exitMenuItem").connect("activate", self._on_user_exit)
+
+               for scrollingWidgetName in (
+                       "unitsViewScrolledWindow",
+               ):
+                       scrollingWidget = widgets.get_widget(scrollingWidgetName)
+                       assert scrollingWidget is not None, scrollingWidgetName
+                       hildonize.hildonize_scrollwindow_with_viewport(scrollingWidget)
+
+               if hildonize.IS_HILDON_SUPPORTED or FORCE_HILDON_LIKE:
+                       self._categoryView.get_parent().hide()
+                       self._unitsView.set_headers_visible(False)
+                       self._previousUnitName.get_parent().hide()
+                       self._unitDescription.get_parent().get_parent().hide()
+               else:
+                       self._categorySelectionButton.hide()
+
+               replacementButtons = []
+               menu = hildonize.hildonize_menu(
+                       self._mainWindow,
+                       widgets.get_widget("mainMenuBar"),
+                       replacementButtons
+               )
+
+               if not hildonize.IS_HILDON_SUPPORTED:
+                       _moduleLogger.info("No hildonization support")
 
-               self._mainWindow.set_title('gonvert- %s - Unit Conversion Utility' % constants.__version__)
+               hildonize.set_application_title(
+                       self._mainWindow, "%s - Unit Conversion Utility" % constants.__pretty_app_name__
+               )
                iconPath = pixmapspath + '/gonvert.png'
                if os.path.exists(iconPath):
                        self._mainWindow.set_icon(gtk.gdk.pixbuf_new_from_file(iconPath))
@@ -180,52 +243,44 @@ class Gonvert(object):
                        _moduleLogger.warn("Error: Could not find gonvert icon: %s" % iconPath)
 
                self._load_settings()
+               self._mainWindow.show()
 
        def _load_settings(self):
                #Restore window size from previously saved settings if it exists and is valid.
                windowDatPath = "/".join((constants._data_path_, "window.dat"))
                if os.path.exists(windowDatPath):
-                       #Retrieving previous window settings from ~/.gonvert/window.dat
                        saved_window = pickle.load(open(windowDatPath, "r"))
-                       #If the 'size' has been stored, then extract size from saved_window.
-                       if 'size' in saved_window:
+                       try:
                                a, b = saved_window['size']
-                               self._mainWindow.resize(a, b)
-                       else:
-                               #Maximize if no previous size was found
-                               #self._mainWindow.maximize()
+                       except KeyError:
                                pass
-               else:
-                       #Maximize if no previous window.dat file was found
-                       #self._mainWindow.maximize()
-                       pass
+                       else:
+                               self._mainWindow.resize(a, b)
 
                #Restore selections from previously saved settings if it exists and is valid.
-               historical_catergory_found = False
+               categoryIndex = 0
+               selectedCategoryName = unit_data.UNIT_CATEGORIES[0]
                selectionsDatPath = "/".join((constants._data_path_, "selections.dat"))
                if os.path.exists(selectionsDatPath):
-                       #Retrieving previous selections from ~/.gonvert/selections.dat
                        selections = pickle.load(open(selectionsDatPath, 'r'))
-                       #Restoring previous selections.
-                       #If the 'selected_unts' has been stored, then extract self._defaultUnitForCategory from selections.
-                       if 'selected_units' in selections:
+                       try:
                                self._defaultUnitForCategory = selections['selected_units']
-                       #Make sure that the 'self._selectedCategory' has been stored.
-                       if 'selected_category' in selections:
-                               #Match an available category to the previously selected category.
-                               for counter in range(len(unit_data.UNIT_CATEGORIES)):
-                                       if selections['selected_category'] == unit_data.UNIT_CATEGORIES[counter]:
-                                               # Restore the previously selected category.
-                                               self._categoryView.set_cursor(counter, self._categoryColumn, False)
-                                               self._categoryView.grab_focus()
-                               historical_catergory_found = True
-
-               if not historical_catergory_found:
-                       print "Couldn't find saved category, using default."
-                       #If historical records were not kept then default to
-                       # put the focus on the first category
-                       self._categoryView.set_cursor(0, self._categoryColumn, False)
-                       self._categoryView.grab_focus()
+                       except KeyError:
+                               pass
+
+                       try:
+                               selectedCategoryName = selections['selected_category']
+                       except KeyError:
+                               pass
+                       else:
+                               try:
+                                       categoryIndex = unit_data.UNIT_CATEGORIES.index(selectedCategoryName)
+                               except ValueError:
+                                       _moduleLogger.warn("Unknown category: %s" % selectedCategoryName)
+
+               self._categorySelectionButton.set_label(selectedCategoryName)
+               self._categoryView.set_cursor(categoryIndex, self._categoryColumn, False)
+               self._categoryView.grab_focus()
 
                self._select_default_unit()
 
@@ -235,16 +290,16 @@ class Gonvert(object):
                should therefore only be called when exiting the program.
 
                Update selections dictionary which consists of the following keys:
-               'self._selectedCategory': full name of selected category
+               'self._selectedCategoryName': full name of selected category
                'self._defaultUnitForCategory': self._defaultUnitForCategory dictionary which contains:
                [categoryname: #1 displayed unit, #2 displayed unit]
                """
                #Determine the contents of the selected category row
                selected, iter = self._categoryView.get_selection().get_selected()
-               self._selectedCategory = self._categoryModel.get_value(iter, 0)
+               self._selectedCategoryName = self._categoryModel.get_value(iter, 0)
 
                selections = {
-                       'selected_category': self._selectedCategory,
+                       'selected_category': self._selectedCategoryName,
                        'selected_units': self._defaultUnitForCategory
                }
                selectionsDatPath = "/".join((constants._data_path_, "selections.dat"))
@@ -268,7 +323,7 @@ class Gonvert(object):
        def _find_first(self):
                assert len(self._find_result) == 0
                assert self._findIndex == 0
-               findString = string.lower(string.strip(self._findEntry.get_text()))
+               findString = self._findEntry.get_text().strip().lower()
                if not findString:
                        return
 
@@ -284,7 +339,9 @@ class Gonvert(object):
                assert 0 < len(self._find_result)
 
                #check if next find is in a new category (prevent category changes when unnecessary
-               if self._selectedCategory != self._find_result[self._findIndex][0]:
+               searchCategoryName = self._find_result[self._findIndex][0]
+               if self._selectedCategoryName != searchCategoryName:
+                       self._categorySelectionButton.set_label(searchCategoryName)
                        self._categoryView.set_cursor(
                                self._find_result[self._findIndex][2], self._categoryColumn, False
                        )
@@ -294,18 +351,6 @@ class Gonvert(object):
                )
 
        def _find_next(self):
-               """
-               check if 'new find' or 'last find' or 'next-find'
-
-               new-find = run the find algorithm which also selects the first found unit
-                        = self._findIndex = 0 and self._find_result = []
-
-               last-find = restart from top again
-                         = self._findIndex = len(self._find_result)
-
-               next-find = continue to next found location
-                          = self._findIndex = 0 and len(self._find_result)>0
-               """
                if len(self._find_result) == 0:
                        self._find_first()
                else:
@@ -324,18 +369,6 @@ class Gonvert(object):
                        )
 
        def _find_previous(self):
-               """
-               check if 'new find' or 'last find' or 'next-find'
-
-               new-find = run the find algorithm which also selects the first found unit
-                        = self._findIndex = 0 and self._find_result = []
-
-               last-find = restart from top again
-                         = self._findIndex = len(self._find_result)
-
-               next-find = continue to next found location
-                          = self._findIndex = 0 and len(self._find_result)>0
-               """
                if len(self._find_result) == 0:
                        self._find_first()
                else:
@@ -356,8 +389,10 @@ class Gonvert(object):
        def _toggle_find(self):
                if self._searchLayout.get_property("visible"):
                        self._searchLayout.hide()
+                       self._unitsView.grab_focus()
                else:
                        self._searchLayout.show()
+                       self._findEntry.grab_focus()
 
        def _unit_model_cmp(self, sortedModel, leftItr, rightItr):
                leftUnitText = self._unitModel.get_value(leftItr, 0)
@@ -371,7 +406,7 @@ class Gonvert(object):
 
        def _value_model_cmp(self, sortedModel, leftItr, rightItr):
                #special sorting exceptions for ascii values (instead of float values)
-               if self._selectedCategory == "Computer Numbers":
+               if self._selectedCategoryName == "Computer Numbers":
                        leftValue = self._unitModel.get_value(leftItr, 1)
                        rightValue = self._unitModel.get_value(rightItr, 1)
                else:
@@ -391,12 +426,12 @@ class Gonvert(object):
                return columns
 
        def _switch_category(self, category):
-               self._selectedCategory = category
-               self._unitDataInCategory = unit_data.UNIT_DESCRIPTIONS[self._selectedCategory]
+               self._selectedCategoryName = category
+               self._unitDataInCategory = unit_data.UNIT_DESCRIPTIONS[self._selectedCategoryName]
 
                #Fill up the units descriptions and clear the value cells
                self._clear_visible_unit_data()
-               for key in unit_data.get_units(self._selectedCategory):
+               for key in unit_data.get_units(self._selectedCategoryName):
                        iter = self._unitModel.append()
                        self._unitModel.set(iter, 0, key, 1, '', 2, self._unitDataInCategory[key][1])
                self._sortedUnitModel.sort_column_changed()
@@ -418,25 +453,38 @@ class Gonvert(object):
        def _select_default_unit(self):
                # Restore the previous historical settings of previously selected units
                # in this newly selected category
-               if self._selectedCategory in self._defaultUnitForCategory:
-                       units = unit_data.get_units(self._selectedCategory)
-
-                       #Restore oldest selection first.
-                       if self._defaultUnitForCategory[self._selectedCategory][1]:
-                               unitIndex = units.index(self._defaultUnitForCategory[self._selectedCategory][1])
-                               self._unitsView.set_cursor(unitIndex, self._unitNameColumn, True)
-
-                       #Restore newest selection second.
-                       if self._defaultUnitForCategory[self._selectedCategory][0]:
-                               unitIndex = units.index(self._defaultUnitForCategory[self._selectedCategory][0])
-                               self._unitsView.set_cursor(unitIndex, self._unitNameColumn, True)
+               defaultPrimary = unit_data.get_base_unit(self._selectedCategoryName)
+               defaultSecondary = ""
+               if self._selectedCategoryName in self._defaultUnitForCategory:
+                       if self._defaultUnitForCategory[self._selectedCategoryName][0]:
+                               defaultPrimary = self._defaultUnitForCategory[self._selectedCategoryName][0]
+                       if self._defaultUnitForCategory[self._selectedCategoryName][1]:
+                               defaultSecondary = self._defaultUnitForCategory[self._selectedCategoryName][1]
+
+               units = unit_data.get_units(self._selectedCategoryName)
+
+               #Restore oldest selection first.
+               if defaultPrimary:
+                       try:
+                               unitIndex = units.index(defaultPrimary)
+                       except ValueError:
+                               unitIndex = 0
+                       self._unitsView.set_cursor(unitIndex, self._unitNameColumn, True)
+
+               #Restore newest selection second.
+               if defaultSecondary:
+                       try:
+                               unitIndex = units.index(defaultSecondary)
+                       except ValueError:
+                               unitIndex = 0
+                       self._unitsView.set_cursor(unitIndex, self._unitNameColumn, True)
 
                # select the text so user can start typing right away
                self._unitValue.grab_focus()
                self._unitValue.select_region(0, -1)
 
        def _sanitize_value(self, userEntry):
-               if self._selectedCategory == "Computer Numbers":
+               if self._selectedCategoryName == "Computer Numbers":
                        if userEntry == '':
                                value = '0'
                        else:
@@ -452,13 +500,13 @@ class Gonvert(object):
                try:
                        raise NotImplementedError("%s" % self._shortlistcheck.get_active())
                except Exception:
-                       _moduleLogger.exception("")
+                       _moduleLogger.exception("_on_shortlist_changed")
 
        def _on_edit_shortlist(self, *args):
                try:
                        raise NotImplementedError("%s" % self._toggleShortList.get_active())
                except Exception:
-                       _moduleLogger.exception("")
+                       _moduleLogger.exception("_on_edit_shortlist")
 
        def _on_user_clear_selections(self, *args):
                try:
@@ -466,7 +514,7 @@ class Gonvert(object):
                        os.remove(selectionsDatPath)
                        self._defaultUnitForCategory = {}
                except Exception:
-                       _moduleLogger.exception("")
+                       _moduleLogger.exception("_on_user_clear_selections")
 
        def _on_key_press(self, widget, event, *args):
                """
@@ -489,7 +537,7 @@ class Gonvert(object):
                        elif event.keyval == gtk.keysyms.n and event.get_state() & gtk.gdk.CONTROL_MASK:
                                self._find_next()
                except Exception, e:
-                       _moduleLogger.exception("")
+                       _moduleLogger.exception("_on_key_press")
 
        def _on_window_state_change(self, widget, event, *args):
                """
@@ -501,7 +549,7 @@ class Gonvert(object):
                        else:
                                self._isFullScreen = False
                except Exception, e:
-                       _moduleLogger.exception("")
+                       _moduleLogger.exception("_on_window_state_change")
 
        def _on_findEntry_changed(self, *args):
                """
@@ -510,14 +558,14 @@ class Gonvert(object):
                try:
                        self._clear_find()
                except Exception:
-                       _moduleLogger.exception("")
+                       _moduleLogger.exception("_on_findEntry_changed")
 
        def _on_find_activate(self, *args):
                try:
                        self._find_next()
                        self._findButton.grab_focus()
                except Exception:
-                       _moduleLogger.exception("")
+                       _moduleLogger.exception("_on_find_activate")
 
        def _on_click_unit_column(self, col):
                """
@@ -545,15 +593,35 @@ class Gonvert(object):
                        else:
                                assert False, "Unknown column: %s" % (col.get_title(), )
                except Exception:
-                       _moduleLogger.exception("")
+                       _moduleLogger.exception("_on_click_unit_column")
+
+       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,
+                       )
+
+                       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")
 
        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("")
+                       _moduleLogger.exception("_on_click_category")
 
        def _on_click_unit(self, *args):
                try:
@@ -561,24 +629,39 @@ class Gonvert(object):
                        selected_unit = selected.get_value(iter, 0)
                        unit_spec = self._unitDataInCategory[selected_unit]
 
+                       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())
+                               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, 1))
                        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._selectedCategory == "Computer Numbers":
+                               if self._selectedCategoryName == "Computer Numbers":
                                        self._unitValue.set_text("0")
                                else:
                                        self._unitValue.set_text("0.0")
 
-                       self._defaultUnitForCategory[self._selectedCategory] = [
+                       self._defaultUnitForCategory[self._selectedCategoryName] = [
                                self._unitName.get_text(), self._previousUnitName.get_text()
                        ]
 
@@ -586,7 +669,7 @@ class Gonvert(object):
                        self._unitValue.grab_focus()
                        self._unitValue.select_region(0, -1)
                except Exception:
-                       _moduleLogger.exception("")
+                       _moduleLogger.exception("_on_click_unit")
 
        def _on_unit_value_changed(self, *args):
                try:
@@ -610,7 +693,7 @@ class Gonvert(object):
                                func, arg = self._unitDataInCategory[self._previousUnitName.get_text()][0]
                                self._previousUnitValue.set_text(str(func.from_base(base, arg, )))
                except Exception:
-                       _moduleLogger.exception("")
+                       _moduleLogger.exception("_on_unit_value_changed")
 
        def _on_previous_unit_value_changed(self, *args):
                try:
@@ -633,36 +716,7 @@ class Gonvert(object):
                        func, arg = self._unitDataInCategory[self._unitName.get_text()][0]
                        self._unitValue.set_text(str(func.from_base(base, arg, )))
                except Exception:
-                       _moduleLogger.exception("")
-
-       def messagebox_ok_clicked(self, a):
-               messagebox.hide()
-
-       def _on_user_write_units(self, a):
-               ''"Write the list of categories and units to stdout for documentation purposes.''"
-               messagebox_model = gtk.TextBuffer(None)
-               messageboxtext.set_buffer(messagebox_model)
-               messagebox_model.insert_at_cursor(_(u'The units are being written to stdout. You can capture this printout by starting gonvert from the command line as follows: \n$ gonvert > file.txt'), -1)
-               messagebox.show()
-               while gtk.events_pending():
-                       gtk.mainiteration(False)
-
-               total_categories = 0
-               total_units = 0
-               print 'gonvert-%s%s' % (
-                       constants.__version__,
-                       _(u' - Unit Conversion Utility  - Convertible units listing: ')
-               )
-               for category_key in unit_data.UNIT_CATEGORIES:
-                       total_categories = total_categories + 1
-                       print category_key, ": "
-                       self._unitDataInCategory = unit_data.UNIT_DESCRIPTIONS[category_key]
-                       unit_keys = unit_data.get_units_from_category(self._unitDataInCategory)
-                       for unit_key in unit_keys:
-                               total_units = total_units + 1
-                               print "\t", unit_key
-               print total_categories, ' categories'
-               print total_units, ' units'
+                       _moduleLogger.exception("_on_previous_unit_value_changed")
 
        def _on_about_clicked(self, a):
                dlg = gtk.AboutDialog()
@@ -679,12 +733,21 @@ class Gonvert(object):
                try:
                        self._save_settings()
                except Exception:
-                       _moduleLogger.exception("")
+                       _moduleLogger.exception("_on_user_exit")
                finally:
                        gtk.main_quit()
 
 
-def main():
+def run_gonvert():
+       gtk.gdk.threads_init()
+       if hildonize.IS_HILDON_SUPPORTED:
+               gtk.set_application_name(constants.__pretty_app_name__)
+       handle = Gonvert()
+       if not PROFILE_STARTUP:
+               gtk.main()
+
+
+if __name__ == "__main__":
        logging.basicConfig(level = logging.DEBUG)
        try:
                os.makedirs(constants._data_path_)
@@ -692,9 +755,4 @@ def main():
                if e.errno != 17:
                        raise
 
-       gonvert = Gonvert()
-       gtk.main()
-
-
-if __name__ == "__main__":
-       main()
+       run_gonvert()