summaryrefslogtreecommitdiff
path: root/src/game/GameView.cpp
diff options
context:
space:
mode:
authorSimon Robertshaw <simon@hardwired.org.uk>2012-08-04 12:40:39 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-08-04 12:40:39 (GMT)
commit268795eec167a5fdeadef86dabbedac258e5b20a (patch)
treeb0c2e8c06ba8454c6191bd87066cb7bb19a6fbe2 /src/game/GameView.cpp
parentab8466e9908d3982d498b63197bb80ffb489f3c1 (diff)
downloadpowder-268795eec167a5fdeadef86dabbedac258e5b20a.zip
powder-268795eec167a5fdeadef86dabbedac258e5b20a.tar.gz
Add date to Preview View, fixes issue #64
Diffstat (limited to 'src/game/GameView.cpp')
-rw-r--r--src/game/GameView.cpp17
1 files changed, 9 insertions, 8 deletions
diff --git a/src/game/GameView.cpp b/src/game/GameView.cpp
index b0736b4..838f733 100644
--- a/src/game/GameView.cpp
+++ b/src/game/GameView.cpp
@@ -12,6 +12,7 @@
#include "interface/Slider.h"
#include "search/Thumbnail.h"
#include "simulation/SaveRenderer.h"
+#include "Format.h"
#include "QuickOption.h"
GameView::GameView():
@@ -603,10 +604,10 @@ void GameView::NotifyColourSelectorColourChanged(GameModel * sender)
{
std::string intR, intG, intB, intA;
- intR = NumberToString<int>(sender->GetColourSelectorColour().Red);
- intG = NumberToString<int>(sender->GetColourSelectorColour().Green);
- intB = NumberToString<int>(sender->GetColourSelectorColour().Blue);
- intA = NumberToString<int>(sender->GetColourSelectorColour().Alpha);
+ intR = format::NumberToString<int>(sender->GetColourSelectorColour().Red);
+ intG = format::NumberToString<int>(sender->GetColourSelectorColour().Green);
+ intB = format::NumberToString<int>(sender->GetColourSelectorColour().Blue);
+ intA = format::NumberToString<int>(sender->GetColourSelectorColour().Alpha);
colourRSlider->SetValue(sender->GetColourSelectorColour().Red);
colourRSlider->SetColour(ui::Colour(0, 0, 0), ui::Colour(255, 0, 0));
@@ -1318,10 +1319,10 @@ void GameView::changeColourSlider()
void GameView::changeColourText()
{
c->SetColour(ui::Colour(
- std::min(255U, StringToNumber<unsigned int>(colourRValue->GetText())),
- std::min(255U, StringToNumber<unsigned int>(colourGValue->GetText())),
- std::min(255U, StringToNumber<unsigned int>(colourBValue->GetText())),
- std::min(255U, StringToNumber<unsigned int>(colourAValue->GetText())))
+ std::min(255U, format::StringToNumber<unsigned int>(colourRValue->GetText())),
+ std::min(255U, format::StringToNumber<unsigned int>(colourGValue->GetText())),
+ std::min(255U, format::StringToNumber<unsigned int>(colourBValue->GetText())),
+ std::min(255U, format::StringToNumber<unsigned int>(colourAValue->GetText())))
);
}