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

Rename violet to pink

Browse Source
This commit is contained in:
RumovZ 2021-06-01 18:14:43 +02:00
parent c97c6c6e98
commit 5e7a47fdc7
8 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ftl/core/actions.ftl
View File

@ -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

2
ftl/core/search.ftl
View File

@ -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.

2
qt/aqt/browser/table/__init__.py
View File

@ -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

6
qt/aqt/flags.py
View File

@ -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,

6
qt/aqt/forms/browser.ui
View File

@ -262,7 +262,7 @@
<addaction name="actionOrange_Flag"/>
<addaction name="actionGreen_Flag"/>
<addaction name="actionBlue_Flag"/>
<addaction name="actionViolet_Flag"/>
<addaction name="actionPink_Flag"/>
<addaction name="actionTurquoise_Flag"/>
<addaction name="actionPurple_Flag"/>
</widget>
@ -625,12 +625,12 @@
<string notr="true">Ctrl+Shift+Z</string>
</property>
</action>
<action name="actionViolet_Flag">
<action name="actionPink_Flag">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>actions_violet_flag</string>
<string>actions_pink_flag</string>
</property>
<property name="shortcut">
<string notr="true">Ctrl+5</string>

4
rslib/backend.proto
View File

@ -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;
}

2
rslib/src/backend/search/search_node.rs
View File

@ -70,7 +70,7 @@ impl TryFrom<pb::SearchNode> 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)),
},

2
rslib/src/browser_table.rs
View File

@ -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,
_ => {