Merge branch 'master' of https://git.maemo.org/projects/drnoksnes

[drnoksnes] / gui / save.c

diff --git a/gui/save.c b/gui/save.c
index 9b87c19..006394e 100644 (file)
--- a/gui/save.c
+++ b/gui/save.c
@@ -29,13 +29,14 @@
 #include <libgnomevfs/gnome-vfs-ops.h>
 #include <libgnomevfs/gnome-vfs-xfer.h>
 #include <hildon/hildon-file-chooser-dialog.h>
+#include <hildon/hildon-banner.h>
 
 #include "plugin.h"
 
 static gchar * cur_save_uri = NULL;
 
 // Pulling nearly all of gnomevfs just to copy a file. *sigh*.
-static void copy_file(const char * source_uri, const char * dest_uri)
+static GnomeVFSResult copy_file(const char * source_uri, const char * dest_uri)
 {
        GnomeVFSURI* src = gnome_vfs_uri_new(source_uri);
        GnomeVFSURI* dst = gnome_vfs_uri_new(dest_uri);
@@ -49,6 +50,19 @@ static void copy_file(const char * source_uri, const char * dest_uri)
 
        gnome_vfs_uri_unref(src);
        gnome_vfs_uri_unref(dst);
+
+       return res;
+}
+
+static gboolean show_result(GnomeVFSResult res, GtkWindow* parent, const char* msg)
+{
+       if (res == GNOME_VFS_OK) {
+               hildon_banner_show_information(GTK_WIDGET(parent), NULL, msg);
+               return TRUE;
+       } else {
+               hildon_banner_show_information(GTK_WIDGET(parent), NULL, "Failed");
+               return FALSE;
+       }
 }
 
 void save_clear()
@@ -71,7 +85,15 @@ static gchar * show_dialog(GtkWindow* parent, GtkFileChooserAction action)
        dialog = hildon_file_chooser_dialog_new_with_properties(GTK_WINDOW(parent), 
                "action", action, "local-only", FALSE, "filter", filter, NULL);
 
-       // TODO Default path
+       hildon_file_chooser_dialog_set_extension(HILDON_FILE_CHOOSER_DIALOG(dialog),
+               "snsg");
+#if defined(MAEMO)
+       {
+               gchar * games_dir = g_strdup_printf("%s/.games", g_getenv("MYDOCSDIR"));
+               gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(dialog), games_dir);
+               g_free(games_dir);
+       }
+#endif
 
        gtk_widget_show_all(GTK_WIDGET(dialog));
        if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_OK) {
@@ -88,13 +110,12 @@ void save_load(GtkWindow* parent)
        gchar * uri = show_dialog(parent, GTK_FILE_CHOOSER_ACTION_OPEN);
 
        if (uri) {
-               gchar * frz_file = game_state_get_frz_file();
+               const gchar * frz_file = game_state_get_frz_file();
                gchar * frz_uri = gnome_vfs_get_uri_from_local_path(frz_file);
-               copy_file(uri, frz_uri);
+               show_result(copy_file(uri, frz_uri), parent, "Game loaded");
                g_free(frz_uri);
-               g_free(frz_file);
        }
-       
+
        if (cur_save_uri) {
                g_free(cur_save_uri);
        }
@@ -104,11 +125,10 @@ void save_load(GtkWindow* parent)
 void save_save(GtkWindow* parent)
 {
        if (cur_save_uri) {
-               gchar * frz_file = game_state_get_frz_file();
+               const gchar * frz_file = game_state_get_frz_file();
                gchar * frz_uri = gnome_vfs_get_uri_from_local_path(frz_file);
-               copy_file(frz_uri, cur_save_uri);
+               show_result(copy_file(frz_uri, cur_save_uri), parent, "Game saved");
                g_free(frz_uri);
-               g_free(frz_file);
        } else {
                save_save_as(parent);
        }
@@ -119,11 +139,12 @@ void save_save_as(GtkWindow* parent)
        gchar * uri = show_dialog(parent, GTK_FILE_CHOOSER_ACTION_SAVE);
 
        if (uri) {
-               gchar * frz_file = game_state_get_frz_file();
+               const gchar * frz_file = game_state_get_frz_file();
                gchar * frz_uri = gnome_vfs_get_uri_from_local_path(frz_file);
-               copy_file(frz_uri, uri);
+               gboolean res = show_result(copy_file(frz_uri, uri), parent, "Game saved");
                g_free(frz_uri);
-               g_free(frz_file);
+
+               if (!res) return;
 
                if (cur_save_uri) {
                        g_free(cur_save_uri);