change purple flag to orange

This commit is contained in:
Damien Elmes 2018-11-01 14:58:41 +10:00
parent a9f9df5109
commit 5e5d35e9c1
4 changed files with 12 additions and 12 deletions

View File

@ -330,8 +330,8 @@ COLOUR_SUSPENDED = "#FFFFB2"
COLOUR_MARKED = "#ccc"
flagColours = {
1: "#F5B7B1",
2: "#BB8FCE",
1: "#ffaaaa",
2: "#ffb347",
3: "#82E0AA",
4: "#85C1E9",
}
@ -441,7 +441,7 @@ class Browser(QMainWindow):
f.actionReschedule.triggered.connect(self.reschedule)
f.actionToggle_Suspend.triggered.connect(self.onSuspend)
f.actionRed_Flag.triggered.connect(lambda: self.onSetFlag(1))
f.actionPurple_Flag.triggered.connect(lambda: self.onSetFlag(2))
f.actionOrange_Flag.triggered.connect(lambda: self.onSetFlag(2))
f.actionGreen_Flag.triggered.connect(lambda: self.onSetFlag(3))
f.actionBlue_Flag.triggered.connect(lambda: self.onSetFlag(4))
f.actionClear_Flag.triggered.connect(lambda: self.onSetFlag(0))
@ -986,7 +986,7 @@ by clicking on one on the left."""))
(_("Buried"), "is:buried"),
None,
(_("Red Flag"), "flag:1"),
(_("Purple Flag"), "flag:2"),
(_("Orange Flag"), "flag:2"),
(_("Green Flag"), "flag:3"),
(_("Blue Flag"), "flag:4"),
(_("No Flag"), "flag:0"),

View File

@ -586,7 +586,7 @@ time = %(time)d;
opts = [
[_("Flag Card"), [
[_("Red Flag"), "Ctrl+1", lambda: self.setFlag(1)],
[_("Purple Flag"), "Ctrl+2", lambda: self.setFlag(2)],
[_("Orange Flag"), "Ctrl+2", lambda: self.setFlag(2)],
[_("Green Flag"), "Ctrl+3", lambda: self.setFlag(3)],
[_("Blue Flag"), "Ctrl+4", lambda: self.setFlag(4)],
None,

View File

@ -277,7 +277,7 @@
<string>Flag</string>
</property>
<addaction name="actionRed_Flag"/>
<addaction name="actionPurple_Flag"/>
<addaction name="actionOrange_Flag"/>
<addaction name="actionGreen_Flag"/>
<addaction name="actionBlue_Flag"/>
<addaction name="separator"/>
@ -543,9 +543,9 @@
<string>Ctrl+1</string>
</property>
</action>
<action name="actionPurple_Flag">
<action name="actionOrange_Flag">
<property name="text">
<string>Purple Flag</string>
<string>Orange Flag</string>
</property>
<property name="shortcut">
<string>Ctrl+2</string>

View File

@ -86,10 +86,10 @@ function _showAnswer(a, bodyclass) {
}
_flagColours = {
1: "red",
2: "purple",
3: "green",
4: "blue"
1: "#ff6666",
2: "#ff9900",
3: "#77ff77",
4: "#77aaff"
};
function _drawFlag(flag) {