projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tidying.
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
instance.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/instance.cpp
b/synfig-studio/trunk/src/gtkmm/instance.cpp
index
4b6dda5
..
93333d8
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/instance.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/instance.cpp
@@
-50,7
+50,7
@@
#include <synfig/valuenode_composite.h>
#include "widget_waypointmodel.h"
#include <gtkmm/actiongroup.h>
#include <synfig/valuenode_composite.h>
#include "widget_waypointmodel.h"
#include <gtkmm/actiongroup.h>
-#include "iconcontroler.h"
+#include "iconcontrol
l
er.h"
#include <sys/stat.h>
#include <errno.h>
#include <sys/stat.h>
#include <errno.h>
@@
-271,7
+271,7
@@
studio::Instance::dialog_save_as()
{
String ext(filename_extension(filename));
if(ext!=".sif" && ext!=".sifz" && !App::dialog_yes_no(_("Unknown extension"),
{
String ext(filename_extension(filename));
if(ext!=".sif" && ext!=".sifz" && !App::dialog_yes_no(_("Unknown extension"),
- _("You have given the file name an extension\nwhich I do not recogni
s
e. Are you sure this is what you want?")))
+ _("You have given the file name an extension\nwhich I do not recogni
z
e. Are you sure this is what you want?")))
continue;
}
catch(...)
continue;
}
catch(...)
@@
-480,7
+480,7
@@
Instance::dialog_cvs_commit()
}
catch(...)
{
}
catch(...)
{
- App::dialog_error_blocking(_("Error"),_("An error has occured when trying to COMMIT"));
+ App::dialog_error_blocking(_("Error"),_("An error has occur
r
ed when trying to COMMIT"));
}
update_all_titles();
}
}
update_all_titles();
}
@@
-505,7
+505,7
@@
Instance::dialog_cvs_add()
}
catch(...)
{
}
catch(...)
{
- App::dialog_error_blocking(_("Error"),_("An error has occured when trying to ADD"));
+ App::dialog_error_blocking(_("Error"),_("An error has occur
r
ed when trying to ADD"));
}
update_all_titles();
}
}
update_all_titles();
}
@@
-546,7
+546,7
@@
Instance::dialog_cvs_update()
}
catch(...)
{
}
catch(...)
{
- App::dialog_error_blocking(_("Error"),_("An error has occured when trying to UPDATE"));
+ App::dialog_error_blocking(_("Error"),_("An error has occur
r
ed when trying to UPDATE"));
}
//update_all_titles();
}
}
//update_all_titles();
}
@@
-582,7
+582,7
@@
Instance::dialog_cvs_revert()
}
catch(...)
{
}
catch(...)
{
- App::dialog_error_blocking(_("Error"),_("An error has occured when trying to UPDATE"));
+ App::dialog_error_blocking(_("Error"),_("An error has occur
r
ed when trying to UPDATE"));
}
//update_all_titles();
}
}
//update_all_titles();
}
@@
-807,7
+807,7
@@
Instance::add_actions_to_menu(Gtk::Menu *menu, const synfigapp::Action::ParamLis
if(candidate_list2.empty())
synfig::warning("%s:%d Action CandidateList2 is empty!", __FILE__, __LINE__);
if(candidate_list2.empty())
synfig::warning("%s:%d Action CandidateList2 is empty!", __FILE__, __LINE__);
- // Sep
e
rate out the candidate lists so that there are no conflicts
+ // Sep
a
rate out the candidate lists so that there are no conflicts
for(iter=candidate_list.begin();iter!=candidate_list.end();++iter)
{
synfigapp::Action::CandidateList::iterator iter2(candidate_list2.find(iter->name));
for(iter=candidate_list.begin();iter!=candidate_list.end();++iter)
{
synfigapp::Action::CandidateList::iterator iter2(candidate_list2.find(iter->name));