diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-09-25 19:33:14 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2017-09-25 19:33:14 +0000 |
| commit | 943cb6ba767b1f3fd35fb3bb74161f224a53cdc7 (patch) | |
| tree | de6d67aef60b36625f0575e5f34c35f7c3e966f9 /src/live_effects/lpe-measure-segments.h | |
| parent | Minor code cleanup and better handling of non-spacing marks in upright vertic... (diff) | |
| download | inkscape-943cb6ba767b1f3fd35fb3bb74161f224a53cdc7.tar.gz inkscape-943cb6ba767b1f3fd35fb3bb74161f224a53cdc7.zip | |
Add improvements to meassure segments LPE pointed by CR
Diffstat (limited to 'src/live_effects/lpe-measure-segments.h')
| -rw-r--r-- | src/live_effects/lpe-measure-segments.h | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/src/live_effects/lpe-measure-segments.h b/src/live_effects/lpe-measure-segments.h index 7383aeca8..7c4fd4073 100644 --- a/src/live_effects/lpe-measure-segments.h +++ b/src/live_effects/lpe-measure-segments.h @@ -11,15 +11,15 @@ */ #include "live_effects/effect.h" - -#include <gtkmm/expander.h> +#include "ui/dialog/styledialog.h" #include "live_effects/parameter/enum.h" #include "live_effects/parameter/fontbutton.h" #include "live_effects/parameter/text.h" #include "live_effects/parameter/unit.h" #include "live_effects/parameter/bool.h" -#include "live_effects/parameter/originalpath.h" +#include "live_effects/parameter/colorpicker.h" +#include "live_effects/parameter/message.h" #include <libnrtype/font-lister.h> #include <2geom/angle.h> #include <2geom/ray.h> @@ -48,14 +48,13 @@ public: virtual Geom::PathVector doEffect_path(Geom::PathVector const &path_in); void createLine(Geom::Point start,Geom::Point end, const char * id, bool main, bool overflow, bool remove, bool arrows = false); void createTextLabel(Geom::Point pos, size_t counter, double length, Geom::Coord angle, bool remove, bool valid); - void onExpanderChanged(); void createArrowMarker(const char * mode); bool hasMeassure (size_t i); - virtual Gtk::Widget *newWidget(); private: UnitParam unit; - FontButtonParam fontbutton; EnumParam<OrientationMethod> orientation; + ColorPickerParam coloropacity; + FontButtonParam fontbutton; ScalarParam precision; ScalarParam fix_overlaps; ScalarParam position; @@ -63,6 +62,7 @@ private: ScalarParam text_right_left; ScalarParam helpline_distance; ScalarParam helpline_overlap; + ScalarParam line_width; ScalarParam scale; TextParam format; TextParam blacklist; @@ -71,22 +71,15 @@ private: BoolParam flip_side; BoolParam scale_sensitive; BoolParam local_locale; - BoolParam line_group_05; BoolParam rotate_anotation; BoolParam hide_back; - TextParam dimline_format; - TextParam helperlines_format; - TextParam anotation_format; - TextParam arrows_format; + MessageParam message; Glib::ustring display_unit; - bool expanded; - Gtk::Expander * expander; double doc_scale; double fontsize; double anotation_width; double previous_size; double arrow_gap; - LPEMeasureSegments(const LPEMeasureSegments &); LPEMeasureSegments &operator=(const LPEMeasureSegments &); |
