From c702ca67e5ec1f7ac0d6f6ba59f799645f727347 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 7 Dec 2020 21:35:23 +0530 Subject: [PATCH] misc fixes --- src/calibre/gui2/tts/linux_config.py | 2 +- src/calibre/gui2/tts/macos_config.py | 3 ++- src/calibre/gui2/tts/windows_config.py | 11 +++++++---- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/calibre/gui2/tts/linux_config.py b/src/calibre/gui2/tts/linux_config.py index e005a5c991..62ae89c136 100644 --- a/src/calibre/gui2/tts/linux_config.py +++ b/src/calibre/gui2/tts/linux_config.py @@ -126,7 +126,7 @@ class Widget(QWidget): idx = self.voices_model.index_for_voice(tuple(val)) if idx is not None: idx = self.proxy_model.mapFromSource(idx) - self.voices.selectionModel().select(idx, QItemSelectionModel.SelectionFlag.ClearAndSelect) + self.voices.selectionModel().select(idx, QItemSelectionModel.SelectionFlag.ClearAndSelect | QItemSelectionModel.SelectionFlag.Rows) self.voices.scrollTo(idx) @property diff --git a/src/calibre/gui2/tts/macos_config.py b/src/calibre/gui2/tts/macos_config.py index 220fc3b29f..05825c5e11 100644 --- a/src/calibre/gui2/tts/macos_config.py +++ b/src/calibre/gui2/tts/macos_config.py @@ -96,6 +96,7 @@ class Widget(QWidget): v.setSelectionBehavior(QAbstractItemView.SelectionBehavior.SelectRows) v.setSortingEnabled(True) v.horizontalHeader().resizeSection(0, QFontMetrics(self.font()).averageCharWidth() * 20) + v.horizontalHeader().resizeSection(1, QFontMetrics(self.font()).averageCharWidth() * 30) v.verticalHeader().close() v.setSelectionMode(QAbstractItemView.SelectionMode.SingleSelection) v.sortByColumn(0, Qt.SortOrder.AscendingOrder) @@ -123,7 +124,7 @@ class Widget(QWidget): idx = self.voices_model.index_for_voice(val) if idx is not None: idx = self.proxy_model.mapFromSource(idx) - self.voices.selectionModel().select(idx, QItemSelectionModel.SelectionFlag.ClearAndSelect) + self.voices.selectionModel().select(idx, QItemSelectionModel.SelectionFlag.ClearAndSelect | QItemSelectionModel.SelectionFlag.Rows) self.voices.scrollTo(idx) @property diff --git a/src/calibre/gui2/tts/windows_config.py b/src/calibre/gui2/tts/windows_config.py index 0be16f592f..55a377c816 100644 --- a/src/calibre/gui2/tts/windows_config.py +++ b/src/calibre/gui2/tts/windows_config.py @@ -82,6 +82,7 @@ class Widget(QWidget): l.addRow(_('&Speed of speech (words per minute):'), s) s.setRange(-10, 10) s.setSingleStep(1) + s.setPageStep(2) self.voices = v = QTableView(self) self.voices_model = VoicesModel(self.voice_data, parent=v) @@ -92,6 +93,8 @@ class Widget(QWidget): v.setSelectionBehavior(QAbstractItemView.SelectionBehavior.SelectRows) v.setSortingEnabled(True) v.horizontalHeader().resizeSection(0, QFontMetrics(self.font()).averageCharWidth() * 25) + v.horizontalHeader().resizeSection(1, QFontMetrics(self.font()).averageCharWidth() * 30) + v.verticalHeader().close() v.verticalHeader().close() v.setSelectionMode(QAbstractItemView.SelectionMode.SingleSelection) v.sortByColumn(0, Qt.SortOrder.AscendingOrder) @@ -125,7 +128,7 @@ class Widget(QWidget): idx = self.voices_model.index_for_voice(val) if idx is not None: idx = self.proxy_model.mapFromSource(idx) - self.voices.selectionModel().select(idx, QItemSelectionModel.SelectionFlag.ClearAndSelect) + self.voices.selectionModel().select(idx, QItemSelectionModel.SelectionFlag.ClearAndSelect | QItemSelectionModel.SelectionFlag.Rows) self.voices.scrollTo(idx) @property @@ -139,17 +142,17 @@ class Widget(QWidget): @property def sound_output(self): - return self.sound_output.currentData() + return self.sound_outputs.currentData() @sound_output.setter def sound_output(self, val): val = val or '' idx = 0 if val: - q = self.sound_output.findData(val) + q = self.sound_outputs.findData(val) if q > -1: idx = q - self.sound_output.setCurrentIndex(idx) + self.sound_outputs.setCurrentIndex(idx) @property def backend_settings(self):