summaryrefslogtreecommitdiff
path: root/src/game
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-07-03 12:58:59 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-07-03 12:58:59 (GMT)
commitc996d01228f37f3f59b7157deb6e4c695a9654df (patch)
treef5b42e4fb8b4c2e7c41b20de19a6f588cc6e7ce4 /src/game
parente5f96cd3c97833bea60e562e810cc9c66e018172 (diff)
downloadpowder-c996d01228f37f3f59b7157deb6e4c695a9654df.zip
powder-c996d01228f37f3f59b7157deb6e4c695a9654df.tar.gz
Make update notification a little better - correct colour. Correct multiline label for Confirm prompt
Diffstat (limited to 'src/game')
-rw-r--r--src/game/GameController.cpp2
-rw-r--r--src/game/GameView.cpp7
2 files changed, 7 insertions, 2 deletions
diff --git a/src/game/GameController.cpp b/src/game/GameController.cpp
index 5c5c928..8ece34b 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 7d3e0c9..085433f 100644
--- a/src/game/GameView.cpp
+++ b/src/game/GameView.cpp
@@ -2,6 +2,7 @@
#include <iomanip>
#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);