X-Git-Url: http://git.maemo.org/git/?p=gonvert;a=blobdiff_plain;f=src%2Fgonvert_glade.py;h=3eaa758d738e4f85519c942dae61b6e051603f4b;hp=cfe0d4a0c57b41dbe8a7cc93c2143c8871f9e344;hb=e62498c9c596588836ea7e08c83b6b5c21a43fbb;hpb=d74656e2fb9557bb0270bfc6aeafe0d8061dbc7d diff --git a/src/gonvert_glade.py b/src/gonvert_glade.py index cfe0d4a..3eaa758 100755 --- a/src/gonvert_glade.py +++ b/src/gonvert_glade.py @@ -39,7 +39,6 @@ class Gonvert(object): def __init__(self): self._unitDataInCategory = None - self._calcsuppress = False self._unit_sort_direction = False self._value_sort_direction = False self._units_sort_direction = False @@ -48,7 +47,7 @@ class Gonvert(object): self._find_result = [] # empty find result list self._findIndex = 0 # default to find result number zero - self._selectedCategory = '' # preset to no selected category + self._selectedCategoryName = '' # preset to no selected category self._defaultUnitForCategory = {} # empty dictionary for later use #check to see if glade file is in current directory (user must be @@ -70,7 +69,6 @@ class Gonvert(object): 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')) @@ -88,8 +86,6 @@ class Gonvert(object): self._unitValue = widgets.get_widget('unitValue') self._previousUnitName = widgets.get_widget('previousUnitName') self._previousUnitValue = widgets.get_widget('previousUnitValue') - messagebox = widgets.get_widget('msgbox') - messageboxtext = widgets.get_widget('msgboxtext') self._unitSymbol = widgets.get_widget('unitSymbol') self._previousUnitSymbol = widgets.get_widget('previousUnitSymbol') @@ -158,12 +154,10 @@ class Gonvert(object): "on_categoryView_select_row": self._on_click_category, "on_unitValue_changed": self._on_unit_value_changed, "on_previousUnitValue_changed": self._on_previous_unit_value_changed, - "on_writeUnitsMenuItem_activate": self._on_user_write_units, "on_findButton_clicked": self._on_find_activate, "on_findEntry_activated": self._on_find_activate, "on_findEntry_changed": self._on_findEntry_changed, "on_aboutMenuItem_activate": self._on_about_clicked, - "on_messagebox_ok_clicked": self.messagebox_ok_clicked, "on_clearSelectionMenuItem_activate": self._on_user_clear_selections, "on_unitsView_cursor_changed": self._on_click_unit, "on_shortlistcheck_toggled": self._on_shortlist_changed, @@ -211,7 +205,7 @@ class Gonvert(object): #If the 'selected_unts' has been stored, then extract self._defaultUnitForCategory from selections. if 'selected_units' in selections: self._defaultUnitForCategory = selections['selected_units'] - #Make sure that the 'self._selectedCategory' has been stored. + #Make sure that the 'self._selectedCategoryName' has been stored. if 'selected_category' in selections: #Match an available category to the previously selected category. for counter in range(len(unit_data.UNIT_CATEGORIES)): @@ -236,16 +230,16 @@ class Gonvert(object): should therefore only be called when exiting the program. Update selections dictionary which consists of the following keys: - 'self._selectedCategory': full name of selected category + 'self._selectedCategoryName': full name of selected category 'self._defaultUnitForCategory': self._defaultUnitForCategory dictionary which contains: [categoryname: #1 displayed unit, #2 displayed unit] """ #Determine the contents of the selected category row selected, iter = self._categoryView.get_selection().get_selected() - self._selectedCategory = self._categoryModel.get_value(iter, 0) + self._selectedCategoryName = self._categoryModel.get_value(iter, 0) selections = { - 'selected_category': self._selectedCategory, + 'selected_category': self._selectedCategoryName, 'selected_units': self._defaultUnitForCategory } selectionsDatPath = "/".join((constants._data_path_, "selections.dat")) @@ -285,7 +279,7 @@ class Gonvert(object): assert 0 < len(self._find_result) #check if next find is in a new category (prevent category changes when unnecessary - if self._selectedCategory != self._find_result[self._findIndex][0]: + if self._selectedCategoryName != self._find_result[self._findIndex][0]: self._categoryView.set_cursor( self._find_result[self._findIndex][2], self._categoryColumn, False ) @@ -372,7 +366,7 @@ class Gonvert(object): def _value_model_cmp(self, sortedModel, leftItr, rightItr): #special sorting exceptions for ascii values (instead of float values) - if self._selectedCategory == "Computer Numbers": + if self._selectedCategoryName == "Computer Numbers": leftValue = self._unitModel.get_value(leftItr, 1) rightValue = self._unitModel.get_value(rightItr, 1) else: @@ -392,12 +386,12 @@ class Gonvert(object): return columns def _switch_category(self, category): - self._selectedCategory = category - self._unitDataInCategory = unit_data.UNIT_DESCRIPTIONS[self._selectedCategory] + self._selectedCategoryName = category + self._unitDataInCategory = unit_data.UNIT_DESCRIPTIONS[self._selectedCategoryName] #Fill up the units descriptions and clear the value cells self._clear_visible_unit_data() - for key in unit_data.get_units(self._selectedCategory): + for key in unit_data.get_units(self._selectedCategoryName): iter = self._unitModel.append() self._unitModel.set(iter, 0, key, 1, '', 2, self._unitDataInCategory[key][1]) self._sortedUnitModel.sort_column_changed() @@ -419,23 +413,43 @@ class Gonvert(object): def _select_default_unit(self): # Restore the previous historical settings of previously selected units # in this newly selected category - if self._selectedCategory in self._defaultUnitForCategory: - units = unit_data.get_units(self._selectedCategory) - - #Restore oldest selection first. - if self._defaultUnitForCategory[self._selectedCategory][1]: - unitIndex = units.index(self._defaultUnitForCategory[self._selectedCategory][1]) - self._unitsView.set_cursor(unitIndex, self._unitNameColumn, True) - - #Restore newest selection second. - if self._defaultUnitForCategory[self._selectedCategory][0]: - unitIndex = units.index(self._defaultUnitForCategory[self._selectedCategory][0]) - self._unitsView.set_cursor(unitIndex, self._unitNameColumn, True) + defaultPrimary = unit_data.get_base_unit(self._selectedCategoryName) + defaultSecondary = "" + if self._selectedCategoryName in self._defaultUnitForCategory: + if self._defaultUnitForCategory[self._selectedCategoryName][0]: + defaultPrimary = self._defaultUnitForCategory[self._selectedCategoryName][0] + if self._defaultUnitForCategory[self._selectedCategoryName][1]: + defaultSecondary = self._defaultUnitForCategory[self._selectedCategoryName][1] + + units = unit_data.get_units(self._selectedCategoryName) + + #Restore oldest selection first. + if defaultPrimary: + unitIndex = units.index(defaultPrimary) + self._unitsView.set_cursor(unitIndex, self._unitNameColumn, True) + + #Restore newest selection second. + if defaultSecondary: + unitIndex = units.index(defaultSecondary) + self._unitsView.set_cursor(unitIndex, self._unitNameColumn, True) # select the text so user can start typing right away self._unitValue.grab_focus() self._unitValue.select_region(0, -1) + def _sanitize_value(self, userEntry): + if self._selectedCategoryName == "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()) @@ -500,7 +514,7 @@ class Gonvert(object): except Exception: _moduleLogger.exception("") - def _on_find_activate(self, a): + def _on_find_activate(self, *args): try: self._find_next() self._findButton.grab_focus() @@ -538,180 +552,93 @@ class Gonvert(object): def _on_click_category(self, *args): try: selected, iter = self._categoryView.get_selection().get_selected() + if iter is None: + # User is typing in an invalid string, not selecting any category + return selectedCategory = self._categoryModel.get_value(iter, 0) self._switch_category(selectedCategory) except Exception: _moduleLogger.exception("") - def _on_click_unit(self, row): - self._calcsuppress = True #suppress calculations - - #Determine the contents of the selected row. - selected, iter = self._unitsView.get_selection().get_selected() - - selected_unit = selected.get_value(iter, 0) - - unit_spec = self._unitDataInCategory[selected_unit] - - #Clear out the description - text_model = gtk.TextBuffer(None) - self._unitDescription.set_buffer(text_model) - - enditer = text_model.get_end_iter() - text_model.insert(enditer, unit_spec[2]) + 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()) - if self._unitSymbol.get() == None: - self._previousUnitSymbol.set_text('') - else: + if self._unitName.get_text() != selected_unit: + self._previousUnitName.set_text(self._unitName.get_text()) + self._previousUnitValue.set_text(self._unitValue.get_text()) self._previousUnitSymbol.set_text(self._unitSymbol.get()) - self._unitName.set_text(selected_unit) - self._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 self._selectedCategory == "Computer Numbers": - self._unitValue.set_text("0") - else: - self._unitValue.set_text("0.0") + 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 - #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 self._selectedCategory in self._defaultUnitForCategory: - if self._defaultUnitForCategory[self._selectedCategory][0]: - self._defaultUnitForCategory[self._selectedCategory] = [selected_unit, self._defaultUnitForCategory[self._selectedCategory][0]] - else: - self._defaultUnitForCategory[self._selectedCategory] = [selected_unit, ''] - - # select the text so user can start typing right away - self._unitValue.grab_focus() - self._unitValue.select_region(0, -1) - - self._calcsuppress = False #enable calculations - - def _on_unit_value_changed(self, a): - if self._calcsuppress: - #self._calcsuppress = False - return - # determine if value to be calculated is empty - if self._selectedCategory == "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 + if self._selectedCategoryName == "Computer Numbers": + self._unitValue.set_text("0") + else: + self._unitValue.set_text("0.0") - keys = self._unitDataInCategory.keys() - keys.sort() - del keys[0] - row = 0 + self._defaultUnitForCategory[self._selectedCategoryName] = [ + self._unitName.get_text(), self._previousUnitName.get_text() + ] - #point to the first row - iter = self._unitModel.get_iter_first() + # select the text so user can start typing right away + self._unitValue.grab_focus() + self._unitValue.select_region(0, -1) + except Exception: + _moduleLogger.exception("") - while iter: - #get the formula from the name at the row - func, arg = self._unitDataInCategory[self._unitModel.get_value(iter, 0)][0] + def _on_unit_value_changed(self, *args): + try: + if self._unitName.get_text() == '': + return + if not self._unitValue.is_focus(): + return - #set the result in the value column - self._unitModel.set(iter, 1, str(apply(func.from_base, (base, arg, )))) + #retrieve the conversion function and value from the selected unit + value = self._sanitize_value(self._unitValue.get_text()) + func, arg = self._unitDataInCategory[self._unitName.get_text()][0] + base = func.to_base(value, arg) - #point to the next row in the self._unitModel - iter = self._unitModel.iter_next(iter) + #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 + # Update the secondary unit entry if self._previousUnitName.get_text() != '': - self._calcsuppress = True func, arg = self._unitDataInCategory[self._previousUnitName.get_text()][0] - self._previousUnitValue.set_text(str(apply(func.from_base, (base, arg, )))) - self._calcsuppress = False - - def _on_previous_unit_value_changed(self, a): - if self._calcsuppress == True: - #self._calcsuppress = False - return - # determine if value to be calculated is empty - if self._selectedCategory == "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()) + self._previousUnitValue.set_text(str(func.from_base(base, arg, ))) + except Exception: + _moduleLogger.exception("") - 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 + def _on_previous_unit_value_changed(self, *args): + try: + if self._previousUnitName.get_text() == '': + return + if not self._previousUnitValue.is_focus(): + return - keys = self._unitDataInCategory.keys() - keys.sort() - del keys[0] - row = 0 + #retrieve the conversion function and value from the selected unit + value = self._sanitize_value(self._previousUnitValue.get_text()) + func, arg = self._unitDataInCategory[self._previousUnitName.get_text()][0] + base = func.to_base(value, arg) #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() != '': - self._calcsuppress = True - func, arg = self._unitDataInCategory[self._unitName.get_text()][0] - self._unitValue.set_text(str(apply(func.from_base, (base, arg, )))) - self._calcsuppress = False - - def messagebox_ok_clicked(self, a): - messagebox.hide() - - def _on_user_write_units(self, a): - ''"Write the list of categories and units to stdout for documentation purposes.''" - messagebox_model = gtk.TextBuffer(None) - messageboxtext.set_buffer(messagebox_model) - messagebox_model.insert_at_cursor(_(u'The units are being written to stdout. You can capture this printout by starting gonvert from the command line as follows: \n$ gonvert > file.txt'), -1) - messagebox.show() - while gtk.events_pending(): - gtk.mainiteration(False) - - total_categories = 0 - total_units = 0 - print 'gonvert-%s%s' % ( - constants.__version__, - _(u' - Unit Conversion Utility - Convertible units listing: ') - ) - for category_key in unit_data.UNIT_CATEGORIES: - total_categories = total_categories + 1 - print category_key, ": " - self._unitDataInCategory = unit_data.UNIT_DESCRIPTIONS[category_key] - unit_keys = self._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' + for row in self._unitModel: + func, arg = self._unitDataInCategory[row[0]][0] + row[1] = str(func.from_base(base, arg)) + + # Update the primary unit entry + func, arg = self._unitDataInCategory[self._unitName.get_text()][0] + self._unitValue.set_text(str(func.from_base(base, arg, ))) + except Exception: + _moduleLogger.exception("") def _on_about_clicked(self, a): dlg = gtk.AboutDialog()