Author: Yu Chen <[email protected]>
Date: Thu Nov 29 01:41:42 2012 +0800
Rename params to parameters for UI
---
synfig-studio/images/Makefile.am | 4 ++--
.../{params_icon.sif => parameters_icon.sif} | 0
synfig-studio/src/gui/app.cpp | 2 +-
synfig-studio/src/gui/docks/dock_curves.cpp | 2 +-
synfig-studio/src/gui/docks/dock_layers.cpp | 4 ++--
synfig-studio/src/gui/docks/dock_params.cpp | 2 +-
synfig-studio/src/gui/docks/dock_timetrack.cpp | 6 +++---
synfig-studio/src/gui/iconcontroller.cpp | 2 +-
synfig-studio/src/gui/toolbox.cpp | 4 ++--
9 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/synfig-studio/images/Makefile.am b/synfig-studio/images/Makefile.am
index f67ea3f..9d0bc63 100644
--- a/synfig-studio/images/Makefile.am
+++ b/synfig-studio/images/Makefile.am
@@ -168,7 +168,7 @@ EXTRA_DIST = \
meta_data_icon.sif \
navigator_icon.sif \
palette_icon.sif \
- params_icon.sif \
+ parameters_icon.sif \
time_track_icon.sif
IMAGES = \
@@ -334,7 +334,7 @@ IMAGES = \
meta_data_icon.$(EXT) \
navigator_icon.$(EXT) \
palette_icon.$(EXT) \
- params_icon.$(EXT) \
+ parameters_icon.$(EXT) \
time_track_icon.$(EXT)
MAINTAINERCLEANFILES = \
diff --git a/synfig-studio/images/params_icon.sif
b/synfig-studio/images/parameters_icon.sif
similarity index 100%
rename from synfig-studio/images/params_icon.sif
rename to synfig-studio/images/parameters_icon.sif
diff --git a/synfig-studio/src/gui/app.cpp b/synfig-studio/src/gui/app.cpp
index 4de6c99..a20ece4 100644
--- a/synfig-studio/src/gui/app.cpp
+++ b/synfig-studio/src/gui/app.cpp
@@ -1835,7 +1835,7 @@ App::reset_initial_window_configuration()
synfigapp::Main::settings().set_value("dock.dialog.1.size",v_size);
synfigapp::Main::settings().set_value("dock.dialog.1.pos",v_pos);
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","parameters
children keyframes | timetrack curves meta_data");
synfigapp::Main::settings().set_value("dock.dialog.2.contents_size",h_contents);
synfigapp::Main::settings().set_value("dock.dialog.2.size",h_size);
synfigapp::Main::settings().set_value("dock.dialog.2.pos",h_pos);
diff --git a/synfig-studio/src/gui/docks/dock_curves.cpp
b/synfig-studio/src/gui/docks/dock_curves.cpp
index a436b68..2bd4ede 100644
--- a/synfig-studio/src/gui/docks/dock_curves.cpp
+++ b/synfig-studio/src/gui/docks/dock_curves.cpp
@@ -110,7 +110,7 @@
Dock_Curves::init_canvas_view_vfunc(etl::loose_handle<CanvasView> canvas_view)
curves->set_time_adjustment(canvas_view->time_adjustment());
Gtk::TreeView* param_tree_view(
-
static_cast<Gtk::TreeView*>(canvas_view->get_ext_widget("params"))
+
static_cast<Gtk::TreeView*>(canvas_view->get_ext_widget("parameters"))
);
param_tree_view->get_selection()->signal_changed().connect(
diff --git a/synfig-studio/src/gui/docks/dock_layers.cpp
b/synfig-studio/src/gui/docks/dock_layers.cpp
index a626680..6781ba8 100644
--- a/synfig-studio/src/gui/docks/dock_layers.cpp
+++ b/synfig-studio/src/gui/docks/dock_layers.cpp
@@ -235,10 +235,10 @@
Dock_Layers::init_canvas_view_vfunc(etl::loose_handle<CanvasView> canvas_view)
// (a) should be before (b), (b) should be before (c)
canvas_view->set_ext_widget(get_name()+"_cmp",layer_tree); // (a)
canvas_view->set_ext_widget(get_name(),&layer_tree->get_layer_tree_view());
-
canvas_view->set_ext_widget("params",&layer_tree->get_param_tree_view());
+
canvas_view->set_ext_widget("parameters",&layer_tree->get_param_tree_view());
layer_tree->set_model(layer_tree_store); // (b)
-
canvas_view->set_tree_model("params",layer_tree->get_param_tree_view().get_model());
// (c)
+
canvas_view->set_tree_model("parameters",layer_tree->get_param_tree_view().get_model());
// (c)
/*
canvas_view->layermenu.items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::StockID("gtk-delete"),Gtk::AccelKey("Delete"),
diff --git a/synfig-studio/src/gui/docks/dock_params.cpp
b/synfig-studio/src/gui/docks/dock_params.cpp
index 752e1fa..4b93d2c 100644
--- a/synfig-studio/src/gui/docks/dock_params.cpp
+++ b/synfig-studio/src/gui/docks/dock_params.cpp
@@ -62,7 +62,7 @@ using namespace studio;
/* === M E T H O D S ======================================================= */
Dock_Params::Dock_Params():
- Dock_CanvasSpecific("params",_("Params"),Gtk::StockID("synfig-params")),
+
Dock_CanvasSpecific("parameters",_("Parameters"),Gtk::StockID("synfig-parameters")),
action_group(Gtk::ActionGroup::create("action_group_dock_params"))
{
}
diff --git a/synfig-studio/src/gui/docks/dock_timetrack.cpp
b/synfig-studio/src/gui/docks/dock_timetrack.cpp
index 58a8271..150d01e 100644
--- a/synfig-studio/src/gui/docks/dock_timetrack.cpp
+++ b/synfig-studio/src/gui/docks/dock_timetrack.cpp
@@ -404,14 +404,14 @@
Dock_Timetrack::init_canvas_view_vfunc(etl::loose_handle<CanvasView> canvas_view
Glib::RefPtr<LayerParamTreeStore> tree_store(
Glib::RefPtr<LayerParamTreeStore>::cast_dynamic(
- canvas_view->get_tree_model("params")
+ canvas_view->get_tree_model("parameters")
)
);
TimeTrackView* tree_view(new TimeTrackView());
tree_view->set_canvas_view(canvas_view);
tree_view->set_model(tree_store);
- Gtk::TreeView*
param_tree_view(dynamic_cast<Gtk::TreeView*>(canvas_view->get_ext_widget("params")));
+ Gtk::TreeView*
param_tree_view(dynamic_cast<Gtk::TreeView*>(canvas_view->get_ext_widget("parameters")));
tree_view->mimic(param_tree_view);
tree_view->signal_waypoint_clicked_timetrackview.connect(sigc::mem_fun(*canvas_view,
&studio::CanvasView::on_waypoint_clicked_canvasview));
@@ -470,7 +470,7 @@
Dock_Timetrack::changed_canvas_view_vfunc(etl::loose_handle<CanvasView> canvas_v
if(canvas_view)
{
TimeTrackView*
tree_view(dynamic_cast<TimeTrackView*>(canvas_view->get_ext_widget(get_name())));
- Gtk::TreeView*
param_tree_view(dynamic_cast<Gtk::TreeView*>(canvas_view->get_ext_widget("params")));
+ Gtk::TreeView*
param_tree_view(dynamic_cast<Gtk::TreeView*>(canvas_view->get_ext_widget("parameters")));
tree_view->set_vadjustment(*param_tree_view->get_vadjustment());
assert(tree_view);
diff --git a/synfig-studio/src/gui/iconcontroller.cpp
b/synfig-studio/src/gui/iconcontroller.cpp
index e1d1b24..1fd8c16 100644
--- a/synfig-studio/src/gui/iconcontroller.cpp
+++ b/synfig-studio/src/gui/iconcontroller.cpp
@@ -261,7 +261,7 @@ IconController::IconController(const synfig::String&
/*basepath*/)
INIT_STOCK_ICON(timetrack,"time_track_icon."IMAGE_EXT,_("Time Track"));
INIT_STOCK_ICON(history,"history_icon."IMAGE_EXT,_("History"));
INIT_STOCK_ICON(palette,"palette_icon."IMAGE_EXT,_("Palette"));
- INIT_STOCK_ICON(params,"params_icon."IMAGE_EXT,_("Parameters"));
+ INIT_STOCK_ICON(parameters,"parameters_icon."IMAGE_EXT,_("Parameters"));
INIT_STOCK_ICON(keyframe_lock_past_off,"keyframe_lock_past_off_icon."IMAGE_EXT,_("Past
keyframes unlocked"));
INIT_STOCK_ICON(keyframe_lock_past_on,"keyframe_lock_past_on_icon."IMAGE_EXT,_("Past
keyframes locked"));
diff --git a/synfig-studio/src/gui/toolbox.cpp
b/synfig-studio/src/gui/toolbox.cpp
index 30f4019..6e90408 100644
--- a/synfig-studio/src/gui/toolbox.cpp
+++ b/synfig-studio/src/gui/toolbox.cpp
@@ -192,7 +192,7 @@ void _create_stock_dialog1()
void _create_stock_dialog2()
{
DockDialog* dock_dialog(new DockDialog);
- dock_dialog->set_contents("layers children keyframes | params");
+ dock_dialog->set_contents("layers children keyframes | parameters");
dock_dialog->present();
}
@@ -220,7 +220,7 @@ Toolbox::Toolbox():
dock_dialogs=manage(new class Gtk::Menu());
dock_dialogs->items().push_back(Gtk::Menu_Helpers::MenuElem(_("Vertical
Dock: Canvases, History"),sigc::ptr_fun(_create_stock_dialog1)));
-
dock_dialogs->items().push_back(Gtk::Menu_Helpers::MenuElem(_("Horizontal Dock:
Layers, Children, Params"),sigc::ptr_fun(_create_stock_dialog2)));
+
dock_dialogs->items().push_back(Gtk::Menu_Helpers::MenuElem(_("Horizontal Dock:
Layers, Children, Parameters"),sigc::ptr_fun(_create_stock_dialog2)));
dock_dialogs->items().push_back(Gtk::Menu_Helpers::SeparatorElem());
dock_dialogs->items().push_back(Gtk::Menu_Helpers::MenuElem(_("Reset
Windows to Original
Layout"),sigc::ptr_fun(App::reset_initial_window_configuration)));
dock_dialogs->items().push_back(Gtk::Menu_Helpers::SeparatorElem());
------------------------------------------------------------------------------
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
