X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fapp.cpp;h=53f3581a2cc208dc26b647b5076bcfcbb0238e00;hb=c17ff8c0593a678801a38e3dc400ace6bc57a4bb;hp=14fc4b175488935736dedd25a1fa9ff5e276e289;hpb=2d5443247e61b09be783dac722c4d0794c71ef30;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/app.cpp b/synfig-studio/trunk/src/gtkmm/app.cpp
index 14fc4b1..53f3581 100644
--- a/synfig-studio/trunk/src/gtkmm/app.cpp
+++ b/synfig-studio/trunk/src/gtkmm/app.cpp
@@ -131,6 +131,14 @@ using namespace studio;
 
 /* === M A C R O S ========================================================= */
 
+#ifndef SYNFIG_USER_APP_DIR
+#ifdef __APPLE__
+#define SYNFIG_USER_APP_DIR	"Library/Synfig"
+#else
+#define SYNFIG_USER_APP_DIR	"Synfig"
+#endif
+#endif
+
 #ifndef DPM2DPI
 #define DPM2DPI(x)	(float(x)/39.3700787402f)
 #define DPI2DPM(x)	(float(x)*39.3700787402f)
@@ -677,7 +685,7 @@ init_ui_manager()
 	menus_action_group->add( Gtk::Action::create("menu-view", "_View") );
 	menus_action_group->add( Gtk::Action::create("menu-canvas", "_Canvas") );
 	menus_action_group->add( Gtk::Action::create("menu-layer", "_Layer") );
-	menus_action_group->add( Gtk::Action::create("menu-duck-mask", "Mask Ducks") );
+	menus_action_group->add( Gtk::Action::create("menu-duck-mask", "Show/Hide Ducks") );
 	menus_action_group->add( Gtk::Action::create("menu-preview-quality", "Preview Quality") );
 	menus_action_group->add( Gtk::Action::create("menu-layer-new", "New Layer") );
 	menus_action_group->add( Gtk::Action::create("menu-keyframe", "Keyframe") );
@@ -728,12 +736,12 @@ init_ui_manager()
 	DEFINE_ACTION("unselect-all-layers", _("Unselect All Layers"));
 	DEFINE_ACTION("properties", _("Properties"));
 
-	DEFINE_ACTION("mask-position-ducks", _("Mask Position Ducks"));
-	DEFINE_ACTION("mask-vertex-ducks", _("Mask Vertex Ducks"));
-	DEFINE_ACTION("mask-tangent-ducks", _("Mask Tangent Ducks"));
-	DEFINE_ACTION("mask-radius-ducks", _("Mask Radius Ducks"));
-	DEFINE_ACTION("mask-width-ducks", _("Mask Width Ducks"));
-	DEFINE_ACTION("mask-angle-ducks", _("Mask Angle Ducks"));
+	DEFINE_ACTION("mask-position-ducks", _("Show Position Ducks"));
+	DEFINE_ACTION("mask-vertex-ducks", _("Show Vertex Ducks"));
+	DEFINE_ACTION("mask-tangent-ducks", _("Show Tangent Ducks"));
+	DEFINE_ACTION("mask-radius-ducks", _("Show Radius Ducks"));
+	DEFINE_ACTION("mask-width-ducks", _("Show Width Ducks"));
+	DEFINE_ACTION("mask-angle-ducks", _("Show Angle Ducks"));
 	DEFINE_ACTION("quality-00", _("Use Parametric Renderer"));
 	DEFINE_ACTION("quality-01", _("Use Quality Level 1"));
 	DEFINE_ACTION("quality-02", _("Use Quality Level 2"));
@@ -1203,21 +1211,29 @@ App::App(int *argc, char ***argv):
 		state_manager->add_state(&state_rotate);
 
 		state_manager->add_state(&state_bline);
-		state_manager->add_state(&state_polygon);
+		
+		
 		state_manager->add_state(&state_circle);
 		state_manager->add_state(&state_rectangle);
 
-		state_manager->add_state(&state_draw);
-		state_manager->add_state(&state_sketch);
-
+		state_manager->add_state(&state_gradient);
 		state_manager->add_state(&state_eyedrop);
 		state_manager->add_state(&state_fill);
 		
-		state_manager->add_state(&state_width);
-		state_manager->add_state(&state_gradient);
-		
 		state_manager->add_state(&state_zoom);
 
+		if(false) {
+			// Disabled this tool because it should be
+			// considered deprecated. Use the bline tool instead.
+			state_manager->add_state(&state_polygon);
+	
+			// These tools are disabled for now,
+			// because they tend to confuse users.
+			state_manager->add_state(&state_draw);
+			state_manager->add_state(&state_sketch);
+			state_manager->add_state(&state_width);
+		}
+
 		studio_init_cb.task("Init ModPalette...");
 		module_list_.push_back(new ModPalette()); module_list_.back()->start();
 
@@ -1340,11 +1356,7 @@ App::~App()
 String
 App::get_user_app_directory()
 {
-#ifdef __APPLE__
-	return Glib::build_filename(Glib::get_home_dir(),"Library/Synfig");
-#else
-	return Glib::build_filename(Glib::get_home_dir(),"Synfig");
-#endif
+	return Glib::build_filename(Glib::get_home_dir(),SYNFIG_USER_APP_DIR);
 }
 
 synfig::String