From 5e7a47fdc76610fbcbb83d80d5ebc5ed11263be9 Mon Sep 17 00:00:00 2001 From: RumovZ Date: Tue, 1 Jun 2021 18:14:43 +0200 Subject: [PATCH] Rename violet to pink --- ftl/core/actions.ftl | 2 +- ftl/core/search.ftl | 2 +- qt/aqt/browser/table/__init__.py | 2 +- qt/aqt/flags.py | 6 +++--- qt/aqt/forms/browser.ui | 6 +++--- rslib/backend.proto | 4 ++-- rslib/src/backend/search/search_node.rs | 2 +- rslib/src/browser_table.rs | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ftl/core/actions.ftl b/ftl/core/actions.ftl index 263c9d897..b6d04bfc0 100644 --- a/ftl/core/actions.ftl +++ b/ftl/core/actions.ftl @@ -53,6 +53,6 @@ actions-red-flag = Red Flag actions-orange-flag = Orange Flag actions-green-flag = Green Flag actions-blue-flag = Blue Flag -actions-violet-flag = Violet Flag +actions-pink-flag = Pink Flag actions-turquoise-flag = Turquoise Flag actions-purple-flag = Purple Flag diff --git a/ftl/core/search.ftl b/ftl/core/search.ftl index e26ce4a9c..f18fa73c3 100644 --- a/ftl/core/search.ftl +++ b/ftl/core/search.ftl @@ -16,7 +16,7 @@ search-unclosed-quote = an opening double quote `"` was found, but there was no search-missing-key = a colon `:` was found, but there was no keyword preceding it. If you want to search for a literal `:`, prepend a backslash: `\:`. search-unknown-escape = the escape sequence `{ $val }` is not defined. If you want to search for a literal backslash `\`, prepend another one: `\\`. search-invalid-argument = `{ $term }` was given an invalid argument '`{ $argument }`'. -search-invalid-flag = `flag:` must be followed by a valid flag number: `1` (red), `2` (orange), `3` (green), `4` (blue), `5` (violet), `6` (turquoise), `7` (purple) or `0` (no flag). +search-invalid-flag = `flag:` must be followed by a valid flag number: `1` (red), `2` (orange), `3` (green), `4` (blue), `5` (pink), `6` (turquoise), `7` (purple) or `0` (no flag). search-invalid-prop-operator = `prop:{ $val }` must be followed by one of the following comparison operators: `=`, `!=`, `<`, `>`, `<=` or `>=`. search-invalid-other = please check for typing mistakes. diff --git a/qt/aqt/browser/table/__init__.py b/qt/aqt/browser/table/__init__.py index 03d6a0952..4d19ba618 100644 --- a/qt/aqt/browser/table/__init__.py +++ b/qt/aqt/browser/table/__init__.py @@ -88,7 +88,7 @@ def backend_color_to_aqt_color(color: BrowserRow.Color.V) -> Optional[Tuple[str, return colors.FLAG3_BG if color == BrowserRow.COLOR_FLAG_BLUE: return colors.FLAG4_BG - if color == BrowserRow.COLOR_FLAG_VIOLET: + if color == BrowserRow.COLOR_FLAG_PINK: return colors.FLAG5_BG if color == BrowserRow.COLOR_FLAG_TURQUOISE: return colors.FLAG6_BG diff --git a/qt/aqt/flags.py b/qt/aqt/flags.py index a2baa8bc3..af01570d4 100644 --- a/qt/aqt/flags.py +++ b/qt/aqt/flags.py @@ -67,10 +67,10 @@ def load_flags(col: Collection) -> List[Flag]: ), Flag( 5, - labels["5"] if "5" in labels else tr.actions_violet_flag(), + labels["5"] if "5" in labels else tr.actions_pink_flag(), icon.with_color(colors.FLAG5_FG), - SearchNode(flag=SearchNode.FLAG_VIOLET), - "actionViolet_Flag", + SearchNode(flag=SearchNode.FLAG_PINK), + "actionPink_Flag", ), Flag( 6, diff --git a/qt/aqt/forms/browser.ui b/qt/aqt/forms/browser.ui index ded81567a..eda2155e6 100644 --- a/qt/aqt/forms/browser.ui +++ b/qt/aqt/forms/browser.ui @@ -262,7 +262,7 @@ - + @@ -625,12 +625,12 @@ Ctrl+Shift+Z - + true - actions_violet_flag + actions_pink_flag Ctrl+5 diff --git a/rslib/backend.proto b/rslib/backend.proto index 12d4698e9..87f5e1aee 100644 --- a/rslib/backend.proto +++ b/rslib/backend.proto @@ -858,7 +858,7 @@ message SearchNode { FLAG_ORANGE = 3; FLAG_GREEN = 4; FLAG_BLUE = 5; - FLAG_VIOLET = 6; + FLAG_PINK = 6; FLAG_TURQUOISE = 7; FLAG_PURPLE = 8; } @@ -1133,7 +1133,7 @@ message BrowserRow { COLOR_FLAG_ORANGE = 4; COLOR_FLAG_GREEN = 5; COLOR_FLAG_BLUE = 6; - COLOR_FLAG_VIOLET = 7; + COLOR_FLAG_PINK = 7; COLOR_FLAG_TURQUOISE = 8; COLOR_FLAG_PURPLE = 9; } diff --git a/rslib/src/backend/search/search_node.rs b/rslib/src/backend/search/search_node.rs index c3d321551..d1f9da9ab 100644 --- a/rslib/src/backend/search/search_node.rs +++ b/rslib/src/backend/search/search_node.rs @@ -70,7 +70,7 @@ impl TryFrom for Node { Flag::Orange => Node::Search(SearchNode::Flag(2)), Flag::Green => Node::Search(SearchNode::Flag(3)), Flag::Blue => Node::Search(SearchNode::Flag(4)), - Flag::Violet => Node::Search(SearchNode::Flag(5)), + Flag::Pink => Node::Search(SearchNode::Flag(5)), Flag::Turquoise => Node::Search(SearchNode::Flag(6)), Flag::Purple => Node::Search(SearchNode::Flag(7)), }, diff --git a/rslib/src/browser_table.rs b/rslib/src/browser_table.rs index 5fc8a9b1f..634729db5 100644 --- a/rslib/src/browser_table.rs +++ b/rslib/src/browser_table.rs @@ -527,7 +527,7 @@ impl RowContext { 2 => Color::FlagOrange, 3 => Color::FlagGreen, 4 => Color::FlagBlue, - 5 => Color::FlagViolet, + 5 => Color::FlagPink, 6 => Color::FlagTurquoise, 7 => Color::FlagPurple, _ => {