From: Ed Page Date: Sat, 31 Oct 2009 03:48:48 +0000 (-0500) Subject: Switching some layout stuff for better hiding of features and adding those hidings X-Git-Url: http://git.maemo.org/git/?p=gonvert;a=commitdiff_plain;h=83944706904fb8dddf400ddf68b722b9d7568c37 Switching some layout stuff for better hiding of features and adding those hidings --- diff --git a/data/gonvert.glade b/data/gonvert.glade index a3be78b..0de7121 100644 --- a/data/gonvert.glade +++ b/data/gonvert.glade @@ -1,520 +1,354 @@ - - - + - - - True - Gonvert - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - - - True - False - 0 - - - - True - GTK_PACK_DIRECTION_LTR - GTK_PACK_DIRECTION_LTR - - - - True - _File - True - - - - - - - True - _Exit - True - - - - - - - - - - - - True - _Tools - True - - - - - - - True - Show shortlist selections - _Edit shortlist - True - False - - - - - - - True - Clear saved selections - _Clear selections - True - - - - - - - - - - - True - _Help - True - - - - - - - True - _About - True - - - - - - - - - - 0 - False - False - - - - - - True - True - 0 - - - - 260 - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - 250 - True - True - False - False - False - True - False - False - False - - - - - - False - False - - - - - - True - False - 0 - - - - True - False - 0 - - - - True - False - True - 0 - - True - * - False - - - 0 - True - True - - - - - - True - True - True - True - 0 - - True - * - False - - - - 0 - True - True - - - - - - 60 - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.10000000149 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - 0 - False - True - - - - - - True - False - 0 - - - - True - False - True - 0 - - True - * - False - - - 0 - True - True - - - - - - True - True - True - True - 0 - - True - * - False - - - - 0 - True - True - - - - - - 60 - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.10000000149 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - 0 - False - True - - - - - - True - - - - 300 - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - True - False - False - True - False - False - False - - - - - - False - True - - - - - - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_AUTOMATIC - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - False - False - True - GTK_JUSTIFY_LEFT - GTK_WRAP_WORD - True - 0 - 0 - 0 - 0 - 0 - 0 - - - - - - False - False - - - - - 0 - True - True - - - - - - True - False - 0 - - - - True - Enter unit to find here - True - True - True - 0 - - True - * - False - - - - - 0 - False - True - - - - - - True - True - Find - True - GTK_RELIEF_NORMAL - True - - - - - 0 - False - False - - - - - - True - Press to find text. - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - - - 0 - False - False - - - - - - True - True - Shortlist - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - 0 - False - False - GTK_PACK_END - - - - - 0 - False - False - - - - - False - True - - - - - 0 - True - True - - - - - - + + + + True + Gonvert + + + + + True + + + True + + + True + _File + True + + + + + True + _Exit + True + + + + + + + + + + + True + _Tools + True + + + + + True + Show shortlist selections + _Edit shortlist + True + + + + + + True + Clear saved selections + _Clear selections + True + + + + + + + + + + True + _Help + True + + + + + True + _About + True + + + + + + + + + + False + False + 0 + + + + + True + + + 260 + True + True + automatic + automatic + in + + + 250 + True + True + False + + + + + + 0 + + + + + True + vertical + + + True + + + True + True + False + ● + + + 0 + + + + + True + True + ● + + + + 1 + + + + + 60 + True + 0.10000000149011612 + + + False + False + 2 + + + + + False + 0 + + + + + True + + + True + True + False + ● + + + 0 + + + + + True + True + ● + + + + 1 + + + + + 60 + True + 0.10000000149011612 + + + False + False + 2 + + + + + False + 1 + + + + + True + vertical + + + 300 + True + True + automatic + automatic + in + + + True + True + + + + + + 0 + + + + + True + True + automatic + automatic + in + + + True + queue + + + True + True + False + word + + + + + + + 1 + + + + + 2 + + + + + True + + + True + True + Enter unit to find here + ● + + + + + False + 0 + + + + + Find + True + True + True + True + + + + + False + False + 1 + + + + + True + Press to find text. + center + + + False + False + 2 + + + + + True + vertical + + + False + False + 3 + + + + + Shortlist + True + True + False + True + True + + + + False + False + end + 4 + + + + + False + False + 3 + + + + + 1 + + + + + 1 + + + + + diff --git a/src/gonvert_glade.py b/src/gonvert_glade.py index e45d78f..6ea0481 100755 --- a/src/gonvert_glade.py +++ b/src/gonvert_glade.py @@ -12,11 +12,13 @@ import gtk.glade import gtk.gdk import constants +import hildonize import unit_data _moduleLogger = logging.getLogger("gonvert_glade") PROFILE_STARTUP = False +FORCE_HILDON_LIKE = True gettext.bindtextdomain('gonvert', '/usr/share/locale') gettext.textdomain('gonvert') @@ -64,6 +66,8 @@ class Gonvert(object): return self._mainWindow = widgets.get_widget('mainWindow') + self._app = hildonize.get_app_class()() + self._mainWindow = hildonize.hildonize_window(self._app, self._mainWindow) change_menu_label(widgets, 'fileMenuItem', _('File')) change_menu_label(widgets, 'exitMenuItem', _('Exit')) @@ -81,16 +85,22 @@ class Gonvert(object): self._unitsView = widgets.get_widget('unitsView') self._unitsView.set_property('rules_hint', 1) self._unitsView_selection = self._unitsView.get_selection() + if hildonize.IS_HILDON_SUPPORTED or FORCE_HILDON_LIKE: + self._unitsView.set_headers_visible(False) self._unitName = widgets.get_widget('unitName') self._unitValue = widgets.get_widget('unitValue') self._previousUnitName = widgets.get_widget('previousUnitName') self._previousUnitValue = widgets.get_widget('previousUnitValue') + if hildonize.IS_HILDON_SUPPORTED or FORCE_HILDON_LIKE: + self._previousUnitName.get_parent().hide() self._unitSymbol = widgets.get_widget('unitSymbol') self._previousUnitSymbol = widgets.get_widget('previousUnitSymbol') self._unitDescription = widgets.get_widget('unitDescription') + if hildonize.IS_HILDON_SUPPORTED or FORCE_HILDON_LIKE: + self._unitDescription.get_parent().get_parent().hide() self._searchLayout = widgets.get_widget('searchLayout') self._searchLayout.hide() @@ -544,6 +554,10 @@ class Gonvert(object): buffer = self._unitDescription.get_buffer() buffer.set_text(unit_spec[2]) self._unitSymbol.set_text(unit_spec[1]) # put units into label text + if unit_spec[1]: + self._unitSymbol.show() + else: + self._unitSymbol.hide() if self._unitValue.get_text() == '': if self._selectedCategoryName == "Computer Numbers":