Adjusting how rows are sized

diff --git a/src/constants.py b/src/constants.py
index bcc1000..f59990c 100644 (file)
--- a/src/constants.py
+++ b/src/constants.py
@@ -3,7 +3,7 @@ import os
 __pretty_app_name__ = "Gonvert"
 __app_name__ = "gonvert"
 __version__ = "0.9.0"
 __pretty_app_name__ = "Gonvert"
 __app_name__ = "gonvert"
 __version__ = "0.9.0"

-__build__ = 1
+__build__ = 2

 __app_magic__ = 0xdeadbeef
 _data_path_ = os.path.join(os.path.expanduser("~"), ".gonvert")
 _user_settings_ = "%s/settings.ini" % _data_path_
 __app_magic__ = 0xdeadbeef
 _data_path_ = os.path.join(os.path.expanduser("~"), ".gonvert")
 _user_settings_ = "%s/settings.ini" % _data_path_

diff --git a/src/gonvert_glade.py b/src/gonvert_glade.py
index b62d092..674bea4 100755 (executable)
--- a/src/gonvert_glade.py
+++ b/src/gonvert_glade.py
@@ -140,9 +140,10 @@ class Gonvert(object):
                self._findButton = widgets.get_widget('findButton')
 
                self._unitsNameRenderer = gtk.CellRendererText()
                self._findButton = widgets.get_widget('findButton')
 
                self._unitsNameRenderer = gtk.CellRendererText()

-               self._unitsNameRenderer.set_property("ellipsize", pango.ELLIPSIZE_END)

                self._unitsNameRenderer.set_property("scale", 0.75)
                self._unitsNameRenderer.set_property("scale", 0.75)

-               self._unitsNameRenderer.set_property("width-chars", 5)
+               if FORCE_HILDON_LIKE:
+                       self._unitsNameRenderer.set_property("ellipsize", pango.ELLIPSIZE_END)
+                       self._unitsNameRenderer.set_property("width-chars", 5)

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

@@ -458,7 +459,11 @@ class Gonvert(object):
                        self._unitModel.append(row)
                        nameLength = max(nameLength, len(key))
                self._sortedUnitModel.sort_column_changed()
                        self._unitModel.append(row)
                        nameLength = max(nameLength, len(key))
                self._sortedUnitModel.sort_column_changed()

-               self._unitsNameRenderer.set_property("width-chars", int(nameLength * 0.75))
+
+               if FORCE_HILDON_LIKE:
+                       charWidth = int(nameLength * 0.75)
+                       charWidth = min(charWidth, 20)
+                       self._unitsNameRenderer.set_property("width-chars", charWidth)

 
                self._select_default_unit()
 
 
                self._select_default_unit()