Keyboard shortcut for copying the log and attempts to clean up the column stuff

[gonvert] / src / gonvert_glade.py

diff --git a/src/gonvert_glade.py b/src/gonvert_glade.py
index 142bbfd..c15ba8d 100755 (executable)
--- a/src/gonvert_glade.py
+++ b/src/gonvert_glade.py
@@ -1,19 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: UTF8 -*-
 
-"""
-@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
-OR display everything in engineering notation
-
-@tood Add a unit description dialog for when hildonized
-
-@todo Add support for custom units
-
-@todo Add support for compound units
-"""
-
 import os
 import math
 import pickle
@@ -99,6 +86,7 @@ class Gonvert(object):
                self._value_sort_direction = False
                self._units_sort_direction = False
                self._isFullScreen = False
+               self._clipboard = gtk.clipboard_get()
 
                self._find_result = [] # empty find result list
                self._findIndex = 0 # default to find result number zero
@@ -152,13 +140,14 @@ class Gonvert(object):
                self._findLabel = widgets.get_widget('findLabel')
                self._findButton = widgets.get_widget('findButton')
 
-               #insert a self._categoryColumnumn into the units list even though the heading will not be seen
-               renderer = gtk.CellRendererText()
-               renderer.set_property("ellipsize", pango.ELLIPSIZE_END)
-               renderer.set_property("width-chars", len("grams per cubic cm plus some"))
-               self._unitNameColumn = gtk.TreeViewColumn(_('Name'), renderer)
+               self._unitsNameRenderer = gtk.CellRendererText()
+               self._unitsNameRenderer.set_property("scale", 0.75)
+               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(renderer, 'text', self.UNITS_NAME_IDX)
+               self._unitNameColumn.add_attribute(self._unitsNameRenderer, 'text', self.UNITS_NAME_IDX)
                self._unitNameColumn.set_clickable(True)
                self._unitNameColumn.connect("clicked", self._on_click_unit_column)
                self._unitsView.append_column(self._unitNameColumn)
@@ -177,6 +166,7 @@ class Gonvert(object):
                renderer = gtk.CellRendererText()
                renderer.set_property("xalign", 0.0)
                renderer.set_property("alignment", pango.ALIGN_LEFT)
+               renderer.set_property("scale", 0.75)
                self._unitFractionalColumn = gtk.TreeViewColumn(_(''), renderer)
                self._unitFractionalColumn.set_property('resizable', True)
                self._unitFractionalColumn.add_attribute(renderer, 'text', self.UNITS_FRACTION_IDX)
@@ -186,7 +176,7 @@ class Gonvert(object):
 
                renderer = gtk.CellRendererText()
                renderer.set_property("ellipsize", pango.ELLIPSIZE_END)
-               renderer.set_property("width-chars", len("G ohm plus some"))
+               #renderer.set_property("scale", 0.5)
                self._unitSymbolColumn = gtk.TreeViewColumn(_('Units'), renderer)
                self._unitSymbolColumn.set_property('resizable', True)
                self._unitSymbolColumn.add_attribute(renderer, 'text', self.UNITS_SYMBOL_IDX)
@@ -344,6 +334,17 @@ class Gonvert(object):
                windowDatPath = "/".join((constants._data_path_, "window.dat"))
                pickle.dump(window_settings, open(windowDatPath, 'w'))
 
+       def _refresh_columns(self):
+               self._unitsView.remove_column(self._unitNameColumn)
+               self._unitsView.remove_column(self._unitIntegerColumn)
+               self._unitsView.remove_column(self._unitFractionalColumn)
+               self._unitsView.remove_column(self._unitSymbolColumn)
+
+               self._unitsView.append_column(self._unitNameColumn)
+               self._unitsView.append_column(self._unitIntegerColumn)
+               self._unitsView.append_column(self._unitFractionalColumn)
+               self._unitsView.append_column(self._unitSymbolColumn)
+
        def _clear_find(self):
                # switch to "new find" state
                self._find_result = []
@@ -464,11 +465,19 @@ class Gonvert(object):
 
                #Fill up the units descriptions and clear the value cells
                self._clear_visible_unit_data()
+               nameLength = 0
                for key in unit_data.get_units(self._selectedCategoryName):
                        row = key, '0.0', self._unitDataInCategory[key][1], '0.', '0'
                        self._unitModel.append(row)
+                       nameLength = max(nameLength, len(key))
                self._sortedUnitModel.sort_column_changed()
 
+               if FORCE_HILDON_LIKE:
+                       maxCatCharWidth = int(nameLength * 0.75)
+                       maxCharWidth = int(len("nibble | hexit | quadbit") * 0.75)
+                       charWidth = min(maxCatCharWidth, maxCharWidth)
+                       self._unitsNameRenderer.set_property("width-chars", charWidth)
+
                self._select_default_unit()
 
        def _clear_visible_unit_data(self):
@@ -549,6 +558,11 @@ class Gonvert(object):
                                self._find_previous()
                        elif event.keyval == gtk.keysyms.n and event.get_state() & gtk.gdk.CONTROL_MASK:
                                self._find_next()
+                       elif event.keyval == ord("l") and event.get_state() & gtk.gdk.CONTROL_MASK:
+                               with open(constants._user_logpath_, "r") as f:
+                                       logLines = f.xreadlines()
+                                       log = "".join(logLines)
+                                       self._clipboard.set_text(str(log))
                except Exception, e:
                        _moduleLogger.exception("_on_key_press")
 
@@ -714,6 +728,7 @@ class Gonvert(object):
                                self._previousUnitValue.set_text(str(func.from_base(base, arg, )))
 
                        self._sortedUnitModel.sort_column_changed()
+                       self._refresh_columns()
                except Exception:
                        _moduleLogger.exception("_on_unit_value_changed")
 
@@ -746,6 +761,7 @@ class Gonvert(object):
                        self._unitValue.set_text(str(func.from_base(base, arg, )))
 
                        self._sortedUnitModel.sort_column_changed()
+                       self._refresh_columns()
                except Exception:
                        _moduleLogger.exception("_on_previous_unit_value_changed")