X-Git-Url: http://git.maemo.org/git/?p=gonvert;a=blobdiff_plain;f=src%2Fgonvert_qt.py;h=44677cf2dff741c053ca17c77a3b5e79d4fb19b8;hp=95a0c88e9dbb8c6cafcf2200e088252cf4f2baec;hb=ccae6ebacaeb1b6fce72381cc7e4d66da2af5cc0;hpb=9bb563a364d6b49bd4074265a9a92a1e8ab48956 diff --git a/src/gonvert_qt.py b/src/gonvert_qt.py index 95a0c88..44677cf 100755 --- a/src/gonvert_qt.py +++ b/src/gonvert_qt.py @@ -20,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) @@ -52,6 +55,9 @@ def split_number(number): class Gonvert(object): + # @todo get subwindows working + # @todo rotation support + _DATA_PATHS = [ os.path.dirname(__file__), os.path.join(os.path.dirname(__file__), "../data"), @@ -305,7 +311,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() @@ -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() @@ -415,16 +428,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) @@ -460,8 +478,6 @@ class Recent(object): class FavoriteCategoriesWindow(object): - # @todo Add All, None, and Invert actions - def __init__(self, parent, app, source, hidden): self._app = app self._source = list(source) @@ -470,19 +486,35 @@ 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 = [] 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) @@ -496,16 +528,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) @@ -526,6 +563,22 @@ class FavoriteCategoriesWindow(object): 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( @@ -552,7 +605,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) @@ -579,22 +633,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.addSeparator() - 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) @@ -622,7 +690,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): @@ -857,13 +929,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]) @@ -906,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) @@ -933,7 +1034,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) @@ -976,22 +1077,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) @@ -1029,7 +1148,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): @@ -1038,8 +1157,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): @@ -1067,7 +1187,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): @@ -1101,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)