X-Git-Url: http://git.maemo.org/git/?p=gonvert;a=blobdiff_plain;f=src%2Fgonvert_qt.py;h=44677cf2dff741c053ca17c77a3b5e79d4fb19b8;hp=9e1d9eb3e49bd670ba8bb19c01abdd9540fa541b;hb=ccae6ebacaeb1b6fce72381cc7e4d66da2af5cc0;hpb=ef669a681b8acf1ebce04e69208c77d9a29734d2 diff --git a/src/gonvert_qt.py b/src/gonvert_qt.py index 9e1d9eb..44677cf 100755 --- a/src/gonvert_qt.py +++ b/src/gonvert_qt.py @@ -6,6 +6,7 @@ from __future__ import with_statement import sys import os import math +import simplejson import logging from PyQt4 import QtGui @@ -19,6 +20,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,10 +55,8 @@ def split_number(number): class Gonvert(object): - # @todo Persist settings - # @todo Favorites - # @bug Fix the resurrecting window problem - # @todo Unit conversion window: focus always on input, arrows switch units + # @todo get subwindows working + # @todo rotation support _DATA_PATHS = [ os.path.dirname(__file__), @@ -64,7 +66,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") @@ -73,9 +75,11 @@ class Gonvert(object): break else: raise RuntimeError("UI Descriptor not found!") + self._app = app self._appIconPath = appIconPath self._recent = [] - self._isFullscreen = False + self._hiddenCategories = set() + self._hiddenUnits = {} self._clipboard = QtGui.QApplication.clipboard() self._jumpWindow = None @@ -97,9 +101,14 @@ class Gonvert(object): self._recentAction.triggered.connect(self._on_recent_start) self._fullscreenAction = QtGui.QAction(None) - self._fullscreenAction.setText("Toggle Fullscreen") + self._fullscreenAction.setText("Fullscreen") + self._fullscreenAction.setCheckable(True) self._fullscreenAction.setShortcut(QtGui.QKeySequence("CTRL+Enter")) - self._fullscreenAction.triggered.connect(self._on_toggle_fullscreen) + 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") @@ -111,13 +120,16 @@ class Gonvert(object): 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): @@ -125,6 +137,7 @@ 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): @@ -132,6 +145,7 @@ class Gonvert(object): 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): @@ -140,6 +154,7 @@ class Gonvert(object): 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): @@ -153,6 +168,59 @@ class Gonvert(object): 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 @@ -176,6 +244,10 @@ class Gonvert(object): def quitAction(self): return self._quitAction + @property + def showFavoritesAction(self): + return self._showFavoritesAction + def _walk_children(self): if self._catWindow is not None: yield self._catWindow @@ -185,10 +257,20 @@ class Gonvert(object): yield self._recentWindow @misc_utils.log_exception(_moduleLogger) + def _on_app_quit(self, checked = False): + self.save_settings() + + @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) + + @misc_utils.log_exception(_moduleLogger) def _on_toggle_fullscreen(self, checked = False): - self._isFullscreen = not self._isFullscreen for window in self._walk_children(): - window.setFullscreen(self._isFullscreen) + window.set_fullscreen(checked) @misc_utils.log_exception(_moduleLogger) def _on_jump_start(self, checked = False): @@ -211,141 +293,170 @@ class Gonvert(object): window.close() -class CategoryWindow(object): +class QuickJump(object): + + MINIMAL_ENTRY = 3 def __init__(self, parent, app): self._app = app - self._unitWindow = None - 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) + self._searchLabel = QtGui.QLabel("Search:") + self._searchEntry = QtGui.QLineEdit("") + self._searchEntry.textEdited.connect(self._on_search_edited) + + self._entryLayout = QtGui.QHBoxLayout() + self._entryLayout.addWidget(self._searchLabel) + self._entryLayout.addWidget(self._searchEntry) + + 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._categories) + self._layout.addLayout(self._entryLayout) + 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) if parent is not None: self._window.setWindowModality(QtCore.Qt.WindowModal) - self._window.setWindowTitle("%s - Categories" % constants.__pretty_app_name__) + 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("Window") + self._closeWindowAction.setText("Close") self._closeWindowAction.setShortcut(QtGui.QKeySequence("CTRL+w")) self._closeWindowAction.triggered.connect(self._on_close_window) - fileMenu = self._window.menuBar().addMenu("&File") - fileMenu.addAction(self._closeWindowAction) - fileMenu.addAction(self._app.quitAction) + 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) - viewMenu.addSeparator() - viewMenu.addAction(self._app.jumpAction) - viewMenu.addAction(self._app.recentAction) + 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() - def walk_children(self): - if self._unitWindow is not None: - yield self._unitWindow + @property + def window(self): + return self._window def close(self): - for child in self.walk_children(): - child.close() self._window.close() - def selectCategory(self, categoryName): - for child in self.walk_children(): - child.close() - self._unitWindow = UnitWindow(self._window, categoryName, self._app) - return self._unitWindow - - def setFullscreen(self, isFullscreen): + def set_fullscreen(self, isFullscreen): if isFullscreen: self._window.showFullScreen() else: self._window.showNormal() - for child in self.walk_children(): - child.setFullscreen(isFullscreen) @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): + def _on_result_clicked(self, item, columnIndex): categoryName = unicode(item.text(0)) - self.selectCategory(categoryName) + unitName = unicode(item.text(1)) + catWindow = self._app.request_category() + unitsWindow = catWindow.select_category(categoryName) + unitsWindow.select_unit(unitName) + self.close() + @misc_utils.log_exception(_moduleLogger) + def _on_search_edited(self, *args): + userInput = self._searchEntry.text() + if len(userInput) < self.MINIMAL_ENTRY: + return -class QuickJump(object): + self._resultsBox.clear() + lowerInput = str(userInput).lower() + for catIndex, category in enumerate(unit_data.UNIT_CATEGORIES): + units = unit_data.get_units(category) + for unitIndex, unit in enumerate(units): + loweredUnit = unit.lower() + if lowerInput in loweredUnit: + twi = QtGui.QTreeWidgetItem(self._resultsBox) + twi.setText(0, category) + twi.setText(1, unit) - MINIMAL_ENTRY = 3 + +class Recent(object): def __init__(self, parent, app): self._app = app - self._searchLabel = QtGui.QLabel("Search:") - self._searchEntry = QtGui.QLineEdit("") - self._searchEntry.textEdited.connect(self._on_search_edited) - - self._entryLayout = QtGui.QHBoxLayout() - self._entryLayout.addWidget(self._searchLabel) - self._entryLayout.addWidget(self._searchEntry) - 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() - self._layout.addLayout(self._entryLayout) 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) if parent is not None: self._window.setWindowModality(QtCore.Qt.WindowModal) - self._window.setWindowTitle("%s - Quick Jump" % constants.__pretty_app_name__) + 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("Window") + self._closeWindowAction.setText("Close") self._closeWindowAction.setShortcut(QtGui.QKeySequence("CTRL+w")) self._closeWindowAction.triggered.connect(self._on_close_window) - fileMenu = self._window.menuBar().addMenu("&File") - fileMenu.addAction(self._closeWindowAction) - fileMenu.addAction(self._app.quitAction) + 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) + 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 setFullscreen(self, isFullscreen): + def set_fullscreen(self, isFullscreen): if isFullscreen: self._window.showFullScreen() else: @@ -360,100 +471,302 @@ class QuickJump(object): 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() + +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) + 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_search_edited(self, *args): - userInput = self._searchEntry.text() - if len(userInput) < self.MINIMAL_ENTRY: - return + def _on_select_all(self, checked = False): + for child in self._childWidgets: + self._categories.setItemSelected(child, True) - self._resultsBox.clear() - lowerInput = str(userInput).lower() - for catIndex, category in enumerate(unit_data.UNIT_CATEGORIES): - units = unit_data.get_units(category) - for unitIndex, unit in enumerate(units): - loweredUnit = unit.lower() - if lowerInput in loweredUnit: - twi = QtGui.QTreeWidgetItem(self._resultsBox) - twi.setText(0, category) - twi.setText(1, unit) + @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) -class Recent(object): + @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._resultsBox = QtGui.QTreeWidget() - self._resultsBox.setHeaderLabels(["Categories", "Units"]) - self._resultsBox.setHeaderHidden(True) - self._resultsBox.setAlternatingRowColors(True) - self._resultsBox.itemClicked.connect(self._on_result_clicked) + 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._resultsBox) + 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) if parent is not None: self._window.setWindowModality(QtCore.Qt.WindowModal) - self._window.setWindowTitle("%s - Recent" % constants.__pretty_app_name__) + self._window.setWindowTitle("%s - Categories" % 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._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("Window") + self._closeWindowAction.setText("Close") self._closeWindowAction.setShortcut(QtGui.QKeySequence("CTRL+w")) self._closeWindowAction.triggered.connect(self._on_close_window) - fileMenu = self._window.menuBar().addMenu("&File") - fileMenu.addAction(self._closeWindowAction) - fileMenu.addAction(self._app.quitAction) + if IS_MAEMO: + fileMenu = self._window.menuBar().addMenu("&Units") + fileMenu.addAction(self._chooseFavoritesAction) - viewMenu = self._window.menuBar().addMenu("&View") - viewMenu.addAction(self._app.fullscreenAction) + 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 setFullscreen(self, isFullscreen): + 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_result_clicked(self, item, columnIndex): + def _on_category_clicked(self, item, columnIndex): categoryName = unicode(item.text(0)) - unitName = unicode(item.text(1)) - catWindow = self._app.request_category() - unitsWindow = catWindow.selectCategory(categoryName) - unitsWindow.select_unit(unitName) - self.close() + 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 @@ -530,11 +843,11 @@ class UnitModel(QtCore.QAbstractItemModel): 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) @@ -591,8 +904,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: @@ -611,9 +929,22 @@ class UnitModel(QtCore.QAbstractItemModel): newValue = func.from_base(base, arg) child.update_value(newValue) - if self._sortSettings is not None: + 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() + 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, 0, self._children[0]) @@ -640,6 +971,7 @@ class UnitWindow(object): self._app = app self._categoryName = category self._selectedIndex = 0 + self._favoritesWindow = None self._selectedUnitName = QtGui.QLabel() self._selectedUnitValue = QtGui.QLineEdit() @@ -656,13 +988,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) @@ -671,6 +1022,7 @@ class UnitWindow(object): centralWidget.setLayout(self._layout) self._window = QtGui.QMainWindow(parent) + self._window.setAttribute(QtCore.Qt.WA_DeleteOnClose, True) if parent is not None: self._window.setWindowModality(QtCore.Qt.WindowModal) self._window.setWindowTitle("%s - %s" % (constants.__pretty_app_name__, category)) @@ -682,55 +1034,107 @@ class UnitWindow(object): self.select_unit(defaultUnitName) else: self._select_unit(0) - self._unitsModel.sort(1) + 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) + 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) - fileMenu = self._window.menuBar().addMenu("&File") - fileMenu.addAction(self._closeWindowAction) - fileMenu.addAction(self._app.quitAction) - - viewMenu = self._window.menuBar().addMenu("&View") - viewMenu.addAction(self._app.fullscreenAction) - viewMenu.addSeparator() - viewMenu.addAction(self._app.jumpAction) - viewMenu.addAction(self._app.recentAction) - viewMenu.addSeparator() - viewMenu.addAction(self._sortByNameAction) - viewMenu.addAction(self._sortByValueAction) - viewMenu.addAction(self._sortByUnitAction) + 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 setFullscreen(self, isFullscreen): + def set_fullscreen(self, isFullscreen): if isFullscreen: self._window.showFullScreen() else: @@ -740,21 +1144,74 @@ class UnitWindow(object): 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): @@ -764,6 +1221,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) @@ -779,7 +1237,7 @@ class UnitWindow(object): def run_gonvert(): app = QtGui.QApplication([]) - handle = Gonvert() + handle = Gonvert(app) return app.exec_()