X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fapp.cpp;h=aeb07c25727073b7f69c08c58c638dc804634dab;hb=2dc2a206a800705cce91751de1ec3127c2ac2397;hp=cc19fbe92d341b8326300168cb359f1672681a0d;hpb=6d4afc6e7ab68522187e7c9108798dc9b6f0ff43;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/app.cpp b/synfig-studio/trunk/src/gtkmm/app.cpp
index cc19fbe..aeb07c2 100644
--- a/synfig-studio/trunk/src/gtkmm/app.cpp
+++ b/synfig-studio/trunk/src/gtkmm/app.cpp
@@ -411,30 +411,24 @@ studio::add_action_group_to_top(Glib::RefPtr<studio::UIManager> ui_manager, Glib
 {
 	ui_manager->insert_action_group(group,0);
 	return;
-	DEBUGPOINT();
 	std::list<Glib::RefPtr<Gtk::ActionGroup> > prev_groups(ui_manager->get_action_groups());
 	std::list<Glib::RefPtr<Gtk::ActionGroup> >::reverse_iterator iter;
 
-	DEBUGPOINT();
 	for(iter=prev_groups.rbegin();iter!=prev_groups.rend();++iter)
 	{
-		DEBUGPOINT();
 		if(*iter && (*iter)->get_name()!="menus")
 		{
 			synfig::info("Removing action group "+(*iter)->get_name());
 			ui_manager->remove_action_group(*iter);
 		}
 	}
-	DEBUGPOINT();
 	ui_manager->insert_action_group(group,0);
 
-	DEBUGPOINT();
 	for(;!prev_groups.empty();prev_groups.pop_front())
 	{
 		if(prev_groups.front() && prev_groups.front()!=group && prev_groups.front()->get_name()!="menus")
 			ui_manager->insert_action_group(prev_groups.front(),1);
 	}
-	DEBUGPOINT();
 }
 */
 class Preferences : public synfigapp::Settings
@@ -597,6 +591,7 @@ init_ui_manager()
 
 	DEFINE_ACTION2("keyframe-properties", Gtk::StockID("gtk-properties"), _("Keyframe Properties"));
 	DEFINE_ACTION("about", Gtk::StockID("synfig-about"));
+	DEFINE_ACTION("new", Gtk::Stock::NEW);
 	DEFINE_ACTION("open", Gtk::Stock::OPEN);
 	DEFINE_ACTION("save", Gtk::Stock::SAVE);
 	DEFINE_ACTION("save-as", Gtk::Stock::SAVE_AS);
@@ -613,6 +608,7 @@ init_ui_manager()
 	DEFINE_ACTION("options", _("Options"));
 	DEFINE_ACTION("close", _("Close View"));
 	DEFINE_ACTION("close-document", _("Close Document"));
+	DEFINE_ACTION("quit", Gtk::Stock::QUIT);
 
 
 	DEFINE_ACTION("undo", Gtk::StockID("gtk-undo"));
@@ -715,6 +711,8 @@ init_ui_manager()
 "	</popup>"
 "	<popup name='menu-main' action='menu-main'>"
 "	<menu action='menu-file'>"
+"		<menuitem action='new' />"
+"		<menuitem action='open' />"
 "		<menuitem action='save' />"
 "		<menuitem action='save-as' />"
 "		<menuitem action='revert' />"
@@ -733,6 +731,7 @@ init_ui_manager()
 "		<menuitem action='options' />"
 "		<menuitem action='close' />"
 "		<menuitem action='close-document' />"
+"		<menuitem action='quit' />"
 "	</menu>"
 "	<menu action='menu-edit'>"
 "		<menuitem action='undo'/>"
@@ -1000,7 +999,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"
-			"http://www.synfig.com/ "
+			"http://synfig.org/Download"
 		);
 		throw 40;
 	}
@@ -1200,6 +1199,10 @@ App::App(int *argc, char ***argv):
 
 		toolbox->present();
 	}
+	catch(String x)
+	{
+		get_ui_interface()->error(_("Unknown exception caught when constructing App.\nThis software may be unstable.") + String("\n\n") + x);
+	}
 	catch(...)
 	{
 		get_ui_interface()->error(_("Unknown exception caught when constructing App.\nThis software may be unstable."));