Author: Yu Chen <jco...@gmail.com>
Date: Tue Jan 8 00:10:28 2013 +0800
Revert the internal name for group layer to encapsulate
---
synfig-studio/src/gui/docks/dockdialog.cpp | 23 --------------------
synfig-studio/src/gui/docks/dockdialog.h | 4 ---
synfig-studio/src/gui/iconcontroller.cpp | 2 +-
synfig-studio/src/gui/trees/layertree.cpp | 10 ++++----
synfig-studio/src/gui/trees/layertree.h | 2 +-
.../src/synfigapp/actions/layerencapsulate.cpp | 2 +-
6 files changed, 8 insertions(+), 35 deletions(-)
diff --git a/synfig-studio/src/gui/docks/dockdialog.cpp
b/synfig-studio/src/gui/docks/dockdialog.cpp
index 05d078a..68e4fc8 100644
--- a/synfig-studio/src/gui/docks/dockdialog.cpp
+++ b/synfig-studio/src/gui/docks/dockdialog.cpp
@@ -508,23 +508,6 @@ DockDialog::get_contents()const
return ret;
}
-
-///Enable compatiblity to allow terms reworked synfig studio load old settings
file properly for panels:
-//params -> parameters, groups -> sets, children -> library), it should be
removed in the future.
-void
-DockDialog::setting_map(synfig::String& settings, const synfig::String&
strsrc, const synfig::String& strdst)
-{
- synfig::String::size_type pos=0;
- synfig::String::size_type srclen=strsrc.size();
- synfig::String::size_type dstlen=strdst.size();
- while((pos=settings.find(strsrc, pos))!=synfig::String::npos)
- {
- settings.replace(pos, srclen, strdst);
- pos += dstlen;
- }
-
-}
-
void
DockDialog::set_contents(const synfig::String& z)
{
@@ -561,12 +544,6 @@ DockDialog::set_contents(const synfig::String& z)
str=String(str.begin()+separator+1,str.end());
}
- //Enable compatiblity to allow terms reworked synfig
studio(Params -> Parameters, Children -> Library,
- //Groups -> Sets) load the old version setting file properly.
- setting_map(book_contents, "params", "parameters");
- setting_map(book_contents, "children", "library");
- setting_map(book_contents, "groups", "sets");
-
try
{
append_dock_book()->set_contents(book_contents);
diff --git a/synfig-studio/src/gui/docks/dockdialog.h
b/synfig-studio/src/gui/docks/dockdialog.h
index 69cbfcb..587a201 100644
--- a/synfig-studio/src/gui/docks/dockdialog.h
+++ b/synfig-studio/src/gui/docks/dockdialog.h
@@ -98,10 +98,6 @@ private:
bool focused_widget_has_priority(Gtk::Widget* focused);
- //Enable compatiblity to allow terms reworked synfig studio load old
settings file properly for panels:
- //params -> parameters, groups -> sets, children -> library), it should
be removed in the future.
- void setting_map(synfig::String& settings, const synfig::String&
strscr, const synfig::String& strdst);
-
public:
const std::vector<int>& get_dock_book_sizes()const { return
dock_book_sizes_;}
diff --git a/synfig-studio/src/gui/iconcontroller.cpp
b/synfig-studio/src/gui/iconcontroller.cpp
index 166716c..f2e9bc1 100644
--- a/synfig-studio/src/gui/iconcontroller.cpp
+++ b/synfig-studio/src/gui/iconcontroller.cpp
@@ -245,7 +245,7 @@ IconController::IconController(const synfig::String&
/*basepath*/)
INIT_STOCK_ICON(grid_snap_enable,"grid_snap_enable_icon."IMAGE_EXT,_("Enable
Grid Snap"));
INIT_STOCK_ICON(grid_snap_disable,"grid_snap_disable_icon."IMAGE_EXT,_("Disable
Grid Snap"));
INIT_STOCK_ICON(duplicate,"duplicate_icon."IMAGE_EXT,_("Duplicate"));
- INIT_STOCK_ICON(group,"group_icon."IMAGE_EXT,_("Group"));
+ INIT_STOCK_ICON(encapsulate,"group_icon."IMAGE_EXT,_("Group"));
INIT_STOCK_ICON(select_all_child_layers,"select_all_child_layers_icon."IMAGE_EXT,_("Select
All Child Layers"));
INIT_STOCK_ICON(clear_undo,"clear_undo_icon."IMAGE_EXT,_("Clear Undo
Stack"));
diff --git a/synfig-studio/src/gui/trees/layertree.cpp
b/synfig-studio/src/gui/trees/layertree.cpp
index 0ceed21..231a126 100644
--- a/synfig-studio/src/gui/trees/layertree.cpp
+++ b/synfig-studio/src/gui/trees/layertree.cpp
@@ -131,13 +131,13 @@ LayerTree::LayerTree():
SMALL_BUTTON(button_raise,"gtk-go-up","Raise");
SMALL_BUTTON(button_lower,"gtk-go-down","Lower");
SMALL_BUTTON(button_duplicate,"synfig-duplicate","Duplicate");
- SMALL_BUTTON(button_group,"synfig-group","Group");
+ SMALL_BUTTON(button_encapsulate,"synfig-encapsulate","Group");
SMALL_BUTTON(button_delete,"gtk-delete","Delete");
hbox->pack_start(*button_raise,Gtk::PACK_SHRINK);
hbox->pack_start(*button_lower,Gtk::PACK_SHRINK);
hbox->pack_start(*button_duplicate,Gtk::PACK_SHRINK);
- hbox->pack_start(*button_group,Gtk::PACK_SHRINK);
+ hbox->pack_start(*button_encapsulate,Gtk::PACK_SHRINK);
hbox->pack_start(*button_delete,Gtk::PACK_SHRINK);
// button_raise->signal_clicked().connect(sigc::mem_fun(*this,
&studio::LayerTree::on_raise_pressed));
@@ -149,7 +149,7 @@ LayerTree::LayerTree():
button_raise->set_sensitive(false);
button_lower->set_sensitive(false);
button_duplicate->set_sensitive(false);
- button_group->set_sensitive(false);
+ button_encapsulate->set_sensitive(false);
button_delete->set_sensitive(false);
get_selection()->signal_changed().connect(sigc::mem_fun(*this,
&studio::LayerTree::on_selection_changed));
@@ -612,7 +612,7 @@ LayerTree::on_selection_changed()
button_raise->set_sensitive(false);
button_lower->set_sensitive(false);
button_duplicate->set_sensitive(false);
- button_group->set_sensitive(false);
+ button_encapsulate->set_sensitive(false);
button_delete->set_sensitive(false);
layer_amount_hscale->set_sensitive(false);
blend_method_widget.set_sensitive(false);
@@ -622,7 +622,7 @@ LayerTree::on_selection_changed()
button_raise->set_sensitive(true);
button_lower->set_sensitive(true);
button_duplicate->set_sensitive(true);
- button_group->set_sensitive(true);
+ button_encapsulate->set_sensitive(true);
button_delete->set_sensitive(true);
if(layer_list.size()==1 &&
(*layer_list.begin())->get_param("amount").is_valid()&&
(*layer_list.begin())->get_param("amount").same_type_as(Real()))
diff --git a/synfig-studio/src/gui/trees/layertree.h
b/synfig-studio/src/gui/trees/layertree.h
index b711025..56666f9 100644
--- a/synfig-studio/src/gui/trees/layertree.h
+++ b/synfig-studio/src/gui/trees/layertree.h
@@ -145,7 +145,7 @@ private:
Gtk::Button *button_raise;
Gtk::Button *button_lower;
Gtk::Button *button_duplicate;
- Gtk::Button *button_group;
+ Gtk::Button *button_encapsulate;
Gtk::Button *button_delete;
Widget_ValueBase blend_method_widget;
diff --git a/synfig-studio/src/synfigapp/actions/layerencapsulate.cpp
b/synfig-studio/src/synfigapp/actions/layerencapsulate.cpp
index 0b5be1f..a834371 100644
--- a/synfig-studio/src/synfigapp/actions/layerencapsulate.cpp
+++ b/synfig-studio/src/synfigapp/actions/layerencapsulate.cpp
@@ -50,7 +50,7 @@ using namespace Action;
ACTION_INIT_NO_GET_LOCAL_NAME(Action::LayerEncapsulate);
ACTION_SET_NAME(Action::LayerEncapsulate,"LayerGroup");
ACTION_SET_LOCAL_NAME(Action::LayerEncapsulate,N_("Group Layer"));
-ACTION_SET_TASK(Action::LayerEncapsulate,"group");
+ACTION_SET_TASK(Action::LayerEncapsulate,"encapsulate");
ACTION_SET_CATEGORY(Action::LayerEncapsulate,Action::CATEGORY_LAYER);
ACTION_SET_PRIORITY(Action::LayerEncapsulate,0);
ACTION_SET_VERSION(Action::LayerEncapsulate,"0.0");
------------------------------------------------------------------------------
Everyone hates slow websites. So do we.
Make your web apps faster with AppDynamics
Download AppDynamics Lite for free today:
http://p.sf.net/sfu/appdyn_d2d_jan
_______________________________________________
Synfig-devl mailing list
Synfig-devl@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/synfig-devl
