X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fdock_keyframes.cpp;h=a77c0f50d27bd6cb0ca0f3c0d991d405fc19ba1d;hb=66f34e1afba6a05b41bada24417f62c0ca0ea2c4;hp=43073c71958d7092c2429d282c2a372675fe37b4;hpb=02252941b29de64037116f4d37991a38d9ff0d94;p=synfig.git
diff --git a/synfig-studio/trunk/src/gtkmm/dock_keyframes.cpp b/synfig-studio/trunk/src/gtkmm/dock_keyframes.cpp
index 43073c7..a77c0f5 100644
--- a/synfig-studio/trunk/src/gtkmm/dock_keyframes.cpp
+++ b/synfig-studio/trunk/src/gtkmm/dock_keyframes.cpp
@@ -2,19 +2,20 @@
/*! \file dock_keyframes.cpp
** \brief Template File
**
-** $Id: dock_keyframes.cpp,v 1.3 2005/01/13 20:23:01 darco Exp $
+** $Id$
**
** \legal
-** Copyright (c) 2002 Robert B. Quattlebaum Jr.
+** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
-** This software and associated documentation
-** are CONFIDENTIAL and PROPRIETARY property of
-** the above-mentioned copyright holder.
+** This package is free software; you can redistribute it and/or
+** modify it under the terms of the GNU General Public License as
+** published by the Free Software Foundation; either version 2 of
+** the License, or (at your option) any later version.
**
-** You may not copy, print, publish, or in any
-** other way distribute this software without
-** a prior written agreement with
-** the copyright holder.
+** This package is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+** General Public License for more details.
** \endlegal
*/
/* ========================================================================= */
@@ -42,6 +43,8 @@
#include "canvasview.h"
#include "keyframeactionmanager.h"
+#include "general.h"
+
#endif
/* === U S I N G =========================================================== */
@@ -101,9 +104,9 @@ Dock_Keyframes::Dock_Keyframes():
Glib::ustring ui_info =
""
" "
- " "
- " "
- " "
+ " "
+ " "
+ " "
" "
" "
""
@@ -111,7 +114,7 @@ Dock_Keyframes::Dock_Keyframes():
App::ui_manager()->add_ui_from_string(ui_info);
- set_toolbar(*dynamic_cast(App::ui_manager()->get_widget("/toolbar-keyframe")));
+ set_toolbar(*dynamic_cast(App::ui_manager()->get_widget("/toolbar-keyframe")));
}
Dock_Keyframes::~Dock_Keyframes()
@@ -168,10 +171,10 @@ Dock_Keyframes::changed_canvas_view_vfunc(etl::loose_handle canvas_v
if(canvas_view)
{
Gtk::Widget* tree_view(canvas_view->get_ext_widget(get_name()));
-
+
add(*tree_view);
tree_view->show();
-
+
keyframe_action_manager->set_keyframe_tree(dynamic_cast(canvas_view->get_ext_widget(get_name())));
keyframe_action_manager->set_canvas_interface(canvas_view->canvas_interface());
keyframe_action_manager->refresh();
@@ -179,7 +182,7 @@ Dock_Keyframes::changed_canvas_view_vfunc(etl::loose_handle canvas_v
else
{
clear_previous();
-
+
keyframe_action_manager->set_keyframe_tree(0);
keyframe_action_manager->set_canvas_interface(0);
keyframe_action_manager->refresh();