From 3383f1742a228ac0389dae0d54d8ab26038b6936 Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Mon, 29 Mar 2021 17:12:45 +1000 Subject: [PATCH] rename BrowserCardState Use a more verbose name, and use 'note' rather than 'card', so we can rely on the default of False --- qt/aqt/browser.py | 2 +- qt/aqt/scheduling_ops.py | 4 +++- qt/aqt/table.py | 10 ++++++---- rslib/backend.proto | 2 +- rslib/src/backend/config.rs | 2 +- rslib/src/browser_rows.rs | 8 ++++---- rslib/src/config/bool.rs | 5 ++--- 7 files changed, 18 insertions(+), 15 deletions(-) diff --git a/qt/aqt/browser.py b/qt/aqt/browser.py index 1a602ec52..e1da7001c 100644 --- a/qt/aqt/browser.py +++ b/qt/aqt/browser.py @@ -5,7 +5,7 @@ from __future__ import annotations import html from dataclasses import dataclass -from typing import Any, Callable, Dict, List, Optional, Tuple, Union, Sequence +from typing import Any, Callable, Dict, List, Optional, Sequence, Tuple, Union import aqt import aqt.forms diff --git a/qt/aqt/scheduling_ops.py b/qt/aqt/scheduling_ops.py index e7fad0d1f..ea84611d8 100644 --- a/qt/aqt/scheduling_ops.py +++ b/qt/aqt/scheduling_ops.py @@ -54,7 +54,9 @@ def set_due_date_dialog( ) -def forget_cards(*, mw: aqt.AnkiQt, parent: QWidget, card_ids: Sequence[CardId]) -> None: +def forget_cards( + *, mw: aqt.AnkiQt, parent: QWidget, card_ids: Sequence[CardId] +) -> None: if not card_ids: return diff --git a/qt/aqt/table.py b/qt/aqt/table.py index c53058fd3..99dc7591d 100644 --- a/qt/aqt/table.py +++ b/qt/aqt/table.py @@ -60,9 +60,9 @@ class Table: self.browser = browser self.col: Collection = browser.col self._state: ItemState = ( - CardState(self.col) - if self.col.get_config_bool(Config.Bool.BROWSER_CARD_STATE) - else NoteState(self.col) + NoteState(self.col) + if self.col.get_config_bool(Config.Bool.BROWSER_TABLE_SHOW_NOTES_MODE) + else CardState(self.col) ) self._model = DataModel(self.col, self._state) self._view: Optional[QTableView] = None @@ -201,7 +201,9 @@ class Table: self._state = self._model.toggle_state( SearchContext(search=last_search, browser=self.browser) ) - self.col.set_config_bool(Config.Bool.BROWSER_CARD_STATE, self.is_card_state()) + self.col.set_config_bool( + Config.Bool.BROWSER_TABLE_SHOW_NOTES_MODE, not self.is_card_state() + ) self._set_sort_indicator() self._set_column_sizes() self._restore_selection(self._toggled_selection) diff --git a/rslib/backend.proto b/rslib/backend.proto index b85c5475d..25e2a4ed0 100644 --- a/rslib/backend.proto +++ b/rslib/backend.proto @@ -1345,7 +1345,7 @@ message SetDeckIn { message Config { message Bool { enum Key { - BROWSER_CARD_STATE = 0; + BROWSER_TABLE_SHOW_NOTES_MODE = 0; BROWSER_SORT_BACKWARDS = 1; BROWSER_NOTE_SORT_BACKWARDS = 2; PREVIEW_BOTH_SIDES = 3; diff --git a/rslib/src/backend/config.rs b/rslib/src/backend/config.rs index ac769ec49..837f30df4 100644 --- a/rslib/src/backend/config.rs +++ b/rslib/src/backend/config.rs @@ -15,7 +15,7 @@ use serde_json::Value; impl From for BoolKey { fn from(k: BoolKeyProto) -> Self { match k { - BoolKeyProto::BrowserCardState => BoolKey::BrowserCardState, + BoolKeyProto::BrowserTableShowNotesMode => BoolKey::BrowserTableShowNotesMode, BoolKeyProto::BrowserSortBackwards => BoolKey::BrowserSortBackwards, BoolKeyProto::BrowserNoteSortBackwards => BoolKey::BrowserNoteSortBackwards, BoolKeyProto::PreviewBothSides => BoolKey::PreviewBothSides, diff --git a/rslib/src/browser_rows.rs b/rslib/src/browser_rows.rs index d33e9e4dd..ae46b74b7 100644 --- a/rslib/src/browser_rows.rs +++ b/rslib/src/browser_rows.rs @@ -133,14 +133,14 @@ fn card_render_required(columns: &[String]) -> bool { impl Collection { pub fn browser_row_for_id(&mut self, id: i64) -> Result { - if self.get_bool(BoolKey::BrowserCardState) { + if self.get_bool(BoolKey::BrowserTableShowNotesMode) { + let columns = self.get_desktop_browser_note_columns(); + NoteRowContext::new(self, id)?.browser_row_for_id(&columns) + } else { // this is inefficient; we may want to use an enum in the future let columns = self.get_desktop_browser_card_columns(); CardRowContext::new(self, id, card_render_required(&columns))? .browser_row_for_id(&columns) - } else { - let columns = self.get_desktop_browser_note_columns(); - NoteRowContext::new(self, id)?.browser_row_for_id(&columns) } } diff --git a/rslib/src/config/bool.rs b/rslib/src/config/bool.rs index 647fe0a94..3dc0074f1 100644 --- a/rslib/src/config/bool.rs +++ b/rslib/src/config/bool.rs @@ -9,7 +9,7 @@ use strum::IntoStaticStr; #[derive(Debug, Clone, Copy, IntoStaticStr)] #[strum(serialize_all = "camelCase")] pub enum BoolKey { - BrowserCardState, + BrowserTableShowNotesMode, BrowserNoteSortBackwards, CardCountsSeparateInactive, CollapseCardState, @@ -62,8 +62,7 @@ impl Collection { | BoolKey::FutureDueShowBacklog | BoolKey::ShowRemainingDueCountsInStudy | BoolKey::CardCountsSeparateInactive - | BoolKey::NormalizeNoteText - | BoolKey::BrowserCardState => self.get_config_optional(key).unwrap_or(true), + | BoolKey::NormalizeNoteText => self.get_config_optional(key).unwrap_or(true), // other options default to false other => self.get_config_default(other),