Adding logging to those callbacks
[gonvert] / src / gonvert_glade.py
index 679f70b..a314c32 100755 (executable)
@@ -4,7 +4,6 @@
 import os
 import pickle
 import string
-import sys
 import gettext
 import logging
 
@@ -14,7 +13,6 @@ import gtk.glade
 import gtk.gdk
 
 import constants
-import evil_globals
 import unit_data
 
 
@@ -41,6 +39,16 @@ class Gonvert(object):
 
        def __init__(self):
                self._unitDataInCategory = None
+               self._unit_sort_direction = False
+               self._value_sort_direction = False
+               self._units_sort_direction = False
+               self._isFullScreen = False
+
+               self._find_result = [] # empty find result list
+               self._findIndex = 0 # default to find result number zero
+
+               self._selectedCategory = '' # 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
                # running from download untar directory)
@@ -51,6 +59,8 @@ class Gonvert(object):
                                widgets = gtk.glade.XML(gladePath)
                                break
                else:
+                       _moduleLogger.error("UI Descriptor not found!")
+                       gtk.main_quit()
                        return
 
                self._mainWindow = widgets.get_widget('mainWindow')
@@ -70,29 +80,28 @@ class Gonvert(object):
                self._categoryView = widgets.get_widget('categoryView')
 
                self._unitsView = widgets.get_widget('unitsView')
+               self._unitsView.set_property('rules_hint', 1)
                self._unitsView_selection = self._unitsView.get_selection()
 
                self._unitName = widgets.get_widget('unitName')
                self._unitValue = widgets.get_widget('unitValue')
                self._previousUnitName = widgets.get_widget('previousUnitName')
                self._previousUnitValue = widgets.get_widget('previousUnitValue')
-               self._about_box = widgets.get_widget('about_box')
                messagebox = widgets.get_widget('msgbox')
                messageboxtext = widgets.get_widget('msgboxtext')
 
-               about_image = widgets.get_widget('about_image')
-               about_image.set_from_file(pixmapspath +'gonvert.png')
-               versionlabel = widgets.get_widget('versionlabel')
-               versionlabel.set_text(constants.__version__)
-
                self._unitSymbol = widgets.get_widget('unitSymbol')
                self._previousUnitSymbol = widgets.get_widget('previousUnitSymbol')
 
                self._unitDescription = widgets.get_widget('unitDescription')
 
+               self._searchLayout = widgets.get_widget('searchLayout')
+               self._searchLayout.hide()
                self._findEntry = widgets.get_widget('findEntry')
                self._findLabel = widgets.get_widget('findLabel')
-               findButton = widgets.get_widget('findButton')
+               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()
@@ -117,6 +126,13 @@ class Gonvert(object):
                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._sortedUnitModel = gtk.TreeModelSort(self._unitModel)
+               columns = self._get_column_sort_stuff()
+               for columnIndex, (column, sortDirection, col_cmp) in enumerate(columns):
+                       self._sortedUnitModel.set_sort_func(columnIndex, col_cmp)
+               self._unitsView.set_model(self._sortedUnitModel)
+
                #Insert a column into the category list even though the heading will not be seen
                renderer = gtk.CellRendererText()
                self._categoryColumn = gtk.TreeViewColumn('Title', renderer)
@@ -130,37 +146,31 @@ class Gonvert(object):
                self._categoryView.set_property('rules_hint', 1)
 
                #Populate the catagories list
-               keys = unit_data.list_dic.keys()
-               keys.sort()
-               for key in keys:
+               for key in unit_data.UNIT_CATEGORIES:
                        iter = self._categoryModel.append()
                        self._categoryModel.set(iter, 0, key)
 
-               ToolTips = gtk.Tooltips()
-               ToolTips.set_tip(findButton, _(u'Find unit (F6)'))
-
                #--------- 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_unitsView__on_click_unit_column": self._on_click_unit_column,
-                       "on_unitValue_changed": self.top,
-                       "on_previousUnitValue_changed": self.bottom,
+                       "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_user_find_units,
-                       "on_findEntry_key_press_event": self._on_find_key_press,
-                       "on_findEntry_changed": self._findEntry_changed,
+                       "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_about_close_clicked": self._on_about_hide,
                        "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_unitsView_button_released": self._on_button_released,
                        "on_shortlistcheck_toggled": self._on_shortlist_changed,
                        "on_toggleShortList_activate": self._on_edit_shortlist,
                }
                widgets.signal_autoconnect(dic)
+               self._mainWindow.connect("key-press-event", self._on_key_press)
+               self._mainWindow.connect("window-state-event", self._on_window_state_change)
 
                self._mainWindow.set_title('gonvert- %s - Unit Conversion Utility' % constants.__version__)
                iconPath = pixmapspath + '/gonvert.png'
@@ -169,6 +179,9 @@ class Gonvert(object):
                else:
                        _moduleLogger.warn("Error: Could not find gonvert icon: %s" % iconPath)
 
+               self._load_settings()
+
+       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):
@@ -194,19 +207,14 @@ class Gonvert(object):
                        #Retrieving previous selections from ~/.gonvert/selections.dat
                        selections = pickle.load(open(selectionsDatPath, 'r'))
                        #Restoring previous selections.
-                       #
-                       #Make a list of categories to determine which one to select
-                       categories = unit_data.list_dic.keys()
-                       categories.sort()
-                       #
-                       #If the 'selected_unts' has been stored, then extract evil_globals.selected_units from selections.
+                       #If the 'selected_unts' has been stored, then extract self._defaultUnitForCategory from selections.
                        if 'selected_units' in selections:
-                               evil_globals.selected_units = selections['selected_units']
-                       #Make sure that the 'evil_globals.selected_category' has been stored.
+                               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(categories)):
-                                       if selections['selected_category'] == categories[counter]:
+                               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()
@@ -219,44 +227,25 @@ class Gonvert(object):
                        self._categoryView.set_cursor(0, self._categoryColumn, False)
                        self._categoryView.grab_focus()
 
-               self.restore_units()
+               self._select_default_unit()
 
-       def _on_shortlist_changed(self, a):
-               print "shortlist"
-               if self._shortlistcheck.get_active():
-                       print "1"
-               else:
-                       print "0"
-
-       def _on_edit_shortlist(self, a):
-               print "edit shortlist"
-               if self._toggleShortList.get_active():
-                       print "1"
-               else:
-                       print "0"
-
-       def _on_user_clear_selections(self, a):
-               selectionsDatPath = "/".join((constants._data_path_, "selections.dat"))
-               os.remove(selectionsDatPath)
-               evil_globals.selected_units = {}
-
-       def _on_user_exit(self, a):
+       def _save_settings(self):
                """
                This routine saves the selections to a file, and
                should therefore only be called when exiting the program.
 
                Update selections dictionary which consists of the following keys:
-               'evil_globals.selected_category': full name of selected category
-               'evil_globals.selected_units': evil_globals.selected_units dictionary which contains:
+               'self._selectedCategory': 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()
-               evil_globals.selected_category = self._categoryModel.get_value(iter, 0)
+               self._selectedCategory = self._categoryModel.get_value(iter, 0)
 
                selections = {
-                       'selected_category': evil_globals.selected_category,
-                       'selected_units': evil_globals.selected_units
+                       'selected_category': self._selectedCategory,
+                       'selected_units': self._defaultUnitForCategory
                }
                selectionsDatPath = "/".join((constants._data_path_, "selections.dat"))
                pickle.dump(selections, open(selectionsDatPath, 'w'))
@@ -268,332 +257,389 @@ class Gonvert(object):
                windowDatPath = "/".join((constants._data_path_, "window.dat"))
                pickle.dump(window_settings, open(windowDatPath, 'w'))
 
-               gtk.mainquit
-               sys.exit()
+       def _clear_find(self):
+               # switch to "new find" state
+               self._find_result = []
+               self._findIndex = 0
 
-       def _findEntry_changed(self, a):
-               #Clear out find results since the user wants to look for something new
-               evil_globals.find_result = [] #empty find result list
-               evil_globals.find_count = 0 #default to find result number zero
-               self._findLabel.set_text('') #clear result
+               # Clear our user message
+               self._findLabel.set_text('')
 
-       def _on_find_key_press(self, a, b):
-               #Check if the key pressed was an ASCII key
-               if len(b.string)>0:
-                       #Check if the key pressed was the 'Enter' key
-                       if ord(b.string[0]) == 13:
-                               #Execute the find units function
-                               _on_user_find_units(1)
+       def _find_first(self):
+               assert len(self._find_result) == 0
+               assert self._findIndex == 0
+               findString = string.lower(string.strip(self._findEntry.get_text()))
+               if not findString:
+                       return
 
-       def _on_about_clicked(self, a):
-               self._about_box.show()
+               # Gather info on all the matching units from all categories
+               for catIndex, category in enumerate(unit_data.UNIT_CATEGORIES):
+                       units = unit_data.get_units(category)
+                       for unitIndex, unit in enumerate(units):
+                               loweredUnit = unit.lower()
+                               if loweredUnit in findString or findString in loweredUnit:
+                                       self._find_result.append((category, unit, catIndex, unitIndex))
+
+       def _update_find_selection(self):
+               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]:
+                       self._categoryView.set_cursor(
+                               self._find_result[self._findIndex][2], self._categoryColumn, False
+                       )
+
+               self._unitsView.set_cursor(
+                       self._find_result[self._findIndex][3], self._unitNameColumn, True
+               )
 
-       def _on_about_hide(self, *args):
-               self._about_box.hide()
-               return gtk.TRUE
+       def _find_next(self):
+               """
+               check if 'new find' or 'last find' or 'next-find'
 
-       def messagebox_ok_clicked(self, a):
-               messagebox.hide()
+               new-find = run the find algorithm which also selects the first found unit
+                        = self._findIndex = 0 and self._find_result = []
 
-       def _on_user_find_units(self, a):
-               #check if 'new find' or 'last find' or 'next-find'
-
-               #new-find = run the find algorithm which also selects the first found unit
-               #         = evil_globals.find_count = 0 and evil_globals.find_result = []
-
-               #last-find = restart from top again
-               #          = evil_globals.find_count = len(evil_globals.find_result)
-
-               #next-find = continue to next found location
-               #           = evil_globals.find_count = 0 and len(evil_globals.find_result)>0
-
-               #check for new-find
-               if len(evil_globals.find_result) == 0:
-                       find_string = string.lower(string.strip(self._findEntry.get_text()))
-                       #Make sure that a valid find string has been requested
-                       if len(find_string)>0:
-                               categories = unit_data.list_dic.keys()
-                               categories.sort()
-                               found_a_unit = 0 #reset the 'found-a-unit' flag
-                               cat_no = 0
-                               for category in categories:
-                                       units = unit_data.list_dic[category].keys()
-                                       units.sort()
-                                       del units[0] # do not display .base_unit description key
-                                       unit_no = 0
-                                       for unit in units:
-                                               if string.find(string.lower(unit), find_string) >= 0:
-                                                       found_a_unit = 1 #indicate that a unit was found
-                                                       #print "'", find_string, "'", " found at category = ", category, " unit = ", unit
-                                                       evil_globals.find_result.append((category, unit, cat_no, unit_no))
-                                               unit_no = unit_no+1
-                                       cat_no = cat_no+1
-
-                               if found_a_unit == 1:
-                                       #select the first found unit
-                                       evil_globals.find_count = 0
-                                       #check if next find is in a new category (prevent category changes when unnecessary
-                                       if evil_globals.selected_category != evil_globals.find_result[evil_globals.find_count][0]:
-                                               self._categoryView.set_cursor(evil_globals.find_result[0][2], self._categoryColumn, False)
-                                               self._unitsView.set_cursor(evil_globals.find_result[0][3], self._unitNameColumn, True)
-                                               if len(evil_globals.find_result)>1:
-                                                       self._findLabel.set_text(('Press Find for next unit. '+ str(len(evil_globals.find_result))+' result(s).'))
-                                               else:
-                                                       self._findLabel.set_text('Text not found') #Display error
-               else: #must be next-find or last-find
-                       #check for last-find
-                       if evil_globals.find_count == len(evil_globals.find_result)-1:
-                               #select first result
-                               evil_globals.find_count = 0
-                               self._categoryView.set_cursor(evil_globals.find_result[evil_globals.find_count][2], self._categoryColumn, False)
-                               self._unitsView.set_cursor(evil_globals.find_result[evil_globals.find_count][3], self._unitNameColumn, True)
-                       else: #must be next-find
-                               evil_globals.find_count = evil_globals.find_count+1
-                               #check if next find is in a new category (prevent category changes when unnecessary
-                               if evil_globals.selected_category != evil_globals.find_result[evil_globals.find_count][0]:
-                                       self._categoryView.set_cursor(evil_globals.find_result[evil_globals.find_count][2], self._categoryColumn, False)
-                               self._unitsView.set_cursor(evil_globals.find_result[evil_globals.find_count][3], self._unitNameColumn, True)
+               last-find = restart from top again
+                         = self._findIndex = len(self._find_result)
 
-       def _on_click_unit_column(self, col):
-               """
-               Sort the contents of the col when the user clicks on the title.
+               next-find = continue to next found location
+                          = self._findIndex = 0 and len(self._find_result)>0
                """
-               #Determine which column requires sorting
-               if col is self._unitNameColumn:
-                       selectedUnitColumn = 0
-                       self._unitNameColumn.set_sort_indicator(True)
-                       self._unitValueColumn.set_sort_indicator(False)
-                       self._unitSymbolColumn.set_sort_indicator(False)
-                       self._unitNameColumn.set_sort_order(not evil_globals.unit_sort_direction)
-               elif col is self._unitValueColumn:
-                       selectedUnitColumn = 1
-                       self._unitNameColumn.set_sort_indicator(False)
-                       self._unitValueColumn.set_sort_indicator(True)
-                       self._unitSymbolColumn.set_sort_indicator(False)
-                       self._unitValueColumn.set_sort_order(not evil_globals.value_sort_direction)
-               elif col is self._unitSymbolColumn:
-                       selectedUnitColumn = 2
-                       self._unitNameColumn.set_sort_indicator(False)
-                       self._unitValueColumn.set_sort_indicator(False)
-                       self._unitSymbolColumn.set_sort_indicator(True)
-                       self._unitSymbolColumn.set_sort_order(not evil_globals.units_sort_direction)
+               if len(self._find_result) == 0:
+                       self._find_first()
                else:
-                       assert False, "Unknown column: %s" % (col.get_title(), )
-
-               #declare a spot to hold the sorted list
-               sorted_list = []
-
-               #point to the first row
-               iter = self._unitModel.get_iter_first()
-               row = 0
-
-               while iter:
-                       #grab all text from columns for sorting
-
-                       #get the text from each column
-                       unit_text = self._unitModel.get_value(iter, 0)
-                       units_text = self._unitModel.get_value(iter, 2)
-
-                       #do not bother sorting if the value column is empty
-                       if self._unitModel.get_value(iter, 1) == '' and selectedUnitColumn == 1:
-                               return
-
-                       #special sorting exceptions for ascii values (instead of float values)
-                       if evil_globals.selected_category == "Computer Numbers":
-                               value_text = self._unitModel.get_value(iter, 1)
+                       if self._findIndex == len(self._find_result)-1:
+                               self._findIndex = 0
                        else:
-                               if self._unitModel.get_value(iter, 1) == None or unit_model.get_value(iter, 1) == '':
-                                       value_text = ''
-                               else:
-                                       value_text = float(self._unitModel.get_value(iter, 1))
+                               self._findIndex += 1
 
-                       if selectedUnitColumn == 0:
-                               sorted_list.append((unit_text, value_text, units_text))
-                       elif selectedUnitColumn == 1:
-                               sorted_list.append((value_text, unit_text, units_text))
-                       else:
-                               sorted_list.append((units_text, value_text, unit_text))
-
-                       #point to the next row in the self._unitModel
-                       iter = self._unitModel.iter_next(iter)
-                       row = row+1
-
-               #check if no calculations have been made yet (don't bother sorting)
-               if row == 0:
-                       return
+               if not self._find_result:
+                       self._findLabel.set_text('Text not found')
                else:
-                       if selectedUnitColumn == 0:
-                               if not evil_globals.unit_sort_direction:
-                                       sorted_list.sort(lambda (x, xx, xxx), (y, yy, yyy): cmp(string.lower(x), string.lower(y)))
-                                       evil_globals.unit_sort_direction = True
-                               else:
-                                       sorted_list.sort(lambda (x, xx, xxx), (y, yy, yyy): cmp(string.lower(y), string.lower(x)))
-                                       evil_globals.unit_sort_direction = False
-                       elif selectedUnitColumn == 1:
-                               sorted_list.sort()
-                               if not evil_globals.value_sort_direction:
-                                       evil_globals.value_sort_direction = True
-                               else:
-                                       sorted_list.reverse()
-                                       evil_globals.value_sort_direction = False
-                       else:
-                               if not evil_globals.units_sort_direction:
-                                       sorted_list.sort(lambda (x, xx, xxx), (y, yy, yyy): cmp(string.lower(x), string.lower(y)))
-                                       evil_globals.units_sort_direction = True
-                               else:
-                                       sorted_list.sort(lambda (x, xx, xxx), (y, yy, yyy): cmp(string.lower(y), string.lower(x)))
-                                       evil_globals.units_sort_direction = False
-
-                       #Clear out the previous list of units
-                       self._unitModel = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING)
-                       self._unitsView.set_model(self._unitModel)
-
-                       #colourize each row differently for easier reading
-                       self._unitsView.set_property('rules_hint', 1)
-
-                       #Clear out the description
-                       text_model = gtk.TextBuffer(None)
-                       self._unitDescription.set_buffer(text_model)
-
-                       if selectedUnitColumn == 0:
-                               for unit, value, units in sorted_list:
-                                       iter = self._unitModel.append()
-                                       self._unitModel.set(iter, 0, unit, 1, str(value), 2, units)
-                       elif selectedUnitColumn == 1:
-                               for value, unit, units in sorted_list:
-                                       iter = self._unitModel.append()
-                                       self._unitModel.set(iter, 0, unit, 1, str(value), 2, units)
-                       else:
-                               for units, value, unit in sorted_list:
-                                       iter = self._unitModel.append()
-                                       self._unitModel.set(iter, 0, unit, 1, str(value), 2, units)
-               return
-
-       def _on_click_category(self, row):
-               #Clear out the previous list of units
-               self._unitModel = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING)
-               self._unitsView.set_model(self._unitModel)
+                       self._update_find_selection()
+                       resultsLeft = len(self._find_result) - self._findIndex - 1
+                       self._findLabel.set_text(
+                               '%s result(s) left' % (resultsLeft, )
+                       )
 
-               #Colourize each row alternately for easier reading
-               self._unitsView.set_property('rules_hint', 1)
+       def _find_previous(self):
+               """
+               check if 'new find' or 'last find' or 'next-find'
 
-               #Clear out the description
-               text_model = gtk.TextBuffer(None)
-               self._unitDescription.set_buffer(text_model)
+               new-find = run the find algorithm which also selects the first found unit
+                        = self._findIndex = 0 and self._find_result = []
 
-               #Determine the contents of the selected category row
-               selected, iter = row.get_selection().get_selected()
+               last-find = restart from top again
+                         = self._findIndex = len(self._find_result)
 
-               evil_globals.selected_category = self._categoryModel.get_value(iter, 0)
+               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:
+                       if self._findIndex == 0:
+                               self._findIndex = len(self._find_result)-1
+                       else:
+                               self._findIndex -= 1
 
-               evil_globals.unit_sort_direction = False
-               evil_globals.value_sort_direction = False
-               evil_globals.units_sort_direction = False
-               self._unitNameColumn.set_sort_indicator(False)
-               self._unitValueColumn.set_sort_indicator(False)
-               self._unitSymbolColumn.set_sort_indicator(False)
+               if not self._find_result:
+                       self._findLabel.set_text('Text not found')
+               else:
+                       self._update_find_selection()
+                       resultsLeft = len(self._find_result) - self._findIndex - 1
+                       self._findLabel.set_text(
+                               '%s result(s) left' % (resultsLeft, )
+                       )
+
+       def _toggle_find(self):
+               if self._searchLayout.get_property("visible"):
+                       self._searchLayout.hide()
+               else:
+                       self._searchLayout.show()
+
+       def _unit_model_cmp(self, sortedModel, leftItr, rightItr):
+               leftUnitText = self._unitModel.get_value(leftItr, 0)
+               rightUnitText = self._unitModel.get_value(rightItr, 0)
+               return cmp(leftUnitText, rightUnitText)
+
+       def _symbol_model_cmp(self, sortedModel, leftItr, rightItr):
+               leftSymbolText = self._unitModel.get_value(leftItr, 2)
+               rightSymbolText = self._unitModel.get_value(rightItr, 2)
+               return cmp(leftSymbolText, rightSymbolText)
+
+       def _value_model_cmp(self, sortedModel, leftItr, rightItr):
+               #special sorting exceptions for ascii values (instead of float values)
+               if self._selectedCategory == "Computer Numbers":
+                       leftValue = self._unitModel.get_value(leftItr, 1)
+                       rightValue = self._unitModel.get_value(rightItr, 1)
+               else:
+                       leftValueText = self._unitModel.get_value(leftItr, 1)
+                       leftValue = float(leftValueText) if leftValueText else 0.0
+
+                       rightValueText = self._unitModel.get_value(rightItr, 1)
+                       rightValue = float(rightValueText) if rightValueText else 0.0
+               return cmp(leftValue, rightValue)
+
+       def _get_column_sort_stuff(self):
+               columns = (
+                       (self._unitNameColumn, "_unit_sort_direction", self._unit_model_cmp),
+                       (self._unitValueColumn, "_value_sort_direction", self._value_model_cmp),
+                       (self._unitSymbolColumn, "_units_sort_direction", self._symbol_model_cmp),
+               )
+               return columns
 
-               self._unitDataInCategory = unit_data.list_dic[selected.get_value(iter, 0)]
-               keys = self._unitDataInCategory.keys()
-               keys.sort()
-               del keys[0] # do not display .base_unit description key
+       def _switch_category(self, category):
+               self._selectedCategory = category
+               self._unitDataInCategory = unit_data.UNIT_DESCRIPTIONS[self._selectedCategory]
 
                #Fill up the units descriptions and clear the value cells
-               for key in keys:
+               self._clear_visible_unit_data()
+               for key in unit_data.get_units(self._selectedCategory):
                        iter = self._unitModel.append()
                        self._unitModel.set(iter, 0, key, 1, '', 2, self._unitDataInCategory[key][1])
+               self._sortedUnitModel.sort_column_changed()
+
+               self._select_default_unit()
 
+       def _clear_visible_unit_data(self):
+               self._unitDescription.get_buffer().set_text("")
                self._unitName.set_text('')
                self._unitValue.set_text('')
+               self._unitSymbol.set_text('')
+
                self._previousUnitName.set_text('')
                self._previousUnitValue.set_text('')
-               self._unitSymbol.set_text('')
                self._previousUnitSymbol.set_text('')
 
-               self.restore_units()
-
-       def restore_units(self):
-               # Restore the previous historical settings of previously selected units in this newly selected category
-               #Since category has just been clicked, the list will be sorted already.
-               if evil_globals.selected_category in evil_globals.selected_units:
-                       if evil_globals.selected_units[evil_globals.selected_category][0]:
-                               ''"debug ''"
-                               #evil_globals.selected_units[evil_globals.selected_category] = [selected_unit, evil_globals.selected_units[evil_globals.selected_category][0]]
-
-                               units = unit_data.list_dic[evil_globals.selected_category].keys()
-                               units.sort()
-                               del units[0] # do not display .base_unit description key
-
-                               #Restore oldest selection first.
-                               if evil_globals.selected_units[evil_globals.selected_category][1]:
-                                       unit_no = 0
-                                       for unit in units:
-                                               if unit == evil_globals.selected_units[evil_globals.selected_category][1]:
-                                                       self._unitsView.set_cursor(unit_no, self._unitNameColumn, True)
-                                               unit_no = unit_no+1
-
-                               #Restore newest selection second.
-                               unit_no = 0
-                               for unit in units:
-                                       if unit == evil_globals.selected_units[evil_globals.selected_category][0]:
-                                               self._unitsView.set_cursor(unit_no, self._unitNameColumn, True)
-                                       unit_no = unit_no+1
+               self._unitModel.clear()
+
+       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)
 
                # select the text so user can start typing right away
                self._unitValue.grab_focus()
                self._unitValue.select_region(0, -1)
 
-       def _on_button_released(self, row, a):
-               self._on_click_unit(row)
+       def _sanitize_value(self, userEntry):
+               if self._selectedCategory == "Computer Numbers":
+                       if userEntry == '':
+                               value = '0'
+                       else:
+                               value = userEntry
+               else:
+                       if userEntry == '':
+                               value = 0.0
+                       else:
+                               value = float(userEntry)
+               return value
+
+       def _on_shortlist_changed(self, *args):
+               try:
+                       raise NotImplementedError("%s" % self._shortlistcheck.get_active())
+               except Exception:
+                       _moduleLogger.exception("")
+
+       def _on_edit_shortlist(self, *args):
+               try:
+                       raise NotImplementedError("%s" % self._toggleShortList.get_active())
+               except Exception:
+                       _moduleLogger.exception("")
+
+       def _on_user_clear_selections(self, *args):
+               try:
+                       selectionsDatPath = "/".join((constants._data_path_, "selections.dat"))
+                       os.remove(selectionsDatPath)
+                       self._defaultUnitForCategory = {}
+               except Exception:
+                       _moduleLogger.exception("")
+
+       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:
+                               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()
+               except Exception, e:
+                       _moduleLogger.exception("")
+
+       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("")
+
+       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("")
+
+       def _on_find_activate(self, *args):
+               try:
+                       self._find_next()
+                       self._findButton.grab_focus()
+               except Exception:
+                       _moduleLogger.exception("")
+
+       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("")
+
+       def _on_click_category(self, *args):
+               try:
+                       selected, iter = self._categoryView.get_selection().get_selected()
+                       selectedCategory = self._categoryModel.get_value(iter, 0)
+                       self._switch_category(selectedCategory)
+               except Exception:
+                       _moduleLogger.exception("")
+
+       def _on_click_unit(self, *args):
+               try:
+                       selected, iter = self._unitsView.get_selection().get_selected()
+                       selected_unit = selected.get_value(iter, 0)
+                       unit_spec = self._unitDataInCategory[selected_unit]
+
+                       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())
 
-       def _on_click_unit(self, row):
-               evil_globals.calcsuppress = 1 #suppress calculations
+                       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
 
-               #Determine the contents of the selected row.
-               selected, iter = self._unitsView.get_selection().get_selected()
+                       if self._unitValue.get_text() == '':
+                               if self._selectedCategory == "Computer Numbers":
+                                       self._unitValue.set_text("0")
+                               else:
+                                       self._unitValue.set_text("0.0")
 
-               selected_unit = selected.get_value(iter, 0)
+                       self._defaultUnitForCategory[self._selectedCategory] = [
+                               self._unitName.get_text(), self._previousUnitName.get_text()
+                       ]
 
-               unit_spec = self._unitDataInCategory[selected_unit]
+                       # select the text so user can start typing right away
+                       self._unitValue.grab_focus()
+                       self._unitValue.select_region(0, -1)
+               except Exception:
+                       _moduleLogger.exception("")
 
-               #Clear out the description
-               text_model = gtk.TextBuffer(None)
-               self._unitDescription.set_buffer(text_model)
+       def _on_unit_value_changed(self, *args):
+               try:
+                       if self._unitName.get_text() == '':
+                               return
+                       if not self._unitValue.is_focus():
+                               return
 
-               enditer = text_model.get_end_iter()
-               text_model.insert(enditer, unit_spec[2])
+                       value = self._sanitize_value(self._unitValue.get_text())
 
-               if self._unitName.get_text() != selected_unit:
-                       self._previousUnitName.set_text(self._unitName.get_text())
-                       self._previousUnitValue.set_text(self._unitValue.get_text())
-                       if self._unitSymbol.get() == None:
-                               self._previousUnitSymbol.set_text('')
-                       else:
-                               self._previousUnitSymbol.set_text(self._unitSymbol.get())
-               self._unitName.set_text(selected_unit)
+                       #retrieve the conversion function and value from the selected unit
+                       func, arg = self._unitDataInCategory[self._unitName.get_text()][0]
+                       base = func.to_base(value, arg)
 
-               self._unitValue.set_text(selected.get_value(iter, 1))
+                       #point to the first row
+                       for row in self._unitModel:
+                               func, arg = self._unitDataInCategory[row[0]][0]
+                               row[1] = str(func.from_base(base, arg))
 
-               self._unitSymbol.set_text(unit_spec[1]) # put units into label text
-               if self._unitValue.get_text() == '':
-                       if evil_globals.selected_category == "Computer Numbers":
-                               self._unitValue.set_text("0")
-                       else:
-                               self._unitValue.set_text("0.0")
+                       # if the second row has a unit then update its value
+                       if self._previousUnitName.get_text() != '':
+                               func, arg = self._unitDataInCategory[self._previousUnitName.get_text()][0]
+                               self._previousUnitValue.set_text(str(func.from_base(base, arg, )))
+               except Exception:
+                       _moduleLogger.exception("")
 
-               #For historical purposes, record this unit as the most recent one in this category.
-               # Also, if a previous unit exists, then shift that previous unit to oldest unit.
-               if evil_globals.selected_category in evil_globals.selected_units:
-                       if evil_globals.selected_units[evil_globals.selected_category][0]:
-                               evil_globals.selected_units[evil_globals.selected_category] = [selected_unit, evil_globals.selected_units[evil_globals.selected_category][0]]
-               else:
-                       evil_globals.selected_units[evil_globals.selected_category] = [selected_unit, '']
+       def _on_previous_unit_value_changed(self, *args):
+               try:
+                       if self._previousUnitName.get_text() == '':
+                               return
+                       if not self._previousUnitValue.is_focus():
+                               return
 
-               # select the text so user can start typing right away
-               self._unitValue.grab_focus()
-               self._unitValue.select_region(0, -1)
+                       value = self._sanitize_value(self._previousUnitValue.get_text())
+
+                       #retrieve the conversion function and value from the selected unit
+                       func, arg = self._unitDataInCategory[self._previousUnitName.get_text()][0]
+                       base = func.to_base(value, arg)
 
-               evil_globals.calcsuppress = 0 #enable calculations
+                       #point to the first row
+                       for row in self._unitModel:
+                               func, arg = self._unitDataInCategory[row[0]][0]
+                               row[1] = str(func.from_base(base, arg))
+
+                       # if the second row has a unit then update its value
+                       if self._unitName.get_text() != '':
+                               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.''"
@@ -603,119 +649,42 @@ class Gonvert(object):
                messagebox.show()
                while gtk.events_pending():
                        gtk.mainiteration(False)
-               category_keys = unit_data.list_dic.keys()
-               category_keys.sort()
+
                total_categories = 0
                total_units = 0
                print 'gonvert-%s%s' % (
                        constants.__version__,
                        _(u' - Unit Conversion Utility  - Convertible units listing: ')
                )
-               for category_key in category_keys:
+               for category_key in unit_data.UNIT_CATEGORIES:
                        total_categories = total_categories + 1
                        print category_key, ": "
-                       self._unitDataInCategory = unit_data.list_dic[category_key]
-                       unit_keys = self._unitDataInCategory.keys()
-                       unit_keys.sort()
-                       del unit_keys[0] # do not display .base_unit description 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'
-               messagebox_model = gtk.TextBuffer(None)
-               messageboxtext.set_buffer(messagebox_model)
-               messagebox_model.insert_at_cursor(_(u'The units list has been written to stdout. You can capture this printout by starting gonvert from the command line as follows: \n$ gonvert > file.txt'), -1)
 
-       def top(self, a):
-               if evil_globals.calcsuppress == 1:
-                       #evil_globals.calcsuppress = 0
-                       return
-               # determine if value to be calculated is empty
-               if evil_globals.selected_category == "Computer Numbers":
-                       if self._unitValue.get_text() == '':
-                               value = '0'
-                       else:
-                               value = self._unitValue.get_text()
-               else:
-                       if self._unitValue.get_text() == '':
-                               value = 0.0
-                       else:
-                               value = float(self._unitValue.get_text())
-
-               if self._unitName.get_text() != '':
-                       func, arg = self._unitDataInCategory[self._unitName.get_text()][0] #retrieve the conversion function and value from the selected unit
-                       base = apply(func.to_base, (value, arg, )) #determine the base unit value
-
-                       keys = self._unitDataInCategory.keys()
-                       keys.sort()
-                       del keys[0]
-                       row = 0
-
-                       #point to the first row
-                       iter = self._unitModel.get_iter_first()
-
-                       while iter:
-                               #get the formula from the name at the row
-                               func, arg = self._unitDataInCategory[self._unitModel.get_value(iter, 0)][0]
-
-                               #set the result in the value column
-                               self._unitModel.set(iter, 1, str(apply(func.from_base, (base, arg, ))))
-
-                               #point to the next row in the self._unitModel
-                               iter = self._unitModel.iter_next(iter)
-
-                       # if the second row has a unit then update its value
-                       if self._previousUnitName.get_text() != '':
-                               evil_globals.calcsuppress = 1
-                               func, arg = self._unitDataInCategory[self._previousUnitName.get_text()][0]
-                               self._previousUnitValue.set_text(str(apply(func.from_base, (base, arg, ))))
-                               evil_globals.calcsuppress = 0
-
-       def bottom(self, a):
-               if evil_globals.calcsuppress == 1:
-                       #evil_globals.calcsuppress = 0
-                       return
-               # determine if value to be calculated is empty
-               if evil_globals.selected_category == "Computer Numbers":
-                       if self._previousUnitValue.get_text() == '':
-                               value = '0'
-                       else:
-                               value = self._previousUnitValue.get_text()
-               else:
-                       if self._previousUnitValue.get_text() == '':
-                               value = 0.0
-                       else:
-                               value = float(self._previousUnitValue.get_text())
-
-               if self._previousUnitName.get_text() != '':
-                       func, arg = self._unitDataInCategory[self._previousUnitName.get_text()][0] #retrieve the conversion function and value from the selected unit
-                       base = apply(func.to_base, (value, arg, )) #determine the base unit value
-
-                       keys = self._unitDataInCategory.keys()
-                       keys.sort()
-                       del keys[0]
-                       row = 0
-
-                       #point to the first row
-                       iter = self._unitModel.get_iter_first()
-
-                       while iter:
-                               #get the formula from the name at the row
-                               func, arg = self._unitDataInCategory[self._unitModel.get_value(iter, 0)][0]
-
-                               #set the result in the value column
-                               self._unitModel.set(iter, 1, str(apply(func.from_base, (base, arg, ))))
-
-                               #point to the next row in the self._unitModel
-                               iter = self._unitModel.iter_next(iter)
-
-                       # if the second row has a unit then update its value
-                       if self._unitName.get_text() != '':
-                               evil_globals.calcsuppress = 1
-                               func, arg = self._unitDataInCategory[self._unitName.get_text()][0]
-                               self._unitValue.set_text(str(apply(func.from_base, (base, arg, ))))
-                               evil_globals.calcsuppress = 0
+       def _on_about_clicked(self, a):
+               dlg = gtk.AboutDialog()
+               dlg.set_name(constants.__pretty_app_name__)
+               dlg.set_version("%s-%d" % (constants.__version__, constants.__build__))
+               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.run()
+               dlg.destroy()
+
+       def _on_user_exit(self, *args):
+               try:
+                       self._save_settings()
+               except Exception:
+                       _moduleLogger.exception("")
+               finally:
+                       gtk.main_quit()
 
 
 def main():