X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fapp.cpp;h=14c962e64cde25987c06078e7c6af569b6a02746;hb=e704e6dbd6bd7607e0e484685b8f6997dd9d1286;hp=26b923e0665d34d2a0d5587e1b6b3350886988c4;hpb=4106e1bfd5d478d23fc173ce76d3b6af77f80e04;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/app.cpp b/synfig-studio/trunk/src/gtkmm/app.cpp
index 26b923e..14c962e 100644
--- a/synfig-studio/trunk/src/gtkmm/app.cpp
+++ b/synfig-studio/trunk/src/gtkmm/app.cpp
@@ -113,9 +113,12 @@
 #endif
 
 #ifdef WIN32
+#define _WIN32_WINNT 0x0500
 #include <windows.h>
 #endif
 #include <gtkmm/accelmap.h>
+#include <gtkmm/filechooser.h>
+#include <gtkmm/filechooserdialog.h>
 
 #endif
 
@@ -128,6 +131,14 @@ using namespace studio;
 
 /* === M A C R O S ========================================================= */
 
+#ifndef SYNFIG_USER_APP_DIR
+#ifdef __APPLE__
+#define SYNFIG_USER_APP_DIR	"Library/Synfig"
+#else
+#define SYNFIG_USER_APP_DIR	"Synfig"
+#endif
+#endif
+
 #ifndef DPM2DPI
 #define DPM2DPI(x)	(float(x)/39.3700787402f)
 #define DPI2DPM(x)	(float(x)*39.3700787402f)
@@ -658,7 +669,7 @@ public:
 	}
 };
 
-static Preferences _preferences;
+static ::Preferences _preferences;
 
 void
 init_ui_manager()
@@ -1337,11 +1348,7 @@ App::~App()
 String
 App::get_user_app_directory()
 {
-#ifdef __APPLE__
-	return Glib::build_filename(Glib::get_home_dir(),"Library/Synfig");
-#else
-	return Glib::build_filename(Glib::get_home_dir(),"Synfig");
-#endif
+	return Glib::build_filename(Glib::get_home_dir(),SYNFIG_USER_APP_DIR);
 }
 
 synfig::String
@@ -1653,6 +1660,21 @@ App::dialog_open_file(const std::string &title, std::string &filename)
 	if(!_preferences.get_value("curr_path",prev_path))
 		prev_path=".";
 	
+    Gtk::FileChooserDialog *dialog=new Gtk::FileChooserDialog(title,Gtk::FILE_CHOOSER_ACTION_OPEN);
+    dialog->set_current_folder(prev_path);
+    dialog->add_button(Gtk::StockID("gtk-ok"),GTK_RESPONSE_ACCEPT);
+    dialog->add_button(Gtk::StockID("gtk-cancel"),GTK_RESPONSE_CANCEL);
+    if(!filename.empty())
+        dialog->set_filename(filename);
+    if(dialog->run()==GTK_RESPONSE_ACCEPT) {
+        filename=dialog->get_filename();
+        delete dialog;
+        return true;
+    }
+    delete dialog;
+    return false;
+    /*
+    
 	GtkWidget *ok;
 	GtkWidget *cancel;
 	int val=0;
@@ -1694,6 +1716,7 @@ App::dialog_open_file(const std::string &title, std::string &filename)
 	}
 	gtk_widget_destroy(fileselection);
 	return true;
+    */
 #endif
 }
 
@@ -1742,7 +1765,24 @@ App::dialog_save_file(const std::string &title, std::string &filename)
 	}
 	return false;
 #else
-	return dialog_open_file(title, filename);
+	synfig::String prev_path;
+	if(!_preferences.get_value("curr_path",prev_path))
+		prev_path=".";
+	
+    Gtk::FileChooserDialog *dialog=new Gtk::FileChooserDialog(title,Gtk::FILE_CHOOSER_ACTION_SAVE);
+    dialog->set_current_folder(prev_path);
+    dialog->add_button(Gtk::StockID("gtk-ok"),GTK_RESPONSE_ACCEPT);
+    dialog->add_button(Gtk::StockID("gtk-cancel"),GTK_RESPONSE_CANCEL);
+    if(!filename.empty())
+        dialog->set_filename(filename);
+    if(dialog->run()==GTK_RESPONSE_ACCEPT) {
+        filename=dialog->get_filename();
+        delete dialog;
+        return true;
+    }
+    delete dialog;
+    return false;
+//	return dialog_open_file(title, filename);
 #endif
 }
 
@@ -1791,7 +1831,24 @@ App::dialog_saveas_file(const std::string &title, std::string &filename)
 	}
 	return false;
 #else
-	return dialog_open_file(title, filename);
+	synfig::String prev_path;
+	if(!_preferences.get_value("curr_path",prev_path))
+		prev_path=".";
+	
+    Gtk::FileChooserDialog *dialog=new Gtk::FileChooserDialog(title,Gtk::FILE_CHOOSER_ACTION_SAVE);
+    dialog->set_current_folder(prev_path);
+    dialog->add_button(Gtk::StockID("gtk-ok"),GTK_RESPONSE_ACCEPT);
+    dialog->add_button(Gtk::StockID("gtk-cancel"),GTK_RESPONSE_CANCEL);
+    if(!filename.empty())
+        dialog->set_filename(filename);
+    if(dialog->run()==GTK_RESPONSE_ACCEPT) {
+        filename=dialog->get_filename();
+        delete dialog;
+        return true;
+    }
+    delete dialog;
+    return false;
+//	return dialog_open_file(title, filename);
 #endif
 }