X-Git-Url: http://git.maemo.org/git/?p=gonvert;a=blobdiff_plain;f=src%2Fgonvert_glade.py;h=c15ba8d1f3b148ccc660f36f64d30c10d6851dd7;hp=6ea04815e25acce39478d5ce5e1fd2efa0b3b072;hb=9903347dfe72293334a49c2b942fd69b680833f0;hpb=83944706904fb8dddf400ddf68b722b9d7568c37
diff --git a/src/gonvert_glade.py b/src/gonvert_glade.py
index 6ea0481..c15ba8d 100755
--- a/src/gonvert_glade.py
+++ b/src/gonvert_glade.py
@@ -2,10 +2,11 @@
# -*- coding: UTF8 -*-
import os
+import math
import pickle
-import gettext
import logging
+import pango
import gobject
import gtk
import gtk.glade
@@ -15,14 +16,22 @@ import constants
import hildonize
import unit_data
+try:
+ import gettext
+except ImportError:
+ _ = lambda x: x
+ gettext = None
+else:
+ _ = gettext.gettext
+
_moduleLogger = logging.getLogger("gonvert_glade")
PROFILE_STARTUP = False
-FORCE_HILDON_LIKE = True
+FORCE_HILDON_LIKE = False
-gettext.bindtextdomain('gonvert', '/usr/share/locale')
-gettext.textdomain('gonvert')
-_ = gettext.gettext
+if gettext is not None:
+ gettext.bindtextdomain('gonvert', '/usr/share/locale')
+ gettext.textdomain('gonvert')
def change_menu_label(widgets, labelname, newtext):
@@ -30,21 +39,54 @@ def change_menu_label(widgets, labelname, newtext):
item_label.set_text(newtext)
+def split_number(number):
+ try:
+ fractional, integer = math.modf(number)
+ except TypeError:
+ integerDisplay = number
+ fractionalDisplay = ""
+ else:
+ integerDisplay = str(integer)
+ fractionalDisplay = str(fractional)
+ if "e+" in integerDisplay:
+ integerDisplay = number
+ fractionalDisplay = ""
+ elif "e-" in fractionalDisplay and 0.0 < integer:
+ integerDisplay = number
+ fractionalDisplay = ""
+ elif "e-" in fractionalDisplay:
+ integerDisplay = ""
+ fractionalDisplay = number
+ else:
+ integerDisplay = integerDisplay.split(".", 1)[0] + "."
+ fractionalDisplay = fractionalDisplay.rsplit(".", 1)[-1]
+
+ return integerDisplay, fractionalDisplay
+
+
class Gonvert(object):
_glade_files = [
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',
]
+ UNITS_NAME_IDX = 0
+ UNITS_VALUE_IDX = 1
+ UNITS_SYMBOL_IDX = 2
+ UNITS_INTEGER_IDX = 3
+ UNITS_FRACTION_IDX = 4
+
def __init__(self):
self._unitDataInCategory = None
self._unit_sort_direction = False
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
@@ -71,69 +113,84 @@ class Gonvert(object):
change_menu_label(widgets, 'fileMenuItem', _('File'))
change_menu_label(widgets, 'exitMenuItem', _('Exit'))
- change_menu_label(widgets, 'toolsMenuItem', _('Tools'))
- change_menu_label(widgets, 'clearSelectionMenuItem', _('Clear selections'))
change_menu_label(widgets, 'helpMenuItem', _('Help'))
change_menu_label(widgets, 'aboutMenuItem', _('About'))
change_menu_label(widgets, 'findButton', _('Find'))
- self._shortlistcheck = widgets.get_widget('shortlistcheck')
- self._toggleShortList = widgets.get_widget('toggleShortList')
-
+ self._categorySelectionButton = widgets.get_widget("categorySelectionButton")
self._categoryView = widgets.get_widget('categoryView')
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()
self._findEntry = widgets.get_widget('findEntry')
self._findLabel = widgets.get_widget('findLabel')
self._findButton = widgets.get_widget('findButton')
- ToolTips = gtk.Tooltips()
- ToolTips.set_tip(self._findButton, _(u'Find unit (F6)'))
- #insert a self._categoryColumnumn into the units list even though the heading will not be seen
- renderer = gtk.CellRendererText()
- self._unitNameColumn = gtk.TreeViewColumn(_('Unit Name'), renderer)
- self._unitNameColumn.set_property('resizable', 1)
- self._unitNameColumn.add_attribute(renderer, 'text', 0)
+ 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(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)
- self._unitValueColumn = gtk.TreeViewColumn(_('Value'), renderer)
- self._unitValueColumn.set_property('resizable', 1)
- self._unitValueColumn.add_attribute(renderer, 'text', 1)
- self._unitValueColumn.set_clickable(True)
- self._unitValueColumn.connect("clicked", self._on_click_unit_column)
- self._unitsView.append_column(self._unitValueColumn)
+ renderer = gtk.CellRendererText()
+ renderer.set_property("xalign", 1.0)
+ renderer.set_property("alignment", pango.ALIGN_RIGHT)
+ hildonize.set_cell_thumb_selectable(renderer)
+ self._unitIntegerColumn = gtk.TreeViewColumn(_('Value'), renderer)
+ self._unitIntegerColumn.set_property('resizable', True)
+ self._unitIntegerColumn.add_attribute(renderer, 'text', self.UNITS_INTEGER_IDX)
+ self._unitIntegerColumn.set_clickable(True)
+ self._unitIntegerColumn.connect("clicked", self._on_click_unit_column)
+ self._unitsView.append_column(self._unitIntegerColumn)
+
+ 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)
+ self._unitFractionalColumn.set_clickable(True)
+ self._unitFractionalColumn.connect("clicked", self._on_click_unit_column)
+ self._unitsView.append_column(self._unitFractionalColumn)
+ renderer = gtk.CellRendererText()
+ renderer.set_property("ellipsize", pango.ELLIPSIZE_END)
+ #renderer.set_property("scale", 0.5)
self._unitSymbolColumn = gtk.TreeViewColumn(_('Units'), renderer)
- self._unitSymbolColumn.set_property('resizable', 1)
- self._unitSymbolColumn.add_attribute(renderer, 'text', 2)
+ self._unitSymbolColumn.set_property('resizable', True)
+ self._unitSymbolColumn.add_attribute(renderer, 'text', self.UNITS_SYMBOL_IDX)
self._unitSymbolColumn.set_clickable(True)
self._unitSymbolColumn.connect("clicked", self._on_click_unit_column)
self._unitsView.append_column(self._unitSymbolColumn)
- self._unitModel = gtk.ListStore(gobject.TYPE_STRING, gobject.TYPE_STRING, gobject.TYPE_STRING)
+ self._unitModel = gtk.ListStore(
+ gobject.TYPE_STRING, # UNITS_NAME_IDX
+ gobject.TYPE_STRING, # UNITS_VALUE_IDX
+ gobject.TYPE_STRING, # UNITS_SYMBOL_IDX
+ gobject.TYPE_STRING, # UNITS_INTEGER_IDX
+ gobject.TYPE_STRING, # UNITS_FRACTION_IDX
+ )
self._sortedUnitModel = gtk.TreeModelSort(self._unitModel)
columns = self._get_column_sort_stuff()
for columnIndex, (column, sortDirection, col_cmp) in enumerate(columns):
@@ -154,30 +211,53 @@ class Gonvert(object):
#Populate the catagories list
for key in unit_data.UNIT_CATEGORIES:
- iter = self._categoryModel.append()
- self._categoryModel.set(iter, 0, key)
+ row = (key, )
+ self._categoryModel.append(row)
#--------- connections to GUI ----------------
- dic = {
- "on_exit_menu_activate": self._on_user_exit,
- "on_main_window_destroy": 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._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._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("exitMenuItem").connect("activate", self._on_user_exit)
+
+ for scrollingWidgetName in (
+ "unitsViewScrolledWindow",
+ ):
+ scrollingWidget = widgets.get_widget(scrollingWidgetName)
+ assert scrollingWidget is not None, scrollingWidgetName
+ hildonize.hildonize_scrollwindow_with_viewport(scrollingWidget)
+
+ if hildonize.IS_HILDON_SUPPORTED or FORCE_HILDON_LIKE:
+ self._categoryView.get_parent().hide()
+ self._unitsView.set_headers_visible(False)
+ self._previousUnitName.get_parent().hide()
+ self._unitDescription.get_parent().get_parent().hide()
+ else:
+ self._categorySelectionButton.hide()
+
+ replacementButtons = []
+ menu = hildonize.hildonize_menu(
+ self._mainWindow,
+ widgets.get_widget("mainMenuBar"),
+ replacementButtons
+ )
- self._mainWindow.set_title('gonvert- %s - Unit Conversion Utility' % constants.__version__)
+ if not hildonize.IS_HILDON_SUPPORTED:
+ _moduleLogger.info("No hildonization support")
+
+ hildonize.set_application_title(
+ self._mainWindow, "%s - Unit Conversion Utility" % constants.__pretty_app_name__
+ )
iconPath = pixmapspath + '/gonvert.png'
if os.path.exists(iconPath):
self._mainWindow.set_icon(gtk.gdk.pixbuf_new_from_file(iconPath))
@@ -185,44 +265,44 @@ class Gonvert(object):
_moduleLogger.warn("Error: Could not find gonvert icon: %s" % iconPath)
self._load_settings()
+ self._mainWindow.show()
def _load_settings(self):
#Restore window size from previously saved settings if it exists and is valid.
windowDatPath = "/".join((constants._data_path_, "window.dat"))
if os.path.exists(windowDatPath):
- #Retrieving previous window settings from ~/.gonvert/window.dat
saved_window = pickle.load(open(windowDatPath, "r"))
- #If the 'size' has been stored, then extract size from saved_window.
- if 'size' in saved_window:
+ try:
a, b = saved_window['size']
+ except KeyError:
+ pass
+ else:
self._mainWindow.resize(a, b)
#Restore selections from previously saved settings if it exists and is valid.
- historical_catergory_found = False
+ categoryIndex = 0
+ selectedCategoryName = unit_data.UNIT_CATEGORIES[0]
selectionsDatPath = "/".join((constants._data_path_, "selections.dat"))
if os.path.exists(selectionsDatPath):
- #Retrieving previous selections from ~/.gonvert/selections.dat
selections = pickle.load(open(selectionsDatPath, 'r'))
- #Restoring previous selections.
- #If the 'selected_unts' has been stored, then extract self._defaultUnitForCategory from selections.
- if 'selected_units' in selections:
+ try:
self._defaultUnitForCategory = selections['selected_units']
- #Make sure that the 'self._selectedCategoryName' has been stored.
- if 'selected_category' in selections:
- #Match an available category to the previously selected category.
- for counter in range(len(unit_data.UNIT_CATEGORIES)):
- if selections['selected_category'] == unit_data.UNIT_CATEGORIES[counter]:
- # Restore the previously selected category.
- self._categoryView.set_cursor(counter, self._categoryColumn, False)
- self._categoryView.grab_focus()
- historical_catergory_found = True
-
- if not historical_catergory_found:
- print "Couldn't find saved category, using default."
- #If historical records were not kept then default to
- # put the focus on the first category
- self._categoryView.set_cursor(0, self._categoryColumn, False)
- self._categoryView.grab_focus()
+ except KeyError:
+ pass
+
+ try:
+ selectedCategoryName = selections['selected_category']
+ except KeyError:
+ pass
+ else:
+ try:
+ categoryIndex = unit_data.UNIT_CATEGORIES.index(selectedCategoryName)
+ except ValueError:
+ _moduleLogger.warn("Unknown category: %s" % selectedCategoryName)
+
+ self._categorySelectionButton.get_child().set_markup("%s" % selectedCategoryName)
+ self._categoryView.set_cursor(categoryIndex, self._categoryColumn, False)
+ self._categoryView.grab_focus()
self._select_default_unit()
@@ -254,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 = []
@@ -281,7 +372,9 @@ class Gonvert(object):
assert 0 < len(self._find_result)
#check if next find is in a new category (prevent category changes when unnecessary
- if self._selectedCategoryName != self._find_result[self._findIndex][0]:
+ searchCategoryName = self._find_result[self._findIndex][0]
+ if self._selectedCategoryName != searchCategoryName:
+ self._categorySelectionButton.get_child().set_markup("%s" % searchCategoryName)
self._categoryView.set_cursor(
self._find_result[self._findIndex][2], self._categoryColumn, False
)
@@ -329,36 +422,39 @@ class Gonvert(object):
def _toggle_find(self):
if self._searchLayout.get_property("visible"):
self._searchLayout.hide()
+ self._unitsView.grab_focus()
else:
self._searchLayout.show()
+ self._findEntry.grab_focus()
def _unit_model_cmp(self, sortedModel, leftItr, rightItr):
- leftUnitText = self._unitModel.get_value(leftItr, 0)
- rightUnitText = self._unitModel.get_value(rightItr, 0)
+ leftUnitText = self._unitModel.get_value(leftItr, self.UNITS_NAME_IDX)
+ rightUnitText = self._unitModel.get_value(rightItr, self.UNITS_NAME_IDX)
return cmp(leftUnitText, rightUnitText)
def _symbol_model_cmp(self, sortedModel, leftItr, rightItr):
- leftSymbolText = self._unitModel.get_value(leftItr, 2)
- rightSymbolText = self._unitModel.get_value(rightItr, 2)
+ leftSymbolText = self._unitModel.get_value(leftItr, self.UNITS_SYMBOL_IDX)
+ rightSymbolText = self._unitModel.get_value(rightItr, self.UNITS_SYMBOL_IDX)
return cmp(leftSymbolText, rightSymbolText)
def _value_model_cmp(self, sortedModel, leftItr, rightItr):
#special sorting exceptions for ascii values (instead of float values)
if self._selectedCategoryName == "Computer Numbers":
- leftValue = self._unitModel.get_value(leftItr, 1)
- rightValue = self._unitModel.get_value(rightItr, 1)
+ leftValue = self._unitModel.get_value(leftItr, self.UNITS_VALUE_IDX)
+ rightValue = self._unitModel.get_value(rightItr, self.UNITS_VALUE_IDX)
else:
- leftValueText = self._unitModel.get_value(leftItr, 1)
+ leftValueText = self._unitModel.get_value(leftItr, self.UNITS_VALUE_IDX)
leftValue = float(leftValueText) if leftValueText else 0.0
- rightValueText = self._unitModel.get_value(rightItr, 1)
+ rightValueText = self._unitModel.get_value(rightItr, self.UNITS_VALUE_IDX)
rightValue = float(rightValueText) if rightValueText else 0.0
return cmp(leftValue, rightValue)
def _get_column_sort_stuff(self):
columns = (
(self._unitNameColumn, "_unit_sort_direction", self._unit_model_cmp),
- (self._unitValueColumn, "_value_sort_direction", self._value_model_cmp),
+ (self._unitIntegerColumn, "_value_sort_direction", self._value_model_cmp),
+ (self._unitFractionalColumn, "_value_sort_direction", self._value_model_cmp),
(self._unitSymbolColumn, "_units_sort_direction", self._symbol_model_cmp),
)
return columns
@@ -369,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):
- iter = self._unitModel.append()
- self._unitModel.set(iter, 0, key, 1, '', 2, self._unitDataInCategory[key][1])
+ 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):
@@ -403,12 +507,18 @@ class Gonvert(object):
#Restore oldest selection first.
if defaultPrimary:
- unitIndex = units.index(defaultPrimary)
+ try:
+ unitIndex = units.index(defaultPrimary)
+ except ValueError:
+ unitIndex = 0
self._unitsView.set_cursor(unitIndex, self._unitNameColumn, True)
#Restore newest selection second.
if defaultSecondary:
- unitIndex = units.index(defaultSecondary)
+ try:
+ unitIndex = units.index(defaultSecondary)
+ except ValueError:
+ unitIndex = 0
self._unitsView.set_cursor(unitIndex, self._unitNameColumn, True)
# select the text so user can start typing right away
@@ -428,26 +538,6 @@ class Gonvert(object):
value = float(userEntry)
return value
- def _on_shortlist_changed(self, *args):
- try:
- raise NotImplementedError("%s" % self._shortlistcheck.get_active())
- except Exception:
- _moduleLogger.exception("")
-
- def _on_edit_shortlist(self, *args):
- try:
- raise NotImplementedError("%s" % self._toggleShortList.get_active())
- except Exception:
- _moduleLogger.exception("")
-
- def _on_user_clear_selections(self, *args):
- try:
- selectionsDatPath = "/".join((constants._data_path_, "selections.dat"))
- os.remove(selectionsDatPath)
- self._defaultUnitForCategory = {}
- except Exception:
- _moduleLogger.exception("")
-
def _on_key_press(self, widget, event, *args):
"""
@note Hildon specific
@@ -468,8 +558,13 @@ 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("")
+ _moduleLogger.exception("_on_key_press")
def _on_window_state_change(self, widget, event, *args):
"""
@@ -481,7 +576,7 @@ class Gonvert(object):
else:
self._isFullScreen = False
except Exception, e:
- _moduleLogger.exception("")
+ _moduleLogger.exception("_on_window_state_change")
def _on_findEntry_changed(self, *args):
"""
@@ -490,14 +585,14 @@ class Gonvert(object):
try:
self._clear_find()
except Exception:
- _moduleLogger.exception("")
+ _moduleLogger.exception("_on_findEntry_changed")
def _on_find_activate(self, *args):
try:
self._find_next()
self._findButton.grab_focus()
except Exception:
- _moduleLogger.exception("")
+ _moduleLogger.exception("_on_find_activate")
def _on_click_unit_column(self, col):
"""
@@ -525,7 +620,24 @@ class Gonvert(object):
else:
assert False, "Unknown column: %s" % (col.get_title(), )
except Exception:
- _moduleLogger.exception("")
+ _moduleLogger.exception("_on_click_unit_column")
+
+ def _on_category_selector_clicked(self, *args):
+ try:
+ currenntIndex = unit_data.UNIT_CATEGORIES.index(self._selectedCategoryName)
+ newIndex = hildonize.touch_selector(
+ self._mainWindow,
+ "Categories",
+ unit_data.UNIT_CATEGORIES,
+ currenntIndex,
+ )
+
+ selectedCategoryName = unit_data.UNIT_CATEGORIES[newIndex]
+ self._categorySelectionButton.set_label(selectedCategoryName)
+ self._categoryView.set_cursor(newIndex, self._categoryColumn, False)
+ self._categoryView.grab_focus()
+ except Exception:
+ _moduleLogger.exception("_on_category_selector_clicked")
def _on_click_category(self, *args):
try:
@@ -536,28 +648,39 @@ class Gonvert(object):
selectedCategory = self._categoryModel.get_value(iter, 0)
self._switch_category(selectedCategory)
except Exception:
- _moduleLogger.exception("")
+ _moduleLogger.exception("_on_click_category")
def _on_click_unit(self, *args):
try:
selected, iter = self._unitsView.get_selection().get_selected()
- selected_unit = selected.get_value(iter, 0)
+ selected_unit = selected.get_value(iter, self.UNITS_NAME_IDX)
unit_spec = self._unitDataInCategory[selected_unit]
+ showSymbol = False
+
if self._unitName.get_text() != selected_unit:
self._previousUnitName.set_text(self._unitName.get_text())
self._previousUnitValue.set_text(self._unitValue.get_text())
- self._previousUnitSymbol.set_text(self._unitSymbol.get())
+ self._previousUnitSymbol.set_text(self._unitSymbol.get_text())
+ if self._unitSymbol.get_text():
+ showSymbol = True
self._unitName.set_text(selected_unit)
- self._unitValue.set_text(selected.get_value(iter, 1))
+ self._unitValue.set_text(selected.get_value(iter, self.UNITS_VALUE_IDX))
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]:
+ showSymbol = True
+ else:
+ showSymbol = False
+
+ if showSymbol:
self._unitSymbol.show()
+ self._previousUnitSymbol.show()
else:
self._unitSymbol.hide()
+ self._previousUnitSymbol.hide()
if self._unitValue.get_text() == '':
if self._selectedCategoryName == "Computer Numbers":
@@ -573,7 +696,7 @@ class Gonvert(object):
self._unitValue.grab_focus()
self._unitValue.select_region(0, -1)
except Exception:
- _moduleLogger.exception("")
+ _moduleLogger.exception("_on_click_unit")
def _on_unit_value_changed(self, *args):
try:
@@ -589,15 +712,25 @@ class Gonvert(object):
#point to the first row
for row in self._unitModel:
- func, arg = self._unitDataInCategory[row[0]][0]
- row[1] = str(func.from_base(base, arg))
+ func, arg = self._unitDataInCategory[row[self.UNITS_NAME_IDX]][0]
+ newValue = func.from_base(base, arg)
+
+ newValueDisplay = str(newValue)
+ integerDisplay, fractionalDisplay = split_number(newValue)
+
+ row[self.UNITS_VALUE_IDX] = newValueDisplay
+ row[self.UNITS_INTEGER_IDX] = integerDisplay
+ row[self.UNITS_FRACTION_IDX] = fractionalDisplay
# Update the secondary unit entry
if self._previousUnitName.get_text() != '':
func, arg = self._unitDataInCategory[self._previousUnitName.get_text()][0]
self._previousUnitValue.set_text(str(func.from_base(base, arg, )))
+
+ self._sortedUnitModel.sort_column_changed()
+ self._refresh_columns()
except Exception:
- _moduleLogger.exception("")
+ _moduleLogger.exception("_on_unit_value_changed")
def _on_previous_unit_value_changed(self, *args):
try:
@@ -613,14 +746,24 @@ class Gonvert(object):
#point to the first row
for row in self._unitModel:
- func, arg = self._unitDataInCategory[row[0]][0]
- row[1] = str(func.from_base(base, arg))
+ func, arg = self._unitDataInCategory[row[self.UNITS_NAME_IDX]][0]
+ newValue = func.from_base(base, arg)
+
+ newValueDisplay = str(newValue)
+ integerDisplay, fractionalDisplay = split_number(newValue)
+
+ row[self.UNITS_VALUE_IDX] = newValueDisplay
+ row[self.UNITS_INTEGER_IDX] = integerDisplay
+ row[self.UNITS_FRACTION_IDX] = fractionalDisplay
# Update the primary unit entry
func, arg = self._unitDataInCategory[self._unitName.get_text()][0]
self._unitValue.set_text(str(func.from_base(base, arg, )))
+
+ self._sortedUnitModel.sort_column_changed()
+ self._refresh_columns()
except Exception:
- _moduleLogger.exception("")
+ _moduleLogger.exception("_on_previous_unit_value_changed")
def _on_about_clicked(self, a):
dlg = gtk.AboutDialog()
@@ -637,12 +780,21 @@ class Gonvert(object):
try:
self._save_settings()
except Exception:
- _moduleLogger.exception("")
+ _moduleLogger.exception("_on_user_exit")
finally:
gtk.main_quit()
-def main():
+def run_gonvert():
+ gtk.gdk.threads_init()
+ if hildonize.IS_HILDON_SUPPORTED:
+ gtk.set_application_name(constants.__pretty_app_name__)
+ handle = Gonvert()
+ if not PROFILE_STARTUP:
+ gtk.main()
+
+
+if __name__ == "__main__":
logging.basicConfig(level = logging.DEBUG)
try:
os.makedirs(constants._data_path_)
@@ -650,10 +802,4 @@ def main():
if e.errno != 17:
raise
- gonvert = Gonvert()
- if not PROFILE_STARTUP:
- gtk.main()
-
-
-if __name__ == "__main__":
- main()
+ run_gonvert()