Update Help menu entries to the new wiki address. Add a new macro for "website" links.

diff --git a/synfig-studio/src/gtkmm/about.cpp b/synfig-studio/src/gtkmm/about.cpp
index 600d135..dc005ff 100644 (file)
--- a/synfig-studio/src/gtkmm/about.cpp
+++ b/synfig-studio/src/gtkmm/about.cpp
@@ -104,7 +104,7 @@ About::About()
        set_comments(_("2D vector animation studio"));
 
        set_url_hook(sigc::mem_fun(*this, &About::on_link_clicked));
        set_comments(_("2D vector animation studio"));
 
        set_url_hook(sigc::mem_fun(*this, &About::on_link_clicked));

-       set_website("http://www.synfig.org/");
+       set_website("http://synfig.org/");

        set_website_label(_("Visit the Synfig website"));
 
        set_copyright(_("Copyright 2001-2008\nRobert B. Quattlebaum Jr.,\nAdrian Bentley and Synfig contributors"));
        set_website_label(_("Visit the Synfig website"));
 
        set_copyright(_("Copyright 2001-2008\nRobert B. Quattlebaum Jr.,\nAdrian Bentley and Synfig contributors"));

diff --git a/synfig-studio/src/gtkmm/app.cpp b/synfig-studio/src/gtkmm/app.cpp
index 232a323..54d0c36 100644 (file)
--- a/synfig-studio/src/gtkmm/app.cpp
+++ b/synfig-studio/src/gtkmm/app.cpp
@@ -1182,7 +1182,7 @@ App::App(int *argc, char ***argv):
                        "different version of libsynfig than what is currently\n"
                        "installed. Synfig Studio will now abort. Try downloading\n"
                        "the latest version from the Synfig website at\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 website at\n"

-                       "http://synfig.org/Download"
+                       "http://synfig.org/en/current-release"

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


@@ -2292,10 +2292,10 @@ try_open_url(const std::string &url)
 void
 App::dialog_help()
 {
 void
 App::dialog_help()
 {

-       if (!try_open_url("http://synfig.org/Documentation"))
+       if (!try_open_url("http://synfig.org/wiki/Category:Manual"))

        {
                Gtk::MessageDialog dialog(_("Documentation"), false, Gtk::MESSAGE_INFO, Gtk::BUTTONS_CLOSE, true);
        {
                Gtk::MessageDialog dialog(_("Documentation"), false, Gtk::MESSAGE_INFO, Gtk::BUTTONS_CLOSE, true);

-               dialog.set_secondary_text(_("Documentation for Synfig Studio is available on the website:\n\nhttp://www.synfig.org/Documentation"));
+               dialog.set_secondary_text(_("Documentation for Synfig Studio is available on the website:\n\nhttp://synfig.org/wiki/Category:Manual"));

                dialog.set_title(_("Help"));
                dialog.run();
        }
                dialog.set_title(_("Help"));
                dialog.run();
        }

diff --git a/synfig-studio/src/gtkmm/toolbox.cpp b/synfig-studio/src/gtkmm/toolbox.cpp
index af2931e..bd975e2 100644 (file)
--- a/synfig-studio/src/gtkmm/toolbox.cpp
+++ b/synfig-studio/src/gtkmm/toolbox.cpp
@@ -261,20 +261,21 @@ Toolbox::Toolbox():
 
 #define WIKI(title,page)                                                                                       \
        helpmenu->items().push_back(Gtk::Menu_Helpers::MenuElem(title,  \
 
 #define WIKI(title,page)                                                                                       \
        helpmenu->items().push_back(Gtk::Menu_Helpers::MenuElem(title,  \

+               sigc::bind(sigc::ptr_fun(&studio::App::open_url),String("http://synfig.org/wiki")+page)))
+
+#define SITE(title,page)                                                                                       \
+       helpmenu->items().push_back(Gtk::Menu_Helpers::MenuElem(title,  \

                sigc::bind(sigc::ptr_fun(&studio::App::open_url),String("http://synfig.org")+page)))
 
        Gtk::Menu       *helpmenu = manage(new class Gtk::Menu());
        helpmenu->items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::Stock::HELP, sigc::ptr_fun(studio::App::dialog_help)));
        helpmenu->items().push_back(Gtk::Menu_Helpers::SeparatorElem());
 
                sigc::bind(sigc::ptr_fun(&studio::App::open_url),String("http://synfig.org")+page)))
 
        Gtk::Menu       *helpmenu = manage(new class Gtk::Menu());
        helpmenu->items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::Stock::HELP, sigc::ptr_fun(studio::App::dialog_help)));
        helpmenu->items().push_back(Gtk::Menu_Helpers::SeparatorElem());
 

-       /* TRANSLATORS: Help menu entry */ WIKI(_("Synfig Wiki"),                               /* TRANSLATORS: a wiki page */ _("/Main_Page")                          );
-       /* TRANSLATORS: Help menu entry */ WIKI(_("Tutorials"),                                 /* TRANSLATORS: a wiki page */ _("/Tutorials")                          );
+       /* TRANSLATORS: Help menu entry */ WIKI(_("Tutorials"),                                 /* TRANSLATORS: a wiki page */ _("/Category:Tutorials")                         );
+       /* TRANSLATORS: Help menu entry */ WIKI(_("Reference"),                                 /* TRANSLATORS: a wiki page */ _("/Category:Reference")                         );

        /* TRANSLATORS: Help menu entry */ WIKI(_("Frequently Asked Questions"),/* TRANSLATORS: a wiki page */ _("/FAQ")                                        );
        /* TRANSLATORS: Help menu entry */ WIKI(_("Frequently Asked Questions"),/* TRANSLATORS: a wiki page */ _("/FAQ")                                        );

-       /* TRANSLATORS: Help menu entry */ WIKI(_("Get Support"),                               /* TRANSLATORS: a wiki page */ _("/Contact")                    );
-       /* TRANSLATORS: Help menu entry */ WIKI(_("Keyboard Shortcuts"),                /* TRANSLATORS: a wiki page */ _("/Keyboard_Shortcuts")         );
-       /* TRANSLATORS: Help menu entry */ WIKI(_("Mouse Shortcuts"),                   /* TRANSLATORS: a wiki page */ _("/Mouse_Shortcuts")            );
-       /* TRANSLATORS: Help menu entry */ WIKI(_("All Pages"), "/Special:Allpages" );
-
+       helpmenu->items().push_back(Gtk::Menu_Helpers::SeparatorElem());
+       /* TRANSLATORS: Help menu entry */ SITE(_("Get Support"),                               /* TRANSLATORS: a website page */ _("/en/support")                      );

        helpmenu->items().push_back(Gtk::Menu_Helpers::SeparatorElem());
        helpmenu->items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::StockID("synfig-about"),
                sigc::ptr_fun(studio::App::dialog_about)));
        helpmenu->items().push_back(Gtk::Menu_Helpers::SeparatorElem());
        helpmenu->items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::StockID("synfig-about"),
                sigc::ptr_fun(studio::App::dialog_about)));