X-Git-Url: http://git.maemo.org/git/?p=gonvert;a=blobdiff_plain;f=src%2Fgonvert_glade.py;h=8034d58d96b1ace03d5b4112fd891f47587e752f;hp=7166f4753fe48ac7526a3329d7b996665689962c;hb=3ce2cd5d0d645b0e7baae4113f1c70f11af18c02;hpb=9c7384375a44cc0e31977cf6caa52a2e46363a8a

diff --git a/src/gonvert_glade.py b/src/gonvert_glade.py
index 7166f47..8034d58 100755
--- a/src/gonvert_glade.py
+++ b/src/gonvert_glade.py
@@ -2,8 +2,6 @@
 # -*- coding: UTF8 -*-
 
 """
-@todo Get rid of autoconnects except for menus
-
 @todo Look into using two columns for displaying the value, split by the
 decimal place.  The left one would be right aligned and the right would be left
 aligned (only if not in exponential notation
@@ -59,6 +57,7 @@ class Gonvert(object):
 		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/share/gonvert/gonvert.glade',
 		'/usr/lib/gonvert/gonvert.glade',
 	]
 
@@ -191,25 +190,23 @@ class Gonvert(object):
 			self._categoryModel.append(row)
 
 		#--------- connections to GUI ----------------
-		dic = {
-			"on_exit_menu_activate": self._on_user_exit,
-			"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_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_clearSelectionMenuItem_activate": self._on_user_clear_selections,
-			"on_unitsView_cursor_changed": self._on_click_unit,
-			"on_shortlistcheck_toggled": self._on_shortlist_changed,
-			"on_toggleShortList_activate": self._on_edit_shortlist,
-		}
-		widgets.signal_autoconnect(dic)
 		self._mainWindow.connect("delete-event", self._on_user_exit)
 		self._mainWindow.connect("key-press-event", self._on_key_press)
 		self._mainWindow.connect("window-state-event", self._on_window_state_change)
 		self._categorySelectionButton.connect("clicked", self._on_category_selector_clicked)
+		self._categoryView.connect("cursor-changed", self._on_click_category)
+		self._findButton.connect("clicked", self._on_find_activate)
+		self._findEntry.connect("activate", self._on_find_activate)
+		self._findEntry.connect("changed", self._on_findEntry_changed)
+		self._previousUnitValue.connect("changed", self._on_previous_unit_value_changed)
+		self._shortlistcheck.connect("toggled", self._on_shortlist_changed)
+		self._unitValue.connect("changed", self._on_unit_value_changed)
+		self._unitsView.connect("cursor-changed", self._on_click_unit)
+		if hildonize.GTK_MENU_USED:
+			widgets.get_widget("aboutMenuItem").connect("activate", self._on_about_clicked)
+			widgets.get_widget("clearSelectionMenuItem").connect("activate", self._on_user_clear_selections)
+			widgets.get_widget("editShortListMenuItem").connect("activate", self._on_edit_shortlist)
+			widgets.get_widget("exitMenuItem").connect("activate", self._on_user_exit)
 
 		for scrollingWidgetName in (
 			"unitsViewScrolledWindow",
@@ -232,6 +229,7 @@ class Gonvert(object):
 			widgets.get_widget("mainMenuBar"),
 			replacementButtons
 		)
+
 		if not hildonize.IS_HILDON_SUPPORTED:
 			_moduleLogger.info("No hildonization support")