diff --git a/src/Graphics.cpp b/src/Graphics.cpp index 3b88adb91..5f84088e0 100644 --- a/src/Graphics.cpp +++ b/src/Graphics.cpp @@ -738,11 +738,17 @@ void Graphics::draw_icon(int x, int y, Icon icon) drawchar(x, y, 0x8C, 160, 144, 32, 255); drawchar(x, y, 0x84, 255, 255, 255, 255); break; + case IconClose: + drawchar(x, y, 0xAA, 230, 230, 230, 255); + break; case IconVoteSort: case IconDateSort: case IconFolder: case IconSearch: case IconDelete: + drawchar(x, y, 0x86, 255, 55, 55, 255); + drawchar(x, y, 0x85, 255, 255, 255, 255); + break; default: drawchar(x, y, 't', 255, 255, 255, 255); break; diff --git a/src/Graphics.h b/src/Graphics.h index 8c019e1e0..1209b8667 100644 --- a/src/Graphics.h +++ b/src/Graphics.h @@ -79,7 +79,8 @@ enum Icon IconDelete, IconReport, IconUsername, - IconPassword + IconPassword, + IconClose }; //"Graphics lite" - slightly lower performance due to variable size, diff --git a/src/dialogues/ConfirmPrompt.cpp b/src/dialogues/ConfirmPrompt.cpp index 30b94a8f2..93ef06aa3 100644 --- a/src/dialogues/ConfirmPrompt.cpp +++ b/src/dialogues/ConfirmPrompt.cpp @@ -23,6 +23,7 @@ ConfirmPrompt::ConfirmPrompt(std::string title, std::string message, ConfirmDial ui::Label * messageLabel = new ui::Label(ui::Point(4, 25), ui::Point(Size.X-8, -1), message); + messageLabel->SetMultiline(true); messageLabel->Appearance.HorizontalAlign = ui::Appearance::AlignLeft; messageLabel->Appearance.VerticalAlign = ui::Appearance::AlignTop; AddComponent(messageLabel); diff --git a/src/game/GameController.cpp b/src/game/GameController.cpp index 5c5c92898..8ece34b9d 100644 --- a/src/game/GameController.cpp +++ b/src/game/GameController.cpp @@ -681,7 +681,7 @@ void GameController::NotifyUpdateAvailable(Client * sender) } }; - gameModel->AddNotification(new UpdateNotification(this, "An Update is available")); + gameModel->AddNotification(new UpdateNotification(this, "A new version is available - click here to download")); } void GameController::RemoveNotification(Notification * notification) diff --git a/src/game/GameView.cpp b/src/game/GameView.cpp index 7d3e0c93c..085433f2a 100644 --- a/src/game/GameView.cpp +++ b/src/game/GameView.cpp @@ -2,6 +2,7 @@ #include #include "Config.h" +#include "Style.h" #include "GameView.h" #include "Graphics.h" #include "interface/Window.h" @@ -988,12 +989,16 @@ void GameView::NotifyNotificationsChanged(GameModel * sender) int width = (Graphics::textwidth((*iter)->Message.c_str()))+8; ui::Button * tempButton = new ui::Button(ui::Point(XRES-width-22, currentY), ui::Point(width, 15), (*iter)->Message); tempButton->SetActionCallback(new NotificationButtonAction(this, *iter)); + tempButton->Appearance.BorderInactive = style::Colour::WarningTitle; + tempButton->Appearance.TextInactive = style::Colour::WarningTitle; AddComponent(tempButton); notificationComponents.push_back(tempButton); tempButton = new ui::Button(ui::Point(XRES-20, currentY), ui::Point(15, 15)); - tempButton->SetIcon(IconDelete); + tempButton->SetIcon(IconClose); tempButton->SetActionCallback(new CloseNotificationButtonAction(this, *iter)); + tempButton->Appearance.BorderInactive = style::Colour::WarningTitle; + tempButton->Appearance.TextInactive = style::Colour::WarningTitle; AddComponent(tempButton); notificationComponents.push_back(tempButton);