diff --git a/qt/aqt/table.py b/qt/aqt/table.py index f8a83c18c..3dff0ce48 100644 --- a/qt/aqt/table.py +++ b/qt/aqt/table.py @@ -547,7 +547,9 @@ class ItemState(ABC): return self._active_columns[index] def column_label(self, column: Column) -> str: - return column.notes_label if self.is_notes_mode() else column.label + return ( + column.notes_mode_label if self.is_notes_mode() else column.cards_mode_label + ) # Columns and sorting @@ -1083,8 +1085,8 @@ def addon_column_fillin(key: str) -> Column: """ return Column( key=key, - label=tr.browsing_addon(), - notes_label=tr.browsing_addon(), + cards_mode_label=tr.browsing_addon(), + notes_mode_label=tr.browsing_addon(), sorting=Columns.SORTING_NONE, uses_cell_font=False, alignment=Columns.ALIGNMENT_CENTER, diff --git a/rslib/backend.proto b/rslib/backend.proto index f36ac6550..8a5400a67 100644 --- a/rslib/backend.proto +++ b/rslib/backend.proto @@ -1043,8 +1043,8 @@ message BrowserColumns { } message Column { string key = 1; - string label = 2; - string notes_label = 3; + string cards_mode_label = 2; + string notes_mode_label = 3; Sorting sorting = 4; bool uses_cell_font = 5; Alignment alignment = 6; diff --git a/rslib/src/backend/search/browser_table.rs b/rslib/src/backend/search/browser_table.rs index dcafc1c1b..94a7ef193 100644 --- a/rslib/src/backend/search/browser_table.rs +++ b/rslib/src/backend/search/browser_table.rs @@ -9,8 +9,8 @@ impl browser_table::Column { pub fn to_pb_column(self, i18n: &I18n) -> pb::browser_columns::Column { pb::browser_columns::Column { key: self.to_string(), - label: self.localized_label(i18n), - notes_label: self.localized_notes_label(i18n), + cards_mode_label: self.cards_mode_label(i18n), + notes_mode_label: self.notes_mode_label(i18n), sorting: self.sorting() as i32, uses_cell_font: self.uses_cell_font(), alignment: self.alignment() as i32, diff --git a/rslib/src/browser_table.rs b/rslib/src/browser_table.rs index 3c3a40059..ff68e733a 100644 --- a/rslib/src/browser_table.rs +++ b/rslib/src/browser_table.rs @@ -172,7 +172,7 @@ impl Note { } impl Column { - pub fn localized_label(self, i18n: &I18n) -> String { + pub fn cards_mode_label(self, i18n: &I18n) -> String { match self { Self::Answer => i18n.browsing_answer(), Self::CardMod => i18n.search_card_modified(), @@ -194,14 +194,14 @@ impl Column { .into() } - pub fn localized_notes_label(self, i18n: &I18n) -> String { + pub fn notes_mode_label(self, i18n: &I18n) -> String { match self { Self::CardMod => i18n.search_card_modified(), Self::Cards => i18n.editing_cards(), Self::Ease => i18n.browsing_average_ease(), Self::Interval => i18n.browsing_average_interval(), Self::Reps => i18n.scheduling_reviews(), - _ => return self.localized_label(i18n), + _ => return self.cards_mode_label(i18n), } .into() } @@ -240,7 +240,7 @@ impl Collection { .filter(|&c| c != Column::Custom) .map(|c| c.to_pb_column(&self.tr)) .collect(); - columns.sort_by(|c1, c2| c1.label.cmp(&c2.label)); + columns.sort_by(|c1, c2| c1.cards_mode_label.cmp(&c2.cards_mode_label)); pb::BrowserColumns { columns } }