#include "dialog_gradient.h"
#include "dialog_color.h"
#include "toolbox.h"
-#include "compview.h"
#include "onemoment.h"
#include "dockmanager.h"
#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_rotate.h"
#include "state_zoom.h"
#include "devicetracker.h"
));
}
-#define DEFINE_ACTION(x,stock) { Glib::RefPtr<Gtk::Action> action( Gtk::Action::create(x, stock) ); /*action->set_sensitive(false);*/ actions_action_group->add(action); }
-#define DEFINE_ACTION2(x,stock,label) { Glib::RefPtr<Gtk::Action> action( Gtk::Action::create(x, stock,label,label) ); /*action->set_sensitive(false);*/ actions_action_group->add(action); }
-#define DEFINE_ACTION_SIG(group,x,stock,sig) { Glib::RefPtr<Gtk::Action> action( Gtk::Action::create(x, stock) ); /*action->set_sensitive(false);*/ group->add(action,sig); }
+#define DEFINE_ACTION(x,stock) { Glib::RefPtr<Gtk::Action> action( Gtk::Action::create(x, stock) ); actions_action_group->add(action); }
+#define DEFINE_ACTION2(x,stock,label) { Glib::RefPtr<Gtk::Action> action( Gtk::Action::create(x, stock,label,label) ); actions_action_group->add(action); }
+#define DEFINE_ACTION_SIG(group,x,stock,sig) { Glib::RefPtr<Gtk::Action> action( Gtk::Action::create(x, stock) ); group->add(action,sig); }
DEFINE_ACTION2("keyframe-properties", Gtk::StockID("gtk-properties"), _("Keyframe Properties"));
DEFINE_ACTION("about", Gtk::StockID("synfig-about"));
DEFINE_ACTION("amount-dec", _("Decrease Amount"));
#undef DEFINE_ACTION
-
-
-// Set up synfigapp actions
- /*{
- synfigapp::Action::Book::iterator iter;
-
- for(iter=synfigapp::Action::book().begin();iter!=synfigapp::Action::book().end();++iter)
- {
- Gtk::StockID stock_id;
-
- if(!(iter->second.category&synfigapp::Action::CATEGORY_HIDDEN))
- {
- //Gtk::Image* image(manage(new Gtk::Image()));
- if(iter->second.task=="raise") stock_id=Gtk::Stock::GO_UP;
- else if(iter->second.task=="lower") stock_id=Gtk::Stock::GO_DOWN;
- else if(iter->second.task=="move_top") stock_id=Gtk::Stock::GOTO_TOP;
- else if(iter->second.task=="move_bottom") stock_id=Gtk::Stock::GOTO_BOTTOM;
- else if(iter->second.task=="remove") stock_id=Gtk::Stock::DELETE;
- else if(iter->second.task=="set_on") stock_id=Gtk::Stock::YES;
- else if(iter->second.task=="set_off") stock_id=Gtk::Stock::NO;
- //else if(iter->second.task=="duplicate") stock_id=Gtk::Stock::COPY;
- else if(iter->second.task=="remove") stock_id=Gtk::Stock::DELETE;
- else stock_id=Gtk::StockID("synfig-"+iter->second.task);
-
- actions_action_group->add(Gtk::Action::create(
- "action-"+iter->second.name,
- stock_id,
- iter->second.local_name,iter->second.local_name
- ));
- }
- }
- }
-*/
-
+#undef DEFINE_ACTION_2
+#undef DEFINE_ACTION_SIG
Glib::ustring ui_info =
"<ui>"
ACCEL("End", "<Actions>/canvasview/seek-end" );
#undef ACCEL
+#undef ACCEL2
}
#ifdef _WIN32
/* editing tools */
state_manager->add_state(&state_normal);
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);
toolbox->hide();
-// studio::App::iteration(false);
-
delete toolbox;
-// studio::App::iteration(false);
-
-// studio::App::iteration(false);
-
delete dialog_setup;
delete dialog_gradient;
delete dock_manager;
instance_list.clear();
-
-// studio::App::iteration(false);
}
String
}
return false;
-#else
+#else // not USE_WIN32_FILE_DIALOGS
synfig::String prev_path;
if(!_preferences.get_value(preference, prev_path))
delete dialog;
return false;
-
- /*
-
- GtkWidget *ok;
- GtkWidget *cancel;
- int val=0;
-
- GtkWidget *fileselection;
- fileselection = gtk_file_selection_new(title.c_str());
-
-
- if(basename(filename)==filename)
- {
- gtk_file_selection_set_filename(GTK_FILE_SELECTION(fileselection),(prev_path+ETL_DIRECTORY_SEPARATOR).c_str());
- }
- else
- gtk_file_selection_set_filename(GTK_FILE_SELECTION(fileselection),dirname(filename).c_str());
-
- gtk_file_selection_complete(GTK_FILE_SELECTION(fileselection),basename(filename).c_str());
-
- ok=GTK_FILE_SELECTION(fileselection)->ok_button;
- cancel=GTK_FILE_SELECTION(fileselection)->cancel_button;
-
- gtk_signal_connect(GTK_OBJECT(ok),"clicked",GTK_SIGNAL_FUNC(Signal_Open_Ok),&val);
- gtk_signal_connect(GTK_OBJECT(cancel),"clicked",GTK_SIGNAL_FUNC(Signal_Open_Cancel),&val);
-
- gtk_widget_show(fileselection);
-
- while(!val)
- iteration();
-
-
- if(val==1)
- {
- filename=gtk_file_selection_get_filename(GTK_FILE_SELECTION(fileselection));
- _preferences.set_value(preference,dirname(filename));
- }
- else
- {
- gtk_widget_destroy(fileselection);
- return false;
- }
- gtk_widget_destroy(fileselection);
- return true;
- */
-#endif
+#endif // not USE_WIN32_FILE_DIALOGS
}
bool
{
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"))));