langfingaz/anki
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1170 from RumovZ/fix-columns

Browse Source 
Fix column issues
This commit is contained in:
Damien Elmes 2021-05-18 09:24:15 +10:00 committed by GitHub
commit fa47f6ec15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
qt/aqt/browser/table/table.py
View File

@ -253,7 +253,11 @@ class Table:
saveHeader(self._view.horizontalHeader(), self._state.config_key_prefix) saveHeader(self._view.horizontalHeader(), self._state.config_key_prefix)
def _restore_header(self) -> None: def _restore_header(self) -> None:
self._view.horizontalHeader().blockSignals(True)
restoreHeader(self._view.horizontalHeader(), self._state.config_key_prefix) restoreHeader(self._view.horizontalHeader(), self._state.config_key_prefix)
self._set_column_sizes()
self._set_sort_indicator()
self._view.horizontalHeader().blockSignals(False)
# Setup # Setup
@ -301,8 +305,6 @@ class Table:
hh.setSectionsMovable(True) hh.setSectionsMovable(True)
hh.setContextMenuPolicy(Qt.CustomContextMenu) hh.setContextMenuPolicy(Qt.CustomContextMenu)
self._restore_header() self._restore_header()
self._set_column_sizes()
self._set_sort_indicator()
qconnect(hh.customContextMenuRequested, self._on_header_context) qconnect(hh.customContextMenuRequested, self._on_header_context)
qconnect(hh.sortIndicatorChanged, self._on_sort_column_changed) qconnect(hh.sortIndicatorChanged, self._on_sort_column_changed)
qconnect(hh.sectionMoved, self._on_column_moved) qconnect(hh.sectionMoved, self._on_column_moved)
@ -358,15 +360,14 @@ class Table:
self._scroll_to_column(self._model.len_columns() - 1) self._scroll_to_column(self._model.len_columns() - 1)
def _on_sort_column_changed(self, section: int, order: int) -> None: def _on_sort_column_changed(self, section: int, order: int) -> None:
order = bool(order)
column = self._model.column_at_section(section) column = self._model.column_at_section(section)
if column.sorting == Columns.SORTING_NONE: if column.sorting == Columns.SORTING_NONE:
showInfo(tr.browsing_sorting_on_this_column_is_not()) showInfo(tr.browsing_sorting_on_this_column_is_not())
sort_key = self._state.sort_column self._set_sort_indicator()
else: return
sort_key = column.key order = bool(order)
if self._state.sort_column != sort_key: if self._state.sort_column != column.key:
self._state.sort_column = sort_key self._state.sort_column = column.key
# default to descending for non-text fields # default to descending for non-text fields
if column.sorting == Columns.SORTING_REVERSED: if column.sorting == Columns.SORTING_REVERSED:
order = not order order = not order