From 797448905789ef3706c111a565040116249831c8 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Thu, 29 Oct 2009 19:27:49 -0500 Subject: [PATCH 1/1] Doing massive renames --- data/gonvert.glade | 28 ++--- src/gonvert_glade.py | 291 ++++++++++++++++++++++++++------------------------ 2 files changed, 163 insertions(+), 156 deletions(-) diff --git a/data/gonvert.glade b/data/gonvert.glade index 45deaa6..f5b841f 100644 --- a/data/gonvert.glade +++ b/data/gonvert.glade @@ -66,33 +66,33 @@ - + True Show shortlist selections _Edit shortlist True False - + - + True Clear saved selections _Clear selections True - + - + True Writes all categories and units to STDOUT _Write Units True - + @@ -145,7 +145,7 @@ GTK_CORNER_TOP_LEFT - + 250 True True @@ -156,7 +156,7 @@ False False False - + @@ -409,7 +409,7 @@ 0 - + True Enter unit to find here True @@ -420,8 +420,8 @@ True * False - - + + 0 @@ -431,14 +431,14 @@ - + True True Find True GTK_RELIEF_NORMAL True - + @@ -449,7 +449,7 @@ - + True Press to find text. False diff --git a/src/gonvert_glade.py b/src/gonvert_glade.py index 85136e5..3a9d2ec 100755 --- a/src/gonvert_glade.py +++ b/src/gonvert_glade.py @@ -35,7 +35,7 @@ def shortlist_changed(a): def edit_shortlist(a): print "edit shortlist" - if edit_shortlist1.get_active(): + if toggleShortList.get_active(): print "1" else: print "0" @@ -63,8 +63,8 @@ def exitprogram(a): [categoryname: #1 displayed unit, #2 displayed unit] """ #Determine the contents of the selected category row - selected,iter= cat_clist.get_selection().get_selected() - evil_globals.selected_category = cat_model.get_value(iter,0) + selected,iter= categoryView.get_selection().get_selected() + evil_globals.selected_category = categoryModel.get_value(iter,0) selections = {'evil_globals.selected_category':evil_globals.selected_category, 'evil_globals.selected_units':evil_globals.selected_units} selectionsDatPath = "/".join((constants._data_path_, "selections.dat")) @@ -79,11 +79,11 @@ def exitprogram(a): sys.exit() -def find_entry_changed(a): +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 - find_label.set_text('') #clear result + findLabel.set_text('') #clear result def find_key_press(a,b): @@ -109,8 +109,8 @@ def messagebox_ok_clicked(a): def find_units(a): - global column1 - global col + 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 @@ -124,7 +124,7 @@ def find_units(a): #check for new-find if len(evil_globals.find_result)==0: - find_string = string.lower(string.strip(find_entry.get_text())) + find_string = string.lower(string.strip(findEntry.get_text())) #Make sure that a valid find string has been requested if len(find_string)>0: categories = unit_data.list_dic.keys() @@ -149,101 +149,108 @@ def find_units(a): 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]: - cat_clist.set_cursor(evil_globals.find_result[0][2],col,False) - unitsView.set_cursor(evil_globals.find_result[0][3],column1,True) + 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: - find_label.set_text(('Press Find for next unit. '+ str(len(evil_globals.find_result))+' result(s).')) + findLabel.set_text(('Press Find for next unit. '+ str(len(evil_globals.find_result))+' result(s).')) else: - find_label.set_text('Text not found') #Display error + 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 - cat_clist.set_cursor(evil_globals.find_result[evil_globals.find_count][2],col,False) - unitsView.set_cursor(evil_globals.find_result[evil_globals.find_count][3],column1,True) + 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]: - cat_clist.set_cursor(evil_globals.find_result[evil_globals.find_count][2],col,False) - unitsView.set_cursor(evil_globals.find_result[evil_globals.find_count][3],column1,True) + 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 click_column(col): - ''"Sort the contents of the column when the user clicks on the title.''" - global column1, column2, unit_model +def 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.get_title()==_(u"Unit Name"): - selected_column=0 - column1.set_sort_indicator(True) - column2.set_sort_indicator(False) - column3.set_sort_indicator(False) - column1.set_sort_order(not evil_globals.unit_sort_direction) - elif col.get_title()==_(u"Value"): - selected_column=1 - column1.set_sort_indicator(False) - column2.set_sort_indicator(True) - column3.set_sort_indicator(False) - column2.set_sort_order(not evil_globals.value_sort_direction) + 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: - selected_column=2 - column1.set_sort_indicator(False) - column2.set_sort_indicator(False) - column3.set_sort_indicator(True) - column3.set_sort_order(not evil_globals.units_sort_direction) + assert False, "Unknown column: %s" % (col.get_title(), ) #declare a spot to hold the sorted list sorted_list = [] #point to the first row - iter=unit_model.get_iter_first() + iter=unitModel.get_iter_first() row=0 while (iter): #grab all text from columns for sorting #get the text from each column - unit_text = unit_model.get_value(iter,0) - units_text = unit_model.get_value(iter,2) + 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 unit_model.get_value(iter,1)=='' and selected_column==1: + 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 = unit_model.get_value(iter,1) + value_text = unitModel.get_value(iter,1) else: - if unit_model.get_value(iter,1)==None or unit_model.get_value(iter,1)=='': + if unitModel.get_value(iter,1)==None or unit_model.get_value(iter,1)=='': value_text = '' else: - value_text = float(unit_model.get_value(iter,1)) + value_text = float(unitModel.get_value(iter,1)) - if selected_column==0: + if selectedUnitColumn==0: sorted_list.append((unit_text,value_text,units_text)) - elif selected_column==1: + 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 unit_model - iter=unit_model.iter_next(iter) + #point to the next row in the unitModel + iter=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 selected_column==0: + 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 selected_column==1: + elif selectedUnitColumn==1: sorted_list.sort() if not evil_globals.value_sort_direction: evil_globals.value_sort_direction=True @@ -259,8 +266,8 @@ def click_column(col): evil_globals.units_sort_direction=False #Clear out the previous list of units - unit_model = gtk.ListStore(gobject.TYPE_STRING,gobject.TYPE_STRING,gobject.TYPE_STRING) - unitsView.set_model(unit_model) + unitModel = gtk.ListStore(gobject.TYPE_STRING,gobject.TYPE_STRING,gobject.TYPE_STRING) + unitsView.set_model(unitModel) #colourize each row differently for easier reading unitsView.set_property( 'rules_hint',1) @@ -269,28 +276,28 @@ def click_column(col): text_model = gtk.TextBuffer(None) unitDescription.set_buffer(text_model) - if selected_column==0: + if selectedUnitColumn==0: for unit,value,units in sorted_list: - iter = unit_model.append() - unit_model.set(iter,0,unit,1,str(value),2,units) - elif selected_column==1: + iter = unitModel.append() + unitModel.set(iter,0,unit,1,str(value),2,units) + elif selectedUnitColumn==1: for value,unit,units in sorted_list: - iter = unit_model.append() - unit_model.set(iter,0,unit,1,str(value),2,units) + iter = unitModel.append() + unitModel.set(iter,0,unit,1,str(value),2,units) else: for units,value,unit in sorted_list: - iter = unit_model.append() - unit_model.set(iter,0,unit,1,str(value),2,units) + iter = unitModel.append() + unitModel.set(iter,0,unit,1,str(value),2,units) return def click_category(row): - global unit_model, cat_model + global unitModel, categoryModel global unit_dic, list_dic #Clear out the previous list of units - unit_model = gtk.ListStore(gobject.TYPE_STRING,gobject.TYPE_STRING,gobject.TYPE_STRING) - unitsView.set_model(unit_model) + 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) @@ -302,14 +309,14 @@ def click_category(row): #Determine the contents of the selected category row selected,iter= row.get_selection().get_selected() - evil_globals.selected_category = cat_model.get_value(iter,0) + 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 - column1.set_sort_indicator(False) - column2.set_sort_indicator(False) - column3.set_sort_indicator(False) + unitNameColumn.set_sort_indicator(False) + unitValueColumn.set_sort_indicator(False) + unitSymbolColumn.set_sort_indicator(False) unit_dic=unit_data.list_dic[selected.get_value(iter,0)] keys = unit_dic.keys() @@ -318,8 +325,8 @@ def click_category(row): #Fill up the units descriptions and clear the value cells for key in keys: - iter = unit_model.append() - unit_model.set(iter,0,key,1,'',2,unit_dic[key][1]) + iter = unitModel.append() + unitModel.set(iter,0,key,1,'',2,unit_dic[key][1]) unitName.set_text('') unitValue.set_text('') @@ -350,14 +357,14 @@ def restore_units(): unit_no=0 for unit in units: if unit==evil_globals.selected_units[evil_globals.selected_category][1]: - unitsView.set_cursor(unit_no,column1,True) + unitsView.set_cursor(unit_no,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,column1,True) + unitsView.set_cursor(unit_no,unitNameColumn,True) unit_no=unit_no+1 # select the text so user can start typing right away @@ -455,7 +462,7 @@ def write_units(a): class Ccalculate(object): def top(self,a): - global unit_model + global unitModel global testvalue if evil_globals.calcsuppress == 1: @@ -483,17 +490,17 @@ class Ccalculate(object): row = 0 #point to the first row - iter=unit_model.get_iter_first() + iter=unitModel.get_iter_first() while (iter): #get the formula from the name at the row - func,arg = unit_dic[unit_model.get_value(iter,0)][0] + func,arg = unit_dic[unitModel.get_value(iter,0)][0] #set the result in the value column - unit_model.set(iter,1,str(apply(func.from_base,(base,arg,)))) + unitModel.set(iter,1,str(apply(func.from_base,(base,arg,)))) - #point to the next row in the unit_model - iter=unit_model.iter_next(iter) + #point to the next row in the unitModel + iter=unitModel.iter_next(iter) # if the second row has a unit then update its value if previousUnitName.get_text() != '': @@ -528,17 +535,17 @@ class Ccalculate(object): row = 0 #point to the first row - iter=unit_model.get_iter_first() + iter=unitModel.get_iter_first() while (iter): #get the formula from the name at the row - func,arg = unit_dic[unit_model.get_value(iter,0)][0] + func,arg = unit_dic[unitModel.get_value(iter,0)][0] #set the result in the value column - unit_model.set(iter,1,str(apply(func.from_base,(base,arg,)))) + unitModel.set(iter,1,str(apply(func.from_base,(base,arg,)))) - #point to the next row in the unit_model - iter=unit_model.iter_next(iter) + #point to the next row in the unitModel + iter=unitModel.iter_next(iter) # if the second row has a unit then update its value if unitName.get_text() != '': @@ -548,7 +555,7 @@ class Ccalculate(object): evil_globals.calcsuppress=0 -# cat_clist is categoryView +# categoryView is categoryView # unitConversionLayout # selectedUnitLayouta # unitName @@ -566,8 +573,8 @@ class Ccalculate(object): # searchLayout is the search box def main(): global mainWindow - global cat_clist - global cat_model + global categoryView + global categoryModel global unitValue global unitName global unitSymbol @@ -576,16 +583,16 @@ def main(): global shortlistcheck global about_box global unitDescription - global column1 - global column2 - global column3 + global unitNameColumn + global unitValueColumn + global unitSymbolColumn global previousUnitName global previousUnitValue global previousUnitSymbol - global find_label - global find_entry - global col - global edit_shortlist1 + global findLabel + global findEntry + global categoryColumn + global toggleShortList logging.basicConfig(level=logging.DEBUG) @@ -643,23 +650,23 @@ def main(): dic = { "on_exitMenuItem_activate": exitprogram, "on_mainWindow_destroy": exitprogram, - "on_cat_clist_select_row": click_category, - "on_unitsView_click_column": click_column, + "on_categoryView_select_row": click_category, + "on_unitsView_click_unit_column": click_unit_column, "on_unitValue_changed": calculate.top, "on_previousUnitValue_changed": calculate.bottom, - "on_write_units1_activate": write_units, - "on_find_button_clicked": find_units, - "on_find_entry_key_press_event": find_key_press, - "on_find_entry_changed": find_entry_changed, + "on_writeUnitsMenuItem_activate": write_units, + "on_findButton_clicked": find_units, + "on_findEntry_key_press_event": find_key_press, + "on_findEntry_changed": findEntry_changed, "on_about1_activate": about_clicked, "on_about_close_clicked": about_hide, "on_messagebox_ok_clicked": messagebox_ok_clicked, - "on_clear_selections1_activate": clear_selections, + "on_clearSelectionMenuItem_activate": clear_selections, "on_unitsView_cursor_changed": click_unit, "on_unitsView_button_released": button_released, "on_mainWindow_size_allocate": app_size_changed, "on_shortlistcheck_toggled": shortlist_changed, - "on_edit_shortlist1_activate": edit_shortlist, + "on_toggleShortList_activate": edit_shortlist, } widgets.signal_autoconnect (dic); @@ -675,17 +682,17 @@ def main(): change_menu_label('fileMenuItem',_('File')) change_menu_label('exitMenuItem',_('Exit')) change_menu_label('toolsMenuItem',_('Tools')) - change_menu_label('clear_selections1',_('Clear selections')) - change_menu_label('write_units1',_('Write Units')) + 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('find_button',_('Find')) + change_menu_label('findButton',_('Find')) shortlistcheck = widgets.get_widget('shortlistcheck') - edit_shortlist1 = widgets.get_widget('edit_shortlist1') + toggleShortList = widgets.get_widget('toggleShortList') - cat_clist = widgets.get_widget('cat_clist' ) + categoryView = widgets.get_widget('categoryView' ) unitsView = widgets.get_widget('unitsView') unitsView_selection=unitsView.get_selection() @@ -708,54 +715,54 @@ def main(): unitDescription = widgets.get_widget('unitDescription' ) - find_entry = widgets.get_widget('find_entry') - find_label = widgets.get_widget('find_label') + findEntry = widgets.get_widget('findEntry') + findLabel = widgets.get_widget('findLabel') - #insert a column into the units list even though the heading will not be seen + #insert a categoryColumnumn into the units list even though the heading will not be seen renderer = gtk.CellRendererText() - column1 = gtk.TreeViewColumn( _('Unit Name'), renderer ) - column1.set_property( 'resizable', 1 ) - column1.add_attribute( renderer, 'text', 0 ) - column1.set_clickable(True) - column1.connect("clicked",click_column) - unitsView.append_column( column1 ) - - column2 = gtk.TreeViewColumn( _('Value'), renderer ) - column2.set_property( 'resizable', 1 ) - column2.add_attribute( renderer, 'text', 1 ) - column2.set_clickable(True) - column2.connect("clicked",click_column) - unitsView.append_column( column2 ) - - column3 = gtk.TreeViewColumn( _('Units'), renderer ) - column3.set_property( 'resizable', 1 ) - column3.add_attribute( renderer, 'text', 2 ) - column3.set_clickable(True) - column3.connect("clicked",click_column) - unitsView.append_column( column3 ) + unitNameColumn = gtk.TreeViewColumn( _('Unit Name'), renderer ) + unitNameColumn.set_property( 'resizable', 1 ) + unitNameColumn.add_attribute( renderer, 'text', 0 ) + unitNameColumn.set_clickable(True) + unitNameColumn.connect("clicked",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",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",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() - col = gtk.TreeViewColumn( 'Title', renderer ) - col.set_property( 'resizable', 1 ) - col.add_attribute( renderer, 'text', 0 ) - cat_clist.append_column( col ) + categoryColumn = gtk.TreeViewColumn( 'Title', renderer ) + categoryColumn.set_property( 'resizable', 1 ) + categoryColumn.add_attribute( renderer, 'text', 0 ) + categoryView.append_column( categoryColumn ) - cat_model = gtk.ListStore(gobject.TYPE_STRING) - cat_clist.set_model(cat_model) + categoryModel = gtk.ListStore(gobject.TYPE_STRING) + categoryView.set_model(categoryModel) #colourize each row differently for easier reading - cat_clist.set_property( 'rules_hint',1) + categoryView.set_property( 'rules_hint',1) #Populate the catagories list keys = unit_data.list_dic.keys() keys.sort() for key in keys: - iter = cat_model.append() - cat_model.set(iter,0,key) + iter = categoryModel.append() + categoryModel.set(iter,0,key) ToolTips=gtk.Tooltips() - find_button = widgets.get_widget('find_button') - ToolTips.set_tip(find_button,_(u'Find unit (F6)')) + 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 @@ -778,16 +785,16 @@ def main(): for counter in range(len(categories)): if selections['evil_globals.selected_category']==categories[counter]: # Restore the previously selected category. - cat_clist.set_cursor(counter, col, False ) - cat_clist.grab_focus() + 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 - cat_clist.set_cursor(0, col, False) - cat_clist.grab_focus() + categoryView.set_cursor(0, categoryColumn, False) + categoryView.grab_focus() restore_units() -- 1.7.9.5