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
/
mod_palette
/
dock_paledit.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/mod_palette/dock_paledit.cpp
b/synfig-studio/trunk/src/gtkmm/mod_palette/dock_paledit.cpp
index
6b5e0a0
..
a7167db
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/mod_palette/dock_paledit.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/mod_palette/dock_paledit.cpp
@@
-1,4
+1,4
@@
-/* === S
I N F G ==
========================================================= */
+/* === S
Y N F I G
========================================================= */
/*! \file dialog_palette.cpp
** \brief Template File
**
/*! \file dialog_palette.cpp
** \brief Template File
**
@@
-33,13
+33,13
@@
#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
ynfi
g/general.h>
+#include <s
ynfi
gapp/canvasinterface.h>
+#include <s
ynfi
gapp/value_desc.h>
#include "../widget_color.h"
#include <gtkmm/spinbutton.h>
#include <gtkmm/menu.h>
#include "../widget_color.h"
#include <gtkmm/spinbutton.h>
#include <gtkmm/menu.h>
-#include <s
inf
gapp/main.h>
+#include <s
ynfi
gapp/main.h>
#include "../app.h"
#include "../dialog_color.h"
#include "../app.h"
#include "../dialog_color.h"
@@
-49,19
+49,19
@@
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 ========================================================= */
/* === G L O B A L S ======================================================= */
/*
using namespace studio;
/* === M A C R O S ========================================================= */
/* === G L O B A L S ======================================================= */
/*
-class studio::PaletteSettings : public s
inf
gapp::Settings
+class studio::PaletteSettings : public s
ynfi
gapp::Settings
{
Dock_PalEdit* dialog_palette;
{
Dock_PalEdit* dialog_palette;
- s
inf
g::String name;
+ s
ynfi
g::String name;
public:
public:
- PaletteSettings(Dock_PalEdit* window,const s
inf
g::String& name):
+ PaletteSettings(Dock_PalEdit* window,const s
ynfi
g::String& name):
dialog_palette(window),
name(name)
{
dialog_palette(window),
name(name)
{
@@
-73,7
+73,7
@@
public:
dialog_palette->dialog_settings.remove_domain(name);
}
dialog_palette->dialog_settings.remove_domain(name);
}
- virtual bool get_value(const s
infg::String& key, sinf
g::String& value)const
+ virtual bool get_value(const s
ynfig::String& key, synfi
g::String& value)const
{
int i(atoi(key.c_str()));
if(i<0 || i>=dialog_palette->size())
{
int i(atoi(key.c_str()));
if(i<0 || i>=dialog_palette->size())
@@
-83,7
+83,7
@@
public:
return true;
}
return true;
}
- virtual bool set_value(const s
infg::String& key,const sinf
g::String& value)
+ virtual bool set_value(const s
ynfig::String& key,const synfi
g::String& value)
{
int i(atoi(key.c_str()));
if(i<0)
{
int i(atoi(key.c_str()));
if(i<0)
@@
-99,7
+99,7
@@
public:
virtual KeyList get_key_list()const
{
virtual KeyList get_key_list()const
{
- s
infgapp::Settings::KeyList ret(sinf
gapp::Settings::get_key_list());
+ s
ynfigapp::Settings::KeyList ret(synfi
gapp::Settings::get_key_list());
int i;
for(i=0;i<dialog_palette->size();i++)
int i;
for(i=0;i<dialog_palette->size();i++)
@@
-171,7
+171,7
@@
Dock_PalEdit::~Dock_PalEdit()
}
void
}
void
-Dock_PalEdit::set_palette(const s
inf
g::Palette& x)
+Dock_PalEdit::set_palette(const s
ynfi
g::Palette& x)
{
palette_=x;
refresh();
{
palette_=x;
refresh();
@@
-180,7
+180,7
@@
Dock_PalEdit::set_palette(const sinfg::Palette& x)
void
Dock_PalEdit::on_add_pressed()
{
void
Dock_PalEdit::on_add_pressed()
{
- add_color(s
inf
gapp::Main::get_foreground_color());
+ add_color(s
ynfi
gapp::Main::get_foreground_color());
}
void
}
void
@@
-212,7
+212,7
@@
Dock_PalEdit::show_menu(int i)
}
int
}
int
-Dock_PalEdit::add_color(const s
inf
g::Color& x)
+Dock_PalEdit::add_color(const s
ynfi
g::Color& x)
{
palette_.push_back(x);
signal_changed()();
{
palette_.push_back(x);
signal_changed()();
@@
-221,7
+221,7
@@
Dock_PalEdit::add_color(const sinfg::Color& x)
}
void
}
void
-Dock_PalEdit::set_color(s
inf
g::Color x, int i)
+Dock_PalEdit::set_color(s
ynfi
g::Color x, int i)
{
palette_[i].color=x;
signal_changed()();
{
palette_[i].color=x;
signal_changed()();
@@
-292,7
+292,7
@@
Dock_PalEdit::edit_color(int i)
void
Dock_PalEdit::select_color(int i)
{
void
Dock_PalEdit::select_color(int i)
{
- s
inf
gapp::Main::set_foreground_color(get_color(i));
+ s
ynfi
gapp::Main::set_foreground_color(get_color(i));
}
void
}
void