Stop hildonizing widgets that don't exist, now and in the future

[gc-dialer] / src / dc_glade.py

diff --git a/src/dc_glade.py b/src/dc_glade.py
index cee25f1..33ad67a 100755 (executable)
--- a/src/dc_glade.py
+++ b/src/dc_glade.py
@@ -115,31 +115,36 @@ class Dialcentral(object):
                hildonize.hildonize_text_entry(self._widgetTree.get_widget("usernameentry"))
                hildonize.hildonize_password_entry(self._widgetTree.get_widget("passwordentry"))
 
-               for scrollingWidget in (
+               for scrollingWidgetName in (
                        'recent_scrolledwindow',
                        'message_scrolledwindow',
                        'contacts_scrolledwindow',
-                       "phoneSelectionMessages_scrolledwindow",
                        "smsMessages_scrolledwindow",
                ):
-                       hildonize.hildonize_scrollwindow(self._widgetTree.get_widget(scrollingWidget))
-               for scrollingWidget in (
-                       "phonetypes_scrolledwindow",
+                       scrollingWidget = self._widgetTree.get_widget(scrollingWidgetName)
+                       assert scrollingWidget is not None, scrollingWidgetName
+                       hildonize.hildonize_scrollwindow(scrollingWidget)
+               for scrollingWidgetName in (
                        "smsMessage_scrolledEntry",
                ):
-                       hildonize.hildonize_scrollwindow_with_viewport(self._widgetTree.get_widget(scrollingWidget))
+                       scrollingWidget = self._widgetTree.get_widget(scrollingWidgetName)
+                       assert scrollingWidget is not None, scrollingWidgetName
+                       hildonize.hildonize_scrollwindow_with_viewport(scrollingWidget)
 
-               for button in (
+               for buttonName in (
                        "back",
+                       "addressbookSelectButton",
                        "sendSmsButton",
+                       "dialButton",
+                       "selectButton",
                        "cancelSmsButton",
-                       "sms_button",
-                       "dial_button",
-                       "select_button",
-                       "cancel_button",
+                       "callbackSelectButton",
                        "minutesEntryButton",
                        "clearcookies",
+                       "phoneTypeSelection",
                ):
+                       button = self._widgetTree.get_widget(buttonName)
+                       assert button is not None, buttonName
                        hildonize.set_button_thumb_selectable(button)
 
                replacementButtons = [gtk.Button("Test")]
@@ -679,10 +684,11 @@ class Dialcentral(object):
                """
                @note Hildon specific
                """
+               RETURN_TYPES = (gtk.keysyms.Return, gtk.keysyms.ISO_Enter, gtk.keysyms.KP_Enter)
                try:
                        if (
                                event.keyval == gtk.keysyms.F6 or
-                               event.keyval == gtk.keysyms.Return and event.get_state() & gtk.gdk.CONTROL_MASK
+                               event.keyval in RETURN_TYPES and event.get_state() & gtk.gdk.CONTROL_MASK
                        ):
                                if self._isFullScreen:
                                        self._window.unfullscreen()