#!/usr/bin/env python
# -*- coding: UTF8 -*-
+#@todo Research Fn
+#@todo Research optimizations
+#@todo Look into switching favorites from selection to checking?
+
from __future__ import with_statement
import sys
import unit_data
-_moduleLogger = logging.getLogger("gonvert_glade")
+_moduleLogger = logging.getLogger(__name__)
IS_MAEMO = True
-def change_menu_label(widgets, labelname, newtext):
- item_label = widgets.get_widget(labelname).get_children()[0]
- item_label.set_text(newtext)
-
-
def split_number(number):
try:
fractional, integer = math.modf(number)
self._catWindow = None
self._quickWindow = None
+ self._on_jump_close = lambda obj = None: self._on_child_close("_jumpWindow", obj)
+ self._on_recent_close = lambda obj = None: self._on_child_close("_recentWindow", obj)
+ self._on_cat_close = lambda obj = None: self._on_child_close("_catWindow", obj)
+ self._on_quick_close = lambda obj = None: self._on_child_close("_quickWindow", obj)
+
self._condensedAction = QtGui.QAction(None)
self._condensedAction.setText("Condensed View")
self._condensedAction.setCheckable(True)
self._showFavoritesAction.setCheckable(True)
self._showFavoritesAction.setText("Favorites Only")
+ self._sortActionGroup = QtGui.QActionGroup(None)
+ self._sortByNameAction = QtGui.QAction(self._sortActionGroup)
+ self._sortByNameAction.setText("Sort By Name")
+ self._sortByNameAction.setStatusTip("Sort the units by name")
+ self._sortByNameAction.setToolTip("Sort the units by name")
+ self._sortByNameAction.setCheckable(True)
+ self._sortByValueAction = QtGui.QAction(self._sortActionGroup)
+ self._sortByValueAction.setText("Sort By Value")
+ self._sortByValueAction.setStatusTip("Sort the units by value")
+ self._sortByValueAction.setToolTip("Sort the units by value")
+ self._sortByValueAction.setCheckable(True)
+ self._sortByUnitAction = QtGui.QAction(self._sortActionGroup)
+ self._sortByUnitAction.setText("Sort By Unit")
+ self._sortByUnitAction.setStatusTip("Sort the units by unit")
+ self._sortByUnitAction.setToolTip("Sort the units by unit")
+ self._sortByUnitAction.setCheckable(True)
+
+ self._sortByNameAction.setChecked(True)
+
self._logAction = QtGui.QAction(None)
self._logAction.setText("Log")
self._logAction.setShortcut(QtGui.QKeySequence("CTRL+l"))
self._mainWindow.select_category(self._recent[-1][0])
def request_category(self):
- if self._mainWindow is not None:
- self._mainWindow.hide()
if self._condensedAction.isChecked():
+ if self._catWindow is not None:
+ self._catWindow.hide()
+
if self._quickWindow is None:
self._quickWindow = QuickConvert(None, self)
- self._quickWindow.window.destroyed.connect(lambda obj = None: self._on_child_close("_quickWindow", obj))
+ self._quickWindow.window.destroyed.connect(self._on_quick_close)
else:
self._quickWindow.show()
+
self._mainWindow = self._quickWindow
else:
+ if self._quickWindow is not None:
+ self._quickWindow.hide()
+
if self._catWindow is None:
self._catWindow = CategoryWindow(None, self)
- self._catWindow.window.destroyed.connect(lambda obj = None: self._on_child_close("_catWindow", obj))
+ self._catWindow.window.destroyed.connect(self._on_cat_close)
else:
self._catWindow.window.show()
- self._mainWindow = self._catWindow
- if self._recent:
- self._mainWindow.select_category(self._recent[-1][0])
+ self._mainWindow = self._catWindow
return self._mainWindow
def search_units(self):
jumpWindow = QuickJump(None, self)
- jumpWindow.window.destroyed.connect(lambda obj = None: self._on_child_close("_jumpWindow", obj))
- self._fake_close_windows()
+ jumpWindow.window.destroyed.connect(self._on_jump_close)
self._jumpWindow = jumpWindow
return self._jumpWindow
def show_recent(self):
recentWindow = Recent(None, self)
- recentWindow.window.destroyed.connect(lambda obj = None: self._on_child_close("_recentWindow", obj))
- self._fake_close_windows()
+ recentWindow.window.destroyed.connect(self._on_recent_close)
self._recentWindow = recentWindow
return self._recentWindow
self._fullscreenAction.setChecked(settings.get("isFullScreen", False))
+ sortBy = settings.get("sortBy", "name")
+ if sortBy not in ["name", "value", "unit"]:
+ _moduleLogger.info("Setting sortBy is not a valid value: %s" % sortBy)
+ sortBy = "name"
+ if sortBy == "name":
+ self._sortByNameAction.setChecked(True)
+ self._sortByValueAction.setChecked(False)
+ self._sortByUnitAction.setChecked(False)
+ elif sortBy == "value":
+ self._sortByNameAction.setChecked(False)
+ self._sortByValueAction.setChecked(True)
+ self._sortByUnitAction.setChecked(False)
+ elif sortBy == "unit":
+ self._sortByNameAction.setChecked(False)
+ self._sortByValueAction.setChecked(False)
+ self._sortByUnitAction.setChecked(True)
+ else:
+ raise RuntimeError("How did this sortBy come about? %s" % sortBy)
+
recent = settings.get("recent", self._recent)
for category, unit in recent:
self.add_recent(category, unit)
self._condensedAction.setChecked(settings.get("useQuick", self._condensedAction.isChecked()))
def save_settings(self):
+ if self._sortByNameAction.isChecked():
+ sortBy = "name"
+ elif self._sortByValueAction.isChecked():
+ sortBy = "value"
+ elif self._sortByUnitAction.isChecked():
+ sortBy = "unit"
+ else:
+ raise RuntimeError("Unknown sorting value")
settings = {
"isFullScreen": self._fullscreenAction.isChecked(),
"recent": self._recent,
),
"showFavorites": self._showFavoritesAction.isChecked(),
"useQuick": self._condensedAction.isChecked(),
+ "sortBy": sortBy,
}
with open(constants._user_settings_, "w") as settingsFile:
simplejson.dump(settings, settingsFile)
return self._condensedAction
@property
+ def sortByNameAction(self):
+ return self._sortByNameAction
+
+ @property
+ def sortByValueAction(self):
+ return self._sortByValueAction
+
+ @property
+ def sortByUnitAction(self):
+ return self._sortByUnitAction
+
+ @property
def logAction(self):
return self._logAction
if self._recentWindow is not None:
yield self._recentWindow
- def _fake_close_windows(self):
+ def _close_windows(self):
if self._catWindow is not None:
- self._catWindow.hide()
+ self._catWindow.window.destroyed.disconnect(self._on_cat_close)
+ self._catWindow.close()
+ self._catWindow = None
if self._quickWindow is not None:
- self._quickWindow.hide()
+ self._quickWindow.window.destroyed.disconnect(self._on_quick_close)
+ self._quickWindow.close()
+ self._quickWindow = None
if self._jumpWindow is not None:
+ self._jumpWindow.window.destroyed.disconnect(self._on_jump_close)
self._jumpWindow.close()
self._jumpWindow = None
if self._recentWindow is not None:
+ self._recentWindow.window.destroyed.disconnect(self._on_recent_close)
self._recentWindow.close()
self._recentWindow = None
- def _close_windows(self):
- for child in self._walk_children():
- child.close()
- self._catWindow = None
- self._quickWindow = None
- self._jumpWindow = None
- self._recentWindow = None
-
@misc_utils.log_exception(_moduleLogger)
def _on_app_quit(self, checked = False):
self.save_settings()
@misc_utils.log_exception(_moduleLogger)
def _on_condensed_start(self, checked = False):
self.request_category()
+ if self._recent:
+ self._mainWindow.select_category(self._recent[-1][0])
@misc_utils.log_exception(_moduleLogger)
def _on_jump_start(self, checked = False):
self._window.setAttribute(QtCore.Qt.WA_DeleteOnClose, True)
maeqt.set_autorient(self._window, True)
maeqt.set_stackable(self._window, True)
- if parent is not None:
- self._window.setWindowModality(QtCore.Qt.WindowModal)
self._window.setWindowTitle("%s - Quick Jump" % constants.__pretty_app_name__)
self._window.setWindowIcon(QtGui.QIcon(self._app.appIconPath))
self._window.setCentralWidget(centralWidget)
self._window.setAttribute(QtCore.Qt.WA_DeleteOnClose, True)
maeqt.set_autorient(self._window, True)
maeqt.set_stackable(self._window, True)
- if parent is not None:
- self._window.setWindowModality(QtCore.Qt.WindowModal)
self._window.setWindowTitle("%s - Recent" % constants.__pretty_app_name__)
self._window.setWindowIcon(QtGui.QIcon(self._app.appIconPath))
self._window.setCentralWidget(centralWidget)
self._favoritesWindow = None
self._inputUnitValue = QtGui.QLineEdit()
- self._inputUnitValue.setInputMethodHints(QtCore.Qt.ImhPreferNumbers)
+ maeqt.mark_numbers_preferred(self._inputUnitValue)
self._inputUnitValue.textEdited.connect(self._on_value_edited)
self._inputUnitSymbol = QtGui.QLabel()
- self._outputUnitValue = QtGui.QLabel()
+ self._outputUnitValue = QtGui.QLineEdit()
+ maeqt.mark_numbers_preferred(self._outputUnitValue)
+ self._outputUnitValue.textEdited.connect(self._on_output_value_edited)
self._outputUnitSymbol = QtGui.QLabel()
self._conversionLayout = QtGui.QHBoxLayout()
self._categoryView = QtGui.QTreeWidget()
self._categoryView.setHeaderLabels(["Categories"])
- self._categoryView.setHeaderHidden(True)
+ self._categoryView.setHeaderHidden(False)
if not IS_MAEMO:
self._categoryView.setAlternatingRowColors(True)
self._categoryView.setSelectionBehavior(QtGui.QAbstractItemView.SelectRows)
self._categorySelection.selectionChanged.connect(self._on_category_selection_changed)
self._inputView = QtGui.QTreeWidget()
- self._inputView.setHeaderLabels(["Input", "Name"])
- self._inputView.setHeaderHidden(True)
+ self._inputView.setHeaderLabels(["From", "Name"])
+ self._inputView.setHeaderHidden(False)
self._inputView.header().hideSection(1)
if not IS_MAEMO:
self._inputView.setAlternatingRowColors(True)
self._inputSelection.selectionChanged.connect(self._on_input_selection_changed)
self._outputView = QtGui.QTreeWidget()
- self._outputView.setHeaderLabels(["Output", "Name"])
- self._outputView.setHeaderHidden(True)
+ self._outputView.setHeaderLabels(["To", "Name"])
+ self._outputView.setHeaderHidden(False)
self._outputView.header().hideSection(1)
if not IS_MAEMO:
self._outputView.setAlternatingRowColors(True)
self._window.setAttribute(QtCore.Qt.WA_DeleteOnClose, True)
maeqt.set_autorient(self._window, True)
maeqt.set_stackable(self._window, True)
- if parent is not None:
- self._window.setWindowModality(QtCore.Qt.WindowModal)
self._window.setWindowTitle("%s - Quick Convert" % (constants.__pretty_app_name__, ))
self._window.setWindowIcon(QtGui.QIcon(app.appIconPath))
self._window.setCentralWidget(centralWidget)
self._chooseUnitFavoritesAction = QtGui.QAction(None)
self._chooseUnitFavoritesAction.setText("Select Units")
self._chooseUnitFavoritesAction.triggered.connect(self._on_choose_unit_favorites)
+ self._chooseUnitFavoritesAction.setEnabled(False)
self._app.showFavoritesAction.toggled.connect(self._on_show_favorites)
self._window.showNormal()
def select_category(self, categoryName):
+ self._select_category(categoryName)
+
+ i = unit_data.UNIT_CATEGORIES.index(categoryName)
+ rootIndex = self._categoryView.rootIndex()
+ currentIndex = self._categoryView.model().index(i, 0, rootIndex)
+ self._categoryView.scrollTo(currentIndex)
+ self._categoryView.setItemSelected(self._categoryView.topLevelItem(i), True)
+
+ return self
+
+ def select_unit(self, name):
+ self.select_input(name)
+ return self
+
+ def select_input(self, name):
+ self._select_input(name)
+
+ i = self._unitNames.index(name)
+ rootIndex = self._inputView.rootIndex()
+ currentIndex = self._inputView.model().index(i, 0, rootIndex)
+ self._inputView.scrollTo(currentIndex)
+ self._inputView.setItemSelected(self._inputView.topLevelItem(i), True)
+
+ def select_output(self, name):
+ self._select_output(name)
+
+ i = self._unitNames.index(name)
+ rootIndex = self._outputView.rootIndex()
+ currentIndex = self._outputView.model().index(i, 0, rootIndex)
+ self._outputView.scrollTo(currentIndex)
+ self._outputView.setItemSelected(self._outputView.topLevelItem(i), True)
+
+ def _select_category(self, categoryName):
+ self._inputUnitName = ""
+ self._outputUnitName = ""
self._inputUnitValue.setText("")
+ self._inputUnitSymbol.setText("")
self._inputView.clear()
+ self._outputUnitValue.setText("")
+ self._outputUnitSymbol.setText("")
self._outputView.clear()
self._categoryName = categoryName
+ self._chooseUnitFavoritesAction.setEnabled(True)
unitData = unit_data.UNIT_DESCRIPTIONS[categoryName]
self._unitNames = list(unit_data.get_units(categoryName))
self._unitNames.sort()
for key in self._unitNames:
conversion, unit, description = unitData[key]
- if not unit:
- unit = key
+ unit = key
twi = QtGui.QTreeWidgetItem(self._inputView)
twi.setText(0, unit)
twi.setText(0, unit)
twi.setText(1, key)
- i = unit_data.UNIT_CATEGORIES.index(categoryName)
- rootIndex = self._categoryView.rootIndex()
- currentIndex = self._categoryView.model().index(i, 0, rootIndex)
- self._categoryView.scrollTo(currentIndex)
-
defaultInputUnitName = self._app.get_recent_unit(categoryName)
if defaultInputUnitName:
self.select_input(defaultInputUnitName)
assert defaultOutputUnitName
self.select_output(defaultOutputUnitName)
- return self
-
- def select_unit(self, name):
- self.select_input(name)
-
- def select_input(self, name):
+ def _select_input(self, name):
self._app.add_recent(self._categoryName, name)
self._inputUnitName = name
self._inputUnitSymbol.setText(unit if unit else name)
- i = self._unitNames.index(name)
- rootIndex = self._inputView.rootIndex()
- currentIndex = self._inputView.model().index(i, 0, rootIndex)
- self._inputView.scrollTo(currentIndex)
+ if "" not in [self._categoryName, self._inputUnitName, self._outputUnitName]:
+ self._update_output()
- def select_output(self, name):
+ def _select_output(self, name):
# Add the output to recent but don't make things weird by making it the most recent
self._app.add_recent(self._categoryName, name)
self._app.add_recent(self._categoryName, self._inputUnitName)
self._outputUnitSymbol.setText(unit if unit else name)
- i = self._unitNames.index(name)
- rootIndex = self._outputView.rootIndex()
- currentIndex = self._outputView.model().index(i, 0, rootIndex)
- self._outputView.scrollTo(currentIndex)
+ if "" not in [self._categoryName, self._inputUnitName, self._outputUnitName]:
+ self._update_output()
def _sanitize_value(self, userEntry):
if self._categoryName == "Computer Numbers":
value = float(userEntry)
return value
+ def _update_output(self):
+ assert self._categoryName
+ assert self._inputUnitName
+ assert self._outputUnitName
+
+ userInput = str(self._inputUnitValue.text())
+ value = self._sanitize_value(userInput)
+
+ unitData = unit_data.UNIT_DESCRIPTIONS[self._categoryName]
+ inputConversion, _, _ = unitData[self._inputUnitName]
+ outputConversion, _, _ = unitData[self._outputUnitName]
+
+ func, arg = inputConversion
+ base = func.to_base(value, arg)
+
+ func, arg = outputConversion
+ newValue = func.from_base(base, arg)
+ self._outputUnitValue.setText(str(newValue))
+
+ def _update_input(self):
+ assert self._categoryName
+ assert self._inputUnitName
+ assert self._outputUnitName
+
+ userOutput = str(self._outputUnitValue.text())
+ value = self._sanitize_value(userOutput)
+
+ unitData = unit_data.UNIT_DESCRIPTIONS[self._categoryName]
+ inputConversion, _, _ = unitData[self._inputUnitName]
+ outputConversion, _, _ = unitData[self._outputUnitName]
+
+ func, arg = outputConversion
+ base = func.to_base(value, arg)
+
+ func, arg = inputConversion
+ newValue = func.from_base(base, arg)
+ self._inputUnitValue.setText(str(newValue))
+
def _update_favorites(self):
if self._app.showFavoritesAction.isChecked():
assert self._categoryView.topLevelItemCount() == len(unit_data.UNIT_CATEGORIES)
@misc_utils.log_exception(_moduleLogger)
def _on_value_edited(self, *args):
- assert self._categoryName
- assert self._inputUnitName
- assert self._outputUnitName
+ self._update_output()
- userInput = str(self._inputUnitValue.text())
- value = self._sanitize_value(userInput)
-
- unitData = unit_data.UNIT_DESCRIPTIONS[self._categoryName]
- inputConversion, _, _ = unitData[self._inputUnitName]
- outputConversion, _, _ = unitData[self._outputUnitName]
-
- func, arg = inputConversion
- base = func.to_base(value, arg)
-
- func, arg = outputConversion
- newValue = func.from_base(base, arg)
- self._outputUnitValue.setText(str(newValue))
+ @misc_utils.log_exception(_moduleLogger)
+ def _on_output_value_edited(self, *args):
+ self._update_input()
@misc_utils.log_exception(_moduleLogger)
def _on_category_selection_changed(self, selected, deselected):
for item in self._categoryView.selectedItems()
]
assert len(selectedNames) == 1
- self.select_category(selectedNames[0])
+ self._select_category(selectedNames[0])
@misc_utils.log_exception(_moduleLogger)
def _on_input_selection_changed(self, selected, deselected):
if selectedNames:
assert len(selectedNames) == 1
name = selectedNames[0]
- self.select_input(name)
+ self._select_input(name)
else:
pass
if selectedNames:
assert len(selectedNames) == 1
name = selectedNames[0]
- self.select_output(name)
+ self._select_output(name)
else:
pass
self._window.setAttribute(QtCore.Qt.WA_DeleteOnClose, True)
maeqt.set_autorient(self._window, True)
maeqt.set_stackable(self._window, True)
- if parent is not None:
- self._window.setWindowModality(QtCore.Qt.WindowModal)
self._window.setWindowTitle("%s - Favorites" % constants.__pretty_app_name__)
self._window.setWindowIcon(QtGui.QIcon(self._app.appIconPath))
self._window.setCentralWidget(centralWidget)
self._categories.setHeaderLabels(["Categories"])
self._categories.itemClicked.connect(self._on_category_clicked)
self._categories.setHeaderHidden(True)
+ self._categories.setSelectionBehavior(QtGui.QAbstractItemView.SelectRows)
+ self._categories.setSelectionMode(QtGui.QAbstractItemView.SingleSelection)
if not IS_MAEMO:
self._categories.setAlternatingRowColors(True)
for catName in unit_data.UNIT_CATEGORIES:
self._window.setAttribute(QtCore.Qt.WA_DeleteOnClose, True)
maeqt.set_autorient(self._window, True)
maeqt.set_stackable(self._window, True)
- if parent is not None:
- self._window.setWindowModality(QtCore.Qt.WindowModal)
self._window.setWindowTitle("%s - Categories" % constants.__pretty_app_name__)
self._window.setWindowIcon(QtGui.QIcon(self._app.appIconPath))
self._window.setCentralWidget(centralWidget)
yield self._favoritesWindow
def show(self):
+ self._window.show()
for child in self.walk_children():
child.show()
- self._window.show()
def hide(self):
for child in self.walk_children():
self._window.close()
def select_category(self, categoryName):
- for child in self.walk_children():
- child.window.destroyed.disconnect(self._on_child_close)
- child.close()
- self._unitWindow = UnitWindow(self._window, categoryName, self._app)
- self._unitWindow.window.destroyed.connect(self._on_child_close)
+ self._select_category(categoryName)
i = unit_data.UNIT_CATEGORIES.index(categoryName)
rootIndex = self._categories.rootIndex()
currentIndex = self._categories.model().index(i, 0, rootIndex)
self._categories.scrollTo(currentIndex)
+ self._categories.setItemSelected(self._categories.topLevelItem(i), True)
return self._unitWindow
def set_fullscreen(self, isFullscreen):
for child in self.walk_children():
child.set_fullscreen(isFullscreen)
+ def _select_category(self, categoryName):
+ for child in self.walk_children():
+ child.window.destroyed.disconnect(self._on_child_close)
+ child.close()
+ self._unitWindow = UnitWindow(self._window, categoryName, self._app)
+ self._unitWindow.window.destroyed.connect(self._on_child_close)
+
def _update_favorites(self):
if self._app.showFavoritesAction.isChecked():
assert self._categories.topLevelItemCount() == len(unit_data.UNIT_CATEGORIES)
func, arg = self._children[fromIndex].conversion
base = func.to_base(value, arg)
for i, child in enumerate(self._children):
- if i == fromIndex:
- continue
func, arg = child.conversion
newValue = func.from_base(base, arg)
child.update_value(newValue)
self._sortSettings is not None and
self._sortSettings[0] in [UnitData.VALUE_COLUMN_0, UnitData.VALUE_COLUMN_1]
):
+ # Sort takes care of marking everything as changed
self.sort(*self._sortSettings)
- self._all_changed()
else:
self._values_changed()
self._unitsView.clicked.connect(self._on_unit_clicked)
self._unitsView.setUniformRowHeights(True)
self._unitsView.setSortingEnabled(True)
- self._unitsView.setTextElideMode(QtCore.Qt.ElideNone)
self._unitsView.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
+ self._unitsView.setSelectionBehavior(QtGui.QAbstractItemView.SelectRows)
+ self._unitsView.setSelectionMode(QtGui.QAbstractItemView.SingleSelection)
if not IS_MAEMO:
self._unitsView.setAlternatingRowColors(True)
- if True:
- self._unitsView.setHeaderHidden(True)
+ self._unitsView.setHeaderHidden(True)
viewHeader = self._unitsView.header()
viewHeader.setSortIndicatorShown(True)
viewHeader.setStretchLastSection(False)
# Trying to make things faster by locking in the initial size of the immutable columns
- nameSize = viewHeader.sectionSize(UnitData.NAME_COLUMN)
+ nameSize = min(viewHeader.sectionSize(UnitData.NAME_COLUMN), 150)
viewHeader.setResizeMode(UnitData.NAME_COLUMN, QtGui.QHeaderView.Fixed)
viewHeader.resizeSection(UnitData.NAME_COLUMN, nameSize)
- unitSize = viewHeader.sectionSize(UnitData.UNIT_COLUMN)
+ unitSize = min(viewHeader.sectionSize(UnitData.UNIT_COLUMN), 150)
viewHeader.setResizeMode(UnitData.UNIT_COLUMN, QtGui.QHeaderView.Fixed)
viewHeader.resizeSection(UnitData.UNIT_COLUMN, unitSize)
self._window.setAttribute(QtCore.Qt.WA_DeleteOnClose, True)
maeqt.set_autorient(self._window, True)
maeqt.set_stackable(self._window, True)
- if parent is not None:
- self._window.setWindowModality(QtCore.Qt.WindowModal)
self._window.setWindowTitle("%s - %s" % (constants.__pretty_app_name__, category))
self._window.setWindowIcon(QtGui.QIcon(app.appIconPath))
self._window.setCentralWidget(centralWidget)
self.select_unit(defaultUnitName)
else:
self._select_unit(0)
- self._unitsModel.sort(UnitData.NAME_COLUMN)
- self._sortActionGroup = QtGui.QActionGroup(None)
- self._sortByNameAction = QtGui.QAction(self._sortActionGroup)
- self._sortByNameAction.setText("Sort By Name")
- self._sortByNameAction.setStatusTip("Sort the units by name")
- self._sortByNameAction.setToolTip("Sort the units by name")
- self._sortByNameAction.setCheckable(True)
- self._sortByValueAction = QtGui.QAction(self._sortActionGroup)
- self._sortByValueAction.setText("Sort By Value")
- self._sortByValueAction.setStatusTip("Sort the units by value")
- self._sortByValueAction.setToolTip("Sort the units by value")
- self._sortByValueAction.setCheckable(True)
- self._sortByUnitAction = QtGui.QAction(self._sortActionGroup)
- self._sortByUnitAction.setText("Sort By Unit")
- self._sortByUnitAction.setStatusTip("Sort the units by unit")
- self._sortByUnitAction.setToolTip("Sort the units by unit")
- self._sortByUnitAction.setCheckable(True)
-
- self._sortByValueAction.setChecked(True)
+ if self._app.sortByNameAction.isChecked():
+ sortColumn = UnitData.NAME_COLUMN
+ elif self._app.sortByValueAction.isChecked():
+ sortColumn = UnitData.VALUE_COLUMN_0
+ elif self._app.sortByUnitAction.isChecked():
+ sortColumn = UnitData.UNIT_COLUMN
+ else:
+ raise RuntimeError("No sort column selected")
+ if sortColumn != 0:
+ # By default it sorts by he first column (name)
+ self._unitsModel.sort(sortColumn)
self._chooseFavoritesAction = QtGui.QAction(None)
self._chooseFavoritesAction.setText("Select Favorites")
viewMenu.addAction(self._app.showFavoritesAction)
viewMenu.addAction(self._app.condensedAction)
viewMenu.addSeparator()
- viewMenu.addAction(self._sortByNameAction)
- viewMenu.addAction(self._sortByValueAction)
- viewMenu.addAction(self._sortByUnitAction)
+ viewMenu.addAction(self._app.sortByNameAction)
+ viewMenu.addAction(self._app.sortByValueAction)
+ viewMenu.addAction(self._app.sortByUnitAction)
viewMenu.addSeparator()
viewMenu.addAction(self._app.jumpAction)
viewMenu.addAction(self._app.recentAction)
viewMenu.addAction(self._app.showFavoritesAction)
viewMenu.addAction(self._app.condensedAction)
viewMenu.addSeparator()
- viewMenu.addAction(self._sortByNameAction)
- viewMenu.addAction(self._sortByValueAction)
- viewMenu.addAction(self._sortByUnitAction)
+ viewMenu.addAction(self._app.sortByNameAction)
+ viewMenu.addAction(self._app.sortByValueAction)
+ viewMenu.addAction(self._app.sortByUnitAction)
viewMenu.addSeparator()
viewMenu.addAction(self._app.jumpAction)
viewMenu.addAction(self._app.recentAction)
viewMenu.addSeparator()
viewMenu.addAction(self._app.fullscreenAction)
- self._sortByNameAction.triggered.connect(self._on_sort_by_name)
- self._sortByValueAction.triggered.connect(self._on_sort_by_value)
- self._sortByUnitAction.triggered.connect(self._on_sort_by_unit)
+ self._app.sortByNameAction.triggered.connect(self._on_sort_by_name)
+ self._app.sortByValueAction.triggered.connect(self._on_sort_by_value)
+ self._app.sortByUnitAction.triggered.connect(self._on_sort_by_unit)
self._window.addAction(self._app.logAction)
self._window.addAction(self._nextUnitAction)
index = self._unitsModel.index_unit(unitName)
self._select_unit(index)
+ qindex = self._unitsModel.createIndex(index, 0, self._unitsModel.get_unit(index))
+ self._unitsView.scrollTo(qindex)
+
def walk_children(self):
if self._favoritesWindow is not None:
yield self._favoritesWindow
self._selectedUnitSymbol.setText(unit.unit)
self._selectedIndex = index
- qindex = self._unitsModel.createIndex(index, 0, self._unitsModel.get_unit(index))
- self._unitsView.scrollTo(qindex)
self._app.add_recent(self._categoryName, self._unitsModel.get_unit(index).name)
projects / gonvert / blobdiff