X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fapp.cpp;h=472842355e31be27ea845769ade0169299dd5914;hb=56c8824c217f4d4bf3202f7100c8d582e63d3abe;hp=0d5fa8268c292d286a6a573b9168e6c2aecd33e2;hpb=9c5b887cee5a8100332e7e992df34a573066b917;p=synfig.git
diff --git a/synfig-studio/trunk/src/gtkmm/app.cpp b/synfig-studio/trunk/src/gtkmm/app.cpp
index 0d5fa82..4728423 100644
--- a/synfig-studio/trunk/src/gtkmm/app.cpp
+++ b/synfig-studio/trunk/src/gtkmm/app.cpp
@@ -670,6 +670,8 @@ init_ui_manager()
DEFINE_ACTION("copy", Gtk::StockID("gtk-copy"));
DEFINE_ACTION("paste", Gtk::StockID("gtk-paste"));
DEFINE_ACTION("select-all-ducks", _("Select All Ducks"));
+ DEFINE_ACTION("unselect-all-ducks", _("Unselect All Ducks"));
+ DEFINE_ACTION("select-all-layers", _("Select All Layers"));
DEFINE_ACTION("unselect-all-layers", _("Unselect All Layers"));
DEFINE_ACTION("properties", _("Properties"));
@@ -798,8 +800,10 @@ init_ui_manager()
" "
" "
" "
-" "
+" "
" "
+" "
+" "
" "
" "
" "
@@ -938,7 +942,9 @@ init_ui_manager()
}
ACCEL("//select-all-ducks","a");
- ACCEL("//unselect-all-layers","d");
+ ACCEL("//unselect-all-ducks","d");
+ ACCEL("//select-all-layers","a");
+ ACCEL("//unselect-all-layers","d");
ACCEL("//render","F9");
ACCEL("//preview","F11");
ACCEL("//properties","F8");
@@ -1002,26 +1008,25 @@ init_ui_manager()
ACCEL("//state-normal", "a");
ACCEL("//state-smooth_move", "v");
- ACCEL("//state-scale", "d");
- ACCEL("//state-rotate", "s");
+ ACCEL("//state-scale", "s");
+ ACCEL("//state-rotate", "t");
+ ACCEL("//state-mirror", "m");
- ACCEL("//state-bline", "b");
ACCEL("//state-circle", "c");
ACCEL("//state-rectangle", "r");
+ ACCEL("//state-star", "q");
ACCEL("//state-gradient", "g");
+ ACCEL("//state-polygon", "p");
- ACCEL("//state-eyedrop", "e");
+ ACCEL("//state-bline", "b");
+ ACCEL("//state-text", "x");
ACCEL("//state-fill", "f");
+ ACCEL("//state-eyedrop", "e");
ACCEL("//state-zoom", "z");
- ACCEL("//state-polygon", "p");
- ACCEL("//state-draw", "w");
+ ACCEL("//state-draw", "d");
ACCEL("//state-sketch", "k");
- ACCEL("//state-width", "t");
- ACCEL("//state-mirror", "m");
-
- ACCEL("//state-text", "x");
- ACCEL("//state-star", "q");
+ ACCEL("//state-width", "w");
ACCEL("//canvas-zoom-fit","z");
@@ -1187,21 +1192,21 @@ App::App(int *argc, char ***argv):
studio_init_cb.task(_("Init ModMirror...")); module_list_.push_back(new ModMirror()); module_list_.back()->start();
/* row 2 */
- state_manager->add_state(&state_bline);
state_manager->add_state(&state_circle);
state_manager->add_state(&state_rectangle);
+ state_manager->add_state(&state_star);
state_manager->add_state(&state_gradient);
if(!getenv("SYNFIG_DISABLE_POLYGON")) state_manager->add_state(&state_polygon); // Enabled - for working without ducks
/* row 3 */
- if(!getenv("SYNFIG_DISABLE_DRAW" )) state_manager->add_state(&state_draw); // Enabled for now. Let's see whether they're good enough yet.
- if(!getenv("SYNFIG_DISABLE_SKETCH" )) state_manager->add_state(&state_sketch);
+ state_manager->add_state(&state_bline);
+ state_manager->add_state(&state_text);
state_manager->add_state(&state_fill);
state_manager->add_state(&state_eyedrop);
state_manager->add_state(&state_zoom);
- state_manager->add_state(&state_text);
- state_manager->add_state(&state_star);
+ if(!getenv("SYNFIG_DISABLE_DRAW" )) state_manager->add_state(&state_draw); // Enabled for now. Let's see whether they're good enough yet.
+ if(!getenv("SYNFIG_DISABLE_SKETCH" )) state_manager->add_state(&state_sketch);
// Disabled by default - it doesn't work properly?
if(getenv("SYNFIG_ENABLE_WIDTH" )) state_manager->add_state(&state_width);
@@ -1854,7 +1859,7 @@ App::dialog_open_file(const std::string &title, std::string &filename, std::stri
if(dialog->run() == GTK_RESPONSE_ACCEPT) {
filename = dialog->get_filename();
- info("Saving preference %s = '%s' in App::dialog_open_file()", preference.c_str(), dirname(filename).c_str());
+ // info("Saving preference %s = '%s' in App::dialog_open_file()", preference.c_str(), dirname(filename).c_str());
_preferences.set_value(preference, dirname(filename));
delete dialog;
return true;
@@ -2013,7 +2018,7 @@ App::dialog_save_file(const std::string &title, std::string &filename, std::stri
if (preference == ANIMATION_DIR_PREFERENCE)
set_file_version(synfig::ReleaseVersion(file_type_enum->get_value()));
filename = dialog->get_filename();
- info("Saving preference %s = '%s' in App::dialog_save_file()", preference.c_str(), dirname(filename).c_str());
+ // info("Saving preference %s = '%s' in App::dialog_save_file()", preference.c_str(), dirname(filename).c_str());
_preferences.set_value(preference, dirname(filename));
delete dialog;
return true;