Really really fix 1568925, gawd I suck. This time I tested it, yes I did. YAY NEW...

[synfig.git] / synfig-studio / trunk / src / gtkmm / app.cpp

diff --git a/synfig-studio/trunk/src/gtkmm/app.cpp b/synfig-studio/trunk/src/gtkmm/app.cpp
index 205a0bd..033e285 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/app.cpp
+++ b/synfig-studio/trunk/src/gtkmm/app.cpp
@@ -2,7 +2,7 @@
 /*!    \file app.cpp
 **     \brief writeme
 **
 /*!    \file app.cpp
 **     \brief writeme
 **

-**     $Id: app.cpp,v 1.11 2005/03/24 21:47:28 darco Exp $
+**     $Id$

 **
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **
 **     \legal
 **     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley


@@ -136,8 +136,10 @@ using namespace studio;
 #ifndef SYNFIG_USER_APP_DIR
 #ifdef __APPLE__
 #define SYNFIG_USER_APP_DIR    "Library/Synfig"
 #ifndef SYNFIG_USER_APP_DIR
 #ifdef __APPLE__
 #define SYNFIG_USER_APP_DIR    "Library/Synfig"

-#else
+#elif defined(_WIN32)

 #define SYNFIG_USER_APP_DIR    "Synfig"
 #define SYNFIG_USER_APP_DIR    "Synfig"

+#else
+#define SYNFIG_USER_APP_DIR    ".synfig"

 #endif
 #endif
 
 #endif
 #endif
 


@@ -962,8 +964,18 @@ init_ui_manager()
        }
 
        // Add default keyboard accelerators
        }
 
        // Add default keyboard accelerators

-#define ACCEL(path,accel)      { Gtk::AccelKey accel_key(accel,path); Gtk::AccelMap::add_entry(accel_key.get_path(), accel_key.get_key(),accel_key.get_mod()); }
-#define ACCEL2(accel)  { Gtk::AccelKey accel_key(accel); Gtk::AccelMap::add_entry(accel_key.get_path(), accel_key.get_key(),accel_key.get_mod()); }
+#define ACCEL(path,accel)                                              \
+       {                                                                                       \
+               Gtk::AccelKey accel_key(accel,path);    \
+               Gtk::AccelMap::add_entry(accel_key.get_path(), accel_key.get_key(), accel_key.get_mod());       \
+       }
+
+#define ACCEL2(accel)                                                  \
+       {                                                                                       \
+               Gtk::AccelKey accel_key(accel);                 \
+               Gtk::AccelMap::add_entry(accel_key.get_path(), accel_key.get_key(), accel_key.get_mod());       \
+       }
+

        ACCEL("<Actions>//select-all-ducks","<Control>a");
        ACCEL("<Actions>//unselect-all-layers","<Control>d");
        ACCEL("<Actions>//render","F9");
        ACCEL("<Actions>//select-all-ducks","<Control>a");
        ACCEL("<Actions>//unselect-all-layers","<Control>d");
        ACCEL("<Actions>//render","F9");


@@ -982,7 +994,6 @@ init_ui_manager()
        ACCEL("<Actions>//mask-width-ducks", "<Mod1>5");
        ACCEL("<Actions>//mask-angle-ducks", "<Mod1>6");
 
        ACCEL("<Actions>//mask-width-ducks", "<Mod1>5");
        ACCEL("<Actions>//mask-angle-ducks", "<Mod1>6");
 

-

        ACCEL2(Gtk::AccelKey(GDK_Page_Up,Gdk::SHIFT_MASK,"<Actions>//action-layer_raise"));
        ACCEL2(Gtk::AccelKey(GDK_Page_Down,Gdk::SHIFT_MASK,"<Actions>//action-layer_lower"));
 
        ACCEL2(Gtk::AccelKey(GDK_Page_Up,Gdk::SHIFT_MASK,"<Actions>//action-layer_raise"));
        ACCEL2(Gtk::AccelKey(GDK_Page_Down,Gdk::SHIFT_MASK,"<Actions>//action-layer_lower"));
 


@@ -1078,12 +1089,12 @@ App::App(int *argc, char ***argv):
                if(!SYNFIG_CHECK_VERSION())
                {
                cerr<<"FATAL: Synfig Version Mismatch"<<endl;
                if(!SYNFIG_CHECK_VERSION())
                {
                cerr<<"FATAL: Synfig Version Mismatch"<<endl;

-               dialog_error_blocking("SYNFIG Studio",
-                       "This copy of SYNFIG Studio was compiled against a\n"
+               dialog_error_blocking("Synfig Studio",
+                       "This copy of Synfig Studio was compiled against a\n"

                        "different version of libsynfig than what is currently\n"
                        "installed. Synfig Studio will now abort. Try downloading\n"
                        "different version of libsynfig than what is currently\n"
                        "installed. Synfig Studio will now abort. Try downloading\n"

-                       "the latest version from the SYNFIG Development Website at\n"
-                       "http://dev.synfig.com/ "
+                       "the latest version from the Synfig website at\n"
+                       "http://www.synfig.com/ "

                );
                throw 40;
                }
                );
                throw 40;
                }


@@ -1091,15 +1102,15 @@ App::App(int *argc, char ***argv):
        catch(synfig::SoftwareExpired)
        {
                cerr<<"FATAL: Software Expired"<<endl;
        catch(synfig::SoftwareExpired)
        {
                cerr<<"FATAL: Software Expired"<<endl;

-               dialog_error_blocking("SYNFIG Studio",
-                       "This copy of SYNFIG Studio has expired.\n"
+               dialog_error_blocking("Synfig Studio",
+                       "This copy of Synfig Studio has expired.\n"

                        "Please erase this copy, or download and\n"
                        "Please erase this copy, or download and\n"

-                       "install the latest copy from the SYNFIG\n"
-                       "Development Website at http://dev.synfig.com/ ."
+                       "install the latest copy from the Synfig\n"
+                       "website at http://www.synfig.com/ ."

                );
                throw 39;
        }
                );
                throw 39;
        }

-       Glib::set_application_name(_("SYNFIG Studio"));
+       Glib::set_application_name(_("Synfig Studio"));

 
        About about_window;
        about_window.set_can_self_destruct(false);
 
        About about_window;
        about_window.set_can_self_destruct(false);


@@ -1238,6 +1249,7 @@ App::App(int *argc, char ***argv):
                studio_init_cb.task("Init Input Dialog...");
                dialog_input=new Gtk::InputDialog();
                dialog_input->get_close_button()->signal_clicked().connect( sigc::mem_fun( *dialog_input, &Gtk::InputDialog::hide ) );
                studio_init_cb.task("Init Input Dialog...");
                dialog_input=new Gtk::InputDialog();
                dialog_input->get_close_button()->signal_clicked().connect( sigc::mem_fun( *dialog_input, &Gtk::InputDialog::hide ) );

+               dialog_input->get_save_button()->signal_clicked().connect( sigc::ptr_fun(studio::App::dialog_not_implemented) );

 
                studio_init_cb.task("Init auto recovery...");
                auto_recover=new AutoRecover();
 
                studio_init_cb.task("Init auto recovery...");
                auto_recover=new AutoRecover();


@@ -1255,7 +1267,7 @@ App::App(int *argc, char ***argv):
                        if(
                                get_ui_interface()->yes_no(
                                        "Auto Recovery",
                        if(
                                get_ui_interface()->yes_no(
                                        "Auto Recovery",

-                                       "SYNFIG Studio seems to have crashed\n"
+                                       "Synfig Studio seems to have crashed\n"

                                        "before you could save all your files.\n"
                                        "Would you like to re-open those files\n"
                                        "and recover your unsaved changes?"
                                        "before you could save all your files.\n"
                                        "Would you like to re-open those files\n"
                                        "and recover your unsaved changes?"


@@ -1268,7 +1280,7 @@ App::App(int *argc, char ***argv):
                                }
                                else
                                get_ui_interface()->error(
                                }
                                else
                                get_ui_interface()->error(

-                                       _("SYNFIG Studio has attempted to recover\n"
+                                       _("Synfig Studio has attempted to recover\n"

                                        "from a previous crash. The files that it has\n"
                                        "recovered are NOT YET SAVED. It would be a good\n"
                                        "idea to review them and save them now.")
                                        "from a previous crash. The files that it has\n"
                                        "recovered are NOT YET SAVED. It would be a good\n"
                                        "idea to review them and save them now.")