X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fapp.cpp;h=214f73a8deb6fef8e7769f95d346bf2eab60923f;hb=2408c43789dd50d9219f5bea349ed9543e4e39ea;hp=1b65585464af62942b3d1f1b478f07d1693ec003;hpb=58a0ab96e7f766ca8a705d449ef7575eca837a64;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/app.cpp b/synfig-studio/trunk/src/gtkmm/app.cpp
index 1b65585..214f73a 100644
--- a/synfig-studio/trunk/src/gtkmm/app.cpp
+++ b/synfig-studio/trunk/src/gtkmm/app.cpp
@@ -906,8 +906,6 @@ init_ui_manager()
 "	</menu>"
 "	<menu action='menu-canvas'>"
 "		<menuitem action='canvas-new'/>"
-	"	<menuitem action='amount-inc'/>"
-	"	<menuitem action='amount-dec'/>"
 "	</menu>"
 "	<menu name='menu-state' action='menu-state'>"
 "	</menu>"
@@ -920,6 +918,8 @@ init_ui_manager()
 //"		<menuitem action='paste'/>"
 //"		<separator name='bleh06'/>"
 "		<menu action='menu-layer-new'></menu>"
+"		<menuitem action='amount-inc'/>"
+"		<menuitem action='amount-dec'/>"
 "	</menu>"
 "	<menu action='menu-keyframe'>"
 "		<menuitem action='keyframe-properties'/>"
@@ -1694,8 +1694,8 @@ App::dialog_open_file(const std::string &title, std::string &filename)
 
     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);
+    dialog->add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
+    dialog->add_button(Gtk::Stock::OPEN,   Gtk::RESPONSE_ACCEPT);
     if(!filename.empty())
         dialog->set_filename(filename);
     if(dialog->run()==GTK_RESPONSE_ACCEPT) {
@@ -1803,8 +1803,8 @@ App::dialog_save_file(const std::string &title, std::string &filename)
 
     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);
+    dialog->add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
+    dialog->add_button(Gtk::Stock::SAVE,   Gtk::RESPONSE_ACCEPT);
     if(!filename.empty())
         dialog->set_filename(filename);
     if(dialog->run()==GTK_RESPONSE_ACCEPT) {
@@ -1869,8 +1869,8 @@ App::dialog_saveas_file(const std::string &title, std::string &filename)
 
     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);
+    dialog->add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
+    dialog->add_button(Gtk::Stock::SAVE,   Gtk::RESPONSE_ACCEPT);
     if(!filename.empty())
         dialog->set_filename(filename);
     if(dialog->run()==GTK_RESPONSE_ACCEPT) {