From d99c0303ba9fee0a78e795b088be722860dda806 Mon Sep 17 00:00:00 2001 From: epage Date: Tue, 6 Oct 2009 00:51:00 +0000 Subject: [PATCH] Fixing an issue with Fremantle vs Mer and prepping button size selection stuff git-svn-id: file:///svnroot/gc-dialer/trunk@503 c39d3808-3fe2-4d86-a59f-b7f623ee9f21 --- src/dc_glade.py | 7 +++++++ src/hildonize.py | 50 +++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 56 insertions(+), 1 deletion(-) diff --git a/src/dc_glade.py b/src/dc_glade.py index 735786b..fdc3eb0 100755 --- a/src/dc_glade.py +++ b/src/dc_glade.py @@ -129,6 +129,13 @@ class Dialcentral(object): ): hildonize.hildonize_scrollwindow_with_viewport(self._widgetTree.get_widget(scrollingWidget)) + for button in ( + "back", + "sendSmsButton", + "cancelSmsButton", + ): + hildonize.set_button_thumb_selectable(button) + replacementButtons = [gtk.Button("Test")] menu = hildonize.hildonize_menu( self._window, diff --git a/src/hildonize.py b/src/hildonize.py index 2219703..6b588bc 100644 --- a/src/hildonize.py +++ b/src/hildonize.py @@ -122,6 +122,51 @@ except AttributeError: hildonize_menu = _null_hildonize_menu +def _hildon_set_button_auto_selectable(button): + button.set_theme_size(hildon.HILDON_SIZE_AUTO_HEIGHT) + + +def _null_set_button_auto_selectable(button): + pass + + +try: + hildon.HILDON_SIZE_AUTO_HEIGHT + set_button_auto_selectable = _hildon_set_button_auto_selectable +except AttributeError: + set_button_auto_selectable = _null_set_button_auto_selectable + + +def _hildon_set_button_finger_selectable(button): + button.set_theme_size(hildon.HILDON_SIZE_FINGER_HEIGHT) + + +def _null_set_button_finger_selectable(button): + pass + + +try: + hildon.HILDON_SIZE_FINGER_HEIGHT + set_button_finger_selectable = _hildon_set_button_finger_selectable +except AttributeError: + set_button_finger_selectable = _null_set_button_finger_selectable + + +def _hildon_set_button_thumb_selectable(button): + button.set_theme_size(hildon.HILDON_SIZE_THUMB_HEIGHT) + + +def _null_set_button_thumb_selectable(button): + pass + + +try: + hildon.HILDON_SIZE_THUMB_HEIGHT + set_button_thumb_selectable = _hildon_set_button_thumb_selectable +except AttributeError: + set_button_thumb_selectable = _null_set_button_thumb_selectable + + def _hildon_set_cell_thumb_selectable(renderer): renderer.set_property("scale", 1.5) @@ -496,7 +541,10 @@ except AttributeError: def _hildon_touch_selector_entry(parent, title, items, defaultItem): # Got a segfault when using append_text_column with TouchSelectorEntry, so using this way - selector = hildon.hildon_touch_selector_entry_new_text() + try: + selector = hildon.TouchSelectorEntry(text=True) + except TypeError: + selector = hildon.hildon_touch_selector_entry_new_text() defaultIndex = -1 for i, item in enumerate(items): selector.append_text(item) -- 1.7.9.5