Making the full unit name smaller for more space

[gonvert] / src / gonvert_glade.py

diff --git a/src/gonvert_glade.py b/src/gonvert_glade.py
index 7166f47..17d1df5 100755 (executable)
--- a/src/gonvert_glade.py
+++ b/src/gonvert_glade.py
@@ -2,8 +2,6 @@
 # -*- coding: UTF8 -*-
 
 """
 # -*- 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
 @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

@@ -41,7 +39,7 @@ else:
 
 _moduleLogger = logging.getLogger("gonvert_glade")
 PROFILE_STARTUP = False
 
 _moduleLogger = logging.getLogger("gonvert_glade")
 PROFILE_STARTUP = False

-FORCE_HILDON_LIKE = False
+FORCE_HILDON_LIKE = True

 
 if gettext is not None:
        gettext.bindtextdomain('gonvert', '/usr/share/locale')
 
 if gettext is not None:
        gettext.bindtextdomain('gonvert', '/usr/share/locale')

@@ -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"),
                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',
        ]
 
                '/usr/lib/gonvert/gonvert.glade',
        ]
 

@@ -134,7 +133,6 @@ class Gonvert(object):
                renderer = gtk.CellRendererText()
                renderer.set_property("ellipsize", pango.ELLIPSIZE_END)
                renderer.set_property("width-chars", len("grams per cubic cm plus some"))
                renderer = gtk.CellRendererText()
                renderer.set_property("ellipsize", pango.ELLIPSIZE_END)
                renderer.set_property("width-chars", len("grams per cubic cm plus some"))

-               hildonize.set_cell_thumb_selectable(renderer)

                self._unitNameColumn = gtk.TreeViewColumn(_('Name'), renderer)
                self._unitNameColumn.set_property('resizable', 1)
                self._unitNameColumn.add_attribute(renderer, 'text', self.UNITS_NAME_IDX)
                self._unitNameColumn = gtk.TreeViewColumn(_('Name'), renderer)
                self._unitNameColumn.set_property('resizable', 1)
                self._unitNameColumn.add_attribute(renderer, 'text', self.UNITS_NAME_IDX)

@@ -191,25 +189,23 @@ class Gonvert(object):
                        self._categoryModel.append(row)
 
                #--------- connections to GUI ----------------
                        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._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",
 
                for scrollingWidgetName in (
                        "unitsViewScrolledWindow",

@@ -232,6 +228,7 @@ class Gonvert(object):
                        widgets.get_widget("mainMenuBar"),
                        replacementButtons
                )
                        widgets.get_widget("mainMenuBar"),
                        replacementButtons
                )

+

                if not hildonize.IS_HILDON_SUPPORTED:
                        _moduleLogger.info("No hildonization support")
 
                if not hildonize.IS_HILDON_SUPPORTED:
                        _moduleLogger.info("No hildonization support")
 

@@ -280,7 +277,7 @@ class Gonvert(object):
                                except ValueError:
                                        _moduleLogger.warn("Unknown category: %s" % selectedCategoryName)
 
                                except ValueError:
                                        _moduleLogger.warn("Unknown category: %s" % selectedCategoryName)
 

-               self._categorySelectionButton.set_label(selectedCategoryName)
+               self._categorySelectionButton.get_child().set_markup("<big>%s</big>" % selectedCategoryName)

                self._categoryView.set_cursor(categoryIndex, self._categoryColumn, False)
                self._categoryView.grab_focus()
 
                self._categoryView.set_cursor(categoryIndex, self._categoryColumn, False)
                self._categoryView.grab_focus()
 

@@ -343,7 +340,7 @@ class Gonvert(object):
                #check if next find is in a new category (prevent category changes when unnecessary
                searchCategoryName = self._find_result[self._findIndex][0]
                if self._selectedCategoryName != searchCategoryName:
                #check if next find is in a new category (prevent category changes when unnecessary
                searchCategoryName = self._find_result[self._findIndex][0]
                if self._selectedCategoryName != searchCategoryName:

-                       self._categorySelectionButton.set_label(searchCategoryName)
+                       self._categorySelectionButton.get_child().set_markup("<big>%s</big>" % searchCategoryName)

                        self._categoryView.set_cursor(
                                self._find_result[self._findIndex][2], self._categoryColumn, False
                        )
                        self._categoryView.set_cursor(
                                self._find_result[self._findIndex][2], self._categoryColumn, False
                        )