Misc cleanups

[gonvert] / src / gonvert_glade.py

diff --git a/src/gonvert_glade.py b/src/gonvert_glade.py
index b8118de..c80b8b6 100755 (executable)
--- a/src/gonvert_glade.py
+++ b/src/gonvert_glade.py
@@ -85,15 +85,9 @@ class Gonvert(object):
                self._unitValue = widgets.get_widget('unitValue')
                self._previousUnitName = widgets.get_widget('previousUnitName')
                self._previousUnitValue = widgets.get_widget('previousUnitValue')
                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')
 
                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._unitSymbol = widgets.get_widget('unitSymbol')
                self._previousUnitSymbol = widgets.get_widget('previousUnitSymbol')
 

@@ -102,6 +96,8 @@ class Gonvert(object):
                self._findEntry = widgets.get_widget('findEntry')
                self._findLabel = widgets.get_widget('findLabel')
                findButton = widgets.get_widget('findButton')
                self._findEntry = widgets.get_widget('findEntry')
                self._findLabel = widgets.get_widget('findLabel')
                findButton = widgets.get_widget('findButton')

+               ToolTips = gtk.Tooltips()
+               ToolTips.set_tip(findButton, _(u'Find unit (F6)'))

 
                #insert a self._categoryColumnumn into the units list even though the heading will not be seen
                renderer = gtk.CellRendererText()
 
                #insert a self._categoryColumnumn into the units list even though the heading will not be seen
                renderer = gtk.CellRendererText()

@@ -139,29 +135,25 @@ class Gonvert(object):
                self._categoryView.set_property('rules_hint', 1)
 
                #Populate the catagories list
                self._categoryView.set_property('rules_hint', 1)
 
                #Populate the catagories list

-               keys = unit_data.list_dic.keys()
+               keys = unit_data.UNIT_DESCRIPTIONS.keys()

                keys.sort()
                for key in keys:
                        iter = self._categoryModel.append()
                        self._categoryModel.set(iter, 0, key)
 
                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,
                #--------- 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_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_findEntry_changed": self._on_findEntry_changed,

                        "on_aboutMenuItem_activate": self._on_about_clicked,
                        "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_messagebox_ok_clicked": self.messagebox_ok_clicked,
                        "on_clearSelectionMenuItem_activate": self._on_user_clear_selections,
                        "on_unitsView_cursor_changed": self._on_click_unit,

@@ -205,7 +197,7 @@ class Gonvert(object):
                        #Restoring previous selections.
                        #
                        #Make a list of categories to determine which one to select
                        #Restoring previous selections.
                        #
                        #Make a list of categories to determine which one to select

-                       categories = unit_data.list_dic.keys()
+                       categories = unit_data.UNIT_DESCRIPTIONS.keys()

                        categories.sort()
                        #
                        #If the 'selected_unts' has been stored, then extract self._selected_units from selections.
                        categories.sort()
                        #
                        #If the 'selected_unts' has been stored, then extract self._selected_units from selections.

@@ -231,18 +223,10 @@ class Gonvert(object):
                self.restore_units()
 
        def _on_shortlist_changed(self, a):
                self.restore_units()
 
        def _on_shortlist_changed(self, a):

-               print "shortlist"
-               if self._shortlistcheck.get_active():
-                       print "1"
-               else:
-                       print "0"
+               raise NotImplementedError("%s" % self._shortlistcheck.get_active())

 
        def _on_edit_shortlist(self, a):
 
        def _on_edit_shortlist(self, a):

-               print "edit shortlist"
-               if self._toggleShortList.get_active():
-                       print "1"
-               else:
-                       print "0"
+               raise NotImplementedError("%s" % self._toggleShortList.get_active())

 
        def _on_user_clear_selections(self, a):
                selectionsDatPath = "/".join((constants._data_path_, "selections.dat"))
 
        def _on_user_clear_selections(self, a):
                selectionsDatPath = "/".join((constants._data_path_, "selections.dat"))

@@ -280,7 +264,7 @@ class Gonvert(object):
                gtk.mainquit
                sys.exit()
 
                gtk.mainquit
                sys.exit()
 

-       def _findEntry_changed(self, a):
+       def _on_findEntry_changed(self, a):

                #Clear out find results since the user wants to look for something new
                self._find_result = [] #empty find result list
                self._find_count = 0 #default to find result number zero
                #Clear out find results since the user wants to look for something new
                self._find_result = [] #empty find result list
                self._find_count = 0 #default to find result number zero

@@ -292,14 +276,18 @@ class Gonvert(object):
                        #Check if the key pressed was the 'Enter' key
                        if ord(b.string[0]) == 13:
                                #Execute the find units function
                        #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)
+                               self._on_user_find_units(1)

 
        def _on_about_clicked(self, a):
 
        def _on_about_clicked(self, a):

-               self._about_box.show()
-
-       def _on_about_hide(self, *args):
-               self._about_box.hide()
-               return gtk.TRUE
+               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 messagebox_ok_clicked(self, a):
                messagebox.hide()
 
        def messagebox_ok_clicked(self, a):
                messagebox.hide()

@@ -321,12 +309,12 @@ class Gonvert(object):
                        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:
                        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 = unit_data.UNIT_DESCRIPTIONS.keys()

                                categories.sort()
                                found_a_unit = 0 #reset the 'found-a-unit' flag
                                cat_no = 0
                                for category in categories:
                                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 = unit_data.UNIT_DESCRIPTIONS[category].keys()

                                        units.sort()
                                        del units[0] # do not display .base_unit description key
                                        unit_no = 0
                                        units.sort()
                                        del units[0] # do not display .base_unit description key
                                        unit_no = 0

@@ -502,7 +490,7 @@ class Gonvert(object):
                self._unitValueColumn.set_sort_indicator(False)
                self._unitSymbolColumn.set_sort_indicator(False)
 
                self._unitValueColumn.set_sort_indicator(False)
                self._unitSymbolColumn.set_sort_indicator(False)
 

-               self._unitDataInCategory = unit_data.list_dic[selected.get_value(iter, 0)]
+               self._unitDataInCategory = unit_data.UNIT_DESCRIPTIONS[selected.get_value(iter, 0)]

                keys = self._unitDataInCategory.keys()
                keys.sort()
                del keys[0] # do not display .base_unit description key
                keys = self._unitDataInCategory.keys()
                keys.sort()
                del keys[0] # do not display .base_unit description key

@@ -529,7 +517,7 @@ class Gonvert(object):
                                ''"debug ''"
                                #self._selected_units[self._selected_category] = [selected_unit, self._selected_units[self._selected_category][0]]
 
                                ''"debug ''"
                                #self._selected_units[self._selected_category] = [selected_unit, self._selected_units[self._selected_category][0]]
 

-                               units = unit_data.list_dic[self._selected_category].keys()
+                               units = unit_data.UNIT_DESCRIPTIONS[self._selected_category].keys()

                                units.sort()
                                del units[0] # do not display .base_unit description key
 
                                units.sort()
                                del units[0] # do not display .base_unit description key
 

@@ -612,7 +600,7 @@ class Gonvert(object):
                messagebox.show()
                while gtk.events_pending():
                        gtk.mainiteration(False)
                messagebox.show()
                while gtk.events_pending():
                        gtk.mainiteration(False)

-               category_keys = unit_data.list_dic.keys()
+               category_keys = unit_data.UNIT_DESCRIPTIONS.keys()

                category_keys.sort()
                total_categories = 0
                total_units = 0
                category_keys.sort()
                total_categories = 0
                total_units = 0

@@ -623,7 +611,7 @@ class Gonvert(object):
                for category_key in category_keys:
                        total_categories = total_categories + 1
                        print category_key, ": "
                for category_key in category_keys:
                        total_categories = total_categories + 1
                        print category_key, ": "

-                       self._unitDataInCategory = unit_data.list_dic[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
                        unit_keys = self._unitDataInCategory.keys()
                        unit_keys.sort()
                        del unit_keys[0] # do not display .base_unit description key

@@ -632,11 +620,8 @@ class Gonvert(object):
                                print "\t", unit_key
                print total_categories, ' categories'
                print total_units, ' units'
                                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):
+       def _on_unit_value_changed(self, a):

                if self._calcsuppress:
                        #self._calcsuppress = False
                        return
                if self._calcsuppress:
                        #self._calcsuppress = False
                        return

@@ -681,7 +666,7 @@ class Gonvert(object):
                                self._previousUnitValue.set_text(str(apply(func.from_base, (base, arg, ))))
                                self._calcsuppress = False
 
                                self._previousUnitValue.set_text(str(apply(func.from_base, (base, arg, ))))
                                self._calcsuppress = False
 

-       def bottom(self, a):
+       def _on_previous_unit_value_changed(self, a):

                if self._calcsuppress == True:
                        #self._calcsuppress = False
                        return
                if self._calcsuppress == True:
                        #self._calcsuppress = False
                        return