projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Automatically export the Index parameter of new Duplicate layers.
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
dialog_color.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/dialog_color.cpp
b/synfig-studio/trunk/src/gtkmm/dialog_color.cpp
index
de8f64d
..
1903ec8
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/dialog_color.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/dialog_color.cpp
@@
-1,8
+1,8
@@
/* === S Y N F I G ========================================================= */
/* === S Y N F I G ========================================================= */
-/*! \file dialog_
gradient
.cpp
+/*! \file dialog_
color
.cpp
** \brief Template File
**
** \brief Template File
**
-** $Id
: dialog_color.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
@@
-45,6
+45,8
@@
#include <sigc++/hide.h>
#include "app.h"
#include <sigc++/hide.h>
#include "app.h"
+#include "general.h"
+
#endif
/* === U S I N G =========================================================== */
#endif
/* === U S I N G =========================================================== */
@@
-83,7
+85,7
@@
Dialog_Color::Dialog_Color():
Gtk::Button *cancel_button(manage(new class Gtk::Button(Gtk::StockID("gtk-close"))));
cancel_button->show();
add_action_widget(*cancel_button,0);
Gtk::Button *cancel_button(manage(new class Gtk::Button(Gtk::StockID("gtk-close"))));
cancel_button->show();
add_action_widget(*cancel_button,0);
- cancel_button->signal_clicked().connect(sigc::hide_return(sigc::mem_fun(*this, &Dialog_Color::on_close_pressed)));
+ cancel_button->signal_clicked().connect(sigc::hide_return(sigc::mem_fun(*this, &Dialog_Color::on_close_pressed)));
signal_delete_event().connect(sigc::hide(sigc::mem_fun(*this, &Dialog_Color::on_close_pressed)));
Gtk::Table* table(manage(new Gtk::Table(2,2,false)));
signal_delete_event().connect(sigc::hide(sigc::mem_fun(*this, &Dialog_Color::on_close_pressed)));
Gtk::Table* table(manage(new Gtk::Table(2,2,false)));
@@
-92,7
+94,7
@@
Dialog_Color::Dialog_Color():
widget_color=manage(new Widget_ColorEdit());
widget_color->signal_value_changed().connect(sigc::mem_fun(*this,&studio::Dialog_Color::on_color_changed));
//widget_color->signal_activate().connect(sigc::mem_fun(*this,&studio::Dialog_Color::on_color_changed));
widget_color=manage(new Widget_ColorEdit());
widget_color->signal_value_changed().connect(sigc::mem_fun(*this,&studio::Dialog_Color::on_color_changed));
//widget_color->signal_activate().connect(sigc::mem_fun(*this,&studio::Dialog_Color::on_color_changed));
- table->attach(*widget_color, 0, 1, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
+ table->attach(*widget_color, 0, 1, 0, 1, Gtk::EXPAND|Gtk::FILL, Gtk::EXPAND|Gtk::FILL, 0, 0);
add_accel_group(App::ui_manager()->get_accel_group());
add_accel_group(App::ui_manager()->get_accel_group());