-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
/*! \file app.cpp
** \brief writeme
**
-** $Id: app.cpp,v 1.11 2005/03/24 21:47:28 darco Exp $
+** $Id$
**
** \legal
-** Copyright (c) 2002 Robert B. Quattlebaum Jr.
+** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+** Copyright (c) 2007, 2008 Chris Moore
+** Copyright (c) 2008 Gerald Young
+** Copyright (c) 2008 Carlos López
**
-** This software and associated documentation
-** are CONFIDENTIAL and PROPRIETARY property of
-** the above-mentioned copyright holder.
+** This package is free software; you can redistribute it and/or
+** modify it under the terms of the GNU General Public License as
+** published by the Free Software Foundation; either version 2 of
+** the License, or (at your option) any later version.
**
-** You may not copy, print, publish, or in any
-** other way distribute this software without
-** a prior written agreement with
-** the copyright holder.
+** This package is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+** General Public License for more details.
** \endlegal
*/
/* ========================================================================= */
# include <config.h>
#endif
+#ifdef WIN32
+#define WINVER 0x0500
+#include <windows.h>
+#endif
+
#include <fstream>
#include <iostream>
+#include <locale>
+#include <cstring>
+#ifdef HAVE_SYS_ERRNO_H
+#include <sys/errno.h>
+#endif
#include <gtkmm/fileselection.h>
#include <gtkmm/dialog.h>
+#include <gtkmm/messagedialog.h>
#include <gtkmm/label.h>
#include <gtkmm/stock.h>
#include <gtkmm/stockitem.h>
#include <gtkmm/inputdialog.h>
#include <gtkmm/accelmap.h>
#include <gtkmm/uimanager.h>
+#include <gtkmm/textview.h>
#include <gtk/gtk.h>
-#include <sinfg/loadcanvas.h>
+#include <gdkmm/general.h>
+
+#include <synfig/loadcanvas.h>
+#include <synfig/savecanvas.h>
#include "app.h"
#include "about.h"
+#include "splash.h"
#include "instance.h"
#include "canvasview.h"
#include "dialog_setup.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"
#include "dialog_tooloptions.h"
+#include "widget_enum.h"
#include "autorecover.h"
-#include <sinfgapp/settings.h>
+#include <synfigapp/settings.h>
#include "dock_history.h"
#include "dock_canvases.h"
#include "dock_keyframes.h"
#include <fmod.h>
#endif
-#ifdef WIN32
-#include <windows.h>
-#endif
#include <gtkmm/accelmap.h>
+#include <gtkmm/filechooser.h>
+#include <gtkmm/filechooserdialog.h>
+
+#include "general.h"
#endif
using namespace std;
using namespace etl;
-using namespace sinfg;
+using namespace synfig;
using namespace studio;
/* === M A C R O S ========================================================= */
+#ifndef SYNFIG_USER_APP_DIR
+#ifdef __APPLE__
+#define SYNFIG_USER_APP_DIR "Library/Synfig"
+#elif defined(_WIN32)
+#define SYNFIG_USER_APP_DIR "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)
# define IMAGE_EXT "tif"
#endif
-#include <sinfgapp/main.h>
+#include <synfigapp/main.h>
/* === S I G N A L S ======================================================= */
static std::list<std::string> recent_files;
const std::list<std::string>& App::get_recent_files() { return recent_files; }
+static std::list<std::string> recent_files_window_size;
+
int App::Busy::count;
bool App::shutdown_in_progress;
-sinfg::Gamma App::gamma;
+synfig::Gamma App::gamma;
Glib::RefPtr<studio::UIManager> App::ui_manager_;
-sinfg::Distance::System App::distance_system;
+synfig::Distance::System App::distance_system;
studio::Dialog_Setup* App::dialog_setup;
std::list<etl::handle<Instance> > App::instance_list;
-static etl::handle<sinfgapp::UIInterface> ui_interface_;
-const etl::handle<sinfgapp::UIInterface>& App::get_ui_interface() { return ui_interface_; }
+static etl::handle<synfigapp::UIInterface> ui_interface_;
+const etl::handle<synfigapp::UIInterface>& App::get_ui_interface() { return ui_interface_; }
etl::handle<Instance> App::selected_instance;
etl::handle<CanvasView> App::selected_canvas_view;
+studio::About *studio::App::about=NULL;
+
studio::Toolbox *studio::App::toolbox=NULL;
studio::AutoRecover *studio::App::auto_recover=NULL;
std::list< etl::handle< studio::Module > > module_list_;
bool studio::App::use_colorspace_gamma=true;
+#ifdef SINGLE_THREADED
+bool studio::App::single_threaded=false;
+#endif
+bool studio::App::restrict_radius_ducks=false;
+bool studio::App::resize_imported_images=false;
+String studio::App::custom_filename_prefix(DEFAULT_FILENAME_PREFIX);
+int studio::App::preferred_x_size=480;
+int studio::App::preferred_y_size=270;
+String studio::App::predefined_size(DEFAULT_PREDEFINED_SIZE);
+String studio::App::predefined_fps(DEFAULT_PREDEFINED_FPS);
+float studio::App::preferred_fps=24.0;
+#ifdef USE_OPEN_FOR_URLS
+String studio::App::browser_command("open"); // MacOS only
+#else
+String studio::App::browser_command("xdg-open"); // Linux XDG standard
+#endif
static int max_recent_files_=25;
int studio::App::get_max_recent_files() { return max_recent_files_; }
void studio::App::set_max_recent_files(int x) { max_recent_files_=x; }
-static sinfg::String app_base_path_;
+static synfig::String app_base_path_;
namespace studio {
+
+bool
+really_delete_widget(Gtk::Widget *widget)
+{
+ // synfig::info("really delete %p", (void*)widget);
+ delete widget;
+ return false;
+}
+
+// nasty workaround - when we've finished with a popup menu, we want to delete it
+// attaching to the signal_hide() signal gets us here before the action on the menu has run,
+// so schedule the real delete to happen in 50ms, giving the action a chance to run
+void
+delete_widget(Gtk::Widget *widget)
+{
+ // synfig::info("delete %p", (void*)widget);
+ Glib::signal_timeout().connect(sigc::bind(sigc::ptr_fun(&really_delete_widget), widget), 50);
+}
+
}; // END of namespace studio
studio::StateManager* state_manager;
-class GlobalUIInterface : public sinfgapp::UIInterface
+class GlobalUIInterface : public synfigapp::UIInterface
{
public:
+ virtual Response confirmation(const std::string &title,
+ const std::string &primaryText,
+ const std::string &secondaryText,
+ const std::string &confirmPhrase,
+ const std::string &cancelPhrase,
+ Response defaultResponse)
+ {
+ Gtk::MessageDialog dialog(
+ primaryText, // Message
+ false, // Markup
+ Gtk::MESSAGE_WARNING, // Type
+ Gtk::BUTTONS_NONE, // Buttons
+ true // Modal
+ );
+
+ if (! title.empty())
+ dialog.set_title(title);
+ if (! secondaryText.empty())
+ dialog.set_secondary_text(secondaryText);
+
+ dialog.add_button(cancelPhrase, RESPONSE_CANCEL);
+ dialog.add_button(confirmPhrase, RESPONSE_OK);
+ dialog.set_default_response(defaultResponse);
+
+ dialog.show_all();
+ return (Response) dialog.run();
+ }
+
virtual Response yes_no(const std::string &title, const std::string &message,Response dflt=RESPONSE_YES)
{
Gtk::Dialog dialog(
);
Gtk::Label label(message);
label.show();
-
+
dialog.get_vbox()->pack_start(label);
dialog.add_button(Gtk::StockID("gtk-yes"),RESPONSE_YES);
dialog.add_button(Gtk::StockID("gtk-no"),RESPONSE_NO);
-
+
dialog.set_default_response(dflt);
dialog.show();
return (Response)dialog.run();
);
Gtk::Label label(message);
label.show();
-
+
dialog.get_vbox()->pack_start(label);
dialog.add_button(Gtk::StockID("gtk-yes"),RESPONSE_YES);
dialog.add_button(Gtk::StockID("gtk-no"),RESPONSE_NO);
dialog.add_button(Gtk::StockID("gtk-cancel"),RESPONSE_CANCEL);
-
+
dialog.set_default_response(dflt);
dialog.show();
return (Response)dialog.run();
);
Gtk::Label label(message);
label.show();
-
+
dialog.get_vbox()->pack_start(label);
dialog.add_button(Gtk::StockID("gtk-ok"),RESPONSE_OK);
dialog.add_button(Gtk::StockID("gtk-cancel"),RESPONSE_CANCEL);
-
+
dialog.set_default_response(dflt);
dialog.show();
return (Response)dialog.run();
virtual bool
error(const std::string &err)
- {
- Gtk::Dialog dialog(
- "Error", // Title
- true, // Modal
- true // use_separator
- );
- Gtk::Label label(err);
- label.show();
-
- dialog.get_vbox()->pack_start(label);
- dialog.add_button(Gtk::StockID("gtk-ok"),RESPONSE_OK);
+ {
+ Gtk::MessageDialog dialog(err, false, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_CLOSE, true);
dialog.show();
dialog.run();
return true;
}
virtual bool
- amount_complete(int current, int total)
+ amount_complete(int /*current*/, int /*total*/)
{
while(studio::App::events_pending())studio::App::iteration(false);
return true;
/* === P R O C E D U R E S ================================================= */
-typedef unsigned char U8;
-typedef unsigned short U16;
-typedef unsigned long U32;
-
-typedef union {
- struct {
- U32 serial;
- U32 checksum;
- } element;
- U8 raw[8];
-} V_KeyUnwound;
-
-static inline U32 hash_U32(U32 i)
-{
- i=i*1664525+1013904223;
- i=i*1664525+1013904223;
- i=i*1664525+1013904223;
- return i;
-}
-
-#ifdef BIG_ENDIAN
-static const int endian_fix_table[8] = { 3, 2, 1, 0, 7, 6, 5, 4 } ;
-#define endian_fix(x) (endian_fix_table[x])
-#else
-#define endian_fix(x) (x)
-#endif
-
-int v_unwind_key(V_KeyUnwound* unwound, const char* key)
-{
- int i;
- unwound->element.serial=0;
- unwound->element.checksum=0;
-
- for(i=0;i<16;i++)
- {
- U8 data;
-
- switch(key[i])
- {
- case '0': data=0; break;
- case '1': data=1; break;
- case '2': data=2; break;
- case '3': data=3; break;
- case '4': data=4; break;
- case '5': data=5; break;
- case '6': data=6; break;
- case '7': data=7; break;
- case '8': data=8; break;
- case '9': data=9; break;
- case 'a': case 'A': data=10; break;
- case 'b': case 'B': data=11; break;
- case 'c': case 'C': data=12; break;
- case 'd': case 'D': data=13; break;
- case 'e': case 'E': data=14; break;
- case 'f': case 'F': data=15; break;
- default: return 0; break;
- }
- int bit=i*2;
- unwound->element.checksum|=(((U32)data&3)<<bit);
- unwound->element.serial|=(((U32)(data>>2)&3)<<bit);
- }
- return 1;
-}
-
-int v_key_check(const char* key, U32* serial, U32 appid)
-{
- V_KeyUnwound unwound_key;
- U32 appid_mask_a=hash_U32(appid);
- U32 appid_mask_b=hash_U32(appid_mask_a);
-
- if(!v_unwind_key(&unwound_key, key))
- {
- // Invalid characters in key
- return 0;
- }
-
-
- // Undo obfuscation pass
- {
- U32 next=hash_U32(unwound_key.raw[endian_fix(7)]);
- int i;
- for(i=0;i<7;i++)
- {
- next=hash_U32(next);
- unwound_key.raw[endian_fix(i)]^=(next>>24);
- }
- }
-
- unwound_key.element.serial^=appid_mask_a;
- unwound_key.element.checksum^=appid_mask_b;
-
- *serial=unwound_key.element.serial;
-
- return unwound_key.element.checksum==hash_U32(unwound_key.element.serial);
-}
-
-
-int check_license(String basedir)
-{
- String key;
- String license_file;
-
-#ifndef _WIN32
- license_file="/usr/local/etc/.synfiglicense";
-#else
- license_file=basedir+"\\etc\\.synfiglicense";
-#endif
-
- try {
- key=Glib::file_get_contents(license_file);
- } catch (Glib::FileError) { }
- U32 serial(0);
- if(!v_key_check(key.c_str(),&serial,0xdeadbeef))
- {
- while(!v_key_check(key.c_str(),&serial,0xdeadbeef))
- {
- key.clear();
-
- if(!App::dialog_entry(
- _("Synfig Studio Authentication"),
- _("Please enter your license key below. You will not\nbe able to use this software without a valid license key."),
- key
- ))
- throw String("No License");
- }
-
- FILE* file=fopen(license_file.c_str(),"w");
- if(file)
- {
- fprintf(file,"%s",key.c_str());
- fclose(file);
- }
- else
- sinfg::error("Unable to save license key!");
- }
- sinfg::info("License Authenticated -- Serial #%05d",serial);
- return serial;
-}
-
/*
void
studio::UIManager::insert_action_group (const Glib::RefPtr<Gtk::ActionGroup>& action_group, int pos)
Gtk::UIManager::remove_action_group(action_group);
return;
}
- sinfg::error("Unable to find action group");
+ synfig::error("Unable to find action group");
}
void
{
ui_manager->insert_action_group(group,0);
return;
- DEBUGPOINT();
std::list<Glib::RefPtr<Gtk::ActionGroup> > prev_groups(ui_manager->get_action_groups());
std::list<Glib::RefPtr<Gtk::ActionGroup> >::reverse_iterator iter;
-
- DEBUGPOINT();
+
for(iter=prev_groups.rbegin();iter!=prev_groups.rend();++iter)
{
- DEBUGPOINT();
if(*iter && (*iter)->get_name()!="menus")
{
- sinfg::info("Removing action group "+(*iter)->get_name());
+ synfig::info("Removing action group "+(*iter)->get_name());
ui_manager->remove_action_group(*iter);
}
}
- DEBUGPOINT();
ui_manager->insert_action_group(group,0);
-
- DEBUGPOINT();
+
for(;!prev_groups.empty();prev_groups.pop_front())
{
if(prev_groups.front() && prev_groups.front()!=group && prev_groups.front()->get_name()!="menus")
ui_manager->insert_action_group(prev_groups.front(),1);
}
- DEBUGPOINT();
}
*/
-class Preferences : public sinfgapp::Settings
+class Preferences : public synfigapp::Settings
{
public:
- virtual bool get_value(const sinfg::String& key, sinfg::String& value)const
+ virtual bool get_value(const synfig::String& key, synfig::String& value)const
{
if(key=="gamma")
{
value=strprintf("%s",Distance::system_name(App::distance_system).c_str());
return true;
}
+#ifdef SINGLE_THREADED
+ if(key=="single_threaded")
+ {
+ value=strprintf("%i",(int)App::single_threaded);
+ return true;
+ }
+#endif
if(key=="auto_recover_backup_interval")
{
value=strprintf("%i",App::auto_recover->get_timeout());
return true;
}
-
- return sinfgapp::Settings::get_value(key,value);
+ if(key=="restrict_radius_ducks")
+ {
+ value=strprintf("%i",(int)App::restrict_radius_ducks);
+ return true;
+ }
+ if(key=="resize_imported_images")
+ {
+ value=strprintf("%i",(int)App::resize_imported_images);
+ return true;
+ }
+ if(key=="browser_command")
+ {
+ value=App::browser_command;
+ return true;
+ }
+ if(key=="custom_filename_prefix")
+ {
+ value=App::custom_filename_prefix;
+ return true;
+ }
+ if(key=="preferred_x_size")
+ {
+ value=strprintf("%i",App::preferred_x_size);
+ return true;
+ }
+ if(key=="preferred_y_size")
+ {
+ value=strprintf("%i",App::preferred_y_size);
+ return true;
+ }
+ if(key=="predefined_size")
+ {
+ value=strprintf("%s",App::predefined_size.c_str());
+ return true;
+ }
+ if(key=="preferred_fps")
+ {
+ value=strprintf("%f",App::preferred_fps);
+ return true;
+ }
+ if(key=="predefined_fps")
+ {
+ value=strprintf("%s",App::predefined_fps.c_str());
+ return true;
+ }
+
+ return synfigapp::Settings::get_value(key,value);
}
-
- virtual bool set_value(const sinfg::String& key,const sinfg::String& value)
+
+ virtual bool set_value(const synfig::String& key,const synfig::String& value)
{
if(key=="gamma")
{
float r,g,b,blk;
-
+
strscanf(value,"%f %f %f %f",
&r,
&g,
);
App::gamma.set_all(r,g,b,blk);
-
+
return true;
}
if(key=="time_format")
{
int i(atoi(value.c_str()));
- App::set_time_format(static_cast<sinfg::Time::Format>(i));
+ App::set_time_format(static_cast<synfig::Time::Format>(i));
return true;
}
if(key=="auto_recover_backup_interval")
App::distance_system=Distance::ident_system(value);;
return true;
}
-
- return sinfgapp::Settings::set_value(key,value);
+#ifdef SINGLE_THREADED
+ if(key=="single_threaded")
+ {
+ int i(atoi(value.c_str()));
+ App::single_threaded=i;
+ return true;
+ }
+#endif
+ if(key=="restrict_radius_ducks")
+ {
+ int i(atoi(value.c_str()));
+ App::restrict_radius_ducks=i;
+ return true;
+ }
+ if(key=="resize_imported_images")
+ {
+ int i(atoi(value.c_str()));
+ App::resize_imported_images=i;
+ return true;
+ }
+ if(key=="browser_command")
+ {
+ App::browser_command=value;
+ return true;
+ }
+ if(key=="custom_filename_prefix")
+ {
+ App::custom_filename_prefix=value;
+ return true;
+ }
+ if(key=="preferred_x_size")
+ {
+ int i(atoi(value.c_str()));
+ App::preferred_x_size=i;
+ return true;
+ }
+ if(key=="preferred_y_size")
+ {
+ int i(atoi(value.c_str()));
+ App::preferred_y_size=i;
+ return true;
+ }
+ if(key=="predefined_size")
+ {
+ App::predefined_size=value;
+ return true;
+ }
+ if(key=="preferred_fps")
+ {
+ float i(atof(value.c_str()));
+ App::preferred_fps=i;
+ return true;
+ }
+ if(key=="predefined_fps")
+ {
+ App::predefined_fps=value;
+ return true;
+ }
+
+ return synfigapp::Settings::set_value(key,value);
}
-
+
virtual KeyList get_key_list()const
{
- KeyList ret(sinfgapp::Settings::get_key_list());
+ KeyList ret(synfigapp::Settings::get_key_list());
ret.push_back("gamma");
ret.push_back("time_format");
ret.push_back("distance_system");
ret.push_back("file_history.size");
ret.push_back("use_colorspace_gamma");
+#ifdef SINGLE_THREADED
+ ret.push_back("single_threaded");
+#endif
ret.push_back("auto_recover_backup_interval");
+ ret.push_back("restrict_radius_ducks");
+ ret.push_back("resize_imported_images");
+ ret.push_back("browser_command");
+ ret.push_back("custom_filename_prefix");
+ ret.push_back("preferred_x_size");
+ ret.push_back("preferred_y_size");
+ ret.push_back("predefined_size");
+ ret.push_back("preferred_fps");
+ ret.push_back("predefined_fps");
return ret;
}
};
-static Preferences _preferences;
+static ::Preferences _preferences;
void
init_ui_manager()
Glib::RefPtr<Gtk::ActionGroup> toolbox_action_group = Gtk::ActionGroup::create("toolbox");
Glib::RefPtr<Gtk::ActionGroup> actions_action_group = Gtk::ActionGroup::create();
-
- menus_action_group->add( Gtk::Action::create("menu-file", "_File") );
- menus_action_group->add( Gtk::Action::create("menu-edit", "_Edit") );
- 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-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") );
- menus_action_group->add( Gtk::Action::create("menu-group", "Group") );
- menus_action_group->add( Gtk::Action::create("menu-state", "State") );
- menus_action_group->add( Gtk::Action::create("menu-toolbox", "Toolbox") );
-
- // Add the sinfgapp actions...
- sinfgapp::Action::Book::iterator iter;
- for(iter=sinfgapp::Action::book().begin();iter!=sinfgapp::Action::book().end();++iter)
+
+ menus_action_group->add( Gtk::Action::create("menu-file", _("_File")) );
+ menus_action_group->add( Gtk::Action::create("menu-edit", _("_Edit")) );
+ 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", _("Show/Hide Ducks")) );
+ menus_action_group->add( Gtk::Action::create("menu-preview-quality", _("Preview Quality")) );
+ menus_action_group->add( Gtk::Action::create("menu-lowres-pixel", _("Low-Res Pixel Size")) );
+ menus_action_group->add( Gtk::Action::create("menu-layer-new", _("New Layer")) );
+ menus_action_group->add( Gtk::Action::create("menu-keyframe", _("Keyframe")) );
+ menus_action_group->add( Gtk::Action::create("menu-group", _("Group")) );
+ menus_action_group->add( Gtk::Action::create("menu-state", _("Tool")) );
+ menus_action_group->add( Gtk::Action::create("menu-toolbox", _("Toolbox")) );
+
+ // Add the synfigapp actions...
+ synfigapp::Action::Book::iterator iter;
+ for(iter=synfigapp::Action::book().begin();iter!=synfigapp::Action::book().end();++iter)
{
actions_action_group->add(Gtk::Action::create(
"action-"+iter->second.name,
iter->second.local_name,iter->second.local_name
));
}
-
+
#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_ACTION2("keyframe-properties", Gtk::StockID("gtk-properties"), _("Keyframe Properties"));
- DEFINE_ACTION("about", Gtk::StockID("sinfg-about"));
+ DEFINE_ACTION("about", Gtk::StockID("synfig-about"));
+ DEFINE_ACTION("new", Gtk::Stock::NEW);
DEFINE_ACTION("open", Gtk::Stock::OPEN);
DEFINE_ACTION("save", Gtk::Stock::SAVE);
DEFINE_ACTION("save-as", Gtk::Stock::SAVE_AS);
DEFINE_ACTION("revert", Gtk::Stock::REVERT_TO_SAVED);
- DEFINE_ACTION("cvs-add", Gtk::StockID("sinfg-cvs_add"));
- DEFINE_ACTION("cvs-update", Gtk::StockID("sinfg-cvs_update"));
- DEFINE_ACTION("cvs-commit", Gtk::StockID("sinfg-cvs_commit"));
- DEFINE_ACTION("cvs-revert", Gtk::StockID("sinfg-cvs_revert"));
+ DEFINE_ACTION("cvs-add", Gtk::StockID("synfig-cvs_add"));
+ DEFINE_ACTION("cvs-update", Gtk::StockID("synfig-cvs_update"));
+ DEFINE_ACTION("cvs-commit", Gtk::StockID("synfig-cvs_commit"));
+ DEFINE_ACTION("cvs-revert", Gtk::StockID("synfig-cvs_revert"));
DEFINE_ACTION("import", _("Import"));
DEFINE_ACTION("render", _("Render"));
DEFINE_ACTION("preview", _("Preview"));
DEFINE_ACTION("dialog-flipbook", _("Preview Dialog"));
DEFINE_ACTION("sound", _("Sound File"));
DEFINE_ACTION("options", _("Options"));
- DEFINE_ACTION("close", _("Close"));
+ DEFINE_ACTION("close", _("Close View"));
+ DEFINE_ACTION("close-document", _("Close Document"));
+ DEFINE_ACTION("quit", Gtk::Stock::QUIT);
DEFINE_ACTION("undo", Gtk::StockID("gtk-undo"));
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"));
- 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"));
DEFINE_ACTION("quality-08", _("Use Quality Level 8"));
DEFINE_ACTION("quality-09", _("Use Quality Level 9"));
DEFINE_ACTION("quality-10", _("Use Quality Level 10"));
+ for(list<int>::iterator iter = CanvasView::get_pixel_sizes().begin(); iter != CanvasView::get_pixel_sizes().end(); iter++)
+ DEFINE_ACTION(strprintf("lowres-pixel-%d", *iter), strprintf(_("Set Low-Res pixel size to %d"), *iter));
DEFINE_ACTION("play", _("Play"));
- DEFINE_ACTION("pause", _("Pause"));
+ // DEFINE_ACTION("pause", _("Pause"));
DEFINE_ACTION("stop", _("Stop"));
DEFINE_ACTION("toggle-grid-show", _("Toggle Grid Show"));
DEFINE_ACTION("toggle-grid-snap", _("Toggle Grid Snap"));
DEFINE_ACTION("toggle-guide-show", _("Toggle Guide Show"));
DEFINE_ACTION("toggle-low-res", _("Toggle Low-Res"));
+ DEFINE_ACTION("decrease-low-res-pixel-size", _("Decrease Low-Res Pixel Size"));
+ DEFINE_ACTION("increase-low-res-pixel-size", _("Increase Low-Res Pixel Size"));
DEFINE_ACTION("toggle-onion-skin", _("Toggle Onion Skin"));
DEFINE_ACTION("canvas-zoom-in", Gtk::StockID("gtk-zoom-in"));
DEFINE_ACTION("canvas-zoom-out", Gtk::StockID("gtk-zoom-out"));
#undef DEFINE_ACTION
-// Set up sinfgapp actions
+// Set up synfigapp actions
/*{
- sinfgapp::Action::Book::iterator iter;
-
- for(iter=sinfgapp::Action::book().begin();iter!=sinfgapp::Action::book().end();++iter)
+ 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&sinfgapp::Action::CATEGORY_HIDDEN))
+
+ 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=="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("sinfg-"+iter->second.task);
-
+ else stock_id=Gtk::StockID("synfig-"+iter->second.task);
+
actions_action_group->add(Gtk::Action::create(
"action-"+iter->second.name,
stock_id,
" </popup>"
" <popup name='menu-main' action='menu-main'>"
" <menu action='menu-file'>"
+" <menuitem action='new' />"
+" <menuitem action='open' />"
" <menuitem action='save' />"
" <menuitem action='save-as' />"
" <menuitem action='revert' />"
" <separator name='bleh04'/>"
" <menuitem action='options' />"
" <menuitem action='close' />"
+" <menuitem action='close-document' />"
+" <menuitem action='quit' />"
" </menu>"
" <menu action='menu-edit'>"
" <menuitem action='undo'/>"
" <menuitem action='copy'/>"
" <menuitem action='paste'/>"
" <separator name='bleh06'/>"
-" <menuitem action='select-all-ducks'/>"
+" <menuitem action='select-all-layers'/>"
" <menuitem action='unselect-all-layers'/>"
+" <menuitem action='select-all-ducks'/>"
+" <menuitem action='unselect-all-ducks'/>"
" <separator name='bleh07'/>"
" <menuitem action='properties'/>"
" </menu>"
" <menuitem action='quality-09' />"
" <menuitem action='quality-10' />"
" </menu>"
+" <menu action='menu-lowres-pixel'>"
+" <menuitem action='decrease-low-res-pixel-size'/>"
+" <menuitem action='increase-low-res-pixel-size'/>"
+" <separator name='pixel-size-separator'/>"
+;
+
+ for(list<int>::iterator iter = CanvasView::get_pixel_sizes().begin(); iter != CanvasView::get_pixel_sizes().end(); iter++)
+ ui_info += strprintf(" <menuitem action='lowres-pixel-%d' />", *iter);
+
+ ui_info +=
+" </menu>"
" <separator name='bleh08'/>"
" <menuitem action='play'/>"
-" <menuitem action='pause'/>"
+//" <menuitem action='pause'/>"
" <menuitem action='stop'/>"
" <menuitem action='dialog-flipbook'/>"
" <separator name='bleh09'/>"
" </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>"
//" <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'/>"
}
catch(const Glib::Error& ex)
{
- sinfg::error("building menus and toolbars failed: " + ex.what());
+ synfig::error("building menus and toolbars failed: " + ex.what());
}
// Add default keyboard accelerators
-#define ACCEL(path,accel) { Gtk::AccelKey accel_key(accel,path); Gtk::AccelMap::add_entry(accel_key.get_path(), accel_key.get_key(),accel_key.get_mod()); }
-#define ACCEL2(accel) { Gtk::AccelKey accel_key(accel); Gtk::AccelMap::add_entry(accel_key.get_path(), accel_key.get_key(),accel_key.get_mod()); }
- ACCEL("<Actions>//select-all-ducks","<Control>a");
- ACCEL("<Actions>//unselect-all-layers","<Control>d");
- ACCEL("<Actions>//render","F9");
- ACCEL("<Actions>//preview","F11");
- ACCEL("<Actions>//properties","F8");
- ACCEL("<Actions>//options","F12");
- ACCEL("<Actions>//import","<control>i");
- ACCEL2(Gtk::AccelKey(GDK_Escape,static_cast<Gdk::ModifierType>(0),"<Actions>//stop"));
- ACCEL("<Actions>//toggle-grid-show","<Control>g");
- ACCEL("<Actions>//toggle-grid-snap","<Control>l");
- ACCEL2(Gtk::AccelKey('`',Gdk::CONTROL_MASK,"<Actions>//toggle-low-res"));
- ACCEL("<Actions>//mask-position-ducks", "<Mod1>1");
- ACCEL("<Actions>//mask-vertex-ducks", "<Mod1>2");
- ACCEL("<Actions>//mask-tangent-ducks", "<Mod1>3");
- ACCEL("<Actions>//mask-radius-ducks", "<Mod1>4");
- ACCEL("<Actions>//mask-width-ducks", "<Mod1>5");
- ACCEL("<Actions>//mask-angle-ducks", "<Mod1>6");
-
-
- ACCEL2(Gtk::AccelKey(GDK_Page_Up,Gdk::SHIFT_MASK,"<Actions>//action-layer_raise"));
- ACCEL2(Gtk::AccelKey(GDK_Page_Down,Gdk::SHIFT_MASK,"<Actions>//action-layer_lower"));
-
- ACCEL("<Actions>//quality-01","<Control>1");
- ACCEL("<Actions>//quality-02","<Control>2");
- ACCEL("<Actions>//quality-03","<Control>3");
- ACCEL("<Actions>//quality-04","<Control>4");
- ACCEL("<Actions>//quality-05","<Control>5");
- ACCEL("<Actions>//quality-06","<Control>6");
- ACCEL("<Actions>//quality-07","<Control>7");
- ACCEL("<Actions>//quality-08","<Control>8");
- ACCEL("<Actions>//quality-09","<Control>9");
- ACCEL("<Actions>//quality-10","<Control>0");
- ACCEL("<Actions>//undo","<Control>z");
- ACCEL("<Actions>//redo","<Control>r");
- ACCEL("<Actions>//action-layer_remove","Delete");
-
-/* ACCEL2(Gtk::AccelKey(']',static_cast<Gdk::ModifierType>(0),"<Actions>//jump-next-keyframe"));
- ACCEL2(Gtk::AccelKey('[',static_cast<Gdk::ModifierType>(0),"<Actions>//jump-prev-keyframe"));
- ACCEL2(Gtk::AccelKey('=',static_cast<Gdk::ModifierType>(0),"<Actions>//canvas-zoom-in"));
- ACCEL2(Gtk::AccelKey('-',static_cast<Gdk::ModifierType>(0),"<Actions>//canvas-zoom-out"));
- ACCEL("<Actions>//time-zoom-in","+");
- ACCEL("<Actions>//time-zoom-out","_");
-*/
- ACCEL2(Gtk::AccelKey('(',Gdk::MOD1_MASK|Gdk::CONTROL_MASK,"<Actions>//amount-dec"));
- ACCEL2(Gtk::AccelKey(')',Gdk::MOD1_MASK|Gdk::CONTROL_MASK,"<Actions>//amount-inc"));
-
- ACCEL2(Gtk::AccelKey(']',Gdk::CONTROL_MASK,"<Actions>//jump-next-keyframe"));
- ACCEL2(Gtk::AccelKey('[',Gdk::CONTROL_MASK,"<Actions>//jump-prev-keyframe"));
- ACCEL2(Gtk::AccelKey('=',Gdk::CONTROL_MASK,"<Actions>//canvas-zoom-in"));
- ACCEL2(Gtk::AccelKey('-',Gdk::CONTROL_MASK,"<Actions>//canvas-zoom-out"));
- ACCEL2(Gtk::AccelKey('+',Gdk::CONTROL_MASK,"<Actions>//time-zoom-in"));
- ACCEL2(Gtk::AccelKey('_',Gdk::CONTROL_MASK,"<Actions>//time-zoom-out"));
- ACCEL2(Gtk::AccelKey('.',Gdk::CONTROL_MASK,"<Actions>//seek-next-frame"));
- ACCEL2(Gtk::AccelKey(',',Gdk::CONTROL_MASK,"<Actions>//seek-prev-frame"));
- ACCEL2(Gtk::AccelKey('>',Gdk::CONTROL_MASK,"<Actions>//seek-next-second"));
- ACCEL2(Gtk::AccelKey('<',Gdk::CONTROL_MASK,"<Actions>//seek-prev-second"));
- 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>//canvas-zoom-fit","<Control><Shift>z");
-
+#define ACCEL(accel,path) \
+ { \
+ Gtk::AccelKey accel_key(accel,path); \
+ Gtk::AccelMap::add_entry(accel_key.get_path(), accel_key.get_key(), accel_key.get_mod()); \
+ }
+
+#define ACCEL2(accel) \
+ { \
+ Gtk::AccelKey accel_key(accel); \
+ Gtk::AccelMap::add_entry(accel_key.get_path(), accel_key.get_key(), accel_key.get_mod()); \
+ }
+
+ // the toolbox
+ ACCEL("<Mod1>a", "<Actions>//state-normal" );
+ ACCEL("<Mod1>v", "<Actions>//state-smooth_move" );
+ ACCEL("<Mod1>s", "<Actions>//state-scale" );
+ ACCEL("<Mod1>t", "<Actions>//state-rotate" );
+ ACCEL("<Mod1>m", "<Actions>//state-mirror" );
+ ACCEL("<Mod1>c", "<Actions>//state-circle" );
+ ACCEL("<Mod1>r", "<Actions>//state-rectangle" );
+ ACCEL("<Mod1>q", "<Actions>//state-star" );
+ ACCEL("<Mod1>g", "<Actions>//state-gradient" );
+ ACCEL("<Mod1>p", "<Actions>//state-polygon" );
+ ACCEL("<Mod1>b", "<Actions>//state-bline" );
+ ACCEL("<Mod1>x", "<Actions>//state-text" );
+ ACCEL("<Mod1>f", "<Actions>//state-fill" );
+ ACCEL("<Mod1>e", "<Actions>//state-eyedrop" );
+ ACCEL("<Mod1>z", "<Actions>//state-zoom" );
+ ACCEL("<Mod1>d", "<Actions>//state-draw" );
+ ACCEL("<Mod1>k", "<Actions>//state-sketch" );
+ ACCEL("<Mod1>w", "<Actions>//state-width" );
+
+ // everything else
+ ACCEL("<Control>a", "<Actions>//select-all-ducks" );
+ ACCEL("<Control>d", "<Actions>//unselect-all-ducks" );
+ ACCEL("<Control><Shift>a", "<Actions>//select-all-layers" );
+ ACCEL("<Control><Shift>d", "<Actions>//unselect-all-layers" );
+ ACCEL("F9", "<Actions>//render" );
+ ACCEL("F11", "<Actions>//preview" );
+ ACCEL("F8", "<Actions>//properties" );
+ ACCEL("F12", "<Actions>//options" );
+ ACCEL("<control>i", "<Actions>//import" );
+ ACCEL2(Gtk::AccelKey(GDK_Escape,static_cast<Gdk::ModifierType>(0), "<Actions>//stop" ));
+ ACCEL("<Control>g", "<Actions>//toggle-grid-show" );
+ ACCEL("<Control>l", "<Actions>//toggle-grid-snap" );
+ ACCEL2(Gtk::AccelKey('`',Gdk::CONTROL_MASK, "<Actions>//toggle-low-res" ));
+ ACCEL("<Mod1>1", "<Actions>//mask-position-ducks" );
+ ACCEL("<Mod1>2", "<Actions>//mask-vertex-ducks" );
+ ACCEL("<Mod1>3", "<Actions>//mask-tangent-ducks" );
+ ACCEL("<Mod1>4", "<Actions>//mask-radius-ducks" );
+ ACCEL("<Mod1>5", "<Actions>//mask-width-ducks" );
+ ACCEL("<Mod1>6", "<Actions>//mask-angle-ducks" );
+ ACCEL2(Gtk::AccelKey(GDK_Page_Up,Gdk::SHIFT_MASK, "<Actions>//action-LayerRaise" ));
+ ACCEL2(Gtk::AccelKey(GDK_Page_Down,Gdk::SHIFT_MASK, "<Actions>//action-LayerLower" ));
+ ACCEL("<Control>1", "<Actions>//quality-01" );
+ ACCEL("<Control>2", "<Actions>//quality-02" );
+ ACCEL("<Control>3", "<Actions>//quality-03" );
+ ACCEL("<Control>4", "<Actions>//quality-04" );
+ ACCEL("<Control>5", "<Actions>//quality-05" );
+ ACCEL("<Control>6", "<Actions>//quality-06" );
+ ACCEL("<Control>7", "<Actions>//quality-07" );
+ ACCEL("<Control>8", "<Actions>//quality-08" );
+ ACCEL("<Control>9", "<Actions>//quality-09" );
+ ACCEL("<Control>0", "<Actions>//quality-10" );
+ ACCEL("<Control>z", "<Actions>//undo" );
+ ACCEL("<Control>r", "<Actions>//redo" );
+ ACCEL2(Gtk::AccelKey(GDK_Delete,Gdk::CONTROL_MASK, "<Actions>//action-LayerRemove" ));
+ ACCEL2(Gtk::AccelKey('(',Gdk::CONTROL_MASK, "<Actions>//decrease-low-res-pixel-size" ));
+ ACCEL2(Gtk::AccelKey(')',Gdk::CONTROL_MASK, "<Actions>//increase-low-res-pixel-size" ));
+ ACCEL2(Gtk::AccelKey('(',Gdk::MOD1_MASK|Gdk::CONTROL_MASK, "<Actions>//amount-dec" ));
+ ACCEL2(Gtk::AccelKey(')',Gdk::MOD1_MASK|Gdk::CONTROL_MASK, "<Actions>//amount-inc" ));
+ ACCEL2(Gtk::AccelKey(']',Gdk::CONTROL_MASK, "<Actions>//jump-next-keyframe" ));
+ ACCEL2(Gtk::AccelKey('[',Gdk::CONTROL_MASK, "<Actions>//jump-prev-keyframe" ));
+ ACCEL2(Gtk::AccelKey('=',Gdk::CONTROL_MASK, "<Actions>//canvas-zoom-in" ));
+ ACCEL2(Gtk::AccelKey('-',Gdk::CONTROL_MASK, "<Actions>//canvas-zoom-out" ));
+ ACCEL2(Gtk::AccelKey('+',Gdk::CONTROL_MASK, "<Actions>//time-zoom-in" ));
+ ACCEL2(Gtk::AccelKey('_',Gdk::CONTROL_MASK, "<Actions>//time-zoom-out" ));
+ ACCEL2(Gtk::AccelKey('.',Gdk::CONTROL_MASK, "<Actions>//seek-next-frame" ));
+ ACCEL2(Gtk::AccelKey(',',Gdk::CONTROL_MASK, "<Actions>//seek-prev-frame" ));
+ ACCEL2(Gtk::AccelKey('>',Gdk::CONTROL_MASK, "<Actions>//seek-next-second" ));
+ ACCEL2(Gtk::AccelKey('<',Gdk::CONTROL_MASK, "<Actions>//seek-prev-second" ));
+ ACCEL("<Mod1>o", "<Actions>//toggle-onion-skin" );
+ ACCEL("<Control><Shift>z", "<Actions>//canvas-zoom-fit" );
+ ACCEL("<Control>p", "<Actions>//play" );
+ ACCEL("Home", "<Actions>//seek-begin" );
+ ACCEL("End", "<Actions>//seek-end" );
+
#undef ACCEL
}
App::App(int *argc, char ***argv):
Gtk::Main(argc,argv),
- IconControler(etl::dirname((*argv)[0]))
+ IconController(etl::dirname((*argv)[0]))
{
app_base_path_=etl::dirname(etl::dirname((*argv)[0]));
-
- int serial_;
- serial_=check_license(app_base_path_);
-
-
+
+
ui_interface_=new GlobalUIInterface();
gdk_rgb_init();
- Glib::thread_init();
+ // don't call thread_init() if threads are already initialized
+ // on some machines bonobo_init() initialized threads before we get here
+ if (!g_thread_supported())
+ Glib::thread_init();
distance_system=Distance::SYSTEM_UNITS;
-
+
if(mkdir(get_user_app_directory().c_str(),ACCESSPERMS)<0)
{
if(errno!=EEXIST)
- sinfg::error("UNABLE TO CREATE \"%s\"",get_user_app_directory().c_str());
+ synfig::error("UNABLE TO CREATE \"%s\"",get_user_app_directory().c_str());
}
else
{
- sinfg::info("Created directory \"%s\"",get_user_app_directory().c_str());
+ synfig::info("Created directory \"%s\"",get_user_app_directory().c_str());
}
-
-
+
+
ipc=new IPC();
-
- try
+
+ if(!SYNFIG_CHECK_VERSION())
{
- if(!SINFG_CHECK_VERSION())
- {
- cerr<<"FATAL: Sinfg Version Mismatch"<<endl;
- dialog_error_blocking("SINFG Studio",
- "This copy of SINFG Studio was compiled against a\n"
- "different version of libsinfg than what is currently\n"
- "installed. Sinfg Studio will now abort. Try downloading\n"
- "the latest version from the SINFG Development Website at\n"
- "http://dev.sinfg.com/ "
+ cerr<<"FATAL: Synfig Version Mismatch"<<endl;
+ dialog_error_blocking("Synfig Studio",
+ "This copy of Synfig Studio was compiled against a\n"
+ "different version of libsynfig than what is currently\n"
+ "installed. Synfig Studio will now abort. Try downloading\n"
+ "the latest version from the Synfig website at\n"
+ "http://synfig.org/Download"
);
throw 40;
- }
- }
- catch(sinfg::SoftwareExpired)
- {
- cerr<<"FATAL: Software Expired"<<endl;
- dialog_error_blocking("SINFG Studio",
- "This copy of SINFG Studio has expired.\n"
- "Please erase this copy, or download and\n"
- "install the latest copy from the SINFG\n"
- "Development Website at http://dev.sinfg.com/ ."
- );
- throw 39;
}
- Glib::set_application_name(_("SINFG Studio"));
-
- About about_window;
- about_window.set_can_self_destruct(false);
- about_window.show();
+ Glib::set_application_name(_("Synfig Studio"));
+
+ Splash splash_screen;
+ splash_screen.show();
shutdown_in_progress=false;
- SuperCallback sinfg_init_cb(about_window.get_callback(),0,9000,10000);
- SuperCallback studio_init_cb(about_window.get_callback(),9000,10000,10000);
-
- // Initialize the Sinfg library
- try { sinfgapp_main=etl::smart_ptr<sinfgapp::Main>(new sinfgapp::Main(etl::dirname((*argv)[0]),&sinfg_init_cb)); }
+ SuperCallback synfig_init_cb(splash_screen.get_callback(),0,9000,10000);
+ SuperCallback studio_init_cb(splash_screen.get_callback(),9000,10000,10000);
+
+ // Initialize the Synfig library
+ try { synfigapp_main=etl::smart_ptr<synfigapp::Main>(new synfigapp::Main(etl::dirname((*argv)[0]),&synfig_init_cb)); }
+ catch(std::runtime_error x)
+ {
+ get_ui_interface()->error(strprintf("%s\n\n%s", _("Failed to initialize synfig!"), x.what()));
+ throw;
+ }
catch(...)
{
- get_ui_interface()->error("Failed to initialize sinfg!");
+ get_ui_interface()->error(_("Failed to initialize synfig!"));
throw;
}
// add the preferences to the settings
- sinfgapp::Main::settings().add_domain(&_preferences,"pref");
-
+ synfigapp::Main::settings().add_domain(&_preferences,"pref");
+
try
{
- studio_init_cb.task("Init UI Manager...");
+ studio_init_cb.task(_("Init UI Manager..."));
App::ui_manager_=studio::UIManager::create();
init_ui_manager();
-
- studio_init_cb.task("Init Dock Manager...");
+
+ studio_init_cb.task(_("Init Dock Manager..."));
dock_manager=new studio::DockManager();
- studio_init_cb.task("Init State Manager...");
+ studio_init_cb.task(_("Init State Manager..."));
state_manager=new StateManager();
- studio_init_cb.task("Init Toolbox...");
+ studio_init_cb.task(_("Init Toolbox..."));
toolbox=new studio::Toolbox();
- studio_init_cb.task("Init Tool Options...");
+ studio_init_cb.task(_("Init About Dialog..."));
+ about=new studio::About();
+
+ studio_init_cb.task(_("Init Tool Options..."));
dialog_tool_options=new studio::Dialog_ToolOptions();
dock_manager->register_dockable(*dialog_tool_options);
- studio_init_cb.task("Init History...");
+ studio_init_cb.task(_("Init History..."));
dock_history=new studio::Dock_History();
dock_manager->register_dockable(*dock_history);
- studio_init_cb.task("Init Canvases...");
+ studio_init_cb.task(_("Init Canvases..."));
dock_canvases=new studio::Dock_Canvases();
dock_manager->register_dockable(*dock_canvases);
- studio_init_cb.task("Init Keyframes...");
+ studio_init_cb.task(_("Init Keyframes..."));
dock_keyframes=new studio::Dock_Keyframes();
dock_manager->register_dockable(*dock_keyframes);
- studio_init_cb.task("Init Layers...");
+ studio_init_cb.task(_("Init Layers..."));
dock_layers=new studio::Dock_Layers();
dock_manager->register_dockable(*dock_layers);
- studio_init_cb.task("Init Params...");
+ studio_init_cb.task(_("Init Params..."));
dock_params=new studio::Dock_Params();
dock_manager->register_dockable(*dock_params);
- studio_init_cb.task("Init MetaData...");
+ studio_init_cb.task(_("Init MetaData..."));
dock_meta_data=new studio::Dock_MetaData();
dock_manager->register_dockable(*dock_meta_data);
- studio_init_cb.task("Init Children...");
+ studio_init_cb.task(_("Init Children..."));
dock_children=new studio::Dock_Children();
dock_manager->register_dockable(*dock_children);
-
- studio_init_cb.task("Init Info...");
+
+ studio_init_cb.task(_("Init Info..."));
dock_info = new studio::Dock_Info();
dock_manager->register_dockable(*dock_info);
-
- studio_init_cb.task("Init Navigator...");
+
+ studio_init_cb.task(_("Init Navigator..."));
dock_navigator = new studio::Dock_Navigator();
dock_manager->register_dockable(*dock_navigator);
- studio_init_cb.task("Init Timetrack...");
+ studio_init_cb.task(_("Init Timetrack..."));
dock_timetrack = new studio::Dock_Timetrack();
dock_manager->register_dockable(*dock_timetrack);
- studio_init_cb.task("Init Curve Editor...");
+ studio_init_cb.task(_("Init Curve Editor..."));
dock_curves = new studio::Dock_Curves();
dock_manager->register_dockable(*dock_curves);
- studio_init_cb.task("Init Layer Groups...");
+ studio_init_cb.task(_("Init Layer Groups..."));
dock_layer_groups = new studio::Dock_LayerGroups();
dock_manager->register_dockable(*dock_layer_groups);
-
-
- studio_init_cb.task("Init Color Dialog...");
+
+
+ studio_init_cb.task(_("Init Color Dialog..."));
dialog_color=new studio::Dialog_Color();
- studio_init_cb.task("Init Gradient Dialog...");
+ studio_init_cb.task(_("Init Gradient Dialog..."));
dialog_gradient=new studio::Dialog_Gradient();
- studio_init_cb.task("Init DeviceTracker...");
+ studio_init_cb.task(_("Init DeviceTracker..."));
device_tracker=new studio::DeviceTracker();
- studio_init_cb.task("Init Tools...");
+ studio_init_cb.task(_("Init Tools..."));
+
+ /* row 1 */
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();
- state_manager->add_state(&state_bline);
- state_manager->add_state(&state_polygon);
+ /* row 2 */
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_draw);
- state_manager->add_state(&state_sketch);
-
- state_manager->add_state(&state_eyedrop);
+ /* row 3 */
+ state_manager->add_state(&state_bline);
+ state_manager->add_state(&state_text);
state_manager->add_state(&state_fill);
-
- state_manager->add_state(&state_width);
- state_manager->add_state(&state_gradient);
-
+ state_manager->add_state(&state_eyedrop);
state_manager->add_state(&state_zoom);
- studio_init_cb.task("Init ModPalette...");
- module_list_.push_back(new ModPalette()); module_list_.back()->start();
-
- studio_init_cb.task("Init ModMirror...");
- module_list_.push_back(new ModMirror()); module_list_.back()->start();
+ 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);
+ if(!getenv("SYNFIG_DISABLE_WIDTH" )) state_manager->add_state(&state_width); // Enabled since 0.61.09
+ studio_init_cb.task(_("Init ModPalette..."));
+ module_list_.push_back(new ModPalette()); module_list_.back()->start();
- studio_init_cb.task("Init Setup Dialog...");
+ studio_init_cb.task(_("Init Setup Dialog..."));
dialog_setup=new studio::Dialog_Setup();
-
- studio_init_cb.task("Init Input Dialog...");
+
+ studio_init_cb.task(_("Init Input Dialog..."));
dialog_input=new Gtk::InputDialog();
+ dialog_input->get_close_button()->signal_clicked().connect( sigc::mem_fun( *dialog_input, &Gtk::InputDialog::hide ) );
+ dialog_input->get_save_button()->signal_clicked().connect( sigc::mem_fun( *device_tracker, &DeviceTracker::save_preferences) );
- studio_init_cb.task("Init auto recovery...");
+ studio_init_cb.task(_("Init auto recovery..."));
auto_recover=new AutoRecover();
studio_init_cb.amount_complete(9250,10000);
- studio_init_cb.task("Loading Settings...");
+ studio_init_cb.task(_("Loading Settings..."));
load_settings();
- studio_init_cb.task("Checking auto-recover...");
-
+ device_tracker->load_preferences();
+
+ studio_init_cb.task(_("Checking auto-recover..."));
+
studio_init_cb.amount_complete(9900,10000);
-
+
+ bool opened_any = false;
if(auto_recover->recovery_needed())
{
- about_window.hide();
- if(
- get_ui_interface()->yes_no(
- "Auto Recovery",
- "SINFG Studio seems to have crashed\n"
- "before you could save all your files.\n"
- "Would you like to re-open those files\n"
- "and recover your unsaved changes?"
- )==sinfgapp::UIInterface::RESPONSE_YES
- )
+ splash_screen.hide();
+ if (get_ui_interface()->confirmation("Crash Recovery",
+ _("Auto recovery file found"),
+ _("Synfig Studio seems to have crashed\n"
+ "before you could save all your files.\n"
+ "Recover unsaved changes?"),
+ _("Recover"), _("Ignore"))
+ == synfigapp::UIInterface::RESPONSE_OK)
{
- if(!auto_recover->recover())
- {
- get_ui_interface()->error(_("Unable to fully recover from previous crash"));
- }
+ int number_recovered;
+ if(!auto_recover->recover(number_recovered))
+ if (number_recovered)
+ get_ui_interface()->error(_("Unable to fully recover from previous crash"));
+ else
+ get_ui_interface()->error(_("Unable to recover from previous crash"));
else
- get_ui_interface()->error(
- _("SINFG Studio has attempted to recover\n"
- "from a previous crash. The files that it has\n"
- "recovered are NOT YET SAVED. It would be a good\n"
- "idea to review them and save them now.")
- );
+ get_ui_interface()->error(
+ _("Synfig Studio has attempted to recover\n"
+ "from a previous crash. The files that it has\n"
+ "recovered are NOT YET SAVED. It would be a good\n"
+ "idea to review them and save them now."));
+
+ if (number_recovered)
+ opened_any = true;
}
- about_window.show();
+ splash_screen.show();
}
-
+
// Look for any files given on the command line,
// and load them if found.
for(;*argc>=1;(*argc)--)
if((*argv)[*argc] && (*argv)[*argc][0]!='-')
{
- studio_init_cb.task("Loading files...");
- about_window.hide();
+ studio_init_cb.task(_("Loading files..."));
+ splash_screen.hide();
open((*argv)[*argc]);
- about_window.show();
+ opened_any = true;
+ splash_screen.show();
}
-
- studio_init_cb.task("Done.");
+
+ // if no file was specified to be opened, create a new document to help new users get started more easily
+ if (!opened_any && !getenv("SYNFIG_DISABLE_AUTOMATIC_DOCUMENT_CREATION"))
+ new_instance();
+
+ studio_init_cb.task(_("Done."));
studio_init_cb.amount_complete(10000,10000);
-
+
toolbox->present();
}
+ catch(String x)
+ {
+ get_ui_interface()->error(_("Unknown exception caught when constructing App.\nThis software may be unstable.") + String("\n\n") + x);
+ }
catch(...)
{
get_ui_interface()->error(_("Unknown exception caught when constructing App.\nThis software may be unstable."));
save_settings();
- sinfgapp::Main::settings().remove_domain("pref");
-
+ synfigapp::Main::settings().remove_domain("pref");
+
selected_instance=0;
// Unload all of the modules
- for(;!module_list_.empty();module_list_.pop_back());
-
+ for(;!module_list_.empty();module_list_.pop_back())
+ ;
+
delete state_manager;
delete ipc;
-
+
delete auto_recover;
+ delete about;
+
toolbox->hide();
-// studio::App::iteration(false);
-
+// studio::App::iteration(false);
+
delete toolbox;
-
-// studio::App::iteration(false);
-// studio::App::iteration(false);
+// studio::App::iteration(false);
+
+// studio::App::iteration(false);
delete dialog_setup;
String
App::get_user_app_directory()
{
- return Glib::build_filename(Glib::get_home_dir(),"sinfg");
+//! \todo do we need locale_from_utf8() on non-Windows boxes too? (bug #1837445)
+#ifdef WIN32
+ return Glib::locale_from_utf8(Glib::build_filename(Glib::get_home_dir(),SYNFIG_USER_APP_DIR));
+#else
+ return Glib::build_filename(Glib::get_home_dir(),SYNFIG_USER_APP_DIR);
+#endif
}
-sinfg::String
-App::get_config_file(const sinfg::String& file)
+synfig::String
+App::get_config_file(const synfig::String& file)
{
return Glib::build_filename(get_user_app_directory(),file);
}
+#define SCALE_FACTOR (1280)
+//! set the \a instance's canvas(es) position and size to be those specified in the first entry of recent_files_window_size
+void
+App::set_recent_file_window_size(etl::handle<Instance> instance)
+{
+ int screen_w(Gdk::screen_width());
+ int screen_h(Gdk::screen_height());
+
+ const std::string &canvas_window_size = *recent_files_window_size.begin();
+
+ if(canvas_window_size.empty())
+ return;
+
+ synfig::String::size_type current=0;
+ bool seen_root(false), shown_non_root(false);
+
+ while(current != synfig::String::npos)
+ {
+ // find end of first field (canvas) or return
+ synfig::String::size_type separator = canvas_window_size.find_first_of(' ', current);
+ if(separator == synfig::String::npos) break;
+
+ // find the canvas
+ synfig::Canvas::Handle canvas;
+ try {
+ String warnings;
+ canvas = instance->get_canvas()->find_canvas(String(canvas_window_size, current, separator-current), warnings);
+ }
+ catch(Exception::IDNotFound) {
+ // can't find the canvas; skip to the next canvas or return
+ separator = canvas_window_size.find_first_of('\t', current);
+ if(separator == synfig::String::npos) return;
+ current = separator+1;
+ continue;
+ }
+
+ if (canvas->is_root())
+ seen_root = true;
+ else
+ shown_non_root = true;
+
+ // check that we have the tab character the ends this canvas' data or return
+ current = separator+1;
+ separator = canvas_window_size.find_first_of('\t', current);
+ if(separator == synfig::String::npos) return;
+
+ int x,y,w,h;
+ if(!strscanf(String(canvas_window_size, current, separator-current),"%d %d %d %d",&x, &y, &w, &h))
+ {
+ current = separator+1;
+ continue;
+ }
+
+ if (x > SCALE_FACTOR) x = SCALE_FACTOR - 150; if (x < 0) x = 0;
+ if (y > SCALE_FACTOR) y = SCALE_FACTOR - 150; if (y < 0) y = 0;
+ x=x*screen_w/SCALE_FACTOR;
+ y=y*screen_h/SCALE_FACTOR;
+ if(getenv("SYNFIG_WINDOW_POSITION_X_OFFSET"))
+ x += atoi(getenv("SYNFIG_WINDOW_POSITION_X_OFFSET"));
+ if(getenv("SYNFIG_WINDOW_POSITION_Y_OFFSET"))
+ y += atoi(getenv("SYNFIG_WINDOW_POSITION_Y_OFFSET"));
+
+ if (w > SCALE_FACTOR) w = 150; if (w < 0) w = 0;
+ if (h > SCALE_FACTOR) h = 150; if (h < 0) h = 0;
+
+ CanvasView::Handle canvasview = instance->find_canvas_view(canvas);
+ canvasview->move(x,y);
+ canvasview->resize(w*screen_w/SCALE_FACTOR,h*screen_h/SCALE_FACTOR);
+ canvasview->present();
+
+ current = separator+1;
+ }
+
+ if (shown_non_root && !seen_root)
+ instance->find_canvas_view(instance->get_canvas())->hide();
+}
+
+void
+App::add_recent_file(const etl::handle<Instance> instance)
+{
+ int screen_w(Gdk::screen_width());
+ int screen_h(Gdk::screen_height());
+
+ std::string canvas_window_size;
+
+ const Instance::CanvasViewList& cview_list = instance->canvas_view_list();
+ Instance::CanvasViewList::const_iterator iter;
+
+ for(iter=cview_list.begin();iter!=cview_list.end();iter++)
+ {
+ if( !((*iter)->is_visible()) )
+ continue;
+
+ etl::handle<synfig::Canvas> canvas = (*iter)->get_canvas();
+ int x_pos, y_pos, x_size, y_size;
+ (*iter)->get_position(x_pos,y_pos);
+ (*iter)->get_size(x_size,y_size);
+
+ canvas_window_size += strprintf("%s %d %d %d %d\t",
+ canvas->get_relative_id(canvas->get_root()).c_str(),
+ x_pos*SCALE_FACTOR/screen_w, y_pos*SCALE_FACTOR/screen_h,
+ x_size*SCALE_FACTOR/screen_w, y_size*SCALE_FACTOR/screen_h);
+ }
+
+ add_recent_file(absolute_path(instance->get_file_name()), canvas_window_size);
+}
+#undef SCALE_FACTOR
+
void
-App::add_recent_file(const std::string &file_name)
+App::add_recent_file(const std::string &file_name, const std::string &window_size)
{
std::string filename(file_name);
assert(!filename.empty());
-
+
if(filename.empty())
return;
-
+
// Toss out any "hidden" files
if(basename(filename)[0]=='.')
return;
-
- // If we aren't an absolute path, turn outselves into one
+
+ // If we aren't an absolute path, turn ourselves into one
if(!is_absolute_path(filename))
filename=absolute_path(filename);
-
+
+ std::string old_window_size;
+
list<string>::iterator iter;
+ list<string>::iterator iter_wsize;
// Check to see if the file is already on the list.
// If it is, then remove it from the list
- for(iter=recent_files.begin();iter!=recent_files.end();iter++)
+ for(iter=recent_files.begin(), iter_wsize=recent_files_window_size.begin();iter!=recent_files.end();iter++, iter_wsize++)
if(*iter==filename)
{
recent_files.erase(iter);
+ old_window_size = *iter_wsize;
+ recent_files_window_size.erase(iter_wsize);
break;
}
-
+
// Push the filename to the front of the list
recent_files.push_front(filename);
-
+ if(window_size.empty())
+ recent_files_window_size.push_front(old_window_size);
+ else
+ recent_files_window_size.push_front(window_size);
+
// Clean out the files at the end of the list.
while(recent_files.size()>(unsigned)get_max_recent_files())
+ {
recent_files.pop_back();
-
+ recent_files_window_size.pop_back();
+ }
+
signal_recent_files_changed_();
-
+
return;
}
}
void
-App::set_time_format(sinfg::Time::Format x)
+App::set_time_format(synfig::Time::Format x)
{
_App_time_format=x;
}
void
App::save_settings()
{
+ char * old_locale;
try
{
+ old_locale=strdup(setlocale(LC_NUMERIC, NULL));
+ setlocale(LC_NUMERIC, "C");
{
std::string filename=get_config_file("accelrc");
Gtk::AccelMap::save(filename);
std::string filename=get_config_file("recentfiles");
std::ofstream file(filename.c_str());
-
+
if(!file)
{
- sinfg::warning("Unable to save %s",filename.c_str());
+ synfig::warning("Unable to save %s",filename.c_str());
break;
}
-
+
list<string>::reverse_iterator iter;
-
+
for(iter=recent_files.rbegin();iter!=recent_files.rend();iter++)
file<<*iter<<endl;
}while(0);
+ do{
+ std::string filename=get_config_file("recentfiles")+std::string("_window_size");
+
+ std::ofstream file(filename.c_str());
+
+ if(!file)
+ {
+ synfig::warning("Unable to save %s",filename.c_str());
+ break;
+ }
+
+ list<string>::reverse_iterator iter;
+
+ for(iter=recent_files_window_size.rbegin();iter!=recent_files_window_size.rend();iter++)
+ file<<*iter<<endl;
+ }while(0);
std::string filename=get_config_file("settings");
- sinfgapp::Main::settings().save_to_file(filename);
+ synfigapp::Main::settings().save_to_file(filename);
+ setlocale(LC_NUMERIC,old_locale);
}
catch(...)
{
- sinfg::warning("Caught exception when attempting to save settings.");
+ synfig::warning("Caught exception when attempting to save settings.");
}
}
void
App::load_settings()
{
+ char * old_locale;
try
{
+ old_locale=strdup(setlocale(LC_NUMERIC, NULL));
+ setlocale(LC_NUMERIC, "C");
{
std::string filename=get_config_file("accelrc");
Gtk::AccelMap::load(filename);
}
{
+ bool window_size_broken = false;
+
std::string filename=get_config_file("recentfiles");
+ std::string filename_window_size=filename+std::string("_window_size");
std::ifstream file(filename.c_str());
-
+ std::ifstream file_window_size(filename_window_size.c_str());
+
+ if(!file_window_size)
+ window_size_broken = true;
+
while(file)
{
std::string recent_file;
+ std::string recent_file_window_size;
getline(file,recent_file);
+ if(!window_size_broken)
+ getline(file_window_size,recent_file_window_size);
if(!recent_file.empty())
- add_recent_file(recent_file);
+ {
+ if(!window_size_broken && !file_window_size)
+ window_size_broken = true;
+ if (std::ifstream(recent_file.c_str()))
+ {
+ if(!window_size_broken)
+ add_recent_file(recent_file,recent_file_window_size);
+ else
+ add_recent_file(recent_file);
+ }
+ }
+ }
+ if(!window_size_broken && file_window_size)
+ window_size_broken = true;
+
+ if(window_size_broken)
+ {
+ recent_files_window_size.clear();
+ recent_files_window_size.resize(recent_files.size());
}
}
std::string filename=get_config_file("settings");
- if(!sinfgapp::Main::settings().load_from_file(filename))
+ if(!synfigapp::Main::settings().load_from_file(filename))
{
- //std::string filename=Glib::build_filename(Glib::get_home_dir(),".sinfgrc");
- //if(!sinfgapp::Main::settings().load_from_file(filename))
+ //std::string filename=Glib::locale_from_utf8(Glib::build_filename(Glib::get_home_dir(),".synfigrc"));
+ //if(!synfigapp::Main::settings().load_from_file(filename))
{
gamma.set_gamma(1.0/2.2);
- sinfgapp::Main::settings().set_value("dock.dialog.1.comp_selector","1");
- sinfgapp::Main::settings().set_value("dock.dialog.1.contents","navigator - info pal_edit pal_browse - tool_options history canvases - layers groups");
- sinfgapp::Main::settings().set_value("dock.dialog.1.contents_size","225 167 207");
- sinfgapp::Main::settings().set_value("dock.dialog.1.pos","1057 32");
- sinfgapp::Main::settings().set_value("dock.dialog.1.size","208 1174");
- sinfgapp::Main::settings().set_value("dock.dialog.2.comp_selector","0");
- sinfgapp::Main::settings().set_value("dock.dialog.2.contents","params children keyframes | timetrack curves meta_data");
- sinfgapp::Main::settings().set_value("dock.dialog.2.contents_size","263");
- sinfgapp::Main::settings().set_value("dock.dialog.2.pos","0 973");
- sinfgapp::Main::settings().set_value("dock.dialog.2.size","1045 235");
- sinfgapp::Main::settings().set_value("pref.distance_system","pt");
- sinfgapp::Main::settings().set_value("pref.use_colorspace_gamma","1");
- sinfgapp::Main::settings().set_value("window.toolbox.pos","4 4");
+ reset_initial_window_configuration();
}
}
-
+ setlocale(LC_NUMERIC,old_locale);
}
catch(...)
{
- sinfg::warning("Caught exception when attempting to load settings.");
+ synfig::warning("Caught exception when attempting to load settings.");
}
}
+void
+App::reset_initial_window_configuration()
+{
+ synfigapp::Main::settings().set_value("dock.dialog.1.comp_selector","1");
+ synfigapp::Main::settings().set_value("dock.dialog.1.contents","navigator - info pal_edit pal_browse - tool_options history canvases - layers groups");
+ synfigapp::Main::settings().set_value("dock.dialog.1.contents_size","225 167 207");
+ synfigapp::Main::settings().set_value("dock.dialog.1.pos","1057 32");
+ synfigapp::Main::settings().set_value("dock.dialog.1.size","208 1174");
+ synfigapp::Main::settings().set_value("dock.dialog.2.comp_selector","0");
+ synfigapp::Main::settings().set_value("dock.dialog.2.contents","params children keyframes | timetrack curves meta_data");
+ synfigapp::Main::settings().set_value("dock.dialog.2.contents_size","263");
+ synfigapp::Main::settings().set_value("dock.dialog.2.pos","0 973");
+ synfigapp::Main::settings().set_value("dock.dialog.2.size","1045 235");
+ 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");
+#endif
+ synfigapp::Main::settings().set_value("pref.restrict_radius_ducks","0");
+ synfigapp::Main::settings().set_value("pref.resize_imported_images","0");
+ synfigapp::Main::settings().set_value("pref.custom_filename_prefix",DEFAULT_FILENAME_PREFIX);
+ synfigapp::Main::settings().set_value("pref.preferred_x_size","480");
+ synfigapp::Main::settings().set_value("pref.preferred_y_size","270");
+ synfigapp::Main::settings().set_value("pref.predefined_size",DEFAULT_PREDEFINED_SIZE);
+ synfigapp::Main::settings().set_value("pref.preferred_fps","24.0");
+ synfigapp::Main::settings().set_value("pref.predefined_fps",DEFAULT_PREDEFINED_FPS);
+ synfigapp::Main::settings().set_value("window.toolbox.pos","4 4");
+}
+
bool
App::shutdown_request(GdkEventAny*)
{
App::quit()
{
if(shutdown_in_progress)return;
-
-
- get_ui_interface()->task("Quit Request");
+
+
+ get_ui_interface()->task(_("Quit Request"));
if(Busy::count)
{
- dialog_error_blocking("Cannot quit!","Tasks are currently running.\nPlease cancel the current tasks and try again");
+ dialog_error_blocking(_("Cannot quit!"),_("Tasks are currently running.\nPlease cancel the current tasks and try again"));
return;
}
return;
/*
- if((*iter)->sinfgapp::Instance::get_action_count())
+ if((*iter)->synfigapp::Instance::get_action_count())
{
- handle<sinfgapp::UIInterface> uim;
+ handle<synfigapp::UIInterface> uim;
uim=(*iter)->find_canvas_view((*iter)->get_canvas())->get_ui_interface();
assert(uim);
string str=strprintf(_("Would you like to save your changes to %s?"),(*iter)->get_file_name().c_str() );
- switch(uim->yes_no_cancel((*iter)->get_canvas()->get_name(),str,sinfgapp::UIInterface::RESPONSE_YES))
+ switch(uim->yes_no_cancel((*iter)->get_canvas()->get_name(),str,synfigapp::UIInterface::RESPONSE_YES))
{
- case sinfgapp::UIInterface::RESPONSE_NO:
+ case synfigapp::UIInterface::RESPONSE_NO:
break;
- case sinfgapp::UIInterface::RESPONSE_YES:
+ case synfigapp::UIInterface::RESPONSE_YES:
(*iter)->save();
break;
- case sinfgapp::UIInterface::RESPONSE_CANCEL:
+ case synfigapp::UIInterface::RESPONSE_CANCEL:
return;
default:
assert(0);
}
- if((*iter)->sinfgapp::Instance::is_modified())
+ if((*iter)->synfigapp::Instance::is_modified())
{
- handle<sinfgapp::UIInterface> uim;
+ handle<synfigapp::UIInterface> uim;
uim=(*iter)->find_canvas_view((*iter)->get_canvas())->get_ui_interface();
assert(uim);
string str=strprintf(_("%s has changes not yet on the CVS repository.\nWould you like to commit these changes?"),(*iter)->get_file_name().c_str() );
- switch(uim->yes_no_cancel((*iter)->get_canvas()->get_name(),str,sinfgapp::UIInterface::RESPONSE_YES))
+ switch(uim->yes_no_cancel((*iter)->get_canvas()->get_name(),str,synfigapp::UIInterface::RESPONSE_YES))
{
- case sinfgapp::UIInterface::RESPONSE_NO:
+ case synfigapp::UIInterface::RESPONSE_NO:
break;
- case sinfgapp::UIInterface::RESPONSE_YES:
+ case synfigapp::UIInterface::RESPONSE_YES:
(*iter)->dialog_cvs_commit();
break;
- case sinfgapp::UIInterface::RESPONSE_CANCEL:
+ case synfigapp::UIInterface::RESPONSE_CANCEL:
return;
default:
assert(0);
return;
}
}
-*/
-
+*/
+
// This next line causes things to crash for some reason
- //(*iter)->close();
+ //(*iter)->close();
}
-
+
shutdown_in_progress=true;
instance_list.clear();
while(studio::App::events_pending())studio::App::iteration(false);
-
+
Gtk::Main::quit();
auto_recover->normal_shutdown();
- get_ui_interface()->task("Quit Request sent");
+ get_ui_interface()->task(_("Quit Request sent"));
}
void
dialog_setup->show();
}
-gint Signal_Open_Ok(GtkWidget *widget, int *val){*val=1;return 0;}
-gint Signal_Open_Cancel(GtkWidget *widget, int *val){*val=2;return 0;}
+gint Signal_Open_Ok(GtkWidget */*widget*/, int *val){*val=1;return 0;}
+gint Signal_Open_Cancel(GtkWidget */*widget*/, int *val){*val=2;return 0;}
//#ifdef WIN32
//#define USE_WIN32_FILE_DIALOGS 1
#ifdef WIN32
#include <gdk/gdkwin32.h>
#endif
-
+
bool
-App::dialog_open_file(const std::string &title, std::string &filename)
+App::dialog_open_file(const std::string &title, std::string &filename, std::string preference)
{
+ // info("App::dialog_open_file('%s', '%s', '%s')", title.c_str(), filename.c_str(), preference.c_str());
+
#ifdef USE_WIN32_FILE_DIALOGS
static TCHAR szFilter[] = TEXT ("All Files (*.*)\0*.*\0\0") ;
GdkWindow *gdkWinPtr=toolbox->get_window()->gobj();
HINSTANCE hInstance=static_cast<HINSTANCE>(GetModuleHandle(NULL));
HWND hWnd=static_cast<HWND>(GDK_WINDOW_HWND(gdkWinPtr));
-
+
ofn.lStructSize=sizeof(OPENFILENAME);
ofn.hwndOwner = hWnd;
ofn.hInstance = hInstance;
// ofn.lCustData = 0l;
ofn.lpfnHook=NULL;
// ofn.lpTemplateName=NULL;
-
+
CHAR szFilename[MAX_PATH];
CHAR szTitle[500];
strcpy(szFilename,filename.c_str());
strcpy(szTitle,title.c_str());
-
+
ofn.lpstrFile=szFilename;
ofn.lpstrFileTitle=szTitle;
-
+
if(GetOpenFileName(&ofn))
{
filename=szFilename;
return true;
}
return false;
-
+
#else
- sinfg::String prev_path;
- if(!_preferences.get_value("curr_path",prev_path))
- prev_path=".";
-
+ synfig::String prev_path;
+
+ if(!_preferences.get_value(preference, prev_path))
+ prev_path = ".";
+
+ prev_path = absolute_path(prev_path);
+
+ Gtk::FileChooserDialog *dialog = new Gtk::FileChooserDialog(title, Gtk::FILE_CHOOSER_ACTION_OPEN);
+
+ dialog->set_current_folder(prev_path);
+ dialog->add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
+ dialog->add_button(Gtk::Stock::OPEN, Gtk::RESPONSE_ACCEPT);
+
+ if (filename.empty())
+ dialog->set_filename(prev_path);
+ else if (is_absolute_path(filename))
+ dialog->set_filename(filename);
+ else
+ dialog->set_filename(prev_path + ETL_DIRECTORY_SEPARATOR + filename);
+
+ 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());
+ _preferences.set_value(preference, dirname(filename));
+ delete dialog;
+ return true;
+ }
+
+ 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_SEPERATOR).c_str());
+ 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());
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_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();
-
-
+ iteration();
+
+
if(val==1)
{
filename=gtk_file_selection_get_filename(GTK_FILE_SELECTION(fileselection));
- _preferences.set_value("curr_path",dirname(filename));
+ _preferences.set_value(preference,dirname(filename));
}
else
{
}
gtk_widget_destroy(fileselection);
return true;
+ */
#endif
}
bool
-App::dialog_save_file(const std::string &title, std::string &filename)
+App::dialog_save_file(const std::string &title, std::string &filename, std::string preference)
{
-#ifdef USE_WIN32_FILE_DIALOGS
+ // info("App::dialog_save_file('%s', '%s', '%s')", title.c_str(), filename.c_str(), preference.c_str());
+
+#if USE_WIN32_FILE_DIALOGS
static TCHAR szFilter[] = TEXT ("All Files (*.*)\0*.*\0\0") ;
-
+
GdkWindow *gdkWinPtr=toolbox->get_window()->gobj();
HINSTANCE hInstance=static_cast<HINSTANCE>(GetModuleHandle(NULL));
HWND hWnd=static_cast<HWND>(GDK_WINDOW_HWND(gdkWinPtr));
-
+
ofn.lStructSize=sizeof(OPENFILENAME);
ofn.hwndOwner = hWnd;
ofn.hInstance = hInstance;
// ofn.lCustData = 0l;
ofn.lpfnHook=NULL;
// ofn.lpTemplateName=NULL;
-
+
CHAR szFilename[MAX_PATH];
CHAR szTitle[500];
strcpy(szFilename,filename.c_str());
strcpy(szTitle,title.c_str());
-
+
ofn.lpstrFile=szFilename;
ofn.lpstrFileTitle=szTitle;
-
+
if(GetSaveFileName(&ofn))
{
filename=szFilename;
+ _preferences.set_value(preference,dirname(filename));
return true;
}
return false;
#else
- return dialog_open_file(title, filename);
-#endif
-}
+ synfig::String prev_path;
-bool
-App::dialog_saveas_file(const std::string &title, std::string &filename)
-{
-#if USE_WIN32_FILE_DIALOGS
- static TCHAR szFilter[] = TEXT ("All Files (*.*)\0*.*\0\0") ;
-
- GdkWindow *gdkWinPtr=toolbox->get_window()->gobj();
- HINSTANCE hInstance=static_cast<HINSTANCE>(GetModuleHandle(NULL));
- HWND hWnd=static_cast<HWND>(GDK_WINDOW_HWND(gdkWinPtr));
-
- ofn.lStructSize=sizeof(OPENFILENAME);
- ofn.hwndOwner = hWnd;
- ofn.hInstance = hInstance;
- ofn.lpstrFilter = szFilter;
-// ofn.lpstrCustomFilter=NULL;
-// ofn.nMaxCustFilter=0;
-// ofn.nFilterIndex=0;
-// ofn.lpstrFile=NULL;
- ofn.nMaxFile=MAX_PATH;
-// ofn.lpstrFileTitle=NULL;
-// ofn.lpstrInitialDir=NULL;
-// ofn.lpstrTitle=NULL;
- ofn.Flags=OFN_OVERWRITEPROMPT;
-// ofn.nFileOffset=0;
-// ofn.nFileExtension=0;
- ofn.lpstrDefExt=TEXT("sif");
-// ofn.lCustData = 0l;
- ofn.lpfnHook=NULL;
-// ofn.lpTemplateName=NULL;
-
- CHAR szFilename[MAX_PATH];
- CHAR szTitle[500];
- strcpy(szFilename,filename.c_str());
- strcpy(szTitle,title.c_str());
-
- ofn.lpstrFile=szFilename;
- ofn.lpstrFileTitle=szTitle;
-
- if(GetSaveFileName(&ofn))
+ if(!_preferences.get_value(preference, prev_path))
+ prev_path=".";
+
+ prev_path = absolute_path(prev_path);
+
+ Gtk::FileChooserDialog *dialog = new Gtk::FileChooserDialog(title, Gtk::FILE_CHOOSER_ACTION_SAVE);
+
+ dialog->set_current_folder(prev_path);
+ dialog->add_button(Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
+ dialog->add_button(Gtk::Stock::SAVE, Gtk::RESPONSE_ACCEPT);
+
+ Widget_Enum *file_type_enum = 0;
+ if (preference == ANIMATION_DIR_PREFERENCE)
{
- filename=szFilename;
- return true;
+ 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_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"))));
+ file_type_enum->set_value(RELEASE_VERSION_END-1); // default to the most recent version
+
+ Gtk::HBox *hbox = manage(new Gtk::HBox);
+ hbox->pack_start(*manage(new Gtk::Label(_("File Format Version: "))),Gtk::PACK_SHRINK,0);
+ hbox->pack_start(*file_type_enum,Gtk::PACK_EXPAND_WIDGET,0);
+ hbox->show_all();
+
+ dialog->set_extra_widget(*hbox);
}
- return false;
-#else
- return dialog_open_file(title, filename);
+
+ if (filename.empty())
+ dialog->set_filename(prev_path);
+ else
+ {
+ std::string full_path;
+ if (is_absolute_path(filename))
+ full_path = filename;
+ else
+ full_path = prev_path + ETL_DIRECTORY_SEPARATOR + filename;
+
+ // select the file if it exists
+ dialog->set_filename(full_path);
+
+ // if the file doesn't exist, put its name into the filename box
+ struct stat s;
+ if(stat(full_path.c_str(),&s) == -1 && errno == ENOENT)
+ dialog->set_current_name(basename(filename));
+ }
+
+ if(dialog->run() == GTK_RESPONSE_ACCEPT) {
+ 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());
+ _preferences.set_value(preference, dirname(filename));
+ delete dialog;
+ return true;
+ }
+
+ delete dialog;
+ return false;
#endif
}
void
App::dialog_error_blocking(const std::string &title, const std::string &message)
{
- Gtk::Dialog dialog(
- title, // Title
- true, // Modal
- true // use_separator
- );
- Gtk::Label label(message);
- label.show();
-
- dialog.get_vbox()->pack_start(label);
- dialog.add_button(Gtk::StockID("gtk-ok"),1);
+ Gtk::MessageDialog dialog(message, false, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_CLOSE, true);
+ dialog.set_title(title);
dialog.show();
dialog.run();
}
void
App::dialog_warning_blocking(const std::string &title, const std::string &message)
{
- Gtk::Dialog dialog(
- title, // Title
- true, // Modal
- true // use_separator
- );
- Gtk::Label label(message);
- label.show();
-
- dialog.get_vbox()->pack_start(label);
- dialog.add_button(Gtk::StockID("gtk-ok"),1);
+ Gtk::MessageDialog dialog(message, false, Gtk::MESSAGE_WARNING, Gtk::BUTTONS_CLOSE, true);
+ dialog.set_title(title);
dialog.show();
dialog.run();
}
);
Gtk::Label label(message);
label.show();
-
+
dialog.get_vbox()->pack_start(label);
dialog.add_button(Gtk::StockID("gtk-yes"),1);
dialog.add_button(Gtk::StockID("gtk-no"),0);
void
App::dialog_not_implemented()
{
- Gtk::Dialog dialog(
- "Feature not available", // Title
- true, // Modal
- true // use_separator
- );
- Gtk::Label label("Sorry, this feature has not yet been implemented.");
- label.show();
-
- dialog.get_vbox()->pack_start(label);
- dialog.add_button(Gtk::StockID("gtk-ok"),Gtk::RESPONSE_OK);
- dialog.show();
+ Gtk::MessageDialog dialog(_("Feature not available"), false, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_CLOSE, true);
+ dialog.set_secondary_text(_("Sorry, this feature has not yet been implemented."));
dialog.run();
}
+static bool
+try_open_url(const std::string &url)
+{
+#ifdef WIN32
+ return ShellExecute(GetDesktopWindow(), "open", url.c_str(), NULL, NULL, SW_SHOW);
+#else // !WIN32
+ std::vector<std::string> command_line;
+ std::vector<std::string> browsers;
+ browsers.reserve(23);
+
+ // Browser wrapper scripts
+#ifdef USE_OPEN_FOR_URLS
+ browsers.push_back("open"); // Apple MacOS X wrapper, on Linux it opens a virtual console
+#endif
+ browsers.push_back("xdg-open"); // XDG wrapper
+ browsers.push_back("sensible-browser"); // Debian wrapper
+ browsers.push_back("gnome-open"); // GNOME wrapper
+ browsers.push_back("kfmclient"); // KDE wrapper
+ browsers.push_back("exo-open"); // XFCE wrapper
+
+ // Alternatives system
+ browsers.push_back("gnome-www-browser"); // Debian GNOME alternative
+ browsers.push_back("x-www-browser"); // Debian GUI alternative
+
+ // Individual browsers
+ browsers.push_back("firefox");
+ browsers.push_back("epiphany-browser");
+ browsers.push_back("epiphany");
+ browsers.push_back("konqueror");
+ browsers.push_back("iceweasel");
+ browsers.push_back("mozilla");
+ browsers.push_back("netscape");
+ browsers.push_back("icecat");
+ browsers.push_back("galeon");
+ browsers.push_back("midori");
+ browsers.push_back("safari");
+ browsers.push_back("opera");
+ browsers.push_back("amaya");
+ browsers.push_back("netsurf");
+ browsers.push_back("dillo");
+
+ // Try the user-specified browser first
+ command_line.push_back(App::browser_command);
+ if( command_line[0] == "kfmclient" ) command_line.push_back("openURL");
+ command_line.push_back(url);
+
+ try { Glib::spawn_async(".", command_line, Glib::SPAWN_SEARCH_PATH); return true; }
+ catch( Glib::SpawnError& exception ){
+
+ while ( !browsers.empty() )
+ {
+ // Skip the browser if we already tried it
+ if( browsers[0] == App::browser_command )
+ continue;
+
+ // Construct the command line
+ command_line.clear();
+ command_line.push_back(browsers[0]);
+ if( command_line[0] == "kfmclient" ) command_line.push_back("openURL");
+ command_line.push_back(url);
+
+ // Remove the browser from the list
+ browsers.erase(browsers.begin());
+
+ // Try to spawn the browser
+ try { Glib::spawn_async(".", command_line, Glib::SPAWN_SEARCH_PATH); }
+ // Failed, move on to the next one
+ catch(Glib::SpawnError& exception){ continue; }
+ return true; // No exception means we succeeded!
+ }
+ }
+
+ return false;
+#endif // !WIN32
+}
+
+void
+App::dialog_help()
+{
+ if (!try_open_url("http://synfig.org/Documentation"))
+ {
+ Gtk::MessageDialog dialog(_("Documentation"), false, Gtk::MESSAGE_INFO, Gtk::BUTTONS_CLOSE, true);
+ dialog.set_secondary_text(_("Documentation for Synfig Studio is available on the website:\n\nhttp://www.synfig.org/Documentation"));
+ dialog.set_title(_("Help"));
+ dialog.run();
+ }
+}
+
+void
+App::open_url(const std::string &url)
+{
+ if(!try_open_url(url))
+ {
+ Gtk::MessageDialog dialog(_("No browser was found. Please load this website manually:"), false, Gtk::MESSAGE_ERROR, Gtk::BUTTONS_CLOSE, true);
+ dialog.set_secondary_text(url);
+ dialog.set_title(_("No browser found"));
+ dialog.run();
+ }
+}
+
bool
App::dialog_entry(const std::string &title, const std::string &message,std::string &text)
{
Gtk::Dialog dialog(
title, // Title
true, // Modal
- true // use_separator
- );
+ true); // use_separator
+
Gtk::Label label(message);
label.show();
dialog.get_vbox()->pack_start(label);
entry.set_text(text);
entry.show();
entry.set_activates_default(true);
+
dialog.get_vbox()->pack_start(entry);
dialog.add_button(Gtk::StockID("gtk-ok"),Gtk::RESPONSE_OK);
dialog.add_button(Gtk::StockID("gtk-cancel"),Gtk::RESPONSE_CANCEL);
dialog.set_default_response(Gtk::RESPONSE_OK);
+
entry.signal_activate().connect(sigc::bind(sigc::mem_fun(dialog,&Gtk::Dialog::response),Gtk::RESPONSE_OK));
dialog.show();
return true;
}
+bool
+App::dialog_paragraph(const std::string &title, const std::string &message,std::string &text)
+{
+ Gtk::Dialog dialog(
+ title, // Title
+ true, // Modal
+ true); // use_separator
+
+ Gtk::Label label(message);
+ label.show();
+ dialog.get_vbox()->pack_start(label);
+ Glib::RefPtr<Gtk::TextBuffer> text_buffer(Gtk::TextBuffer::create());
+ text_buffer->set_text(text);
+ Gtk::TextView text_view(text_buffer);
+ text_view.show();
+ dialog.get_vbox()->pack_start(text_view);
+
+ dialog.add_button(Gtk::StockID("gtk-ok"),Gtk::RESPONSE_OK);
+ dialog.add_button(Gtk::StockID("gtk-cancel"),Gtk::RESPONSE_CANCEL);
+ dialog.set_default_response(Gtk::RESPONSE_OK);
+
+ //text_entry.signal_activate().connect(sigc::bind(sigc::mem_fun(dialog,&Gtk::Dialog::response),Gtk::RESPONSE_OK));
+ dialog.show();
+
+ if(dialog.run()!=Gtk::RESPONSE_OK)
+ return false;
+
+ text=text_buffer->get_text();
+
+ return true;
+}
bool
App::open(std::string filename)
return open_as(filename,filename);
}
+// this is called from autorecover.cpp:
+// App::open_as(get_shadow_file_name(filename),filename)
+// other than that, 'filename' and 'as' are the same
bool
App::open_as(std::string filename,std::string as)
{
+#ifdef WIN32
+ char long_name[1024];
+ if(GetLongPathName(as.c_str(),long_name,sizeof(long_name)));
+ // when called from autorecover.cpp, filename doesn't exist, and so long_name is empty
+ // don't use it if that's the case
+ if (long_name[0] != '\0')
+ as=long_name;
+#endif
+
try
{
OneMoment one_moment;
-
- etl::handle<sinfg::Canvas> canvas(open_canvas_as(filename,as));
+ String errors, warnings;
+
+ etl::handle<synfig::Canvas> canvas(open_canvas_as(filename,as,errors,warnings));
if(canvas && get_instance(canvas))
{
get_instance(canvas)->find_canvas_view(canvas)->present();
- throw (String)strprintf(_("\"%s\" appears to already be open!"),filename.c_str());
+ info("%s is already open", filename.c_str());
+ // throw (String)strprintf(_("\"%s\" appears to already be open!"),filename.c_str());
+ }
+ else
+ {
+ if(!canvas)
+ throw (String)strprintf(_("Unable to load \"%s\":\n\n"),filename.c_str()) + errors;
+
+ if (warnings != "")
+ dialog_warning_blocking(_("Warnings"), strprintf("%s:\n\n%s", _("Warnings"), warnings.c_str()));
+
+ if (as.find(custom_filename_prefix.c_str()) != 0)
+ add_recent_file(as);
+
+ handle<Instance> instance(Instance::create(canvas));
+
+ if(!instance)
+ throw (String)strprintf(_("Unable to create instance for \"%s\""),filename.c_str());
+
+ set_recent_file_window_size(instance);
+
+ one_moment.hide();
+
+ if(instance->is_updated() && App::dialog_yes_no(_("CVS Update"), _("There appears to be a newer version of this file available on the CVS repository.\nWould you like to update now? (It would probably be a good idea)")))
+ instance->dialog_cvs_update();
}
- if(!canvas)
- throw (String)strprintf(_("Unable to open file \"%s\""),filename.c_str());
-
- add_recent_file(as);
-
- handle<Instance> instance(Instance::create(canvas));
-
- if(!instance)
- throw (String)strprintf(_("Unable to create instance for \"%s\""),filename.c_str());
-
- one_moment.hide();
-
- if(instance->is_updated() && App::dialog_yes_no(_("CVS Update"), _("There appears to be a newer version of this file available on the CVS repository.\nWould you like to update now? (It would probably be a good idea)")))
- instance->dialog_cvs_update();
}
catch(String x)
{
dialog_error_blocking(_("Error"), x);
return false;
}
+ catch(runtime_error x)
+ {
+ dialog_error_blocking(_("Error"), x.what());
+ return false;
+ }
catch(...)
{
dialog_error_blocking(_("Error"), _("Uncaught error on file open (BUG)"));
return false;
}
- _preferences.set_value("curr_path",dirname(as));
-
return true;
}
void
App::new_instance()
{
- handle<sinfg::Canvas> canvas=sinfg::Canvas::create();
- canvas->set_name(strprintf("Untitled%d",Instance::get_count()));
+ handle<synfig::Canvas> canvas=synfig::Canvas::create();
- String file_name(strprintf("untitled%d.sif",Instance::get_count()));
-
- canvas->rend_desc().set_frame_rate(24.0);
+ String file_name(strprintf("%s%d", App::custom_filename_prefix.c_str(), Instance::get_count()+1));
+ canvas->set_name(file_name);
+ file_name += ".sifz";
+
+ canvas->rend_desc().set_frame_rate(preferred_fps);
canvas->rend_desc().set_time_start(0.0);
- canvas->rend_desc().set_time_end(00.0);
+ canvas->rend_desc().set_time_end(5.0);
canvas->rend_desc().set_x_res(DPI2DPM(72.0f));
canvas->rend_desc().set_y_res(DPI2DPM(72.0f));
- canvas->rend_desc().set_tl(Vector(-4,2.25));
- canvas->rend_desc().set_br(Vector(4,-2.25));
- canvas->rend_desc().set_w(480);
- canvas->rend_desc().set_h(270);
+ // The top left and botton right positions are expressed in units
+ // Original convention is that 1 unit = 60 pixels
+ canvas->rend_desc().set_tl(Vector(-(preferred_x_size/60.0)/2.0,(preferred_y_size/60.0)/2.0));
+ canvas->rend_desc().set_br(Vector((preferred_x_size/60.0)/2.0,-(preferred_y_size/60.0)/2.0));
+ canvas->rend_desc().set_w(preferred_x_size);
+ canvas->rend_desc().set_h(preferred_y_size);
canvas->rend_desc().set_antialias(1);
canvas->rend_desc().set_flags(RendDesc::PX_ASPECT|RendDesc::IM_SPAN);
canvas->set_file_name(file_name);
-
- Instance::create(canvas)->find_canvas_view(canvas)->canvas_properties.present();
+
+ handle<Instance> instance = Instance::create(canvas);
+
+ if (getenv("SYNFIG_ENABLE_NEW_CANVAS_EDIT_PROPERTIES"))
+ instance->find_canvas_view(canvas)->canvas_properties.present();
}
void
-App::dialog_open()
+App::dialog_open(string filename)
{
- string filename="*.sif";
+ if (filename.empty())
+ filename="*.sif";
- while(dialog_open_file("Open", filename))
+ while(dialog_open_file("Open", filename, ANIMATION_DIR_PREFERENCE))
{
// If the filename still has wildcards, then we should
// continue looking for the file we want
}
etl::loose_handle<Instance>
-App::get_instance(Canvas::Handle canvas)
+App::get_instance(etl::handle<synfig::Canvas> canvas)
{
if(!canvas) return 0;
canvas=canvas->get_root();
void
App::dialog_about()
{
- (new class About())->show();
+ if(about)
+ about->show();
}
void
selected_instance->redo();
}
-sinfg::String
+synfig::String
studio::App::get_base_path()
{
return app_base_path_;
projects / synfig.git / blobdiff