Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

misc fixes

Browse Source
This commit is contained in:
Kovid Goyal 2020-12-07 21:35:23 +05:30
parent 26bbeabc43
commit c702ca67e5
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/gui2/tts/linux_config.py
View File

@ -126,7 +126,7 @@ class Widget(QWidget):
idx = self.voices_model.index_for_voice(tuple(val)) idx = self.voices_model.index_for_voice(tuple(val))
if idx is not None: if idx is not None:
idx = self.proxy_model.mapFromSource(idx) 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) self.voices.scrollTo(idx)
@property @property

3
src/calibre/gui2/tts/macos_config.py
View File

@ -96,6 +96,7 @@ class Widget(QWidget):
v.setSelectionBehavior(QAbstractItemView.SelectionBehavior.SelectRows) v.setSelectionBehavior(QAbstractItemView.SelectionBehavior.SelectRows)
v.setSortingEnabled(True) v.setSortingEnabled(True)
v.horizontalHeader().resizeSection(0, QFontMetrics(self.font()).averageCharWidth() * 20) v.horizontalHeader().resizeSection(0, QFontMetrics(self.font()).averageCharWidth() * 20)
v.horizontalHeader().resizeSection(1, QFontMetrics(self.font()).averageCharWidth() * 30)
v.verticalHeader().close() v.verticalHeader().close()
v.setSelectionMode(QAbstractItemView.SelectionMode.SingleSelection) v.setSelectionMode(QAbstractItemView.SelectionMode.SingleSelection)
v.sortByColumn(0, Qt.SortOrder.AscendingOrder) v.sortByColumn(0, Qt.SortOrder.AscendingOrder)
@ -123,7 +124,7 @@ class Widget(QWidget):
idx = self.voices_model.index_for_voice(val) idx = self.voices_model.index_for_voice(val)
if idx is not None: if idx is not None:
idx = self.proxy_model.mapFromSource(idx) 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) self.voices.scrollTo(idx)
@property @property

11
src/calibre/gui2/tts/windows_config.py
View File

@ -82,6 +82,7 @@ class Widget(QWidget):
l.addRow(_('&Speed of speech (words per minute):'), s) l.addRow(_('&Speed of speech (words per minute):'), s)
s.setRange(-10, 10) s.setRange(-10, 10)
s.setSingleStep(1) s.setSingleStep(1)
s.setPageStep(2)
self.voices = v = QTableView(self) self.voices = v = QTableView(self)
self.voices_model = VoicesModel(self.voice_data, parent=v) self.voices_model = VoicesModel(self.voice_data, parent=v)
@ -92,6 +93,8 @@ class Widget(QWidget):
v.setSelectionBehavior(QAbstractItemView.SelectionBehavior.SelectRows) v.setSelectionBehavior(QAbstractItemView.SelectionBehavior.SelectRows)
v.setSortingEnabled(True) v.setSortingEnabled(True)
v.horizontalHeader().resizeSection(0, QFontMetrics(self.font()).averageCharWidth() * 25) 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.verticalHeader().close()
v.setSelectionMode(QAbstractItemView.SelectionMode.SingleSelection) v.setSelectionMode(QAbstractItemView.SelectionMode.SingleSelection)
v.sortByColumn(0, Qt.SortOrder.AscendingOrder) v.sortByColumn(0, Qt.SortOrder.AscendingOrder)
@ -125,7 +128,7 @@ class Widget(QWidget):
idx = self.voices_model.index_for_voice(val) idx = self.voices_model.index_for_voice(val)
if idx is not None: if idx is not None:
idx = self.proxy_model.mapFromSource(idx) 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) self.voices.scrollTo(idx)
@property @property
@ -139,17 +142,17 @@ class Widget(QWidget):
@property @property
def sound_output(self): def sound_output(self):
return self.sound_output.currentData() return self.sound_outputs.currentData()
@sound_output.setter @sound_output.setter
def sound_output(self, val): def sound_output(self, val):
val = val or '' val = val or ''
idx = 0 idx = 0
if val: if val:
q = self.sound_output.findData(val) q = self.sound_outputs.findData(val)
if q > -1: if q > -1:
idx = q idx = q
self.sound_output.setCurrentIndex(idx) self.sound_outputs.setCurrentIndex(idx)
@property @property
def backend_settings(self): def backend_settings(self):