Cleanup

[synfig.git] / synfig-studio / src / gtkmm / app.cpp

diff --git a/synfig-studio/src/gtkmm/app.cpp b/synfig-studio/src/gtkmm/app.cpp
index 2485f81..874ee35 100644 (file)
--- a/synfig-studio/src/gtkmm/app.cpp
+++ b/synfig-studio/src/gtkmm/app.cpp
@@ -9,6 +9,7 @@
 **     Copyright (c) 2007, 2008 Chris Moore
 **     Copyright (c) 2008 Gerald Young
 **  Copyright (c) 2008 Carlos López
+**     Copyright (c) 2009 Nikita Kitaev
 **
 **     This package is free software; you can redistribute it and/or
 **     modify it under the terms of the GNU General Public License as
@@ -89,10 +90,11 @@
 #include "state_circle.h"
 #include "state_rectangle.h"
 #include "state_smoothmove.h"
+#include "state_scale.h"
 #include "state_star.h"
 #include "state_text.h"
 #include "state_width.h"
-#include "state_transform.h"
+#include "state_rotate.h"
 #include "state_zoom.h"
 
 #include "devicetracker.h"
@@ -843,7 +845,8 @@ init_ui_manager()
        DEFINE_ACTION("amount-dec", _("Decrease Amount"));
 
 #undef DEFINE_ACTION
-
+#undef DEFINE_ACTION_2
+#undef DEFINE_ACTION_SIG
 
 // Set up synfigapp actions
        /*{
@@ -1133,6 +1136,7 @@ init_ui_manager()
        ACCEL("End",                                                                                                            "<Actions>/canvasview/seek-end"                                         );
 
 #undef ACCEL
+#undef ACCEL2
 }
 
 #ifdef _WIN32
@@ -1293,23 +1297,23 @@ App::App(int *argc, char ***argv):
 
                /* editing tools */
                state_manager->add_state(&state_normal);
-               state_manager->add_state(&state_transform);
                state_manager->add_state(&state_smooth_move);
+               state_manager->add_state(&state_scale);
+               state_manager->add_state(&state_rotate);
                studio_init_cb.task(_("Init ModMirror...")); module_list_.push_back(new ModMirror()); module_list_.back()->start();
                if(!getenv("SYNFIG_DISABLE_WIDTH"  )) state_manager->add_state(&state_width); // Enabled since 0.61.09
 
                /* new objects */
-               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
                state_manager->add_state(&state_text);
+               state_manager->add_state(&state_bline);
                if(!getenv("SYNFIG_DISABLE_DRAW"   )) state_manager->add_state(&state_draw); // Enabled for now.  Let's see whether they're good enough yet.
 
                /* other */
-
                state_manager->add_state(&state_fill);
                state_manager->add_state(&state_eyedrop);
                state_manager->add_state(&state_zoom);
@@ -1784,7 +1788,7 @@ App::reset_initial_window_configuration()
        synfigapp::Main::settings().set_value("pref.distance_system","pt");
        synfigapp::Main::settings().set_value("pref.use_colorspace_gamma","1");
 #ifdef SINGLE_THREADED
-       synfigapp::Main::settings().set_value("pref.single_threaded","0");
+       synfigapp::Main::settings().set_value("pref.single_threaded","1");
 #endif
        synfigapp::Main::settings().set_value("pref.restrict_radius_ducks","0");
        synfigapp::Main::settings().set_value("pref.resize_imported_images","0");
@@ -2099,7 +2103,8 @@ App::dialog_save_file(const std::string &title, std::string &filename, std::stri
        {
                file_type_enum = manage(new Widget_Enum());
                file_type_enum->set_param_desc(ParamDesc().set_hint("enum")
-                                                                          .add_enum_value(synfig::RELEASE_VERSION_0_61_09, "0.61.09", strprintf("0.61.09 (%s)", _("current")))
+                                                                          .add_enum_value(synfig::RELEASE_VERSION_0_62_00, "0.62.00", strprintf("0.62.00 (%s)", _("current")))
+                                                                          .add_enum_value(synfig::RELEASE_VERSION_0_61_09, "0.61.09", "0.61.09")
                                                                           .add_enum_value(synfig::RELEASE_VERSION_0_61_08, "0.61.08", "0.61.08")
                                                                           .add_enum_value(synfig::RELEASE_VERSION_0_61_07, "0.61.07", "0.61.07")
                                                                           .add_enum_value(synfig::RELEASE_VERSION_0_61_06, "0.61.06", strprintf("0.61.06 %s", _("and older"))));