Author: Yu Chen <[email protected]>
Date: Mon Jan 7 23:50:12 2013 +0800
Revert the internal name for parameters panel.
---
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 | 2 +-
7 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/synfig-studio/src/gui/app.cpp b/synfig-studio/src/gui/app.cpp
index e2d6c5b..c515904 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","parameters
children keyframes | timetrack curves meta_data");
+ 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",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 741b516..7854b4b 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("parameters"))
+
static_cast<Gtk::TreeView*>(canvas_view->get_ext_widget("params"))
);
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 4708aab..663fd4f 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("parameters",&layer_tree->get_param_tree_view());
+
canvas_view->set_ext_widget("params",&layer_tree->get_param_tree_view());
layer_tree->set_model(layer_tree_store); // (b)
-
canvas_view->set_tree_model("parameters",layer_tree->get_param_tree_view().get_model());
// (c)
+
canvas_view->set_tree_model("params",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 4b93d2c..6628091 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("parameters",_("Parameters"),Gtk::StockID("synfig-parameters")),
+
Dock_CanvasSpecific("params",_("Parameters"),Gtk::StockID("synfig-params")),
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 150d01e..58a8271 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("parameters")
+ canvas_view->get_tree_model("params")
)
);
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("parameters")));
+ Gtk::TreeView*
param_tree_view(dynamic_cast<Gtk::TreeView*>(canvas_view->get_ext_widget("params")));
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("parameters")));
+ Gtk::TreeView*
param_tree_view(dynamic_cast<Gtk::TreeView*>(canvas_view->get_ext_widget("params")));
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 8fe24b0..166716c 100644
--- a/synfig-studio/src/gui/iconcontroller.cpp
+++ b/synfig-studio/src/gui/iconcontroller.cpp
@@ -259,7 +259,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(parameters,"parameters_icon."IMAGE_EXT,_("Parameters"));
+ INIT_STOCK_ICON(params,"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 2e1686c..d70f9fb 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 | parameters");
+ dock_dialog->set_contents("layers children keyframes | params");
dock_dialog->present();
}
------------------------------------------------------------------------------
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
