Local Saving, Server Saving rewrite

2 files changed, 3 insertions, 11 deletions

diff --git a/src/filebrowser/FileBrowserActivity.cpp b/src/filebrowser/FileBrowserActivity.cpp
index 4bb68fa..787afd3 100644
--- a/src/filebrowser/FileBrowserActivity.cpp
+++ b/src/filebrowser/FileBrowserActivity.cpp
@@ -105,12 +105,11 @@ public:
 };
 
 FileBrowserActivity::FileBrowserActivity(std::string directory, FileSelectedCallback * callback):
-	ui::Window(ui::Point(-1, -1), ui::Point(450, 300)),
+	WindowActivity(ui::Point(-1, -1), ui::Point(450, 300)),
 	callback(callback),
 	directory(directory),
 	totalFiles(0)
 {
-	ui::Engine::Ref().ShowWindow(this);
 
 	ui::Label * titleLabel = new ui::Label(ui::Point(4, 5), ui::Point(Size.X-8, 18), "Save Browser");
 	titleLabel->SetTextColour(style::Colour::WarningTitle);
@@ -216,12 +215,6 @@ void FileBrowserActivity::OnMouseDown(int x, int y, unsigned button)
 		Exit();
 }
 
-void FileBrowserActivity::Exit()
-{
-	ui::Engine::Ref().CloseWindow();
-	SelfDestruct();
-}
-
 void FileBrowserActivity::NotifyError(Task * task)
 {
 
diff --git a/src/filebrowser/FileBrowserActivity.h b/src/filebrowser/FileBrowserActivity.h
index 3eb99d6..693a16d 100644
--- a/src/filebrowser/FileBrowserActivity.h
+++ b/src/filebrowser/FileBrowserActivity.h
@@ -2,6 +2,7 @@
 
 #include <vector>
 #include <string>
+#include "Activity.h"
 #include "interface/Window.h"
 #include "tasks/TaskListener.h"
 
@@ -23,7 +24,7 @@ namespace ui
 }
 
 class LoadFilesTask;
-class FileBrowserActivity: public ui::Window, public TaskListener
+class FileBrowserActivity: public TaskListener, public WindowActivity
 {
 	LoadFilesTask * loadFiles;
 	FileSelectedCallback * callback;
@@ -58,6 +59,4 @@ public:
 	virtual void NotifyError(Task * task);
 	virtual void NotifyProgress(Task * task);
 	virtual void NotifyStatus(Task * task);
-
-	void Exit();
 };
\ No newline at end of file