From: Ed Page Date: Fri, 30 Oct 2009 01:26:25 +0000 (-0500) Subject: Encapsulated almost all of the state into a class X-Git-Url: http://git.maemo.org/git/?p=gonvert;a=commitdiff_plain;h=a4f65fa84985ca3301b1c7255435844eca0ff2ae Encapsulated almost all of the state into a class --- diff --git a/data/gonvert.glade b/data/gonvert.glade index f5b841f..7c036f1 100644 --- a/data/gonvert.glade +++ b/data/gonvert.glade @@ -18,7 +18,7 @@ GDK_GRAVITY_NORTH_WEST True False - + @@ -47,7 +47,7 @@ True _Exit True - + diff --git a/src/converters.py b/src/converters.py index d4f9bc2..20a7e1d 100644 --- a/src/converters.py +++ b/src/converters.py @@ -67,11 +67,11 @@ def toroman(n): 'xv' """ if n < 0: - raise NotImplemented("Value out of roman comprehension") + raise NotImplementedError("Value out of roman comprehension") elif n == 0: '' elif n >= 4000: - raise NotImplemented("Value Out of Range") + raise NotImplementedError("Value Out of Range") base = 1 s = '' diff --git a/src/gonvert_glade.py b/src/gonvert_glade.py index 6eb5a03..843706c 100755 --- a/src/gonvert_glade.py +++ b/src/gonvert_glade.py @@ -25,444 +25,611 @@ gettext.textdomain('gonvert') _ = gettext.gettext -def _on_shortlist_changed(a): - print "shortlist" - if shortlistcheck.get_active(): - print "1" - else: - print "0" +def change_menu_label(widgets, labelname, newtext): + item_label = widgets.get_widget(labelname).get_children()[0] + item_label.set_text(newtext) -def _on_edit_shortlist(a): - print "edit shortlist" - if toggleShortList.get_active(): - print "1" - else: - print "0" +class Gonvert(object): + _glade_files = [ + os.path.join(os.path.dirname(__file__), "gonvert.glade"), + os.path.join(os.path.dirname(__file__), "../data/gonvert.glade"), + os.path.join(os.path.dirname(__file__), "../lib/gonvert.glade"), + '/usr/lib/gonvert/gonvert.glade', + ] -def _on_user_clear_selections(a): - selectionsDatPath = "/".join((constants._data_path_, "selections.dat")) - os.remove(selectionsDatPath) - evil_globals.selected_units = {} - - -def _on_user_exit(a): - """ - 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: - [categoryname: #1 displayed unit, #2 displayed unit] - """ - #Determine the contents of the selected category row - selected, iter = categoryView.get_selection().get_selected() - evil_globals.selected_category = categoryModel.get_value(iter, 0) - - selections = { - 'selected_category': evil_globals.selected_category, - 'selected_units': evil_globals.selected_units - } - selectionsDatPath = "/".join((constants._data_path_, "selections.dat")) - pickle.dump(selections, open(selectionsDatPath, 'w')) - - #Get last size of app and save it - window_settings = { - 'size': mainWindow.get_size() - } - windowDatPath = "/".join((constants._data_path_, "window.dat")) - pickle.dump(window_settings, open(windowDatPath, 'w')) - - gtk.mainquit - sys.exit() - - -def findEntry_changed(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 - findLabel.set_text('') #clear result - - -def _on_find_key_press(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 _on_about_clicked(a): - about_box.show() - - -def _on_about_hide(*args): - about_box.hide() - return gtk.TRUE - - -def messagebox_ok_clicked(a): - messagebox.hide() - - -def _on_user_find_units(a): - global unitNameColumn - global categoryColumn - #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) + def __init__(self): + #check to see if glade file is in current directory (user must be + # running from download untar directory) + for gladePath in self._glade_files: + if os.path.isfile(gladePath): + homepath = os.path.dirname(gladePath) + pixmapspath = "/".join((homepath, "pixmaps")) + widgets = gtk.glade.XML(gladePath) + break + else: + return - #next-find = continue to next found location - # = evil_globals.find_count = 0 and len(evil_globals.find_result)>0 + self._mainWindow = widgets.get_widget('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')) + + self._shortlistcheck = widgets.get_widget('shortlistcheck') + self._toggleShortList = widgets.get_widget('toggleShortList') + + self._categoryView = widgets.get_widget('categoryView') + + self._unitsView = widgets.get_widget('unitsView') + 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._findEntry = widgets.get_widget('findEntry') + self._findLabel = widgets.get_widget('findLabel') + findButton = widgets.get_widget('findButton') + + #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) + self._unitNameColumn.set_property('resizable', 1) + self._unitNameColumn.add_attribute(renderer, 'text', 0) + self._unitNameColumn.set_clickable(True) + self._unitNameColumn.connect("clicked", self._on_click_unit_column) + self._unitsView.append_column(self._unitNameColumn) + + self._unitValueColumn = gtk.TreeViewColumn(_('Value'), renderer) + self._unitValueColumn.set_property('resizable', 1) + self._unitValueColumn.add_attribute(renderer, 'text', 1) + self._unitValueColumn.set_clickable(True) + self._unitValueColumn.connect("clicked", self._on_click_unit_column) + self._unitsView.append_column(self._unitValueColumn) + + self._unitSymbolColumn = gtk.TreeViewColumn(_('Units'), renderer) + self._unitSymbolColumn.set_property('resizable', 1) + self._unitSymbolColumn.add_attribute(renderer, 'text', 2) + self._unitSymbolColumn.set_clickable(True) + self._unitSymbolColumn.connect("clicked", self._on_click_unit_column) + self._unitsView.append_column(self._unitSymbolColumn) + + #Insert a column into the category list even though the heading will not be seen + renderer = gtk.CellRendererText() + self._categoryColumn = gtk.TreeViewColumn('Title', renderer) + self._categoryColumn.set_property('resizable', 1) + self._categoryColumn.add_attribute(renderer, 'text', 0) + self._categoryView.append_column(self._categoryColumn) + + self._categoryModel = gtk.ListStore(gobject.TYPE_STRING) + self._categoryView.set_model(self._categoryModel) + #colourize each row differently for easier reading + self._categoryView.set_property('rules_hint', 1) + + #Populate the catagories list + keys = unit_data.list_dic.keys() + keys.sort() + for key in keys: + 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_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_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.set_title('gonvert- %s - Unit Conversion Utility' % constants.__version__) + iconPath = pixmapspath + '/gonvert.png' + if os.path.exists(iconPath): + self._mainWindow.set_icon(gtk.gdk.pixbuf_new_from_file(iconPath)) + else: + _moduleLogger.warn("Error: Could not find gonvert icon: %s" % iconPath) + + #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: + a, b = saved_window['size'] + self._mainWindow.resize(a, b) + else: + #Maximize if no previous size was found + #self._mainWindow.maximize() + pass + else: + #Maximize if no previous window.dat file was found + #self._mainWindow.maximize() + pass - #check for new-find - if len(evil_globals.find_result) == 0: - find_string = string.lower(string.strip(findEntry.get_text())) - #Make sure that a valid find string has been requested - if len(find_string)>0: + #Restore selections from previously saved settings if it exists and is valid. + historical_catergory_found = False + 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. + # + #Make a list of categories to determine which one to select 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 the 'selected_unts' has been stored, then extract evil_globals.selected_units 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. + 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]: + # 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() + + self.restore_units() + + def _on_shortlist_changed(self, a): + print "shortlist" + if self._shortlistcheck.get_active(): + print "1" + else: + print "0" - if found_a_unit == 1: - #select the first found unit + 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): + """ + 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: + [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) + + selections = { + 'selected_category': evil_globals.selected_category, + 'selected_units': evil_globals.selected_units + } + selectionsDatPath = "/".join((constants._data_path_, "selections.dat")) + pickle.dump(selections, open(selectionsDatPath, 'w')) + + #Get last size of app and save it + window_settings = { + 'size': self._mainWindow.get_size() + } + windowDatPath = "/".join((constants._data_path_, "window.dat")) + pickle.dump(window_settings, open(windowDatPath, 'w')) + + gtk.mainquit + sys.exit() + + 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 + + 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 _on_about_clicked(self, a): + self._about_box.show() + + def _on_about_hide(self, *args): + self._about_box.hide() + return gtk.TRUE + + def messagebox_ok_clicked(self, a): + messagebox.hide() + + 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]: - categoryView.set_cursor(evil_globals.find_result[0][2], categoryColumn, False) - unitsView.set_cursor(evil_globals.find_result[0][3], unitNameColumn, True) - if len(evil_globals.find_result)>1: - findLabel.set_text(('Press Find for next unit. '+ str(len(evil_globals.find_result))+' result(s).')) - else: - 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 - categoryView.set_cursor(evil_globals.find_result[evil_globals.find_count][2], categoryColumn, False) - unitsView.set_cursor(evil_globals.find_result[evil_globals.find_count][3], 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]: - categoryView.set_cursor(evil_globals.find_result[evil_globals.find_count][2], categoryColumn, False) - unitsView.set_cursor(evil_globals.find_result[evil_globals.find_count][3], unitNameColumn, True) - - -def _on_click_unit_column(col): - """ - Sort the contents of the col when the user clicks on the title. - """ - global unitNameColumn - global unitValueColumn - global unitSymbolColumn - global unitModel - - #Determine which column requires sorting - if col is unitNameColumn: - selectedUnitColumn = 0 - unitNameColumn.set_sort_indicator(True) - unitValueColumn.set_sort_indicator(False) - unitSymbolColumn.set_sort_indicator(False) - unitNameColumn.set_sort_order(not evil_globals.unit_sort_direction) - elif col is unitValueColumn: - selectedUnitColumn = 1 - unitNameColumn.set_sort_indicator(False) - unitValueColumn.set_sort_indicator(True) - unitSymbolColumn.set_sort_indicator(False) - unitValueColumn.set_sort_order(not evil_globals.value_sort_direction) - elif col is unitSymbolColumn: - selectedUnitColumn = 2 - unitNameColumn.set_sort_indicator(False) - unitValueColumn.set_sort_indicator(False) - unitSymbolColumn.set_sort_indicator(True) - unitSymbolColumn.set_sort_order(not evil_globals.units_sort_direction) - 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 = unitModel.get_iter_first() - row = 0 - - while iter: - #grab all text from columns for sorting - - #get the text from each column - unit_text = unitModel.get_value(iter, 0) - units_text = unitModel.get_value(iter, 2) - - #do not bother sorting if the value column is empty - if 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 = unitModel.get_value(iter, 1) + 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) + + def _on_click_unit_column(self, col): + """ + Sort the contents of the col when the user clicks on the title. + """ + #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) else: - if unitModel.get_value(iter, 1) == None or unit_model.get_value(iter, 1) == '': - value_text = '' - else: - value_text = float(unitModel.get_value(iter, 1)) + assert False, "Unknown column: %s" % (col.get_title(), ) - 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)) + #declare a spot to hold the sorted list + sorted_list = [] - #point to the next row in the unitModel - iter = unitModel.iter_next(iter) - row = row+1 + #point to the first row + iter = self._unitModel.get_iter_first() + row = 0 - #check if no calculations have been made yet (don't bother sorting) - if row == 0: - return - 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 + 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) 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 + 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)) + + 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.reverse() - evil_globals.value_sort_direction = False + 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 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 + 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: - sorted_list.sort(lambda (x, xx, xxx), (y, yy, yyy): cmp(string.lower(y), string.lower(x))) - evil_globals.units_sort_direction = False + 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): + global unitDataInCategory, list_dic #Clear out the previous list of units - unitModel = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING) - unitsView.set_model(unitModel) + 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 - unitsView.set_property('rules_hint', 1) + #Colourize each row alternately for easier reading + self._unitsView.set_property('rules_hint', 1) #Clear out the description text_model = gtk.TextBuffer(None) - unitDescription.set_buffer(text_model) - - if selectedUnitColumn == 0: - for unit, value, units in sorted_list: - iter = unitModel.append() - unitModel.set(iter, 0, unit, 1, str(value), 2, units) - elif selectedUnitColumn == 1: - for value, unit, units in sorted_list: - iter = unitModel.append() - unitModel.set(iter, 0, unit, 1, str(value), 2, units) - else: - for units, value, unit in sorted_list: - iter = unitModel.append() - unitModel.set(iter, 0, unit, 1, str(value), 2, units) - return - - -def _on_click_category(row): - global unitModel, categoryModel - global unitDataInCategory, list_dic - - #Clear out the previous list of units - unitModel = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING) - unitsView.set_model(unitModel) - - #Colourize each row alternately for easier reading - unitsView.set_property('rules_hint', 1) - - #Clear out the description - text_model = gtk.TextBuffer(None) - unitDescription.set_buffer(text_model) - - #Determine the contents of the selected category row - selected, iter = row.get_selection().get_selected() - - evil_globals.selected_category = categoryModel.get_value(iter, 0) - - evil_globals.unit_sort_direction = False - evil_globals.value_sort_direction = False - evil_globals.units_sort_direction = False - unitNameColumn.set_sort_indicator(False) - unitValueColumn.set_sort_indicator(False) - unitSymbolColumn.set_sort_indicator(False) - - unitDataInCategory = unit_data.list_dic[selected.get_value(iter, 0)] - keys = unitDataInCategory.keys() - keys.sort() - del keys[0] # do not display .base_unit description key - - #Fill up the units descriptions and clear the value cells - for key in keys: - iter = unitModel.append() - unitModel.set(iter, 0, key, 1, '', 2, unitDataInCategory[key][1]) - - unitName.set_text('') - unitValue.set_text('') - previousUnitName.set_text('') - previousUnitValue.set_text('') - unitSymbol.set_text('') - previousUnitSymbol.set_text('') - - restore_units() - - -def restore_units(): - global unitDataInCategory, list_dic - - # 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]] + self._unitDescription.set_buffer(text_model) + + #Determine the contents of the selected category row + selected, iter = row.get_selection().get_selected() + + evil_globals.selected_category = self._categoryModel.get_value(iter, 0) + + 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) + + unitDataInCategory = unit_data.list_dic[selected.get_value(iter, 0)] + keys = unitDataInCategory.keys() + keys.sort() + del keys[0] # do not display .base_unit description key + + #Fill up the units descriptions and clear the value cells + for key in keys: + iter = self._unitModel.append() + self._unitModel.set(iter, 0, key, 1, '', 2, unitDataInCategory[key][1]) + + self._unitName.set_text('') + self._unitValue.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): + global unitDataInCategory, list_dic + + # 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 - 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 oldest selection first. - if evil_globals.selected_units[evil_globals.selected_category][1]: + #Restore newest selection second. unit_no = 0 for unit in units: - if unit == evil_globals.selected_units[evil_globals.selected_category][1]: - unitsView.set_cursor(unit_no, unitNameColumn, True) + 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 - #Restore newest selection second. - unit_no = 0 - for unit in units: - if unit == evil_globals.selected_units[evil_globals.selected_category][0]: - unitsView.set_cursor(unit_no, unitNameColumn, True) - unit_no = unit_no+1 - - # select the text so user can start typing right away - unitValue.grab_focus() - unitValue.select_region(0, -1) + # 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 _on_button_released(row, a): - click_unit(row) + def _on_click_unit(self, row): + evil_globals.calcsuppress = 1 #suppress calculations + #Determine the contents of the selected row. + selected, iter = self._unitsView.get_selection().get_selected() -def _on_click_unit(row): - evil_globals.calcsuppress = 1 #suppress calculations + selected_unit = selected.get_value(iter, 0) - #Determine the contents of the selected row. - selected, iter = unitsView.get_selection().get_selected() + unit_spec = unitDataInCategory[selected_unit] - selected_unit = selected.get_value(iter, 0) - - unit_spec = unitDataInCategory[selected_unit] + #Clear out the description + text_model = gtk.TextBuffer(None) + self._unitDescription.set_buffer(text_model) - #Clear out the description - text_model = gtk.TextBuffer(None) - unitDescription.set_buffer(text_model) + enditer = text_model.get_end_iter() + text_model.insert(enditer, unit_spec[2]) - enditer = text_model.get_end_iter() - text_model.insert(enditer, unit_spec[2]) + 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) - if unitName.get_text() != selected_unit: - previousUnitName.set_text(unitName.get_text()) - previousUnitValue.set_text(unitValue.get_text()) - if unitSymbol.get() == None: - previousUnitSymbol.set_text('') - else: - previousUnitSymbol.set_text(unitSymbol.get()) - unitName.set_text(selected_unit) + self._unitValue.set_text(selected.get_value(iter, 1)) - unitValue.set_text(selected.get_value(iter, 1)) + 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") - unitSymbol.set_text(unit_spec[1]) # put units into label text - if unitValue.get_text() == '': - if evil_globals.selected_category == "Computer Numbers": - unitValue.set_text("0") + #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: - unitValue.set_text("0.0") - - #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, ''] - - # select the text so user can start typing right away - unitValue.grab_focus() - unitValue.select_region(0, -1) - - evil_globals.calcsuppress = 0 #enable calculations - - -def _on_user_write_units(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) - 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: - total_categories = total_categories + 1 - print category_key, ": " - unitDataInCategory = unit_data.list_dic[category_key] - unit_keys = unitDataInCategory.keys() - unit_keys.sort() - del unit_keys[0] # do not display .base_unit description key - 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) - - -class Ccalculate(object): + evil_globals.selected_units[evil_globals.selected_category] = [selected_unit, ''] + + # select the text so user can start typing right away + self._unitValue.grab_focus() + self._unitValue.select_region(0, -1) + + evil_globals.calcsuppress = 0 #enable calculations + + 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) + 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: + total_categories = total_categories + 1 + print category_key, ": " + unitDataInCategory = unit_data.list_dic[category_key] + unit_keys = unitDataInCategory.keys() + unit_keys.sort() + del unit_keys[0] # do not display .base_unit description key + 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): - global unitModel global testvalue if evil_globals.calcsuppress == 1: @@ -470,18 +637,18 @@ class Ccalculate(object): return # determine if value to be calculated is empty if evil_globals.selected_category == "Computer Numbers": - if unitValue.get_text() == '': + if self._unitValue.get_text() == '': value = '0' else: - value = unitValue.get_text() + value = self._unitValue.get_text() else: - if unitValue.get_text() == '': + if self._unitValue.get_text() == '': value = 0.0 else: - value = float(unitValue.get_text()) + value = float(self._unitValue.get_text()) - if unitName.get_text() != '': - func, arg = unitDataInCategory[unitName.get_text()][0] #retrieve the conversion function and value from the selected unit + if self._unitName.get_text() != '': + func, arg = 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 = unitDataInCategory.keys() @@ -490,23 +657,23 @@ class Ccalculate(object): row = 0 #point to the first row - iter = unitModel.get_iter_first() + iter = self._unitModel.get_iter_first() while iter: #get the formula from the name at the row - func, arg = unitDataInCategory[unitModel.get_value(iter, 0)][0] + func, arg = unitDataInCategory[self._unitModel.get_value(iter, 0)][0] #set the result in the value column - unitModel.set(iter, 1, str(apply(func.from_base, (base, arg, )))) + self._unitModel.set(iter, 1, str(apply(func.from_base, (base, arg, )))) - #point to the next row in the unitModel - iter = unitModel.iter_next(iter) + #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 previousUnitName.get_text() != '': + if self._previousUnitName.get_text() != '': evil_globals.calcsuppress = 1 - func, arg = unitDataInCategory[previousUnitName.get_text()][0] - previousUnitValue.set_text(str(apply(func.from_base, (base, arg, )))) + func, arg = 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): @@ -515,18 +682,18 @@ class Ccalculate(object): return # determine if value to be calculated is empty if evil_globals.selected_category == "Computer Numbers": - if previousUnitValue.get_text() == '': + if self._previousUnitValue.get_text() == '': value = '0' else: - value = previousUnitValue.get_text() + value = self._previousUnitValue.get_text() else: - if previousUnitValue.get_text() == '': + if self._previousUnitValue.get_text() == '': value = 0.0 else: - value = float(previousUnitValue.get_text()) + value = float(self._previousUnitValue.get_text()) - if previousUnitName.get_text() != '': - func, arg = unitDataInCategory[previousUnitName.get_text()][0] #retrieve the conversion function and value from the selected unit + if self._previousUnitName.get_text() != '': + func, arg = 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 = unitDataInCategory.keys() @@ -535,253 +702,35 @@ class Ccalculate(object): row = 0 #point to the first row - iter = unitModel.get_iter_first() + iter = self._unitModel.get_iter_first() while iter: #get the formula from the name at the row - func, arg = unitDataInCategory[unitModel.get_value(iter, 0)][0] + func, arg = unitDataInCategory[self._unitModel.get_value(iter, 0)][0] #set the result in the value column - unitModel.set(iter, 1, str(apply(func.from_base, (base, arg, )))) + self._unitModel.set(iter, 1, str(apply(func.from_base, (base, arg, )))) - #point to the next row in the unitModel - iter = unitModel.iter_next(iter) + #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 unitName.get_text() != '': + if self._unitName.get_text() != '': evil_globals.calcsuppress = 1 - func, arg = unitDataInCategory[unitName.get_text()][0] - unitValue.set_text(str(apply(func.from_base, (base, arg, )))) + func, arg = unitDataInCategory[self._unitName.get_text()][0] + self._unitValue.set_text(str(apply(func.from_base, (base, arg, )))) evil_globals.calcsuppress = 0 def main(): - global mainWindow - global categoryView - global categoryModel - global unitValue - global unitName - global unitSymbol - global unitsView - global calculate - global shortlistcheck - global about_box - global unitDescription - global unitNameColumn - global unitValueColumn - global unitSymbolColumn - global previousUnitName - global previousUnitValue - global previousUnitSymbol - global findLabel - global findEntry - global categoryColumn - global toggleShortList - logging.basicConfig(level = logging.DEBUG) - try: os.makedirs(constants._data_path_) except OSError, e: if e.errno != 17: raise - #check to see if glade file is in current directory (user must be running from download untar directory) - _glade_files = [ - os.path.join(os.path.dirname(__file__), "gonvert.glade"), - os.path.join(os.path.dirname(__file__), "../data/gonvert.glade"), - os.path.join(os.path.dirname(__file__), "../lib/gonvert.glade"), - '/usr/lib/gonvert/gonvert.glade', - ] - for gladePath in _glade_files: - if os.path.isfile(gladePath): - homepath = os.path.dirname(gladePath) - pixmapspath = "/".join((homepath, "pixmaps")) - widgets = gtk.glade.XML(gladePath) - break - else: - return - - calculate = Ccalculate() - mainWindow = widgets.get_widget('mainWindow') - - #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: - a, b = saved_window['size'] - mainWindow.resize(a, b) - else: - #Maximize if no previous size was found - #mainWindow.maximize() - pass - else: - #Maximize if no previous window.dat file was found - #mainWindow.maximize() - pass - - mainWindow.set_title('gonvert- %s - Unit Conversion Utility' % constants.__version__) - iconPath = pixmapspath + '/gonvert.png' - if os.path.exists(iconPath): - mainWindow.set_icon(gtk.gdk.pixbuf_new_from_file(iconPath)) - else: - _moduleLogger.warn("Error: Could not find gonvert icon: %s" % iconPath) - - #--------- connections to GUI ---------------- - dic = { - "on_exitMenuItem_activate": _on_user_exit, - "on_mainWindow_destroy": _on_user_exit, - "on_categoryView_select_row": _on_click_category, - "on_unitsView__on_click_unit_column": _on_click_unit_column, - "on_unitValue_changed": calculate.top, - "on_previousUnitValue_changed": calculate.bottom, - "on_writeUnitsMenuItem_activate": _on_user_write_units, - "on_findButton_clicked": _on_user_find_units, - "on_findEntry_key_press_event": _on_find_key_press, - "on_findEntry_changed": findEntry_changed, - "on_aboutMenuItem_activate": _on_about_clicked, - "on_about_close_clicked": _on_about_hide, - "on_messagebox_ok_clicked": messagebox_ok_clicked, - "on_clearSelectionMenuItem_activate": _on_user_clear_selections, - "on_unitsView_cursor_changed": _on_click_unit, - "on_unitsView_button_released": _on_button_released, - "on_shortlistcheck_toggled": _on_shortlist_changed, - "on_toggleShortList_activate": _on_edit_shortlist, - } - - widgets.signal_autoconnect(dic) - mainWindow.connect("destroy", _on_user_exit) - - def change_menu_label(labelname, newtext): - item_label = widgets.get_widget(labelname).get_children()[0] - item_label.set_text(newtext) - - def change_label(labelname, newtext): - item_label = widgets.get_widget(labelname) - item_label.set_text(newtext) - - change_menu_label('fileMenuItem', _('File')) - change_menu_label('exitMenuItem', _('Exit')) - change_menu_label('toolsMenuItem', _('Tools')) - change_menu_label('clearSelectionMenuItem', _('Clear selections')) - change_menu_label('writeUnitsMenuItem', _('Write Units')) - change_menu_label('helpMenuItem', _('Help')) - change_menu_label('aboutMenuItem', _('About')) - - change_menu_label('findButton', _('Find')) - - shortlistcheck = widgets.get_widget('shortlistcheck') - toggleShortList = widgets.get_widget('toggleShortList') - - categoryView = widgets.get_widget('categoryView') - - unitsView = widgets.get_widget('unitsView') - unitsView_selection = unitsView.get_selection() - - unitName = widgets.get_widget('unitName') - unitValue = widgets.get_widget('unitValue') - previousUnitName = widgets.get_widget('previousUnitName') - previousUnitValue = widgets.get_widget('previousUnitValue') - 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__) - - unitSymbol = widgets.get_widget('unitSymbol') - previousUnitSymbol = widgets.get_widget('previousUnitSymbol') - - unitDescription = widgets.get_widget('unitDescription') - - findEntry = widgets.get_widget('findEntry') - findLabel = widgets.get_widget('findLabel') - - #insert a categoryColumnumn into the units list even though the heading will not be seen - renderer = gtk.CellRendererText() - unitNameColumn = gtk.TreeViewColumn(_('Unit Name'), renderer) - unitNameColumn.set_property('resizable', 1) - unitNameColumn.add_attribute(renderer, 'text', 0) - unitNameColumn.set_clickable(True) - unitNameColumn.connect("clicked", _on_click_unit_column) - unitsView.append_column(unitNameColumn) - - unitValueColumn = gtk.TreeViewColumn(_('Value'), renderer) - unitValueColumn.set_property('resizable', 1) - unitValueColumn.add_attribute(renderer, 'text', 1) - unitValueColumn.set_clickable(True) - unitValueColumn.connect("clicked", _on_click_unit_column) - unitsView.append_column(unitValueColumn) - - unitSymbolColumn = gtk.TreeViewColumn(_('Units'), renderer) - unitSymbolColumn.set_property('resizable', 1) - unitSymbolColumn.add_attribute(renderer, 'text', 2) - unitSymbolColumn.set_clickable(True) - unitSymbolColumn.connect("clicked", _on_click_unit_column) - unitsView.append_column(unitSymbolColumn) - - #Insert a column into the category list even though the heading will not be seen - renderer = gtk.CellRendererText() - categoryColumn = gtk.TreeViewColumn('Title', renderer) - categoryColumn.set_property('resizable', 1) - categoryColumn.add_attribute(renderer, 'text', 0) - categoryView.append_column(categoryColumn) - - categoryModel = gtk.ListStore(gobject.TYPE_STRING) - categoryView.set_model(categoryModel) - #colourize each row differently for easier reading - categoryView.set_property('rules_hint', 1) - - #Populate the catagories list - keys = unit_data.list_dic.keys() - keys.sort() - for key in keys: - iter = categoryModel.append() - categoryModel.set(iter, 0, key) - - ToolTips = gtk.Tooltips() - findButton = widgets.get_widget('findButton') - ToolTips.set_tip(findButton, _(u'Find unit (F6)')) - - #Restore selections from previously saved settings if it exists and is valid. - historical_catergory_found = False - 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. - # - #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 'selected_units' in selections: - evil_globals.selected_units = selections['selected_units'] - #Make sure that the 'evil_globals.selected_category' 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]: - # Restore the previously selected category. - categoryView.set_cursor(counter, categoryColumn, False) - 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 - categoryView.set_cursor(0, categoryColumn, False) - categoryView.grab_focus() - - restore_units() - + gonvert = Gonvert() gtk.main()