projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more updates
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
dialog_gradient.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/dialog_gradient.cpp
b/synfig-studio/trunk/src/gtkmm/dialog_gradient.cpp
index
e65c4fa
..
fff92e0
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/dialog_gradient.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/dialog_gradient.cpp
@@
-1,4
+1,4
@@
-/* === S
I N F G ==
========================================================= */
+/* === S
Y N F I G
========================================================= */
/*! \file dialog_gradient.cpp
** \brief Template File
**
/*! \file dialog_gradient.cpp
** \brief Template File
**
@@
-33,10
+33,10
@@
#include <gtkmm/frame.h>
#include <gtkmm/table.h>
#include <gtkmm/label.h>
#include <gtkmm/frame.h>
#include <gtkmm/table.h>
#include <gtkmm/label.h>
-#include <s
inf
g/general.h>
-#include <s
inf
gapp/canvasinterface.h>
-#include <s
inf
gapp/value_desc.h>
-#include <s
inf
gapp/main.h>
+#include <s
ynfi
g/general.h>
+#include <s
ynfi
gapp/canvasinterface.h>
+#include <s
ynfi
gapp/value_desc.h>
+#include <s
ynfi
gapp/main.h>
#include "widget_color.h"
#include <gtkmm/spinbutton.h>
#include "app.h"
#include "widget_color.h"
#include <gtkmm/spinbutton.h>
#include "app.h"
@@
-47,7
+47,7
@@
using namespace std;
using namespace etl;
using namespace std;
using namespace etl;
-using namespace s
inf
g;
+using namespace s
ynfi
g;
using namespace studio;
/* === M A C R O S ========================================================= */
using namespace studio;
/* === M A C R O S ========================================================= */
@@
-63,7
+63,12
@@
Dialog_Gradient::Dialog_Gradient():
dialog_settings(this,"gradient"),
adjustment_pos(0,0.0,1.0,0.001,0.001,0.001)
{
dialog_settings(this,"gradient"),
adjustment_pos(0,0.0,1.0,0.001,0.001,0.001)
{
- set_type_hint(Gdk::WINDOW_TYPE_HINT_UTILITY);
+ set_type_hint(Gdk::WINDOW_TYPE_HINT_DIALOG);
+ set_keep_below(true);
+ set_keep_above(false);
+
+ set_role("gradient_editor");
+
// Setup the buttons
Gtk::Button *grab_button(manage(new class Gtk::Button(Gtk::StockID("Grab"))));
grab_button->show();
// Setup the buttons
Gtk::Button *grab_button(manage(new class Gtk::Button(Gtk::StockID("Grab"))));
grab_button->show();
@@
-116,7
+121,7
@@
Dialog_Gradient::~Dialog_Gradient()
}
void
}
void
-Dialog_Gradient::set_gradient(const s
inf
g::Gradient& x)
+Dialog_Gradient::set_gradient(const s
ynfi
g::Gradient& x)
{
widget_gradient->set_value(x);
}
{
widget_gradient->set_value(x);
}
@@
-131,7
+136,7
@@
Dialog_Gradient::reset()
void
Dialog_Gradient::on_grab_pressed()
{
void
Dialog_Gradient::on_grab_pressed()
{
- s
inf
gapp::Main::set_gradient(get_gradient());
+ s
ynfi
gapp::Main::set_gradient(get_gradient());
// signal_edited_(get_gradient());
// reset();
// hide();
// signal_edited_(get_gradient());
// reset();
// hide();
@@
-150,7
+155,7
@@
Dialog_Gradient::on_changed()
}
void
}
void
-Dialog_Gradient::on_cpoint_selected(s
inf
g::Gradient::CPoint x)
+Dialog_Gradient::on_cpoint_selected(s
ynfi
g::Gradient::CPoint x)
{
widget_color->set_value(x.color);
adjustment_pos.set_value(x.pos);
{
widget_color->set_value(x.color);
adjustment_pos.set_value(x.pos);
@@
-159,20
+164,20
@@
Dialog_Gradient::on_cpoint_selected(sinfg::Gradient::CPoint x)
void
Dialog_Gradient::on_values_adjusted()
{
void
Dialog_Gradient::on_values_adjusted()
{
- s
inf
g::Gradient::CPoint x(widget_gradient->get_selected_cpoint());
+ s
ynfi
g::Gradient::CPoint x(widget_gradient->get_selected_cpoint());
x.color=widget_color->get_value();
x.pos=adjustment_pos.get_value();
widget_gradient->update_cpoint(x);
}
static void
x.color=widget_color->get_value();
x.pos=adjustment_pos.get_value();
widget_gradient->update_cpoint(x);
}
static void
-dialog_gradient_value_desc_edit(s
infg::Gradient g,sinfgapp::ValueDesc x,handle<sinf
gapp::CanvasInterface> canvas_interface)
+dialog_gradient_value_desc_edit(s
ynfig::Gradient g,synfigapp::ValueDesc x,handle<synfi
gapp::CanvasInterface> canvas_interface)
{
// canvas_interface->connect_value(x,ValueBase(g));
}
void
{
// canvas_interface->connect_value(x,ValueBase(g));
}
void
-Dialog_Gradient::edit(const s
infgapp::ValueDesc &x, etl::handle<sinfgapp::CanvasInterface> canvas_interface, sinf
g::Time time)
+Dialog_Gradient::edit(const s
ynfigapp::ValueDesc &x, etl::handle<synfigapp::CanvasInterface> canvas_interface, synfi
g::Time time)
{
reset();
if(x.is_const())
{
reset();
if(x.is_const())