projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use Color::is_straight(). Also, re-enable the optimization for straight blending...
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
statemanager.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/statemanager.cpp
b/synfig-studio/trunk/src/gtkmm/statemanager.cpp
index
574205f
..
4a6828c
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/statemanager.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/statemanager.cpp
@@
-2,10
+2,11
@@
/*! \file statemanager.cpp
** \brief Template File
**
/*! \file statemanager.cpp
** \brief Template File
**
-** $Id
: statemanager.cpp,v 1.1.1.1 2005/01/07 03:34:36 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
@@
-36,6
+37,8
@@
#include "app.h"
#include "toolbox.h"
#include "app.h"
#include "toolbox.h"
+#include "general.h"
+
#endif
/* === U S I N G =========================================================== */
#endif
/* === U S I N G =========================================================== */
@@
-79,12
+82,15
@@
StateManager::add_state(const Smach::state_base *state)
{
String name(state->get_name());
{
String name(state->get_name());
+ Gtk::StockItem stock_item;
+ Gtk::Stock::lookup(Gtk::StockID("synfig-"+name),stock_item);
+
Glib::RefPtr<Gtk::Action> action(
Gtk::Action::create(
"state-"+name,
Glib::RefPtr<Gtk::Action> action(
Gtk::Action::create(
"state-"+name,
-
Gtk::StockID("synfig-"+name
),
-
name
,
- name
+
stock_item.get_stock_id(
),
+
stock_item.get_label()
,
+ stock_item.get_label()
)
);
/*action->set_sensitive(false);*/
)
);
/*action->set_sensitive(false);*/