X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fapp.cpp;h=cc7874af82a3d68a4fe3e15cf4f3bcbc3380633d;hb=c25902b514d64fd65c96ed56171bcd205d19d699;hp=033e285f9065253b80d95e8a98bf553f85245a63;hpb=e44f4e3c44d44afde20b5f42a66e8df2c75108ff;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/app.cpp b/synfig-studio/trunk/src/gtkmm/app.cpp
index 033e285..cc7874a 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'/>"
@@ -1034,14 +1034,27 @@ init_ui_manager()
 	ACCEL2(Gtk::AccelKey('o',Gdk::CONTROL_MASK,"<Actions>//toggle-onion-skin"));
 	ACCEL("<Actions>//seek-begin","Home");
 	ACCEL("<Actions>//seek-end","End");
-	ACCEL("<Actions>//state-normal","<Mod1>a");
-	ACCEL("<Actions>//state-rotate","<Mod1>s");
-	ACCEL("<Actions>//state-scale","<Mod1>d");
-	ACCEL("<Actions>//state-bline","<Mod1>b");
-	ACCEL("<Actions>//state-fill","<Mod1>f");
-	ACCEL("<Actions>//state-eyedrop","<Mod1>e");
-	ACCEL("<Actions>//state-gradient","<Mod1>g");
-	ACCEL("<Actions>//state-zoom","<Mod1>z");
+
+	ACCEL("<Actions>//state-normal",      "<Mod1>a");
+	ACCEL("<Actions>//state-smooth_move", "<Mod1>v");
+	ACCEL("<Actions>//state-scale",       "<Mod1>d");
+	ACCEL("<Actions>//state-rotate",      "<Mod1>s");
+
+	ACCEL("<Actions>//state-bline",       "<Mod1>b");
+	ACCEL("<Actions>//state-circle",      "<Mod1>c");
+	ACCEL("<Actions>//state-rectangle",   "<Mod1>r");
+	ACCEL("<Actions>//state-gradient",    "<Mod1>g");
+
+	ACCEL("<Actions>//state-eyedrop",     "<Mod1>e");
+	ACCEL("<Actions>//state-fill",        "<Mod1>f");
+	ACCEL("<Actions>//state-zoom",        "<Mod1>z");
+	ACCEL("<Actions>//state-polygon",     "<Mod1>p");
+
+	ACCEL("<Actions>//state-draw",        "<Mod1>w");
+	ACCEL("<Actions>//state-sketch",      "<Mod1>k");
+	ACCEL("<Actions>//state-width",       "<Mod1>t");
+	ACCEL("<Actions>//state-mirror",      "<Mod1>m");
+
 	ACCEL("<Actions>//canvas-zoom-fit","<Control><Shift>z");
 
 #undef ACCEL
@@ -1226,15 +1239,16 @@ App::App(int *argc, char ***argv):
 
 		state_manager->add_state(&state_zoom);
 
-		// Disabled this tool because it should be
-		// considered deprecated. Use the bline tool instead.
-		if(getenv("SYNFIG_ENABLE_POLYGON")) state_manager->add_state(&state_polygon);
+		// Enabled - it's useful to be able to work with polygons without tangent ducks getting in the way.
+		// I know we can switch tangent ducks off, but why not allow this kind of layer as well?
+		if(!getenv("SYNFIG_DISABLE_POLYGON")) state_manager->add_state(&state_polygon);
+
+		// Enabled for now.  Let's see whether they're good enough yet.
+		if(!getenv("SYNFIG_DISABLE_DRAW"   )) state_manager->add_state(&state_draw);
+		if(!getenv("SYNFIG_DISABLE_SKETCH" )) state_manager->add_state(&state_sketch);
 
-		// These tools are disabled by default for now,
-		// because they tend to confuse users.
-		if(getenv("SYNFIG_ENABLE_DRAW"  )) state_manager->add_state(&state_draw);
-		if(getenv("SYNFIG_ENABLE_SKETCH")) state_manager->add_state(&state_sketch);
-		if(getenv("SYNFIG_ENABLE_WIDTH" )) state_manager->add_state(&state_width);
+		// Disabled by default - it doesn't work properly?
+		if(getenv("SYNFIG_ENABLE_WIDTH"    )) state_manager->add_state(&state_width);
 
 		studio_init_cb.task("Init ModPalette...");
 		module_list_.push_back(new ModPalette()); module_list_.back()->start();
@@ -1681,8 +1695,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) {
@@ -1790,8 +1804,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) {
@@ -1856,8 +1870,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) {