X-Git-Url: http://git.maemo.org/git/?p=gonvert;a=blobdiff_plain;f=src%2Fgonvert_qt.py;h=d53529b30dcca036e7dbcffaa5adf59c19006284;hp=c4a837743f7b792416fdd5ff9e3644ddc5f3617a;hb=63f3e7b7b6f4d5efadf3f8e3efc126b057404ce8;hpb=14f7cdfc86c6e229e2903206a73040e005e748b5 diff --git a/src/gonvert_qt.py b/src/gonvert_qt.py index c4a8377..d53529b 100755 --- a/src/gonvert_qt.py +++ b/src/gonvert_qt.py @@ -13,6 +13,7 @@ from PyQt4 import QtGui from PyQt4 import QtCore import constants +import maeqt from util import misc as misc_utils import unit_data @@ -20,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) @@ -305,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() @@ -317,6 +322,8 @@ class QuickJump(object): 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__) @@ -324,16 +331,21 @@ class QuickJump(object): 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("&Units") - 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) @@ -392,7 +404,8 @@ class Recent(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() @@ -403,6 +416,8 @@ class Recent(object): 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__) @@ -415,16 +430,21 @@ class Recent(object): 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("&Units") - 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) @@ -468,7 +488,8 @@ class FavoriteCategoriesWindow(object): self._categories = QtGui.QTreeWidget() self._categories.setHeaderLabels(["Categories"]) self._categories.setHeaderHidden(True) - self._categories.setAlternatingRowColors(True) + if not IS_MAEMO: + self._categories.setAlternatingRowColors(True) self._categories.setSelectionBehavior(QtGui.QAbstractItemView.SelectRows) self._categories.setSelectionMode(QtGui.QAbstractItemView.MultiSelection) self._childWidgets = [] @@ -502,6 +523,8 @@ class FavoriteCategoriesWindow(object): 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__) @@ -509,16 +532,21 @@ class FavoriteCategoriesWindow(object): 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("&Units") - 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) @@ -581,7 +609,8 @@ class CategoryWindow(object): self._categories.setHeaderLabels(["Categories"]) self._categories.itemClicked.connect(self._on_category_clicked) self._categories.setHeaderHidden(True) - self._categories.setAlternatingRowColors(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) @@ -594,6 +623,8 @@ class CategoryWindow(object): 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__) @@ -608,22 +639,36 @@ class CategoryWindow(object): 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("&Units") - fileMenu.addAction(self._chooseFavoritesAction) - 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.showFavoritesAction) + viewMenu.addSeparator() + viewMenu.addAction(self._app.jumpAction) + viewMenu.addAction(self._app.recentAction) - 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._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) @@ -651,7 +696,11 @@ class CategoryWindow(object): child.close() self._unitWindow = UnitWindow(self._window, categoryName, self._app) self._unitWindow.window.destroyed.connect(self._on_child_close) - # @todo Add scroll to category + + 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): @@ -886,13 +935,23 @@ 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]) bottomRight = self.createIndex(len(self._children)-1, len(UnitData.HEADERS)-1, self._children[-1]) @@ -922,6 +981,7 @@ class UnitWindow(object): 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() @@ -935,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) @@ -951,6 +1030,8 @@ class UnitWindow(object): 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)) @@ -962,7 +1043,7 @@ class UnitWindow(object): self.select_unit(defaultUnitName) else: self._select_unit(0) - self._unitsModel.sort(UnitData.VALUE_COLUMN_0) + self._unitsModel.sort(UnitData.NAME_COLUMN) self._sortActionGroup = QtGui.QActionGroup(None) self._sortByNameAction = QtGui.QAction(self._sortActionGroup) @@ -1005,22 +1086,40 @@ class UnitWindow(object): self._closeWindowAction.setShortcut(QtGui.QKeySequence("CTRL+w")) self._closeWindowAction.triggered.connect(self._on_close_window) - 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) + 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) @@ -1058,7 +1157,7 @@ class UnitWindow(object): if self._favoritesWindow is not None: yield self._favoritesWindow - def _update_favorites(self): + def _update_favorites(self, force = False): if self._app.showFavoritesAction.isChecked(): unitNames = list(self._unitsModel.get_unit_names()) for i, unitName in enumerate(unitNames): @@ -1067,8 +1166,9 @@ class UnitWindow(object): else: self._unitsView.setRowHidden(i, self._unitsView.rootIndex(), False) else: - for i in xrange(len(self._unitsModel)): - self._unitsView.setRowHidden(i, self._unitsView.rootIndex(), False) + 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): @@ -1096,7 +1196,7 @@ class UnitWindow(object): @misc_utils.log_exception(_moduleLogger) def _on_close_favorites(self, obj = None): self._favoritesWindow = None - self._update_favorites() + self._update_favorites(force=True) @misc_utils.log_exception(_moduleLogger) def _on_previous_unit(self, checked = True): @@ -1130,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)