X-Git-Url: http://git.maemo.org/git/?p=gonvert;a=blobdiff_plain;f=src%2Fgonvert_qt.py;h=d53529b30dcca036e7dbcffaa5adf59c19006284;hp=f416cab8119a8e0bc4033d7c88fac65caa0f9660;hb=fc07f0d12633b7f6e54dd4f73e5b98db7cb04fbd;hpb=e6e2aa6ae2efc7a0534e0efbfb4c7ad3d0a8ef91 diff --git a/src/gonvert_qt.py b/src/gonvert_qt.py index f416cab..d53529b 100755 --- a/src/gonvert_qt.py +++ b/src/gonvert_qt.py @@ -6,12 +6,14 @@ from __future__ import with_statement import sys import os import math +import simplejson import logging from PyQt4 import QtGui from PyQt4 import QtCore import constants +import maeqt from util import misc as misc_utils import unit_data @@ -19,6 +21,9 @@ import unit_data _moduleLogger = logging.getLogger("gonvert_glade") +IS_MAEMO = True + + def change_menu_label(widgets, labelname, newtext): item_label = widgets.get_widget(labelname).get_children()[0] item_label.set_text(newtext) @@ -51,14 +56,6 @@ def split_number(number): class Gonvert(object): - # @todo Remember last selection - # @todo Recent - # @todo Favorites - # @todo Fullscreen support (showFullscreen, showNormal) - # @todo Close Window / Quit keyboard shortcuts - # @todo Ctrl+l support - # @todo Unit conversion window: focus always on input, arrows switch units - _DATA_PATHS = [ os.path.dirname(__file__), os.path.join(os.path.dirname(__file__), "../data"), @@ -67,7 +64,7 @@ class Gonvert(object): '/usr/lib/gonvert', ] - def __init__(self): + def __init__(self, app): self._dataPath = "" for dataPath in self._DATA_PATHS: appIconPath = os.path.join(dataPath, "pixmaps", "gonvert.png") @@ -76,9 +73,15 @@ class Gonvert(object): break else: raise RuntimeError("UI Descriptor not found!") + self._app = app self._appIconPath = appIconPath + self._recent = [] + self._hiddenCategories = set() + self._hiddenUnits = {} + self._clipboard = QtGui.QApplication.clipboard() self._jumpWindow = None + self._recentWindow = None self._catWindow = None self._jumpAction = QtGui.QAction(None) @@ -88,13 +91,43 @@ class Gonvert(object): self._jumpAction.setShortcut(QtGui.QKeySequence("CTRL+j")) self._jumpAction.triggered.connect(self._on_jump_start) + self._recentAction = QtGui.QAction(None) + self._recentAction.setText("Recent Units") + self._recentAction.setStatusTip("View the recent units") + self._recentAction.setToolTip("View the recent units") + self._recentAction.setShortcut(QtGui.QKeySequence("CTRL+r")) + self._recentAction.triggered.connect(self._on_recent_start) + + self._fullscreenAction = QtGui.QAction(None) + self._fullscreenAction.setText("Fullscreen") + self._fullscreenAction.setCheckable(True) + self._fullscreenAction.setShortcut(QtGui.QKeySequence("CTRL+Enter")) + self._fullscreenAction.toggled.connect(self._on_toggle_fullscreen) + + self._showFavoritesAction = QtGui.QAction(None) + self._showFavoritesAction.setCheckable(True) + self._showFavoritesAction.setText("Favorites Only") + + self._logAction = QtGui.QAction(None) + self._logAction.setText("Log") + self._logAction.setShortcut(QtGui.QKeySequence("CTRL+l")) + self._logAction.triggered.connect(self._on_log) + + self._quitAction = QtGui.QAction(None) + self._quitAction.setText("Quit") + self._quitAction.setShortcut(QtGui.QKeySequence("CTRL+q")) + self._quitAction.triggered.connect(self._on_quit) + + self._app.lastWindowClosed.connect(self._on_app_quit) self.request_category() + self.load_settings() def request_category(self): if self._catWindow is not None: self._catWindow.close() self._catWindow = None self._catWindow = CategoryWindow(None, self) + self._catWindow.window.destroyed.connect(lambda obj = None: self._on_child_close("_catWindow", obj)) return self._catWindow def search_units(self): @@ -102,8 +135,89 @@ class Gonvert(object): self._jumpWindow.close() self._jumpWindow = None self._jumpWindow = QuickJump(None, self) + self._jumpWindow.window.destroyed.connect(lambda obj = None: self._on_child_close("_jumpWindow", obj)) return self._jumpWindow + def show_recent(self): + if self._recentWindow is not None: + self._recentWindow.close() + self._recentWindow = None + self._recentWindow = Recent(None, self) + self._recentWindow.window.destroyed.connect(lambda obj = None: self._on_child_close("_recentWindow", obj)) + return self._recentWindow + + def add_recent(self, categoryName, unitName): + catUnit = categoryName, unitName + try: + self._recent.remove(catUnit) + except ValueError: + pass # ignore if its not already in the recent history + assert catUnit not in self._recent + self._recent.append(catUnit) + + def get_recent_unit(self, categoryName): + for catName, unitName in reversed(self._recent): + if catName == categoryName: + return unitName + else: + return "" + + def get_recent(self): + return reversed(self._recent) + + @property + def hiddenCategories(self): + return self._hiddenCategories + + def get_hidden_units(self, categoryName): + try: + return self._hiddenUnits[categoryName] + except KeyError: + self._hiddenUnits[categoryName] = set() + return self._hiddenUnits[categoryName] + + def load_settings(self): + try: + with open(constants._user_settings_, "r") as settingsFile: + settings = simplejson.load(settingsFile) + except IOError, e: + _moduleLogger.info("No settings") + settings = {} + except ValueError: + _moduleLogger.info("Settings were corrupt") + settings = {} + + self._fullscreenAction.setChecked(settings.get("isFullScreen", False)) + + recent = settings.get("recent", self._recent) + for category, unit in recent: + self.add_recent(category, unit) + + self._hiddenCategories = set(settings.get("hiddenCategories", set())) + self._hiddenUnits = dict( + (catName, set(units)) + for (catName, units) in settings.get("hiddenUnits", {}).iteritems() + ) + + self._showFavoritesAction.setChecked(settings.get("showFavorites", True)) + + if self._recent: + self._catWindow.select_category(self._recent[-1][0]) + + def save_settings(self): + settings = { + "isFullScreen": self._fullscreenAction.isChecked(), + "recent": self._recent, + "hiddenCategories": list(self._hiddenCategories), + "hiddenUnits": dict( + (catName, list(units)) + for (catName, units) in self._hiddenUnits.iteritems() + ), + "showFavorites": self._showFavoritesAction.isChecked(), + } + with open(constants._user_settings_, "w") as settingsFile: + simplejson.dump(settings, settingsFile) + @property def appIconPath(self): return self._appIconPath @@ -112,61 +226,69 @@ class Gonvert(object): def jumpAction(self): return self._jumpAction - @misc_utils.log_exception(_moduleLogger) - def _on_jump_start(self, checked = False): - self.search_units() + @property + def recentAction(self): + return self._recentAction + @property + def fullscreenAction(self): + return self._fullscreenAction -class CategoryWindow(object): + @property + def logAction(self): + return self._logAction - def __init__(self, parent, app): - self._app = app - self._unitWindow = None + @property + def quitAction(self): + return self._quitAction - self._categories = QtGui.QTreeWidget() - self._categories.setHeaderLabels(["Categories"]) - self._categories.itemClicked.connect(self._on_category_clicked) - self._categories.setHeaderHidden(True) - self._categories.setAlternatingRowColors(True) - for catName in unit_data.UNIT_CATEGORIES: - twi = QtGui.QTreeWidgetItem(self._categories) - twi.setText(0, catName) + @property + def showFavoritesAction(self): + return self._showFavoritesAction - self._layout = QtGui.QVBoxLayout() - self._layout.addWidget(self._categories) + def _walk_children(self): + if self._catWindow is not None: + yield self._catWindow + if self._jumpWindow is not None: + yield self._jumpWindow + if self._recentWindow is not None: + yield self._recentWindow - centralWidget = QtGui.QWidget() - centralWidget.setLayout(self._layout) + @misc_utils.log_exception(_moduleLogger) + def _on_app_quit(self, checked = False): + self.save_settings() - self._window = QtGui.QMainWindow(parent) - 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) + @misc_utils.log_exception(_moduleLogger) + def _on_child_close(self, name, obj = None): + if not hasattr(self, name): + _moduleLogger.info("Something weird going on when we don't have a %s" % name) + return + setattr(self, name, None) - viewMenu = self._window.menuBar().addMenu("&View") - viewMenu.addAction(self._app.jumpAction) + @misc_utils.log_exception(_moduleLogger) + def _on_toggle_fullscreen(self, checked = False): + for window in self._walk_children(): + window.set_fullscreen(checked) - self._window.show() + @misc_utils.log_exception(_moduleLogger) + def _on_jump_start(self, checked = False): + self.search_units() - def close(self): - if self._unitWindow is not None: - self._unitWindow.close() - self._unitWindow = None - self._window.close() + @misc_utils.log_exception(_moduleLogger) + def _on_recent_start(self, checked = False): + self.show_recent() - def selectCategory(self, categoryName): - if self._unitWindow is not None: - self._unitWindow.close() - self._unitWindow = None - self._unitWindow = UnitWindow(self._window, categoryName, self._app) - return self._unitWindow + @misc_utils.log_exception(_moduleLogger) + def _on_log(self, checked = False): + with open(constants._user_logpath_, "r") as f: + logLines = f.xreadlines() + log = "".join(logLines) + self._clipboard.setText(log) @misc_utils.log_exception(_moduleLogger) - def _on_category_clicked(self, item, columnIndex): - categoryName = unicode(item.text(0)) - self.selectCategory(categoryName) + def _on_quit(self, checked = False): + for window in self._walk_children(): + window.close() class QuickJump(object): @@ -187,7 +309,8 @@ class QuickJump(object): self._resultsBox = QtGui.QTreeWidget() self._resultsBox.setHeaderLabels(["Categories", "Units"]) self._resultsBox.setHeaderHidden(True) - self._resultsBox.setAlternatingRowColors(True) + if not IS_MAEMO: + self._resultsBox.setAlternatingRowColors(True) self._resultsBox.itemClicked.connect(self._on_result_clicked) self._layout = QtGui.QVBoxLayout() @@ -198,24 +321,62 @@ class QuickJump(object): centralWidget.setLayout(self._layout) self._window = QtGui.QMainWindow(parent) + 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._closeWindowAction = QtGui.QAction(None) + self._closeWindowAction.setText("Close") + self._closeWindowAction.setShortcut(QtGui.QKeySequence("CTRL+w")) + self._closeWindowAction.triggered.connect(self._on_close_window) + + if IS_MAEMO: + self._window.addAction(self._closeWindowAction) + self._window.addAction(self._app.quitAction) + self._window.addAction(self._app.fullscreenAction) + else: + fileMenu = self._window.menuBar().addMenu("&Units") + fileMenu.addAction(self._closeWindowAction) + fileMenu.addAction(self._app.quitAction) + + viewMenu = self._window.menuBar().addMenu("&View") + viewMenu.addAction(self._app.fullscreenAction) + + self._window.addAction(self._app.logAction) + + self.set_fullscreen(self._app.fullscreenAction.isChecked()) self._window.show() + @property + def window(self): + return self._window + def close(self): self._window.close() + def set_fullscreen(self, isFullscreen): + if isFullscreen: + self._window.showFullScreen() + else: + self._window.showNormal() + + @misc_utils.log_exception(_moduleLogger) + def _on_close_window(self, checked = True): + self.close() + @misc_utils.log_exception(_moduleLogger) def _on_result_clicked(self, item, columnIndex): categoryName = unicode(item.text(0)) unitName = unicode(item.text(1)) catWindow = self._app.request_category() - unitsWindow = catWindow.selectCategory(categoryName) + unitsWindow = catWindow.select_category(categoryName) unitsWindow.select_unit(unitName) + self.close() @misc_utils.log_exception(_moduleLogger) def _on_search_edited(self, *args): @@ -223,6 +384,7 @@ class QuickJump(object): if len(userInput) < self.MINIMAL_ENTRY: return + self._resultsBox.clear() lowerInput = str(userInput).lower() for catIndex, category in enumerate(unit_data.UNIT_CATEGORIES): units = unit_data.get_units(category) @@ -234,10 +396,383 @@ class QuickJump(object): twi.setText(1, unit) +class Recent(object): + + def __init__(self, parent, app): + self._app = app + + self._resultsBox = QtGui.QTreeWidget() + self._resultsBox.setHeaderLabels(["Categories", "Units"]) + self._resultsBox.setHeaderHidden(True) + if not IS_MAEMO: + self._resultsBox.setAlternatingRowColors(True) + self._resultsBox.itemClicked.connect(self._on_result_clicked) + + self._layout = QtGui.QVBoxLayout() + self._layout.addWidget(self._resultsBox) + + centralWidget = QtGui.QWidget() + centralWidget.setLayout(self._layout) + + self._window = QtGui.QMainWindow(parent) + 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) + + for cat, unit in self._app.get_recent(): + twi = QtGui.QTreeWidgetItem(self._resultsBox) + twi.setText(0, cat) + twi.setText(1, unit) + + self._closeWindowAction = QtGui.QAction(None) + self._closeWindowAction.setText("Close") + self._closeWindowAction.setShortcut(QtGui.QKeySequence("CTRL+w")) + self._closeWindowAction.triggered.connect(self._on_close_window) + + if IS_MAEMO: + self._window.addAction(self._closeWindowAction) + self._window.addAction(self._app.quitAction) + self._window.addAction(self._app.fullscreenAction) + else: + fileMenu = self._window.menuBar().addMenu("&Units") + fileMenu.addAction(self._closeWindowAction) + fileMenu.addAction(self._app.quitAction) + + viewMenu = self._window.menuBar().addMenu("&View") + viewMenu.addAction(self._app.fullscreenAction) + + self._window.addAction(self._app.logAction) + + self.set_fullscreen(self._app.fullscreenAction.isChecked()) + self._window.show() + + @property + def window(self): + return self._window + + def close(self): + self._window.close() + + def set_fullscreen(self, isFullscreen): + if isFullscreen: + self._window.showFullScreen() + else: + self._window.showNormal() + + @misc_utils.log_exception(_moduleLogger) + def _on_close_window(self, checked = True): + self.close() + + @misc_utils.log_exception(_moduleLogger) + def _on_result_clicked(self, item, columnIndex): + categoryName = unicode(item.text(0)) + unitName = unicode(item.text(1)) + catWindow = self._app.request_category() + unitsWindow = catWindow.select_category(categoryName) + unitsWindow.select_unit(unitName) + self.close() + + +class FavoriteCategoriesWindow(object): + + def __init__(self, parent, app, source, hidden): + self._app = app + self._source = list(source) + self._hidden = hidden + + self._categories = QtGui.QTreeWidget() + self._categories.setHeaderLabels(["Categories"]) + self._categories.setHeaderHidden(True) + if not IS_MAEMO: + self._categories.setAlternatingRowColors(True) + self._categories.setSelectionBehavior(QtGui.QAbstractItemView.SelectRows) + self._categories.setSelectionMode(QtGui.QAbstractItemView.MultiSelection) + self._childWidgets = [] + for catName in self._source: + twi = QtGui.QTreeWidgetItem(self._categories) + twi.setText(0, catName) + self._childWidgets.append(twi) + if catName not in self._hidden: + self._categories.setItemSelected(twi, True) + self._selection = self._categories.selectionModel() + self._selection.selectionChanged.connect(self._on_selection_changed) + + self._allButton = QtGui.QPushButton("All") + self._allButton.clicked.connect(self._on_select_all) + self._invertButton = QtGui.QPushButton("Invert") + self._invertButton.clicked.connect(self._on_invert_selection) + self._noneButton = QtGui.QPushButton("None") + self._noneButton.clicked.connect(self._on_select_none) + + self._buttonLayout = QtGui.QHBoxLayout() + self._buttonLayout.addWidget(self._allButton) + self._buttonLayout.addWidget(self._invertButton) + self._buttonLayout.addWidget(self._noneButton) + + self._layout = QtGui.QVBoxLayout() + self._layout.addWidget(self._categories) + self._layout.addLayout(self._buttonLayout) + + centralWidget = QtGui.QWidget() + centralWidget.setLayout(self._layout) + + self._window = QtGui.QMainWindow(parent) + 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._closeWindowAction = QtGui.QAction(None) + self._closeWindowAction.setText("Close") + self._closeWindowAction.setShortcut(QtGui.QKeySequence("CTRL+w")) + self._closeWindowAction.triggered.connect(self._on_close_window) + + if IS_MAEMO: + self._window.addAction(self._closeWindowAction) + self._window.addAction(self._app.quitAction) + self._window.addAction(self._app.fullscreenAction) + else: + fileMenu = self._window.menuBar().addMenu("&Units") + fileMenu.addAction(self._closeWindowAction) + fileMenu.addAction(self._app.quitAction) + + viewMenu = self._window.menuBar().addMenu("&View") + viewMenu.addAction(self._app.fullscreenAction) + + self._window.addAction(self._app.logAction) + + self.set_fullscreen(self._app.fullscreenAction.isChecked()) + self._window.show() + + @property + def window(self): + return self._window + + def close(self): + self._window.close() + + def set_fullscreen(self, isFullscreen): + if isFullscreen: + self._window.showFullScreen() + else: + self._window.showNormal() + + @misc_utils.log_exception(_moduleLogger) + def _on_select_all(self, checked = False): + for child in self._childWidgets: + self._categories.setItemSelected(child, True) + + @misc_utils.log_exception(_moduleLogger) + def _on_invert_selection(self, checked = False): + for child in self._childWidgets: + isSelected = self._categories.isItemSelected(child) + self._categories.setItemSelected(child, not isSelected) + + @misc_utils.log_exception(_moduleLogger) + def _on_select_none(self, checked = False): + for child in self._childWidgets: + self._categories.setItemSelected(child, False) + + @misc_utils.log_exception(_moduleLogger) + def _on_selection_changed(self, selected, deselected): + self._hidden.clear() + selectedNames = set( + str(item.text(0)) + for item in self._categories.selectedItems() + ) + for name in self._source: + if name not in selectedNames: + self._hidden.add(name) + + @misc_utils.log_exception(_moduleLogger) + def _on_close_window(self, checked = True): + self.close() + + +class CategoryWindow(object): + + def __init__(self, parent, app): + self._app = app + self._unitWindow = None + self._favoritesWindow = None + + self._categories = QtGui.QTreeWidget() + self._categories.setHeaderLabels(["Categories"]) + self._categories.itemClicked.connect(self._on_category_clicked) + self._categories.setHeaderHidden(True) + if not IS_MAEMO: + self._categories.setAlternatingRowColors(True) + for catName in unit_data.UNIT_CATEGORIES: + twi = QtGui.QTreeWidgetItem(self._categories) + twi.setText(0, catName) + + self._layout = QtGui.QVBoxLayout() + self._layout.addWidget(self._categories) + + centralWidget = QtGui.QWidget() + centralWidget.setLayout(self._layout) + + self._window = QtGui.QMainWindow(parent) + 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) + + self._chooseFavoritesAction = QtGui.QAction(None) + self._chooseFavoritesAction.setText("Select Favorites") + self._chooseFavoritesAction.setShortcut(QtGui.QKeySequence("CTRL+f")) + self._chooseFavoritesAction.triggered.connect(self._on_choose_favorites) + + self._app.showFavoritesAction.toggled.connect(self._on_show_favorites) + + self._closeWindowAction = QtGui.QAction(None) + self._closeWindowAction.setText("Close") + self._closeWindowAction.setShortcut(QtGui.QKeySequence("CTRL+w")) + self._closeWindowAction.triggered.connect(self._on_close_window) + + if IS_MAEMO: + fileMenu = self._window.menuBar().addMenu("&Units") + fileMenu.addAction(self._chooseFavoritesAction) + + viewMenu = self._window.menuBar().addMenu("&View") + viewMenu.addAction(self._app.showFavoritesAction) + viewMenu.addSeparator() + viewMenu.addAction(self._app.jumpAction) + viewMenu.addAction(self._app.recentAction) + + self._window.addAction(self._closeWindowAction) + self._window.addAction(self._app.quitAction) + self._window.addAction(self._app.fullscreenAction) + else: + fileMenu = self._window.menuBar().addMenu("&Units") + fileMenu.addAction(self._chooseFavoritesAction) + fileMenu.addAction(self._closeWindowAction) + fileMenu.addAction(self._app.quitAction) + + viewMenu = self._window.menuBar().addMenu("&View") + viewMenu.addAction(self._app.showFavoritesAction) + viewMenu.addSeparator() + viewMenu.addAction(self._app.jumpAction) + viewMenu.addAction(self._app.recentAction) + viewMenu.addSeparator() + viewMenu.addAction(self._app.fullscreenAction) + + self._window.addAction(self._app.logAction) + + self._update_favorites() + self.set_fullscreen(self._app.fullscreenAction.isChecked()) + self._window.show() + + @property + def window(self): + return self._window + + def walk_children(self): + if self._unitWindow is not None: + yield self._unitWindow + if self._favoritesWindow is not None: + yield self._favoritesWindow + + def close(self): + for child in self.walk_children(): + child.close() + self._window.close() + + def select_category(self, categoryName): + for child in self.walk_children(): + child.close() + self._unitWindow = UnitWindow(self._window, categoryName, self._app) + self._unitWindow.window.destroyed.connect(self._on_child_close) + + i = unit_data.UNIT_CATEGORIES.index(categoryName) + rootIndex = self._categories.rootIndex() + currentIndex = self._categories.model().index(i, 0, rootIndex) + self._categories.scrollTo(currentIndex) + return self._unitWindow + + def set_fullscreen(self, isFullscreen): + if isFullscreen: + self._window.showFullScreen() + else: + self._window.showNormal() + for child in self.walk_children(): + child.set_fullscreen(isFullscreen) + + def _update_favorites(self): + if self._app.showFavoritesAction.isChecked(): + assert self._categories.topLevelItemCount() == len(unit_data.UNIT_CATEGORIES) + for i, catName in enumerate(unit_data.UNIT_CATEGORIES): + if catName in self._app.hiddenCategories: + self._categories.setRowHidden(i, self._categories.rootIndex(), True) + else: + self._categories.setRowHidden(i, self._categories.rootIndex(), False) + else: + for i in xrange(self._categories.topLevelItemCount()): + self._categories.setRowHidden(i, self._categories.rootIndex(), False) + + @misc_utils.log_exception(_moduleLogger) + def _on_choose_favorites(self, obj = None): + assert self._favoritesWindow is None + self._favoritesWindow = FavoriteCategoriesWindow( + self._window, + self._app, + unit_data.UNIT_CATEGORIES, + self._app.hiddenCategories + ) + self._favoritesWindow.window.destroyed.connect(self._on_close_favorites) + return self._favoritesWindow + + @misc_utils.log_exception(_moduleLogger) + def _on_show_favorites(self, checked = True): + if checked: + assert self._categories.topLevelItemCount() == len(unit_data.UNIT_CATEGORIES) + for i, catName in enumerate(unit_data.UNIT_CATEGORIES): + if catName in self._app.hiddenCategories: + self._categories.setRowHidden(i, self._categories.rootIndex(), True) + else: + for i in xrange(self._categories.topLevelItemCount()): + self._categories.setRowHidden(i, self._categories.rootIndex(), False) + + @misc_utils.log_exception(_moduleLogger) + def _on_close_favorites(self, obj = None): + self._favoritesWindow = None + self._update_favorites() + + @misc_utils.log_exception(_moduleLogger) + def _on_child_close(self, obj = None): + self._unitWindow = None + + @misc_utils.log_exception(_moduleLogger) + def _on_close_window(self, checked = True): + self.close() + + @misc_utils.log_exception(_moduleLogger) + def _on_category_clicked(self, item, columnIndex): + categoryName = unicode(item.text(0)) + self.select_category(categoryName) + + class UnitData(object): HEADERS = ["Name", "Value", "", "Unit"] ALIGNMENT = [QtCore.Qt.AlignLeft, QtCore.Qt.AlignRight, QtCore.Qt.AlignLeft, QtCore.Qt.AlignLeft] + NAME_COLUMN = 0 + VALUE_COLUMN_0 = 1 + VALUE_COLUMN_1 = 2 + UNIT_COLUMN = 3 def __init__(self, name, unit, description, conversion): self._name = name @@ -286,6 +821,7 @@ class UnitModel(QtCore.QAbstractItemModel): for key in unit_data.get_units(self._categoryName): conversion, unit, description = self._unitData[key] self._children.append(UnitData(key, unit, description, conversion)) + self._sortSettings = None @misc_utils.log_exception(_moduleLogger) def columnCount(self, parent): @@ -311,12 +847,13 @@ class UnitModel(QtCore.QAbstractItemModel): @misc_utils.log_exception(_moduleLogger) def sort(self, column, order = QtCore.Qt.AscendingOrder): + self._sortSettings = column, order isReverse = order == QtCore.Qt.AscendingOrder - if column == 0: + if column == UnitData.NAME_COLUMN: key_func = lambda item: item.name - elif column in [1, 2]: + elif column in [UnitData.VALUE_COLUMN_0, UnitData.VALUE_COLUMN_1]: key_func = lambda item: item.value - elif column == 3: + elif column == UnitData.UNIT_COLUMN: key_func = lambda item: item.unit self._children.sort(key=key_func, reverse = isReverse) @@ -373,8 +910,13 @@ class UnitModel(QtCore.QAbstractItemModel): return len(self._children) def get_unit(self, index): + assert 0 <= index return self._children[index] + def get_unit_names(self): + for child in self._children: + yield child.name + def index_unit(self, unitName): for i, child in enumerate(self._children): if child.name == unitName: @@ -393,11 +935,26 @@ class UnitModel(QtCore.QAbstractItemModel): newValue = func.from_base(base, arg) child.update_value(newValue) - self._all_changed() + if ( + self._sortSettings is not None and + self._sortSettings[0] in [UnitData.VALUE_COLUMN_0, UnitData.VALUE_COLUMN_1] + ): + self.sort(*self._sortSettings) + self._all_changed() + else: + self._values_changed() + + def __len__(self): + return len(self._children) + + def _values_changed(self): + topLeft = self.createIndex(0, UnitData.VALUE_COLUMN_0, self._children[0]) + bottomRight = self.createIndex(len(self._children)-1, UnitData.VALUE_COLUMN_1, self._children[-1]) + self.dataChanged.emit(topLeft, bottomRight) def _all_changed(self): - topLeft = self.createIndex(0, 1, self._children[0]) - bottomRight = self.createIndex(len(self._children)-1, 2, self._children[-1]) + topLeft = self.createIndex(0, 0, self._children[0]) + bottomRight = self.createIndex(len(self._children)-1, len(UnitData.HEADERS)-1, self._children[-1]) self.dataChanged.emit(topLeft, bottomRight) def _sanitize_value(self, userEntry): @@ -420,9 +977,11 @@ class UnitWindow(object): self._app = app self._categoryName = category self._selectedIndex = 0 + self._favoritesWindow = None self._selectedUnitName = QtGui.QLabel() self._selectedUnitValue = QtGui.QLineEdit() + self._selectedUnitValue.setInputMethodHints(QtCore.Qt.ImhPreferNumbers) self._selectedUnitValue.textEdited.connect(self._on_value_edited) self._selectedUnitSymbol = QtGui.QLabel() @@ -436,13 +995,32 @@ class UnitWindow(object): self._unitsView.setModel(self._unitsModel) self._unitsView.clicked.connect(self._on_unit_clicked) self._unitsView.setUniformRowHeights(True) - self._unitsView.header().setSortIndicatorShown(True) - self._unitsView.header().setClickable(True) self._unitsView.setSortingEnabled(True) - self._unitsView.setAlternatingRowColors(True) + self._unitsView.setTextElideMode(QtCore.Qt.ElideNone) + self._unitsView.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff) + if not IS_MAEMO: + self._unitsView.setAlternatingRowColors(True) if True: self._unitsView.setHeaderHidden(True) + viewHeader = self._unitsView.header() + viewHeader.setSortIndicatorShown(True) + viewHeader.setClickable(True) + + viewHeader.setResizeMode(UnitData.NAME_COLUMN, QtGui.QHeaderView.ResizeToContents) + viewHeader.setResizeMode(UnitData.VALUE_COLUMN_0, QtGui.QHeaderView.ResizeToContents) + viewHeader.setResizeMode(UnitData.VALUE_COLUMN_1, QtGui.QHeaderView.ResizeToContents) + viewHeader.setResizeMode(UnitData.UNIT_COLUMN, QtGui.QHeaderView.ResizeToContents) + viewHeader.setStretchLastSection(False) + + # Trying to make things faster by locking in the initial size of the immutable columns + nameSize = viewHeader.sectionSize(UnitData.NAME_COLUMN) + viewHeader.setResizeMode(UnitData.NAME_COLUMN, QtGui.QHeaderView.Fixed) + viewHeader.resizeSection(UnitData.NAME_COLUMN, nameSize) + unitSize = viewHeader.sectionSize(UnitData.UNIT_COLUMN) + viewHeader.setResizeMode(UnitData.UNIT_COLUMN, QtGui.QHeaderView.Fixed) + viewHeader.resizeSection(UnitData.UNIT_COLUMN, unitSize) + self._layout = QtGui.QVBoxLayout() self._layout.addLayout(self._selectedUnitLayout) self._layout.addWidget(self._unitsView) @@ -451,62 +1029,198 @@ class UnitWindow(object): centralWidget.setLayout(self._layout) self._window = QtGui.QMainWindow(parent) + 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(0) - self._unitsModel.sort(1) + defaultUnitName = self._app.get_recent_unit(self._categoryName) + if defaultUnitName: + 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) - viewMenu = self._window.menuBar().addMenu("&View") - viewMenu.addAction(self._app.jumpAction) - viewMenu.addSeparator() - viewMenu.addAction(self._sortByNameAction) - viewMenu.addAction(self._sortByValueAction) - viewMenu.addAction(self._sortByUnitAction) + self._chooseFavoritesAction = QtGui.QAction(None) + self._chooseFavoritesAction.setText("Select Favorites") + self._chooseFavoritesAction.setShortcut(QtGui.QKeySequence("CTRL+f")) + self._chooseFavoritesAction.triggered.connect(self._on_choose_favorites) + + self._app.showFavoritesAction.toggled.connect(self._on_show_favorites) + + self._previousUnitAction = QtGui.QAction(None) + self._previousUnitAction.setText("Previous Unit") + self._previousUnitAction.setShortcut(QtGui.QKeySequence("Up")) + self._previousUnitAction.triggered.connect(self._on_previous_unit) + + self._nextUnitAction = QtGui.QAction(None) + self._nextUnitAction.setText("Next Unit") + self._nextUnitAction.setShortcut(QtGui.QKeySequence("Down")) + self._nextUnitAction.triggered.connect(self._on_next_unit) + + self._closeWindowAction = QtGui.QAction(None) + self._closeWindowAction.setText("Close Window") + self._closeWindowAction.setShortcut(QtGui.QKeySequence("CTRL+w")) + self._closeWindowAction.triggered.connect(self._on_close_window) + + if IS_MAEMO: + self._window.addAction(self._closeWindowAction) + self._window.addAction(self._app.quitAction) + self._window.addAction(self._app.fullscreenAction) + + fileMenu = self._window.menuBar().addMenu("&Units") + fileMenu.addAction(self._chooseFavoritesAction) + + viewMenu = self._window.menuBar().addMenu("&View") + viewMenu.addAction(self._app.showFavoritesAction) + viewMenu.addSeparator() + viewMenu.addAction(self._sortByNameAction) + viewMenu.addAction(self._sortByValueAction) + viewMenu.addAction(self._sortByUnitAction) + viewMenu.addSeparator() + viewMenu.addAction(self._app.jumpAction) + viewMenu.addAction(self._app.recentAction) + else: + fileMenu = self._window.menuBar().addMenu("&Units") + fileMenu.addAction(self._chooseFavoritesAction) + fileMenu.addAction(self._closeWindowAction) + fileMenu.addAction(self._app.quitAction) + + viewMenu = self._window.menuBar().addMenu("&View") + viewMenu.addAction(self._app.showFavoritesAction) + viewMenu.addSeparator() + viewMenu.addAction(self._sortByNameAction) + viewMenu.addAction(self._sortByValueAction) + viewMenu.addAction(self._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._window.addAction(self._app.logAction) + self._window.addAction(self._nextUnitAction) + self._window.addAction(self._previousUnitAction) + self._window.addAction(self._chooseFavoritesAction) + + self._update_favorites() + self.set_fullscreen(self._app.fullscreenAction.isChecked()) self._window.show() + @property + def window(self): + return self._window + def close(self): + for child in self.walk_children(): + child.close() self._window.close() + def set_fullscreen(self, isFullscreen): + if isFullscreen: + self._window.showFullScreen() + else: + self._window.showNormal() + def select_unit(self, unitName): index = self._unitsModel.index_unit(unitName) self._select_unit(index) + def walk_children(self): + if self._favoritesWindow is not None: + yield self._favoritesWindow + + def _update_favorites(self, force = False): + if self._app.showFavoritesAction.isChecked(): + unitNames = list(self._unitsModel.get_unit_names()) + for i, unitName in enumerate(unitNames): + if unitName in self._app.get_hidden_units(self._categoryName): + self._unitsView.setRowHidden(i, self._unitsView.rootIndex(), True) + else: + self._unitsView.setRowHidden(i, self._unitsView.rootIndex(), False) + else: + if force: + for i in xrange(len(self._unitsModel)): + self._unitsView.setRowHidden(i, self._unitsView.rootIndex(), False) + + @misc_utils.log_exception(_moduleLogger) + def _on_choose_favorites(self, obj = None): + assert self._favoritesWindow is None + self._favoritesWindow = FavoriteCategoriesWindow( + self._window, + self._app, + unit_data.get_units(self._categoryName), + self._app.get_hidden_units(self._categoryName) + ) + self._favoritesWindow.window.destroyed.connect(self._on_close_favorites) + return self._favoritesWindow + + @misc_utils.log_exception(_moduleLogger) + def _on_show_favorites(self, checked = True): + if checked: + unitNames = list(self._unitsModel.get_unit_names()) + for i, unitName in enumerate(unitNames): + if unitName in self._app.get_hidden_units(self._categoryName): + self._unitsView.setRowHidden(i, self._unitsView.rootIndex(), True) + else: + for i in xrange(len(self._unitsModel)): + self._unitsView.setRowHidden(i, self._unitsView.rootIndex(), False) + + @misc_utils.log_exception(_moduleLogger) + def _on_close_favorites(self, obj = None): + self._favoritesWindow = None + self._update_favorites(force=True) + + @misc_utils.log_exception(_moduleLogger) + def _on_previous_unit(self, checked = True): + self._select_unit(self._selectedIndex - 1) + + @misc_utils.log_exception(_moduleLogger) + def _on_next_unit(self, checked = True): + self._select_unit(self._selectedIndex + 1) + + @misc_utils.log_exception(_moduleLogger) + def _on_close_window(self, checked = True): + self.close() + @misc_utils.log_exception(_moduleLogger) def _on_sort_by_name(self, checked = False): - self._unitsModel.sort(0, QtCore.Qt.DescendingOrder) + self._unitsModel.sort(UnitData.NAME_COLUMN, QtCore.Qt.DescendingOrder) @misc_utils.log_exception(_moduleLogger) def _on_sort_by_value(self, checked = False): - self._unitsModel.sort(1) + self._unitsModel.sort(UnitData.VALUE_COLUMN_0) @misc_utils.log_exception(_moduleLogger) def _on_sort_by_unit(self, checked = False): - self._unitsModel.sort(3, QtCore.Qt.DescendingOrder) + self._unitsModel.sort(UnitData.UNIT_COLUMN, QtCore.Qt.DescendingOrder) @misc_utils.log_exception(_moduleLogger) def _on_unit_clicked(self, index): @@ -516,6 +1230,7 @@ class UnitWindow(object): def _on_value_edited(self, *args): userInput = self._selectedUnitValue.text() self._unitsModel.update_values(self._selectedIndex, str(userInput)) + self._update_favorites() def _select_unit(self, index): unit = self._unitsModel.get_unit(index) @@ -526,11 +1241,12 @@ class UnitWindow(object): 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) def run_gonvert(): app = QtGui.QApplication([]) - handle = Gonvert() + handle = Gonvert(app) return app.exec_()