Local Saving, Server Saving rewrite

5 files changed, 390 insertions, 0 deletions

diff --git a/src/save/LocalSaveActivity.cpp b/src/save/LocalSaveActivity.cpp
new file mode 100644
index 0000000..2c7d5b6
--- /dev/null
+++ b/src/save/LocalSaveActivity.cpp
@@ -0,0 +1,130 @@
+#include "LocalSaveActivity.h"
+#include "interface/Label.h"
+#include "interface/Textbox.h"
+#include "interface/Button.h"
+#include "search/Thumbnail.h"
+#include "client/ThumbnailBroker.h"
+#include "dialogues/ErrorMessage.h"
+#include "dialogues/ConfirmPrompt.h"
+#include "client/Client.h"
+#include "Style.h"
+
+class LocalSaveActivity::CancelAction: public ui::ButtonAction
+{
+	LocalSaveActivity * a;
+public:
+	CancelAction(LocalSaveActivity * a) : a(a) {}
+	virtual void ActionCallback(ui::Button * sender)
+	{
+		a->Exit();
+	}
+};
+
+class LocalSaveActivity::SaveAction: public ui::ButtonAction
+{
+	LocalSaveActivity * a;
+public:
+	SaveAction(LocalSaveActivity * a) : a(a) {}
+	virtual void ActionCallback(ui::Button * sender)
+	{
+		a->Save();
+	}
+};
+
+LocalSaveActivity::LocalSaveActivity(SaveFile save) :
+	WindowActivity(ui::Point(-1, -1), ui::Point(220, 200)),
+	thumbnail(NULL),
+	save(save)
+{
+	ui::Label * titleLabel = new ui::Label(ui::Point(4, 5), ui::Point(Size.X-8, 16), "Save to computer:");
+	titleLabel->SetTextColour(style::Colour::InformationTitle);
+	titleLabel->Appearance.HorizontalAlign = ui::Appearance::AlignLeft;
+	titleLabel->Appearance.VerticalAlign = ui::Appearance::AlignMiddle;
+	AddComponent(titleLabel);
+
+	filenameField = new ui::Textbox(ui::Point(8, 25), ui::Point(Size.X-16, 16), save.GetDisplayName(), "[filename]");
+	filenameField->Appearance.VerticalAlign = ui::Appearance::AlignMiddle;
+	filenameField->Appearance.HorizontalAlign = ui::Appearance::AlignLeft;
+	AddComponent(filenameField);
+
+	ui::Button * cancelButton = new ui::Button(ui::Point(0, Size.Y-16), ui::Point(Size.X-50, 16), "Cancel");
+	cancelButton->Appearance.HorizontalAlign = ui::Appearance::AlignLeft;
+	cancelButton->Appearance.VerticalAlign = ui::Appearance::AlignMiddle;
+	cancelButton->Appearance.BorderInactive = ui::Colour(200, 200, 200);
+	cancelButton->SetActionCallback(new CancelAction(this));
+	AddComponent(cancelButton);
+
+	ui::Button * okayButton = new ui::Button(ui::Point(Size.X-76, Size.Y-16), ui::Point(76, 16), "Save");
+	okayButton->Appearance.HorizontalAlign = ui::Appearance::AlignLeft;
+	okayButton->Appearance.VerticalAlign = ui::Appearance::AlignMiddle;
+	okayButton->Appearance.TextInactive = style::Colour::InformationTitle;
+	okayButton->SetActionCallback(new SaveAction(this));
+	AddComponent(okayButton);
+
+	if(save.GetGameSave())
+		ThumbnailBroker::Ref().RenderThumbnail(save.GetGameSave(), Size.X-16, -1, this);
+}
+
+void LocalSaveActivity::Save()
+{
+	class FileOverwriteConfirmation: public ConfirmDialogueCallback {
+	public:
+		LocalSaveActivity * a;
+		std::string filename;
+		FileOverwriteConfirmation(LocalSaveActivity * a, std::string finalFilename) : a(a), filename(finalFilename) {}
+		virtual void ConfirmCallback(ConfirmPrompt::DialogueResult result) {
+			if (result == ConfirmPrompt::ResultOkay)
+			{
+				a->saveWrite(filename);
+				a->Exit();
+			}
+		}
+		virtual ~FileOverwriteConfirmation() { }
+	};
+
+	if(filenameField->GetText().length())
+	{
+		std::string finalFilename = std::string(LOCAL_SAVE_DIR) + std::string(PATH_SEP) + filenameField->GetText() + ".cps";
+		if(Client::Ref().FileExists(finalFilename))
+		{
+			new ConfirmPrompt("Overwrite file", "Are you sure you wish to overwrite\n"+finalFilename, new FileOverwriteConfirmation(this, finalFilename));
+		}
+		else
+		{
+			saveWrite(finalFilename);
+			Exit();
+		}
+	}
+	else
+	{
+		new ErrorMessage("Error", "You must specify a filename.");
+	}
+}
+
+void LocalSaveActivity::saveWrite(std::string finalFilename)
+{
+	Client::Ref().WriteFile(save.GetGameSave()->Serialise(), finalFilename);
+}
+
+void LocalSaveActivity::OnDraw()
+{
+	Graphics * g = ui::Engine::Ref().g;
+	g->clearrect(Position.X-2, Position.Y-2, Size.X+3, Size.Y+3);
+	g->drawrect(Position.X, Position.Y, Size.X, Size.Y, 255, 255, 255, 255);
+
+	if(thumbnail)
+	{
+		g->draw_image(thumbnail->Data, Position.X+(Size.X-thumbnail->Size.X)/2, Position.Y+45, thumbnail->Size.X, thumbnail->Size.Y, 255);
+		g->drawrect(Position.X+(Size.X-thumbnail->Size.X)/2, Position.Y+45, thumbnail->Size.X, thumbnail->Size.Y, 180, 180, 180, 255);
+	}
+}
+
+void LocalSaveActivity::OnThumbnailReady(Thumbnail * thumbnail)
+{
+	this->thumbnail = thumbnail;
+}
+
+LocalSaveActivity::~LocalSaveActivity()
+{
+
+}
\ No newline at end of file
diff --git a/src/save/LocalSaveActivity.h b/src/save/LocalSaveActivity.h
new file mode 100644
index 0000000..b5d19f3
--- /dev/null
+++ b/src/save/LocalSaveActivity.h
@@ -0,0 +1,30 @@
+#pragma once
+
+#include "Activity.h"
+#include "client/SaveFile.h"
+#include "client/ThumbnailListener.h"
+
+namespace ui
+{
+	class Textbox;
+}
+
+class Thumbnail;
+
+class LocalSaveActivity: public WindowActivity, public ThumbnailListener
+{
+	SaveFile save;
+	Thumbnail * thumbnail;
+	ui::Textbox * filenameField;
+	class CancelAction;
+	class SaveAction;
+	friend class CancelAction;
+	friend class SaveAction;
+public:
+	LocalSaveActivity(SaveFile save);
+	void saveWrite(std::string finalFilename);
+	virtual void Save();
+	virtual void OnDraw();
+	virtual void OnThumbnailReady(Thumbnail * thumbnail);
+	virtual ~LocalSaveActivity();
+};
\ No newline at end of file
diff --git a/src/save/SSaveView.h b/src/save/SSaveView.h
new file mode 100644
index 0000000..f8e051d
--- /dev/null
+++ b/src/save/SSaveView.h
@@ -0,0 +1,39 @@
+/*
+ * SSaveView.h
+ *
+ *  Created on: Jan 29, 2012
+ *      Author: Simon
+ */
+
+#ifndef SSAVEVIEW_H_
+#define SSAVEVIEW_H_
+
+#include "interface/Window.h"
+#include "interface/Label.h"
+#include "interface/Button.h"
+#include "interface/Textbox.h"
+#include "interface/Textarea.h"
+#include "interface/Checkbox.h"
+#include "SSaveModel.h"
+#include "SSaveController.h"
+
+class SSaveController;
+class SSaveModel;
+class SSaveView: public ui::Window {
+	SSaveController * c;
+	ui::Checkbox * publishCheckbox;
+	ui::Button * saveButton;
+	ui::Button * closeButton;
+	ui::Textbox * nameField;
+	ui::Label * titleLabel;
+	ui::Textarea * descriptionField;
+public:
+	SSaveView();
+	void AttachController(SSaveController * c_) { c = c_; };
+	void NotifySaveChanged(SSaveModel * sender);
+	void NotifySaveUploadChanged(SSaveModel * sender);
+	virtual void OnDraw();
+	virtual ~SSaveView();
+};
+
+#endif /* SSAVEVIEW_H_ */
diff --git a/src/save/ServerSaveActivity.cpp b/src/save/ServerSaveActivity.cpp
new file mode 100644
index 0000000..b90d0e6
--- /dev/null
+++ b/src/save/ServerSaveActivity.cpp
@@ -0,0 +1,149 @@
+#include "ServerSaveActivity.h"
+#include "interface/Label.h"
+#include "interface/Textbox.h"
+#include "interface/Button.h"
+#include "interface/Checkbox.h"
+#include "search/Thumbnail.h"
+#include "client/ThumbnailBroker.h"
+#include "dialogues/ErrorMessage.h"
+#include "dialogues/ConfirmPrompt.h"
+#include "client/Client.h"
+#include "Style.h"
+
+class ServerSaveActivity::CancelAction: public ui::ButtonAction
+{
+	ServerSaveActivity * a;
+public:
+	CancelAction(ServerSaveActivity * a) : a(a) {}
+	virtual void ActionCallback(ui::Button * sender)
+	{
+		a->Exit();
+	}
+};
+
+class ServerSaveActivity::SaveAction: public ui::ButtonAction
+{
+	ServerSaveActivity * a;
+public:
+	SaveAction(ServerSaveActivity * a) : a(a) {}
+	virtual void ActionCallback(ui::Button * sender)
+	{
+		a->Save();
+	}
+};
+
+ServerSaveActivity::ServerSaveActivity(SaveInfo save, ServerSaveActivity::SaveUploadedCallback * callback) :
+	WindowActivity(ui::Point(-1, -1), ui::Point(440, 200)),
+	thumbnail(NULL),
+	save(save),
+	callback(callback)
+{
+	ui::Label * titleLabel = new ui::Label(ui::Point(4, 5), ui::Point((Size.X/2)-8, 16), "Save to server:");
+	titleLabel->SetTextColour(style::Colour::InformationTitle);
+	titleLabel->Appearance.HorizontalAlign = ui::Appearance::AlignLeft;
+	titleLabel->Appearance.VerticalAlign = ui::Appearance::AlignMiddle;
+	AddComponent(titleLabel);
+
+	ui::Label * previewLabel = new ui::Label(ui::Point((Size.X/2)+4, 5), ui::Point((Size.X/2)-8, 16), "Preview:");
+	previewLabel->SetTextColour(style::Colour::InformationTitle);
+	previewLabel->Appearance.HorizontalAlign = ui::Appearance::AlignLeft;
+	previewLabel->Appearance.VerticalAlign = ui::Appearance::AlignMiddle;
+	AddComponent(previewLabel);
+
+	nameField = new ui::Textbox(ui::Point(8, 25), ui::Point((Size.X/2)-16, 16), save.GetName(), "[save name]");
+	nameField->Appearance.VerticalAlign = ui::Appearance::AlignMiddle;
+	nameField->Appearance.HorizontalAlign = ui::Appearance::AlignLeft;
+	AddComponent(nameField);
+
+	descriptionField = new ui::Textbox(ui::Point(8, 65), ui::Point((Size.X/2)-16, Size.Y-(65+16+4)), save.GetDescription(), "[save description]");
+	descriptionField->SetMultiline(true);
+	descriptionField->Appearance.VerticalAlign = ui::Appearance::AlignTop;
+	descriptionField->Appearance.HorizontalAlign = ui::Appearance::AlignLeft;
+	AddComponent(descriptionField);
+
+	publishedCheckbox = new ui::Checkbox(ui::Point(8, 45), ui::Point((Size.X/2)-16, 16), "Publish");
+	publishedCheckbox->SetChecked(save.GetPublished());
+	AddComponent(publishedCheckbox);
+
+	ui::Button * cancelButton = new ui::Button(ui::Point(0, Size.Y-16), ui::Point((Size.X/2)-50, 16), "Cancel");
+	cancelButton->Appearance.HorizontalAlign = ui::Appearance::AlignLeft;
+	cancelButton->Appearance.VerticalAlign = ui::Appearance::AlignMiddle;
+	cancelButton->Appearance.BorderInactive = ui::Colour(200, 200, 200);
+	cancelButton->SetActionCallback(new CancelAction(this));
+	AddComponent(cancelButton);
+
+	ui::Button * okayButton = new ui::Button(ui::Point((Size.X/2)-76, Size.Y-16), ui::Point(76, 16), "Save");
+	okayButton->Appearance.HorizontalAlign = ui::Appearance::AlignLeft;
+	okayButton->Appearance.VerticalAlign = ui::Appearance::AlignMiddle;
+	okayButton->Appearance.TextInactive = style::Colour::InformationTitle;
+	okayButton->SetActionCallback(new SaveAction(this));
+	AddComponent(okayButton);
+
+	if(save.GetGameSave())
+		ThumbnailBroker::Ref().RenderThumbnail(save.GetGameSave(), (Size.X/2)-16, -1, this);
+}
+
+void ServerSaveActivity::Save()
+{
+	if(nameField->GetText().length())
+	{
+		saveUpload();
+		Exit();
+	}
+	else
+	{
+		new ErrorMessage("Error", "You must specify a save name.");
+	}
+}
+
+void ServerSaveActivity::saveUpload()
+{
+	save.SetName(nameField->GetText());
+	save.SetDescription(descriptionField->GetText());
+	save.SetPublished(publishedCheckbox->GetChecked());
+	save.SetUserName(Client::Ref().GetAuthUser().Username);
+	save.SetID(0);
+
+	if(Client::Ref().UploadSave(save) != RequestOkay)
+	{
+		new ErrorMessage("Error", "Upload failed with error:\n"+Client::Ref().GetLastError());
+	}
+	else if(callback)
+	{
+		callback->SaveUploaded(save);
+	}
+}
+
+void ServerSaveActivity::Exit()
+{
+	if(callback)
+	{
+		delete callback;
+		callback = NULL;
+	}
+	WindowActivity::Exit();
+}
+
+void ServerSaveActivity::OnDraw()
+{
+	Graphics * g = ui::Engine::Ref().g;
+	g->clearrect(Position.X-2, Position.Y-2, Size.X+3, Size.Y+3);
+	g->drawrect(Position.X, Position.Y, Size.X, Size.Y, 255, 255, 255, 255);
+	g->draw_line(Position.X+(Size.X/2)-1, Position.Y, Position.X+(Size.X/2)-1, Position.Y+Size.Y-1, 255, 255, 255, 255);
+
+	if(thumbnail)
+	{
+		g->draw_image(thumbnail->Data, Position.X+(Size.X/2)+((Size.X/2)-thumbnail->Size.X)/2, Position.Y+25, thumbnail->Size.X, thumbnail->Size.Y, 255);
+		g->drawrect(Position.X+(Size.X/2)+((Size.X/2)-thumbnail->Size.X)/2, Position.Y+25, thumbnail->Size.X, thumbnail->Size.Y, 180, 180, 180, 255);
+	}
+}
+
+void ServerSaveActivity::OnThumbnailReady(Thumbnail * thumbnail)
+{
+	this->thumbnail = thumbnail;
+}
+
+ServerSaveActivity::~ServerSaveActivity()
+{
+
+}
\ No newline at end of file
diff --git a/src/save/ServerSaveActivity.h b/src/save/ServerSaveActivity.h
new file mode 100644
index 0000000..2a383f3
--- /dev/null
+++ b/src/save/ServerSaveActivity.h
@@ -0,0 +1,42 @@
+#pragma once
+
+#include "Activity.h"
+#include "client/SaveInfo.h"
+#include "client/ThumbnailListener.h"
+
+namespace ui
+{
+	class Textbox;
+	class Checkbox;
+}
+
+class Thumbnail;
+class ServerSaveActivity: public WindowActivity, public ThumbnailListener
+{
+public:
+	class SaveUploadedCallback
+	{
+	public:
+		SaveUploadedCallback() {}
+		virtual  ~SaveUploadedCallback() {}
+		virtual void SaveUploaded(SaveInfo save) {}
+	};
+	ServerSaveActivity(SaveInfo save, SaveUploadedCallback * callback);
+	void saveUpload();
+	virtual void Save();
+	virtual void Exit();
+	virtual void OnDraw();
+	virtual void OnThumbnailReady(Thumbnail * thumbnail);
+	virtual ~ServerSaveActivity();
+protected:
+	SaveUploadedCallback * callback;
+	SaveInfo save;
+	Thumbnail * thumbnail;
+	ui::Textbox * nameField;
+	ui::Textbox * descriptionField;
+	ui::Checkbox * publishedCheckbox;
+	class CancelAction;
+	class SaveAction;
+	friend class CancelAction;
+	friend class SaveAction;
+};
\ No newline at end of file