diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-06-21 14:49:32 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-06-21 14:49:32 (GMT) |
| commit | 550f6e28e012ceba8df9274fc71c7fbddfd90530 (patch) | |
| tree | f4047461c04db78e0d8c8b0a81125c6030074908 /src/dialogues | |
| parent | 8fc3325b1c55a84d29c3b4fafe242af279c09fe5 (diff) | |
| download | powder-550f6e28e012ceba8df9274fc71c7fbddfd90530.zip powder-550f6e28e012ceba8df9274fc71c7fbddfd90530.tar.gz | |
Stage 1 of update process completed
Diffstat (limited to 'src/dialogues')
| -rw-r--r-- | src/dialogues/ConfirmPrompt.cpp | 5 | ||||
| -rw-r--r-- | src/dialogues/ErrorMessage.cpp | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/dialogues/ConfirmPrompt.cpp b/src/dialogues/ConfirmPrompt.cpp index 6943555..91a1326 100644 --- a/src/dialogues/ConfirmPrompt.cpp +++ b/src/dialogues/ConfirmPrompt.cpp @@ -6,6 +6,7 @@ */ #include "ConfirmPrompt.h" +#include "Style.h" #include "interface/Textblock.h" #include "interface/Button.h" @@ -15,7 +16,7 @@ ConfirmPrompt::ConfirmPrompt(std::string title, std::string message, ConfirmDial { int width, height; ui::Label * titleLabel = new ui::Label(ui::Point(4, 5), ui::Point(Size.X-8, 15), title); - titleLabel->SetTextColour(ui::Colour(220, 220, 50)); + titleLabel->SetTextColour(style::Colour::WarningTitle); titleLabel->Appearance.HorizontalAlign = ui::Appearance::AlignLeft; titleLabel->Appearance.VerticalAlign = ui::Appearance::AlignMiddle; AddComponent(titleLabel); @@ -55,7 +56,7 @@ ConfirmPrompt::ConfirmPrompt(std::string title, std::string message, ConfirmDial ui::Button * okayButton = new ui::Button(ui::Point(Size.X-76, Size.Y-16), ui::Point(76, 16), "Continue"); okayButton->Appearance.HorizontalAlign = ui::Appearance::AlignLeft; okayButton->Appearance.VerticalAlign = ui::Appearance::AlignMiddle; - okayButton->Appearance.TextInactive = ui::Colour(220, 220, 50); + okayButton->Appearance.TextInactive = style::Colour::WarningTitle; okayButton->SetActionCallback(new CloseAction(this, ResultOkay)); AddComponent(okayButton); diff --git a/src/dialogues/ErrorMessage.cpp b/src/dialogues/ErrorMessage.cpp index ebcfeae..ccd4a8e 100644 --- a/src/dialogues/ErrorMessage.cpp +++ b/src/dialogues/ErrorMessage.cpp @@ -5,6 +5,7 @@ * Author: Simon */ +#include "Style.h" #include "ErrorMessage.h" #include "interface/Button.h" #include "interface/Label.h" @@ -13,7 +14,7 @@ ErrorMessage::ErrorMessage(std::string title, std::string message): ui::Window(ui::Point(-1, -1), ui::Point(200, 75)) { ui::Label * titleLabel = new ui::Label(ui::Point(4, 5), ui::Point(Size.X-8, 16), title); - titleLabel->SetTextColour(ui::Colour(200, 100, 50)); + titleLabel->SetTextColour(style::Colour::ErrorTitle); titleLabel->Appearance.HorizontalAlign = ui::Appearance::AlignLeft; titleLabel->Appearance.VerticalAlign = ui::Appearance::AlignMiddle; AddComponent(titleLabel); |