diff options
| author | Johan B. C. Engelen <jbc.engelen@swissonline.ch> | 2011-04-14 23:03:50 +0000 |
|---|---|---|
| committer | Johan Engelen <goejendaagh@zonnet.nl> | 2011-04-14 23:03:50 +0000 |
| commit | 384adc13f591fc200e9be292ced829ef8734cba0 (patch) | |
| tree | 65b083496c6d585a18b0ceefed186b024e4d7cfa /src/ui/dialog/guides.h | |
| parent | ScalarUnit: add functionality to grab focus and select the entry text. and ad... (diff) | |
| download | inkscape-384adc13f591fc200e9be292ced829ef8734cba0.tar.gz inkscape-384adc13f591fc200e9be292ced829ef8734cba0.zip | |
convert guideline dialog to ui/widget/... newer widgets.
add unit to guideline angle. save angle unit status when closing dialog
(bzr r10166)
Diffstat (limited to 'src/ui/dialog/guides.h')
| -rw-r--r-- | src/ui/dialog/guides.h | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/src/ui/dialog/guides.h b/src/ui/dialog/guides.h index 8485c78a7..f015c49ff 100644 --- a/src/ui/dialog/guides.h +++ b/src/ui/dialog/guides.h @@ -22,10 +22,20 @@ #include <gtkmm/adjustment.h> #include "ui/widget/button.h" #include "ui/widget/spinbutton.h" +#include "ui/widget/unit-menu.h" +#include "ui/widget/scalar-unit.h" #include <2geom/point.h> +class SPGuide; +class SPDesktop; + namespace Inkscape { namespace UI { + +namespace Widget { + class UnitMenu; +}; + namespace Dialogs { class GuidelinePropertiesDialog : public Gtk::Dialog { @@ -56,21 +66,15 @@ private: Gtk::Table _layout_table; Gtk::Label _label_name; Gtk::Label _label_descr; - Gtk::Label _label_units; - Gtk::Label _label_X; - Gtk::Label _label_Y; - Gtk::Label _label_degrees; Inkscape::UI::Widget::CheckButton _relative_toggle; static bool _relative_toggle_status; // remember the status of the _relative_toggle_status button across instances - Gtk::Adjustment _adjustment_x; - Inkscape::UI::Widget::SpinButton _spin_button_x; - Gtk::Adjustment _adjustment_y; - Inkscape::UI::Widget::SpinButton _spin_button_y; + Inkscape::UI::Widget::UnitMenu _unit_menu; + Inkscape::UI::Widget::ScalarUnit _spin_button_x; + Inkscape::UI::Widget::ScalarUnit _spin_button_y; - Gtk::Adjustment _adj_angle; - Inkscape::UI::Widget::SpinButton _spin_angle; + Inkscape::UI::Widget::ScalarUnit _spin_angle; + static Glib::ustring _angle_unit_status; // remember the status of the _relative_toggle_status button across instances - Gtk::Widget *_unit_selector; bool _mode; Geom::Point _oldpos; gdouble _oldangle; |