projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Typo.
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
dock_layers.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/dock_layers.cpp
b/synfig-studio/trunk/src/gtkmm/dock_layers.cpp
index
1df60b8
..
766f4a2
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/dock_layers.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/dock_layers.cpp
@@
-2,10
+2,11
@@
/*! \file dock_layers.cpp
** \brief Template File
**
/*! \file dock_layers.cpp
** \brief Template File
**
-** $Id
: dock_layers.cpp,v 1.2 2005/01/12 07:03:42 darco Exp
$
+** $Id$
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+** Copyright (c) 2007 Chris Moore
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
@@
-45,6
+46,8
@@
#include "layeractionmanager.h"
//#include <ETL/ref_count>
#include "layeractionmanager.h"
//#include <ETL/ref_count>
+#include "general.h"
+
#endif
/* === U S I N G =========================================================== */
#endif
/* === U S I N G =========================================================== */
@@
-111,7
+114,7
@@
Dock_Layers::Dock_Layers():
Glib::RefPtr<Gtk::ActionGroup> action_group_categories(Gtk::ActionGroup::create("layer-category"));
synfig::String layer_ui_info;
Glib::RefPtr<Gtk::ActionGroup> action_group_categories(Gtk::ActionGroup::create("layer-category"));
synfig::String layer_ui_info;
- layer_ui_info+="<ui><
menubar
action='menu-main'><menu action='menu-layer'><menu action='menu-layer-new'>";
+ layer_ui_info+="<ui><
popup
action='menu-main'><menu action='menu-layer'><menu action='menu-layer-new'>";
std::map<synfig::String,synfig::String>::iterator iter;
for(iter=category_map.begin();iter!=category_map.end();++iter)
std::map<synfig::String,synfig::String>::iterator iter;
for(iter=category_map.begin();iter!=category_map.end();++iter)
@@
-120,7
+123,7
@@
Dock_Layers::Dock_Layers():
action_group_categories->add(Gtk::Action::create(iter->first.c_str(),iter->first.c_str()));
}
action_group_categories->add(Gtk::Action::create(iter->first.c_str(),iter->first.c_str()));
}
- layer_ui_info+="</menu></menu></
menubar
></ui>";
+ layer_ui_info+="</menu></menu></
popup
></ui>";
App::ui_manager()->insert_action_group(action_group_categories);
App::ui_manager()->insert_action_group(action_group_new_layers);
App::ui_manager()->insert_action_group(action_group_categories);
App::ui_manager()->insert_action_group(action_group_new_layers);
@@
-128,7
+131,7
@@
Dock_Layers::Dock_Layers():
}
}
- action_group_layer_ops->add( Gtk::Action::create("toolbar-layer",
"Layer Ops"
) );
+ action_group_layer_ops->add( Gtk::Action::create("toolbar-layer",
_("Layer Ops")
) );
App::ui_manager()->insert_action_group(action_group_layer_ops);
App::ui_manager()->insert_action_group(action_group_layer_ops);