Author: Yu Chen <[email protected]>
Date: Wed Jan 9 21:52:50 2013 +0800
Revert some internal names
---
synfig-studio/src/gui/iconcontroller.cpp | 10 +++++-----
.../src/gui/trees/layergrouptreestore.cpp | 2 +-
.../src/synfigapp/actions/groupaddlayers.cpp | 2 +-
.../src/synfigapp/actions/groupremovelayers.cpp | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/synfig-studio/src/gui/iconcontroller.cpp
b/synfig-studio/src/gui/iconcontroller.cpp
index a768676..d7a37dd 100644
--- a/synfig-studio/src/gui/iconcontroller.cpp
+++ b/synfig-studio/src/gui/iconcontroller.cpp
@@ -223,7 +223,7 @@ IconController::IconController(const synfig::String&
/*basepath*/)
// Other Layers
INIT_STOCK_ICON(layer_other_duplicate,"layer_other_duplicate_icon."IMAGE_EXT,_("Duplicate
Layer"));
INIT_STOCK_ICON(layer_other_importimage,"layer_other_importimage_icon."IMAGE_EXT,_("Import
Image Layer"));
-
INIT_STOCK_ICON(layer_other_group,"layer_other_group_icon."IMAGE_EXT,_("Group
Layer"));
+
INIT_STOCK_ICON(layer_other_pastecanvas,"layer_other_group_icon."IMAGE_EXT,_("Group
Layer"));
INIT_STOCK_ICON(layer_other_plant,"layer_other_plant_icon."IMAGE_EXT,_("Plant
Layer"));
INIT_STOCK_ICON(layer_other_supersample,"layer_other_supersample_icon."IMAGE_EXT,_("Super
Sample Layer"));
INIT_STOCK_ICON(layer_other_text,"layer_other_text_icon."IMAGE_EXT,_("Text
Layer"));
@@ -238,7 +238,7 @@ IconController::IconController(const synfig::String&
/*basepath*/)
INIT_STOCK_ICON(layer_transform_scale,"layer_transform_scale_icon."IMAGE_EXT,_("Scale
Layer"));
INIT_STOCK_ICON(info,"info_icon."IMAGE_EXT,_("Info Tool"));
- INIT_STOCK_ICON(groups,"set_icon."IMAGE_EXT,_("Set"));
+ INIT_STOCK_ICON(group,"set_icon."IMAGE_EXT,_("Set"));
INIT_STOCK_ICON(grid_enable,"grid_enable_icon."IMAGE_EXT,_("Show
Grid"));
INIT_STOCK_ICON(grid_disable,"grid_disable_icon."IMAGE_EXT,_("Hide
Grid"));
@@ -283,8 +283,8 @@ IconController::IconController(const synfig::String&
/*basepath*/)
INIT_STOCK_ICON(animate_seek_end,"animate_seek_end_icon."IMAGE_EXT,_("Seek to
end"));
INIT_STOCK_ICON(animate_loop,"animate_loop_icon."IMAGE_EXT,_("Animate
Loop"));
- INIT_STOCK_ICON(add_to_set,"action_add_to_set_icon."IMAGE_EXT,_("Add
Layer to Set"));
-
INIT_STOCK_ICON(remove_from_set,"action_remove_from_set_icon."IMAGE_EXT,_("Remove
Layer from Set"));
+ INIT_STOCK_ICON(add_to_group,"action_add_to_set_icon."IMAGE_EXT,_("Add
Layer to Set"));
+
INIT_STOCK_ICON(remove_from_group,"action_remove_from_set_icon."IMAGE_EXT,_("Remove
Layer from Set"));
INIT_STOCK_ICON(set_desc,"action_set_layer_description_icon."IMAGE_EXT,_("Set
Layer Description"));
INIT_STOCK_ICON(export,"action_export_icon."IMAGE_EXT,_("Export Value
Node"));
INIT_STOCK_ICON(unexport,"action_unexport_icon."IMAGE_EXT,_("Unexport
Value Node"));
@@ -580,7 +580,7 @@ studio::layer_icon(const synfig::String &layer)
else if(layer=="importimage" || layer=="import")
return Gtk::StockID("synfig-layer_other_importimage");
else if(layer=="PasteCanvas" || layer=="pastecanvas" ||
layer=="paste_canvas")
- return Gtk::StockID("synfig-layer_other_group");
+ return Gtk::StockID("synfig-layer_other_pastecanvas");
else if(layer=="plant")
return Gtk::StockID("synfig-layer_other_plant");
else if(layer=="super_sample")
diff --git a/synfig-studio/src/gui/trees/layergrouptreestore.cpp
b/synfig-studio/src/gui/trees/layergrouptreestore.cpp
index b9fe8ae..b33de75 100644
--- a/synfig-studio/src/gui/trees/layergrouptreestore.cpp
+++ b/synfig-studio/src/gui/trees/layergrouptreestore.cpp
@@ -77,7 +77,7 @@
LayerGroupTreeStore::LayerGroupTreeStore(etl::loose_handle<synfigapp::CanvasInte
canvas_interface_ (canvas_interface_)
{
layer_icon=Gtk::Button().render_icon(Gtk::StockID("synfig-layer"),Gtk::ICON_SIZE_SMALL_TOOLBAR);
-
group_icon=Gtk::Button().render_icon(Gtk::StockID("synfig-groups"),Gtk::ICON_SIZE_SMALL_TOOLBAR);
+
group_icon=Gtk::Button().render_icon(Gtk::StockID("synfig-group"),Gtk::ICON_SIZE_SMALL_TOOLBAR);
// Connect Signals to Terminals
canvas_interface()->signal_layer_status_changed().connect(sigc::mem_fun(*this,&studio::LayerGroupTreeStore::on_layer_status_changed));
diff --git a/synfig-studio/src/synfigapp/actions/groupaddlayers.cpp
b/synfig-studio/src/synfigapp/actions/groupaddlayers.cpp
index afb07fc..d52c743 100644
--- a/synfig-studio/src/synfigapp/actions/groupaddlayers.cpp
+++ b/synfig-studio/src/synfigapp/actions/groupaddlayers.cpp
@@ -47,7 +47,7 @@ using namespace Action;
ACTION_INIT(Action::GroupAddLayers);
ACTION_SET_NAME(Action::GroupAddLayers,"GroupAddLayers");
ACTION_SET_LOCAL_NAME(Action::GroupAddLayers,N_("Add Layers to Set"));
-ACTION_SET_TASK(Action::GroupAddLayers,"add_to_set");
+ACTION_SET_TASK(Action::GroupAddLayers,"add_to_group");
ACTION_SET_CATEGORY(Action::GroupAddLayers,Action::CATEGORY_LAYER|Action::CATEGORY_GROUP);
ACTION_SET_PRIORITY(Action::GroupAddLayers,0);
ACTION_SET_VERSION(Action::GroupAddLayers,"0.0");
diff --git a/synfig-studio/src/synfigapp/actions/groupremovelayers.cpp
b/synfig-studio/src/synfigapp/actions/groupremovelayers.cpp
index 8fe6b3e..d18b8b5 100644
--- a/synfig-studio/src/synfigapp/actions/groupremovelayers.cpp
+++ b/synfig-studio/src/synfigapp/actions/groupremovelayers.cpp
@@ -48,7 +48,7 @@ using namespace Action;
ACTION_INIT(Action::GroupRemoveLayers);
ACTION_SET_NAME(Action::GroupRemoveLayers,"GroupRemoveLayers");
ACTION_SET_LOCAL_NAME(Action::GroupRemoveLayers,N_("Remove Layers from a
Set"));
-ACTION_SET_TASK(Action::GroupRemoveLayers,"remove_from_set");
+ACTION_SET_TASK(Action::GroupRemoveLayers,"remove_from_group");
ACTION_SET_CATEGORY(Action::GroupRemoveLayers,Action::CATEGORY_LAYER|Action::CATEGORY_GROUP);
ACTION_SET_PRIORITY(Action::GroupRemoveLayers,0);
ACTION_SET_VERSION(Action::GroupRemoveLayers,"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
[email protected]
https://lists.sourceforge.net/lists/listinfo/synfig-devl
