projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add checkboxes to create outlines, regions, etc. for the polygon tool. They're not...
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
widget_vector.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/widget_vector.cpp
b/synfig-studio/trunk/src/gtkmm/widget_vector.cpp
index
4b9b6bb
..
ad82683
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/widget_vector.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/widget_vector.cpp
@@
-1,20
+1,21
@@
-/* === S
I N F G ==
========================================================= */
+/* === S
Y N F I G
========================================================= */
/*! \file widget_vector.cpp
** \brief Template File
**
/*! \file widget_vector.cpp
** \brief Template File
**
-** $Id
: widget_vector.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp
$
+** $Id$
**
** \legal
**
** \legal
-** Copyright (c) 2002
Robert B. Quattlebaum Jr.
+** Copyright (c) 2002
-2005 Robert B. Quattlebaum Jr., Adrian Bentley
**
**
-** This software and associated documentation
-** are CONFIDENTIAL and PROPRIETARY property of
-** the above-mentioned copyright holder.
+** This package is free software; you can redistribute it and/or
+** modify it under the terms of the GNU General Public License as
+** published by the Free Software Foundation; either version 2 of
+** the License, or (at your option) any later version.
**
**
-**
You may not copy, print, publish, or in any
-**
other way distribute this software without
-**
a prior written agreement with
-**
the copyright holder
.
+**
This package is distributed in the hope that it will be useful,
+**
but WITHOUT ANY WARRANTY; without even the implied warranty of
+**
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**
General Public License for more details
.
** \endlegal
*/
/* ========================================================================= */
** \endlegal
*/
/* ========================================================================= */
@@
-33,12
+34,14
@@
#include "widget_distance.h"
#include "app.h"
#include "widget_distance.h"
#include "app.h"
+#include "general.h"
+
#endif
/* === U S I N G =========================================================== */
using namespace std;
#endif
/* === U S I N G =========================================================== */
using namespace std;
-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 ========================================================= */
@@
-52,16
+55,19
@@
using namespace studio;
/* === M E T H O D S ======================================================= */
Widget_Vector::Widget_Vector():
/* === M E T H O D S ======================================================= */
Widget_Vector::Widget_Vector():
- x_adjustment(0,-100000000,100000000,0.05,0.05,0.05),
- y_adjustment(0,-100000000,100000000,0.05,0.05,0.05)
+ Gtk::HBox(false, 5),
+ x_adjustment(0,-100000000,100000000,0.05,0.05,0),
+ y_adjustment(0,-100000000,100000000,0.05,0.05,0)
{
Gtk::Label *label;
{
Gtk::Label *label;
-
- label=manage(new class Gtk::Label("x:"));
+
+ label=manage(new class Gtk::Label("X:"));
+ label->set_alignment(0, 0.5);
label->show();
pack_start(*label, Gtk::PACK_SHRINK);
spinbutton_x=manage(new class Gtk::SpinButton(x_adjustment,0.05,DIGITS));
label->show();
pack_start(*label, Gtk::PACK_SHRINK);
spinbutton_x=manage(new class Gtk::SpinButton(x_adjustment,0.05,DIGITS));
+ spinbutton_x->set_alignment(1);
spinbutton_x->set_update_policy(Gtk::UPDATE_ALWAYS);
spinbutton_x->signal_value_changed().connect(sigc::mem_fun(*this,&studio::Widget_Vector::on_value_changed));
pack_start(*spinbutton_x, Gtk::PACK_EXPAND_WIDGET);
spinbutton_x->set_update_policy(Gtk::UPDATE_ALWAYS);
spinbutton_x->signal_value_changed().connect(sigc::mem_fun(*this,&studio::Widget_Vector::on_value_changed));
pack_start(*spinbutton_x, Gtk::PACK_EXPAND_WIDGET);
@@
-72,11
+78,13
@@
Widget_Vector::Widget_Vector():
distance_x->signal_value_changed().connect(sigc::mem_fun(*this,&studio::Widget_Vector::on_value_changed));
pack_start(*distance_x, Gtk::PACK_EXPAND_WIDGET);
distance_x->signal_value_changed().connect(sigc::mem_fun(*this,&studio::Widget_Vector::on_value_changed));
pack_start(*distance_x, Gtk::PACK_EXPAND_WIDGET);
- label=manage(new class Gtk::Label("y:"));
+ label=manage(new class Gtk::Label("Y:"));
+ label->set_alignment(0, 0.5);
label->show();
pack_start(*label, Gtk::PACK_SHRINK);
spinbutton_y=manage(new class Gtk::SpinButton(y_adjustment,0.05,DIGITS));
label->show();
pack_start(*label, Gtk::PACK_SHRINK);
spinbutton_y=manage(new class Gtk::SpinButton(y_adjustment,0.05,DIGITS));
+ spinbutton_y->set_alignment(1);
spinbutton_y->set_update_policy(Gtk::UPDATE_ALWAYS);
spinbutton_y->signal_value_changed().connect(sigc::mem_fun(*this,&studio::Widget_Vector::on_value_changed));
spinbutton_y->signal_activate().connect(sigc::mem_fun(*this,&studio::Widget_Vector::activate));
spinbutton_y->set_update_policy(Gtk::UPDATE_ALWAYS);
spinbutton_y->signal_value_changed().connect(sigc::mem_fun(*this,&studio::Widget_Vector::on_value_changed));
spinbutton_y->signal_activate().connect(sigc::mem_fun(*this,&studio::Widget_Vector::activate));
@@
-91,7
+99,7
@@
Widget_Vector::Widget_Vector():
spinbutton_x->show();
spinbutton_y->show();
spinbutton_x->show();
spinbutton_y->show();
-
+
spinbutton_x->signal_activate().connect(sigc::mem_fun(*spinbutton_y,&Gtk::SpinButton::grab_focus));
distance_x->signal_activate().connect(sigc::mem_fun(*distance_y,&Gtk::SpinButton::grab_focus));
}
spinbutton_x->signal_activate().connect(sigc::mem_fun(*spinbutton_y,&Gtk::SpinButton::grab_focus));
distance_x->signal_activate().connect(sigc::mem_fun(*distance_y,&Gtk::SpinButton::grab_focus));
}
@@
-136,7
+144,7
@@
Widget_Vector::set_digits(int x)
spinbutton_x->set_size_request(48,-1);
spinbutton_y->set_size_request(48,-1);
}
spinbutton_x->set_size_request(48,-1);
spinbutton_y->set_size_request(48,-1);
}
-
+
distance_x->set_digits(x);
distance_y->set_digits(x);
distance_x->set_size_request(48,-1);
distance_x->set_digits(x);
distance_y->set_digits(x);
distance_x->set_size_request(48,-1);
@@
-144,7
+152,7
@@
Widget_Vector::set_digits(int x)
}
void
}
void
-Widget_Vector::set_value(const s
inf
g::Vector &data)
+Widget_Vector::set_value(const s
ynfi
g::Vector &data)
{
vector=data;
{
vector=data;
@@
-157,7
+165,7
@@
Widget_Vector::set_value(const sinfg::Vector &data)
distance_y->set_value(disty);
spinbutton_x->hide();
spinbutton_y->hide();
distance_y->set_value(disty);
spinbutton_x->hide();
spinbutton_y->hide();
- }catch(...) { s
inf
g::error("Widget_Vector::set_value(): Caught something that was thrown"); }}
+ }catch(...) { s
ynfi
g::error("Widget_Vector::set_value(): Caught something that was thrown"); }}
else
{
spinbutton_x->set_value(vector[0]);
else
{
spinbutton_x->set_value(vector[0]);
@@
-167,7
+175,7
@@
Widget_Vector::set_value(const sinfg::Vector &data)
}
}
}
}
-const s
inf
g::Vector &
+const s
ynfi
g::Vector &
Widget_Vector::get_value()
{
if(!canvas_ && spinbutton_x)
Widget_Vector::get_value()
{
if(!canvas_ && spinbutton_x)
@@
-183,7
+191,7
@@
Widget_Vector::get_value()
vector[1]=distance_y->get_value().units(canvas_->rend_desc());
spinbutton_x->hide();
spinbutton_y->hide();
vector[1]=distance_y->get_value().units(canvas_->rend_desc());
spinbutton_x->hide();
spinbutton_y->hide();
- }catch(...) { s
inf
g::error("Widget_Vector::set_value(): Caught something that was thrown"); }
+ }catch(...) { s
ynfi
g::error("Widget_Vector::set_value(): Caught something that was thrown"); }
return vector;
}
return vector;
}
@@
-194,7
+202,7
@@
Widget_Vector::on_value_changed()
}
void
}
void
-Widget_Vector::set_canvas(Canvas::LooseHandle x)
+Widget_Vector::set_canvas(
synfig::
Canvas::LooseHandle x)
{
canvas_=x;
if(x)
{
canvas_=x;
if(x)