summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: eabbb65)
raw | patch | inline | side by side (parent: eabbb65)
author | tweenk <tweenk@users.sourceforge.net> | |
Mon, 9 Feb 2009 21:25:51 +0000 (21:25 +0000) | ||
committer | tweenk <tweenk@users.sourceforge.net> | |
Mon, 9 Feb 2009 21:25:51 +0000 (21:25 +0000) |
index 40cb81dddbf980c454239c90569c17e065d8a64d..11e3a8d97c51b69d9e89a5f355454ff83d95610a 100644 (file)
/** \brief Make the adjustment using an extension and the string
describing the parameter. */
ParamFloatAdjustment (ParamFloat * param, SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal) :
- Gtk::Adjustment(0.0, param->min(), param->max(), 0.1), _pref(param), _doc(doc), _node(node), _changeSignal(changeSignal) {
+ Gtk::Adjustment(0.0, param->min(), param->max(), 0.1, 0), _pref(param), _doc(doc), _node(node), _changeSignal(changeSignal) {
this->set_value(_pref->get(NULL, NULL) /* \todo fix */);
this->signal_value_changed().connect(sigc::mem_fun(this, &ParamFloatAdjustment::val_changed));
return;
index db7f9c67b149bd00507454020fe923789674dcee..301d54ed008aa0ff1b9737c10e54bff4f496b71e 100644 (file)
/** \brief Make the adjustment using an extension and the string
describing the parameter. */
ParamIntAdjustment (ParamInt * param, SPDocument * doc, Inkscape::XML::Node * node, sigc::signal<void> * changeSignal) :
- Gtk::Adjustment(0.0, param->min(), param->max(), 1.0), _pref(param), _doc(doc), _node(node), _changeSignal(changeSignal) {
+ Gtk::Adjustment(0.0, param->min(), param->max(), 1.0, 0), _pref(param), _doc(doc), _node(node), _changeSignal(changeSignal) {
this->set_value(_pref->get(NULL, NULL) /* \todo fix */);
this->signal_value_changed().connect(sigc::mem_fun(this, &ParamIntAdjustment::val_changed));
return;
index 3203816d36f96850cdd956bade4456b46d03c163..0014a3ce5c5572c96300e7ec4b06d8eca5b327bf 100644 (file)
removeOverlapXGap.set_digits(1);
removeOverlapXGap.set_size_request(60, -1);
- removeOverlapXGap.set_increments(1.0, 5.0);
+ removeOverlapXGap.set_increments(1.0, 0);
removeOverlapXGap.set_range(-1000.0, 1000.0);
removeOverlapXGap.set_value(0);
dialog.tooltips().set_tip(removeOverlapXGap,
removeOverlapYGap.set_digits(1);
removeOverlapYGap.set_size_request(60, -1);
- removeOverlapYGap.set_increments(1.0, 5.0);
+ removeOverlapYGap.set_increments(1.0, 0);
removeOverlapYGap.set_range(-1000.0, 1000.0);
removeOverlapYGap.set_value(0);
dialog.tooltips().set_tip(removeOverlapYGap,
index c19e5cedacc479164b94826cdcb98e27d6591c88..fc5eb81f7ad5b74073cd7ec25145b308cdad708c 100644 (file)
{
if (tip_text) _tt.set_tip(*this, tip_text);
set_range(lower, upper);
- set_increments(step_inc, step_inc * 5);
+ set_increments(step_inc, 0);
signal_value_changed().connect(signal_attr_changed().make_slot());
}
if (tt2) _tt.set_tip(_s2, tt2);
_s1.set_range(lower, upper);
_s2.set_range(lower, upper);
- _s1.set_increments(step_inc, step_inc * 5);
- _s2.set_increments(step_inc, step_inc * 5);
+ _s1.set_increments(step_inc, 0);
+ _s2.set_increments(step_inc, 0);
_s1.signal_value_changed().connect(signal_attr_changed().make_slot());
_s2.signal_value_changed().connect(signal_attr_changed().make_slot());
index ad8539775c5670dcf47d327dd7c70f2cb031da7f..c81780321bb8b7518a179991c141d1b744e11123 100644 (file)
setwidth_spin.signal_changed().connect(sigc::mem_fun(*this, &SvgFontsDialog::on_setwidth_changed));
setwidth_spin.set_range(0, 4096);
- setwidth_spin.set_increments(10, 100);
+ setwidth_spin.set_increments(10, 0);
global_vbox.pack_start(*setwidth_hbox, false, false);
return &global_vbox;
diff --git a/src/ui/dialog/tile.cpp b/src/ui/dialog/tile.cpp
index 5741fee4d469016fd570f5136dd44c1633b43119..a383f7b1ad24733ae7ac6b22d917c1843cb650f4 100644 (file)
--- a/src/ui/dialog/tile.cpp
+++ b/src/ui/dialog/tile.cpp
NoOfRowsBox.pack_start(NoOfRowsLabel, false, false, MARGIN);
NoOfRowsSpinner.set_digits(0);
- NoOfRowsSpinner.set_increments(1, 5);
+ NoOfRowsSpinner.set_increments(1, 0);
NoOfRowsSpinner.set_range(1.0, 100.0);
NoOfRowsSpinner.set_value(PerCol);
NoOfRowsSpinner.signal_changed().connect(sigc::mem_fun(*this, &TileDialog::on_col_spinbutton_changed));
NoOfColsBox.pack_start(NoOfColsLabel, false, false, MARGIN);
NoOfColsSpinner.set_digits(0);
- NoOfColsSpinner.set_increments(1, 5);
+ NoOfColsSpinner.set_increments(1, 0);
NoOfColsSpinner.set_range(1.0, 100.0);
NoOfColsSpinner.set_value(PerRow);
NoOfColsSpinner.signal_changed().connect(sigc::mem_fun(*this, &TileDialog::on_row_spinbutton_changed));
YPadBox.pack_start (*(Glib::wrap(i)), false, false, MARGIN);
YPadSpinner.set_digits(1);
- YPadSpinner.set_increments(0.2, 2);
+ YPadSpinner.set_increments(0.2, 0);
YPadSpinner.set_range(-10000, 10000);
double YPad = prefs->getDouble("/dialogs/gridtiler/YPad", 15);
YPadSpinner.set_value(YPad);
XPadBox.pack_start (*(Glib::wrap(i)), false, false, MARGIN);
XPadSpinner.set_digits(1);
- XPadSpinner.set_increments(0.2, 2);
+ XPadSpinner.set_increments(0.2, 0);
XPadSpinner.set_range(-10000, 10000);
double XPad = prefs->getDouble("/dialogs/gridtiler/XPad", 15);
XPadSpinner.set_value(XPad);
index 74404c2f804e00da48325b4e064944e1fd5226dd..f6dd6cb2826c0fe58d67a4b6fc2d8418b57ada23 100644 (file)
_("Trace by a given brightness level"));
modeBrightnessSpinner.set_digits(3);
- modeBrightnessSpinner.set_increments(0.01, 0.1);
+ modeBrightnessSpinner.set_increments(0.01, 0);
modeBrightnessSpinner.set_range(0.0, 1.0);
modeBrightnessSpinner.set_value(0.45);
modeBrightnessBox.pack_end(modeBrightnessSpinner, false, false, MARGIN);
modeCannyLoSpinnerLabel.set_label(_("Low"));
modeCannyBox.pack_start(modeCannyLoSpinnerLabel);
modeCannyLoSpinner.set_digits(5);
- modeCannyLoSpinner.set_increments(0.01, 0.1);
+ modeCannyLoSpinner.set_increments(0.01, 0);
modeCannyLoSpinner.set_range(0.0, 1.0);
modeCannyLoSpinner.set_value(0.1);
modeCannyBox.pack_start(modeCannyLoSpinner);
*/
modeCannyHiSpinner.set_digits(3);
- modeCannyHiSpinner.set_increments(0.01, 0.1);
+ modeCannyHiSpinner.set_increments(0.01, 0);
modeCannyHiSpinner.set_range(0.0, 1.0);
modeCannyHiSpinner.set_value(0.65);
modeCannyBox.pack_end(modeCannyHiSpinner, false, false, MARGIN);
_("Trace along the boundaries of reduced colors"));
modeQuantNrColorSpinner.set_digits(0);
- modeQuantNrColorSpinner.set_increments(1.0, 4.0);
+ modeQuantNrColorSpinner.set_increments(1.0, 0);
modeQuantNrColorSpinner.set_range(2.0, 64.0);
modeQuantNrColorSpinner.set_value(8.0);
modeQuantBox.pack_end(modeQuantNrColorSpinner, false, false, MARGIN);
_("Trace the given number of brightness levels"));
modeMultiScanNrColorSpinner.set_digits(0);
- modeMultiScanNrColorSpinner.set_increments(1.0, 4.0);
+ modeMultiScanNrColorSpinner.set_increments(1.0, 0);
modeMultiScanNrColorSpinner.set_range(2.0, 256.0);
modeMultiScanNrColorSpinner.set_value(8.0);
modeMultiScanHBox1.pack_end(modeMultiScanNrColorSpinner, false, false, MARGIN);
optionsSpecklesButton.set_active(true);
optionsSpecklesBox.pack_start(optionsSpecklesButton, false, false, MARGIN);
optionsSpecklesSizeSpinner.set_digits(0);
- optionsSpecklesSizeSpinner.set_increments(1, 10);
+ optionsSpecklesSizeSpinner.set_increments(1, 0);
optionsSpecklesSizeSpinner.set_range(0, 1000);
optionsSpecklesSizeSpinner.set_value(2);
tips.set_tip(optionsSpecklesSizeSpinner,
optionsCornersButton.set_active(true);
optionsCornersBox.pack_start(optionsCornersButton, false, false, MARGIN);
optionsCornersThresholdSpinner.set_digits(2);
- optionsCornersThresholdSpinner.set_increments(0.01, 0.1);
+ optionsCornersThresholdSpinner.set_increments(0.01, 0);
optionsCornersThresholdSpinner.set_range(0.0, 1.34);
optionsCornersThresholdSpinner.set_value(1.0);
optionsCornersBox.pack_end(optionsCornersThresholdSpinner, false, false, MARGIN);
_("Try to optimize paths by joining adjacent Bezier curve segments"));
optionsOptimBox.pack_start(optionsOptimButton, false, false, MARGIN);
optionsOptimToleranceSpinner.set_digits(2);
- optionsOptimToleranceSpinner.set_increments(0.05, 0.25);
+ optionsOptimToleranceSpinner.set_increments(0.05, 0);
optionsOptimToleranceSpinner.set_range(0.0, 5.0);
optionsOptimToleranceSpinner.set_value(0.2);
optionsOptimBox.pack_end(optionsOptimToleranceSpinner, false, false, MARGIN);
index e21410df6f187c1037c08ee2d73c7341f546fd84..70aed505e062149f5d9e07d866022f145c58677d 100644 (file)
}
void PrefSpinButton::init(Glib::ustring const &prefs_path,
- double lower, double upper, double step_increment, double page_increment,
+ double lower, double upper, double step_increment, double /*page_increment*/,
double default_value, bool is_int, bool is_percent)
{
_prefs_path = prefs_path;
}
this->set_range (lower, upper);
- this->set_increments (step_increment, page_increment);
+ this->set_increments (step_increment, 0);
this->set_numeric();
this->set_value (value);
this->set_width_chars(6);
@@ -438,7 +438,7 @@ ZoomCorrRulerSlider::init(int ruler_width, int ruler_height, double lower, doubl
_unit.signal_changed().connect(sigc::mem_fun(*this, &ZoomCorrRulerSlider::on_unit_changed));
_sb.set_range (lower, upper);
- _sb.set_increments (step_increment, page_increment);
+ _sb.set_increments (step_increment, 0);
_sb.set_value (value);
_sb.set_digits(2);
_sb.signal_value_changed().connect(sigc::mem_fun(*this, &PrefSlider::on_spinbutton_value_changed));
_sb.set_range (lower, upper);
- _sb.set_increments (step_increment, page_increment);
+ _sb.set_increments (step_increment, 0);
_sb.set_value (value);
_sb.set_digits(digits);
index 743c879f06ce102941e2b4e093840da6ea244f07..17fb4964dcad3c311cfe19d98de1c635497fd241 100644 (file)
--- a/src/ui/widget/scalar.cpp
+++ b/src/ui/widget/scalar.cpp
static_cast<Gtk::SpinButton*>(_widget)->set_digits(digits);
}
-/** Sets the step and page increments for the spin button */
+/** Sets the step and page increments for the spin button
+ * @todo Remove the second parameter - deprecated
+ */
void
-Scalar::setIncrements(double step, double page)
+Scalar::setIncrements(double step, double /*page*/)
{
g_assert(_widget != NULL);
- static_cast<Gtk::SpinButton*>(_widget)->set_increments(step, page);
+ static_cast<Gtk::SpinButton*>(_widget)->set_increments(step, 0);
}
/** Sets the minimum and maximum range allowed for the spin button */