diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2012-12-16 05:41:25 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2012-12-16 05:41:25 +0000 |
| commit | 7ec903c9898f872dbd9426ed7a62e1969fdb7be7 (patch) | |
| tree | a306139e829118a83516af02279c9eafd3440eaa /src/extension/param/float.cpp | |
| parent | Hershey Text: whitespace; py: docstring, modeline; inx: fix attribute value (diff) | |
| parent | Translations.Spanish translation update by Lucas Vieites. (diff) | |
| download | inkscape-7ec903c9898f872dbd9426ed7a62e1969fdb7be7.tar.gz inkscape-7ec903c9898f872dbd9426ed7a62e1969fdb7be7.zip | |
merge from trunk (r11955)
(bzr r11687.1.3)
Diffstat (limited to 'src/extension/param/float.cpp')
| -rw-r--r-- | src/extension/param/float.cpp | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/src/extension/param/float.cpp b/src/extension/param/float.cpp index b9ffe68d2..81508f6c0 100644 --- a/src/extension/param/float.cpp +++ b/src/extension/param/float.cpp @@ -14,6 +14,7 @@ #include <gtkmm/box.h> #include <gtkmm/scale.h> #include "ui/widget/spinbutton.h" +#include "ui/widget/spin-scale.h" #include "xml/node.h" #include "extension/extension.h" @@ -175,9 +176,6 @@ Gtk::Widget * ParamFloat::get_widget(SPDocument * doc, Inkscape::XML::Node * nod } Gtk::HBox * hbox = Gtk::manage(new Gtk::HBox(false, 4)); - Gtk::Label * label = Gtk::manage(new Gtk::Label(_(_text), Gtk::ALIGN_START)); - label->show(); - hbox->pack_start(*label, true, true, _indent); #if WITH_GTKMM_3_0 ParamFloatAdjustment * pfa = new ParamFloatAdjustment(this, doc, node, changeSignal); @@ -187,24 +185,27 @@ Gtk::Widget * ParamFloat::get_widget(SPDocument * doc, Inkscape::XML::Node * nod #endif if (_mode == FULL) { -#if WITH_GTKMM_3_0 - Gtk::HScale * scale = Gtk::manage(new Gtk::HScale(fadjust)); -#else - Gtk::HScale * scale = Gtk::manage(new Gtk::HScale(*fadjust)); -#endif - scale->set_draw_value(false); - scale->set_size_request(200, -1); + + UI::Widget::SpinScale *scale = new UI::Widget::SpinScale(_(_text), fadjust, _precision); + scale->set_size_request(400, -1); scale->show(); hbox->pack_start(*scale, false, false); + } + else if (_mode == MINIMAL) { + + Gtk::Label * label = Gtk::manage(new Gtk::Label(_(_text), Gtk::ALIGN_START)); + label->show(); + hbox->pack_start(*label, true, true, _indent); #if WITH_GTKMM_3_0 Inkscape::UI::Widget::SpinButton * spin = Gtk::manage(new Inkscape::UI::Widget::SpinButton(fadjust, 0.1, _precision)); #else Inkscape::UI::Widget::SpinButton * spin = Gtk::manage(new Inkscape::UI::Widget::SpinButton(*fadjust, 0.1, _precision)); #endif - spin->show(); - hbox->pack_start(*spin, false, false); + spin->show(); + hbox->pack_start(*spin, false, false); + } hbox->show(); |