Found a better name for the find callback

[gonvert] / src / gonvert_glade.py

diff --git a/src/gonvert_glade.py b/src/gonvert_glade.py
index 9ccdf7d..0e822b3 100755 (executable)
--- a/src/gonvert_glade.py
+++ b/src/gonvert_glade.py
@@ -148,8 +148,8 @@ class Gonvert(object):
                        "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_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_activated": self._on_user_find_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_findEntry_changed": self._on_findEntry_changed,
                        "on_aboutMenuItem_activate": self._on_about_clicked,
                        "on_messagebox_ok_clicked": self.messagebox_ok_clicked,

@@ -274,7 +274,7 @@ class Gonvert(object):
                # Clear our user message
                self._findLabel.set_text('')
 
                # Clear our user message
                self._findLabel.set_text('')
 

-       def _first_find(self):
+       def _find_first(self):

                assert len(self._find_result) == 0
                assert self._find_count == 0
                findString = string.lower(string.strip(self._findEntry.get_text()))
                assert len(self._find_result) == 0
                assert self._find_count == 0
                findString = string.lower(string.strip(self._findEntry.get_text()))

@@ -314,7 +314,7 @@ class Gonvert(object):
                        self._categoryView.set_cursor(self._find_result[self._find_count][2], self._categoryColumn, False)
                self._unitsView.set_cursor(self._find_result[self._find_count][3], self._unitNameColumn, True)
 
                        self._categoryView.set_cursor(self._find_result[self._find_count][2], self._categoryColumn, False)
                self._unitsView.set_cursor(self._find_result[self._find_count][3], self._unitNameColumn, True)
 

-       def _on_user_find_units(self, a):
+       def _on_find_activate(self, a):

                """
                check if 'new find' or 'last find' or 'next-find'
 
                """
                check if 'new find' or 'last find' or 'next-find'
 

@@ -328,7 +328,7 @@ class Gonvert(object):
                           = self._find_count = 0 and len(self._find_result)>0
                """
                if len(self._find_result) == 0:
                           = self._find_count = 0 and len(self._find_result)>0
                """
                if len(self._find_result) == 0:

-                       self._first_find()
+                       self._find_first()

                else:
                        if self._find_count == len(self._find_result)-1:
                                self._find_wrap_around()
                else:
                        if self._find_count == len(self._find_result)-1:
                                self._find_wrap_around()

@@ -506,7 +506,6 @@ class Gonvert(object):
                #Since category has just been clicked, the list will be sorted already.
                if self._selected_category in self._selected_units:
                        if self._selected_units[self._selected_category][0]:
                #Since category has just been clicked, the list will be sorted already.
                if self._selected_category in self._selected_units:
                        if 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.UNIT_DESCRIPTIONS[self._selected_category].keys()
                                #self._selected_units[self._selected_category] = [selected_unit, self._selected_units[self._selected_category][0]]
 
                                units = unit_data.UNIT_DESCRIPTIONS[self._selected_category].keys()