X-Git-Url: http://git.maemo.org/git/?p=gonvert;a=blobdiff_plain;f=src%2Fgonvert_qt.py;h=dd4845cb551579474702843bba68d96c2aa30ce9;hp=e2489e18e5201ead235b95cb6d34b8951d859636;hb=dd39a79b75d2415934ce94f8b6fb28c0cefa612b;hpb=c78b3cfee1fab6aac8a56518c5fbb84d8044a63c diff --git a/src/gonvert_qt.py b/src/gonvert_qt.py index e2489e1..dd4845c 100755 --- a/src/gonvert_qt.py +++ b/src/gonvert_qt.py @@ -82,7 +82,14 @@ class Gonvert(object): self._jumpWindow = None self._recentWindow = None + self._mainWindow = None self._catWindow = None + self._quickWindow = None + + self._condensedAction = QtGui.QAction(None) + self._condensedAction.setText("Condensed View") + self._condensedAction.setCheckable(True) + self._condensedAction.triggered.connect(self._on_condensed_start) self._jumpAction = QtGui.QAction(None) self._jumpAction.setText("Quick Jump") @@ -119,31 +126,45 @@ class Gonvert(object): self._quitAction.triggered.connect(self._on_quit) self._app.lastWindowClosed.connect(self._on_app_quit) - self.request_category() self.load_settings() + self.request_category() + if self._recent: + self._mainWindow.select_category(self._recent[-1][0]) + 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 + if self._mainWindow is not None: + self._mainWindow.hide() + + if self._condensedAction.isChecked(): + if self._quickWindow is None: + self._quickWindow = QuickConvert(None, self) + self._quickWindow.window.destroyed.connect(lambda obj = None: self._on_child_close("_quickWindow", obj)) + else: + self._quickWindow.show() + self._mainWindow = self._quickWindow + else: + if self._catWindow is None: + self._catWindow = CategoryWindow(None, self) + self._catWindow.window.destroyed.connect(lambda obj = None: self._on_child_close("_catWindow", obj)) + else: + self._catWindow.window.show() + self._mainWindow = self._catWindow + + return self._mainWindow def search_units(self): - if self._jumpWindow is not None: - 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)) + jumpWindow = QuickJump(None, self) + jumpWindow.window.destroyed.connect(lambda obj = None: self._on_child_close("_jumpWindow", obj)) + self._fake_close_windows() + self._jumpWindow = jumpWindow 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)) + recentWindow = Recent(None, self) + recentWindow.window.destroyed.connect(lambda obj = None: self._on_child_close("_recentWindow", obj)) + self._fake_close_windows() + self._recentWindow = recentWindow return self._recentWindow def add_recent(self, categoryName, unitName): @@ -155,12 +176,16 @@ class Gonvert(object): assert catUnit not in self._recent self._recent.append(catUnit) - def get_recent_unit(self, categoryName): + def get_recent_unit(self, categoryName, fromMostRecent = 0): + recentUnitName = "" for catName, unitName in reversed(self._recent): if catName == categoryName: - return unitName - else: - return "" + recentUnitName = unitName + if fromMostRecent <= 0: + break + else: + fromMostRecent -= 1 + return recentUnitName def get_recent(self): return reversed(self._recent) @@ -201,8 +226,7 @@ class Gonvert(object): self._showFavoritesAction.setChecked(settings.get("showFavorites", True)) - if self._recent: - self._catWindow.select_category(self._recent[-1][0]) + self._condensedAction.setChecked(settings.get("useQuick", self._condensedAction.isChecked())) def save_settings(self): settings = { @@ -214,6 +238,7 @@ class Gonvert(object): for (catName, units) in self._hiddenUnits.iteritems() ), "showFavorites": self._showFavoritesAction.isChecked(), + "useQuick": self._condensedAction.isChecked(), } with open(constants._user_settings_, "w") as settingsFile: simplejson.dump(settings, settingsFile) @@ -235,6 +260,10 @@ class Gonvert(object): return self._fullscreenAction @property + def condensedAction(self): + return self._condensedAction + + @property def logAction(self): return self._logAction @@ -249,11 +278,33 @@ class Gonvert(object): def _walk_children(self): if self._catWindow is not None: yield self._catWindow + if self._quickWindow is not None: + yield self._quickWindow if self._jumpWindow is not None: yield self._jumpWindow if self._recentWindow is not None: yield self._recentWindow + def _fake_close_windows(self): + if self._catWindow is not None: + self._catWindow.hide() + if self._quickWindow is not None: + self._quickWindow.hide() + if self._jumpWindow is not None: + self._jumpWindow.close() + self._jumpWindow = None + if self._recentWindow is not None: + self._recentWindow.close() + self._recentWindow = None + + def _close_windows(self): + for child in self._walk_children(): + child.close() + self._catWindow = None + self._quickWindow = None + self._jumpWindow = None + self._recentWindow = None + @misc_utils.log_exception(_moduleLogger) def _on_app_quit(self, checked = False): self.save_settings() @@ -271,6 +322,12 @@ class Gonvert(object): window.set_fullscreen(checked) @misc_utils.log_exception(_moduleLogger) + def _on_condensed_start(self, checked = False): + self.request_category() + if self._recent: + self._mainWindow.select_category(self._recent[-1][0]) + + @misc_utils.log_exception(_moduleLogger) def _on_jump_start(self, checked = False): self.search_units() @@ -287,8 +344,7 @@ class Gonvert(object): @misc_utils.log_exception(_moduleLogger) def _on_quit(self, checked = False): - for window in self._walk_children(): - window.close() + self._close_windows() class QuickJump(object): @@ -356,6 +412,12 @@ class QuickJump(object): def window(self): return self._window + def show(self): + self._window.show() + + def hide(self): + self._window.hide() + def close(self): self._window.close() @@ -455,6 +517,12 @@ class Recent(object): def window(self): return self._window + def show(self): + self._window.show() + + def hide(self): + self._window.hide() + def close(self): self._window.close() @@ -478,7 +546,380 @@ class Recent(object): self.close() -class FavoriteCategoriesWindow(object): +class QuickConvert(object): + + def __init__(self, parent, app): + self._app = app + self._categoryName = "" + self._inputUnitName = "" + self._outputUnitName = "" + self._unitNames = [] + self._favoritesWindow = None + + self._inputUnitValue = QtGui.QLineEdit() + self._inputUnitValue.setInputMethodHints(QtCore.Qt.ImhPreferNumbers) + self._inputUnitValue.textEdited.connect(self._on_value_edited) + self._inputUnitSymbol = QtGui.QLabel() + + self._outputUnitValue = QtGui.QLabel() + self._outputUnitSymbol = QtGui.QLabel() + + self._conversionLayout = QtGui.QHBoxLayout() + self._conversionLayout.addWidget(self._inputUnitValue) + self._conversionLayout.addWidget(self._inputUnitSymbol) + self._conversionLayout.addWidget(self._outputUnitValue) + self._conversionLayout.addWidget(self._outputUnitSymbol) + + self._categoryView = QtGui.QTreeWidget() + self._categoryView.setHeaderLabels(["Categories"]) + self._categoryView.setHeaderHidden(False) + if not IS_MAEMO: + self._categoryView.setAlternatingRowColors(True) + self._categoryView.setSelectionBehavior(QtGui.QAbstractItemView.SelectRows) + self._categoryView.setSelectionMode(QtGui.QAbstractItemView.SingleSelection) + for catName in unit_data.UNIT_CATEGORIES: + twi = QtGui.QTreeWidgetItem(self._categoryView) + twi.setText(0, catName) + self._categorySelection = self._categoryView.selectionModel() + self._categorySelection.selectionChanged.connect(self._on_category_selection_changed) + + self._inputView = QtGui.QTreeWidget() + self._inputView.setHeaderLabels(["From", "Name"]) + self._inputView.setHeaderHidden(False) + self._inputView.header().hideSection(1) + if not IS_MAEMO: + self._inputView.setAlternatingRowColors(True) + self._inputView.setSelectionBehavior(QtGui.QAbstractItemView.SelectRows) + self._inputView.setSelectionMode(QtGui.QAbstractItemView.SingleSelection) + self._inputSelection = self._inputView.selectionModel() + self._inputSelection.selectionChanged.connect(self._on_input_selection_changed) + + self._outputView = QtGui.QTreeWidget() + self._outputView.setHeaderLabels(["To", "Name"]) + self._outputView.setHeaderHidden(False) + self._outputView.header().hideSection(1) + if not IS_MAEMO: + self._outputView.setAlternatingRowColors(True) + self._outputView.setSelectionBehavior(QtGui.QAbstractItemView.SelectRows) + self._outputView.setSelectionMode(QtGui.QAbstractItemView.SingleSelection) + self._outputWidgets = [] + self._outputSelection = self._outputView.selectionModel() + self._outputSelection.selectionChanged.connect(self._on_output_selection_changed) + + self._selectionLayout = QtGui.QHBoxLayout() + self._selectionLayout.addWidget(self._categoryView) + self._selectionLayout.addWidget(self._inputView) + self._selectionLayout.addWidget(self._outputView) + + self._layout = QtGui.QVBoxLayout() + self._layout.addLayout(self._conversionLayout) + self._layout.addLayout(self._selectionLayout) + + 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 - Quick Convert" % (constants.__pretty_app_name__, )) + self._window.setWindowIcon(QtGui.QIcon(app.appIconPath)) + self._window.setCentralWidget(centralWidget) + + self._chooseCatFavoritesAction = QtGui.QAction(None) + self._chooseCatFavoritesAction.setText("Select Categories") + self._chooseCatFavoritesAction.triggered.connect(self._on_choose_category_favorites) + + self._chooseUnitFavoritesAction = QtGui.QAction(None) + self._chooseUnitFavoritesAction.setText("Select Units") + self._chooseUnitFavoritesAction.triggered.connect(self._on_choose_unit_favorites) + self._chooseUnitFavoritesAction.setEnabled(False) + + self._app.showFavoritesAction.toggled.connect(self._on_show_favorites) + + self._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._chooseCatFavoritesAction) + fileMenu.addAction(self._chooseUnitFavoritesAction) + + viewMenu = self._window.menuBar().addMenu("&View") + viewMenu.addAction(self._app.showFavoritesAction) + viewMenu.addAction(self._app.condensedAction) + viewMenu.addSeparator() + viewMenu.addAction(self._app.jumpAction) + viewMenu.addAction(self._app.recentAction) + else: + fileMenu = self._window.menuBar().addMenu("&Units") + fileMenu.addAction(self._chooseCatFavoritesAction) + fileMenu.addAction(self._chooseUnitFavoritesAction) + fileMenu.addAction(self._closeWindowAction) + fileMenu.addAction(self._app.quitAction) + + viewMenu = self._window.menuBar().addMenu("&View") + viewMenu.addAction(self._app.showFavoritesAction) + viewMenu.addAction(self._app.condensedAction) + 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 show(self): + self._window.show() + + def hide(self): + self._window.hide() + + def close(self): + self._window.close() + + def set_fullscreen(self, isFullscreen): + if isFullscreen: + self._window.showFullScreen() + else: + self._window.showNormal() + + def select_category(self, categoryName): + self._inputUnitValue.setText("") + self._inputUnitSymbol.setText("") + self._inputView.clear() + self._outputUnitValue.setText("") + self._outputUnitSymbol.setText("") + self._outputView.clear() + self._categoryName = categoryName + self._chooseUnitFavoritesAction.setEnabled(True) + + unitData = unit_data.UNIT_DESCRIPTIONS[categoryName] + self._unitNames = list(unit_data.get_units(categoryName)) + self._unitNames.sort() + for key in self._unitNames: + conversion, unit, description = unitData[key] + if not unit: + unit = key + + twi = QtGui.QTreeWidgetItem(self._inputView) + twi.setText(0, unit) + twi.setText(1, key) + + twi = QtGui.QTreeWidgetItem(self._outputView) + twi.setText(0, unit) + twi.setText(1, key) + + i = unit_data.UNIT_CATEGORIES.index(categoryName) + rootIndex = self._categoryView.rootIndex() + currentIndex = self._categoryView.model().index(i, 0, rootIndex) + self._categoryView.scrollTo(currentIndex) + + defaultInputUnitName = self._app.get_recent_unit(categoryName) + if defaultInputUnitName: + self.select_input(defaultInputUnitName) + defaultOutputUnitName = self._app.get_recent_unit(categoryName, 1) + assert defaultOutputUnitName + self.select_output(defaultOutputUnitName) + + return self + + def select_unit(self, name): + self.select_input(name) + + def select_input(self, name): + self._app.add_recent(self._categoryName, name) + self._inputUnitName = name + + unitData = unit_data.UNIT_DESCRIPTIONS[self._categoryName] + conversion, unit, description = unitData[name] + + self._inputUnitSymbol.setText(unit if unit else name) + + i = self._unitNames.index(name) + rootIndex = self._inputView.rootIndex() + currentIndex = self._inputView.model().index(i, 0, rootIndex) + self._inputView.scrollTo(currentIndex) + + def select_output(self, name): + # Add the output to recent but don't make things weird by making it the most recent + self._app.add_recent(self._categoryName, name) + self._app.add_recent(self._categoryName, self._inputUnitName) + self._outputUnitName = name + + unitData = unit_data.UNIT_DESCRIPTIONS[self._categoryName] + conversion, unit, description = unitData[name] + + self._outputUnitSymbol.setText(unit if unit else name) + + i = self._unitNames.index(name) + rootIndex = self._outputView.rootIndex() + currentIndex = self._outputView.model().index(i, 0, rootIndex) + self._outputView.scrollTo(currentIndex) + + def _sanitize_value(self, userEntry): + if self._categoryName == "Computer Numbers": + if userEntry == '': + value = '0' + else: + value = userEntry + else: + if userEntry == '': + value = 0.0 + else: + value = float(userEntry) + return value + + def _update_favorites(self): + if self._app.showFavoritesAction.isChecked(): + assert self._categoryView.topLevelItemCount() == len(unit_data.UNIT_CATEGORIES) + for i, catName in enumerate(unit_data.UNIT_CATEGORIES): + if catName in self._app.hiddenCategories: + self._categoryView.setRowHidden(i, self._categoryView.rootIndex(), True) + else: + self._categoryView.setRowHidden(i, self._categoryView.rootIndex(), False) + + for i, unitName in enumerate(self._unitNames): + if unitName in self._app.get_hidden_units(self._categoryName): + self._inputView.setRowHidden(i, self._inputView.rootIndex(), True) + self._outputView.setRowHidden(i, self._outputView.rootIndex(), True) + else: + self._inputView.setRowHidden(i, self._inputView.rootIndex(), False) + self._outputView.setRowHidden(i, self._outputView.rootIndex(), False) + else: + for i in xrange(self._categoryView.topLevelItemCount()): + self._categoryView.setRowHidden(i, self._categoryView.rootIndex(), False) + + for i in xrange(len(self._unitNames)): + self._inputView.setRowHidden(i, self._inputView.rootIndex(), False) + self._outputView.setRowHidden(i, self._outputView.rootIndex(), False) + + @misc_utils.log_exception(_moduleLogger) + def _on_close_window(self, checked = True): + self.close() + + @misc_utils.log_exception(_moduleLogger) + def _on_show_favorites(self, checked = True): + if checked: + assert self._categoryView.topLevelItemCount() == len(unit_data.UNIT_CATEGORIES) + for i, catName in enumerate(unit_data.UNIT_CATEGORIES): + if catName in self._app.hiddenCategories: + self._categoryView.setRowHidden(i, self._categoryView.rootIndex(), True) + + for i, unitName in enumerate(self._unitNames): + if unitName in self._app.get_hidden_units(self._categoryName): + self._inputView.setRowHidden(i, self._inputView.rootIndex(), True) + self._outputView.setRowHidden(i, self._outputView.rootIndex(), True) + else: + for i in xrange(self._categoryView.topLevelItemCount()): + self._categoryView.setRowHidden(i, self._categoryView.rootIndex(), False) + + for i in xrange(len(self._unitNames)): + self._inputView.setRowHidden(i, self._inputView.rootIndex(), False) + self._outputView.setRowHidden(i, self._outputView.rootIndex(), False) + + @misc_utils.log_exception(_moduleLogger) + def _on_choose_category_favorites(self, obj = None): + assert self._favoritesWindow is None + self._favoritesWindow = FavoritesWindow( + 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_choose_unit_favorites(self, obj = None): + assert self._favoritesWindow is None + self._favoritesWindow = FavoritesWindow( + 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_close_favorites(self, obj = None): + self._favoritesWindow = None + self._update_favorites() + + @misc_utils.log_exception(_moduleLogger) + def _on_value_edited(self, *args): + assert self._categoryName + assert self._inputUnitName + assert self._outputUnitName + + userInput = str(self._inputUnitValue.text()) + value = self._sanitize_value(userInput) + + unitData = unit_data.UNIT_DESCRIPTIONS[self._categoryName] + inputConversion, _, _ = unitData[self._inputUnitName] + outputConversion, _, _ = unitData[self._outputUnitName] + + func, arg = inputConversion + base = func.to_base(value, arg) + + func, arg = outputConversion + newValue = func.from_base(base, arg) + self._outputUnitValue.setText(str(newValue)) + + @misc_utils.log_exception(_moduleLogger) + def _on_category_selection_changed(self, selected, deselected): + selectedNames = [ + str(item.text(0)) + for item in self._categoryView.selectedItems() + ] + assert len(selectedNames) == 1 + self.select_category(selectedNames[0]) + + @misc_utils.log_exception(_moduleLogger) + def _on_input_selection_changed(self, selected, deselected): + selectedNames = [ + str(item.text(1)) + for item in self._inputView.selectedItems() + ] + if selectedNames: + assert len(selectedNames) == 1 + name = selectedNames[0] + self.select_input(name) + else: + pass + + @misc_utils.log_exception(_moduleLogger) + def _on_output_selection_changed(self, selected, deselected): + selectedNames = [ + str(item.text(1)) + for item in self._outputView.selectedItems() + ] + if selectedNames: + assert len(selectedNames) == 1 + name = selectedNames[0] + self.select_output(name) + else: + pass + + +class FavoritesWindow(object): def __init__(self, parent, app, source, hidden): self._app = app @@ -557,6 +998,12 @@ class FavoriteCategoriesWindow(object): def window(self): return self._window + def show(self): + self._window.show() + + def hide(self): + self._window.hide() + def close(self): self._window.close() @@ -649,6 +1096,7 @@ class CategoryWindow(object): viewMenu = self._window.menuBar().addMenu("&View") viewMenu.addAction(self._app.showFavoritesAction) + viewMenu.addAction(self._app.condensedAction) viewMenu.addSeparator() viewMenu.addAction(self._app.jumpAction) viewMenu.addAction(self._app.recentAction) @@ -664,6 +1112,7 @@ class CategoryWindow(object): viewMenu = self._window.menuBar().addMenu("&View") viewMenu.addAction(self._app.showFavoritesAction) + viewMenu.addAction(self._app.condensedAction) viewMenu.addSeparator() viewMenu.addAction(self._app.jumpAction) viewMenu.addAction(self._app.recentAction) @@ -686,13 +1135,25 @@ class CategoryWindow(object): if self._favoritesWindow is not None: yield self._favoritesWindow + def show(self): + for child in self.walk_children(): + child.show() + self._window.show() + + def hide(self): + for child in self.walk_children(): + child.hide() + self._window.hide() + def close(self): for child in self.walk_children(): + child.window.destroyed.disconnect(self._on_child_close) child.close() self._window.close() def select_category(self, categoryName): for child in self.walk_children(): + child.window.destroyed.disconnect(self._on_child_close) child.close() self._unitWindow = UnitWindow(self._window, categoryName, self._app) self._unitWindow.window.destroyed.connect(self._on_child_close) @@ -724,18 +1185,6 @@ class CategoryWindow(object): 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) @@ -747,6 +1196,18 @@ class CategoryWindow(object): 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 = FavoritesWindow( + 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_close_favorites(self, obj = None): self._favoritesWindow = None self._update_favorites() @@ -939,8 +1400,8 @@ class UnitModel(QtCore.QAbstractItemModel): self._sortSettings is not None and self._sortSettings[0] in [UnitData.VALUE_COLUMN_0, UnitData.VALUE_COLUMN_1] ): + # Sort takes care of marking everything as changed self.sort(*self._sortSettings) - self._all_changed() else: self._values_changed() @@ -1014,10 +1475,10 @@ class UnitWindow(object): viewHeader.setStretchLastSection(False) # Trying to make things faster by locking in the initial size of the immutable columns - nameSize = viewHeader.sectionSize(UnitData.NAME_COLUMN) + nameSize = min(viewHeader.sectionSize(UnitData.NAME_COLUMN), 125) viewHeader.setResizeMode(UnitData.NAME_COLUMN, QtGui.QHeaderView.Fixed) viewHeader.resizeSection(UnitData.NAME_COLUMN, nameSize) - unitSize = viewHeader.sectionSize(UnitData.UNIT_COLUMN) + unitSize = min(viewHeader.sectionSize(UnitData.UNIT_COLUMN), 125) viewHeader.setResizeMode(UnitData.UNIT_COLUMN, QtGui.QHeaderView.Fixed) viewHeader.resizeSection(UnitData.UNIT_COLUMN, unitSize) @@ -1043,7 +1504,6 @@ class UnitWindow(object): 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) @@ -1062,7 +1522,10 @@ class UnitWindow(object): self._sortByUnitAction.setToolTip("Sort the units by unit") self._sortByUnitAction.setCheckable(True) - self._sortByValueAction.setChecked(True) + if UnitData.NAME_COLUMN != 0: + # By default it sorts by he first column (name) + self._unitsModel.sort(UnitData.NAME_COLUMN) + self._sortByNameAction.setChecked(True) self._chooseFavoritesAction = QtGui.QAction(None) self._chooseFavoritesAction.setText("Select Favorites") @@ -1096,6 +1559,7 @@ class UnitWindow(object): viewMenu = self._window.menuBar().addMenu("&View") viewMenu.addAction(self._app.showFavoritesAction) + viewMenu.addAction(self._app.condensedAction) viewMenu.addSeparator() viewMenu.addAction(self._sortByNameAction) viewMenu.addAction(self._sortByValueAction) @@ -1111,6 +1575,7 @@ class UnitWindow(object): viewMenu = self._window.menuBar().addMenu("&View") viewMenu.addAction(self._app.showFavoritesAction) + viewMenu.addAction(self._app.condensedAction) viewMenu.addSeparator() viewMenu.addAction(self._sortByNameAction) viewMenu.addAction(self._sortByValueAction) @@ -1138,8 +1603,19 @@ class UnitWindow(object): def window(self): return self._window + def show(self): + for child in self.walk_children(): + child.hide() + self._window.show() + + def hide(self): + for child in self.walk_children(): + child.hide() + self._window.hide() + def close(self): for child in self.walk_children(): + child.window.destroyed.disconnect(self._on_child_close) child.close() self._window.close() @@ -1171,18 +1647,6 @@ class UnitWindow(object): 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()) @@ -1194,6 +1658,18 @@ class UnitWindow(object): 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 = FavoritesWindow( + 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_close_favorites(self, obj = None): self._favoritesWindow = None self._update_favorites(force=True)