diff options
| author | John Smith <john.smith7545@yahoo.com> | 2012-08-30 00:36:57 +0000 |
|---|---|---|
| committer | John Smith <john.smith7545@yahoo.com> | 2012-08-30 00:36:57 +0000 |
| commit | 2e8735d2922b80386940d73319e2eba66ae226ea (patch) | |
| tree | 2f745fc22c1e08a66e385e19f3ca2024abd1fe79 /src | |
| parent | Fix for 170550 : open blank document on 'close' (diff) | |
| download | inkscape-2e8735d2922b80386940d73319e2eba66ae226ea.tar.gz inkscape-2e8735d2922b80386940d73319e2eba66ae226ea.zip | |
Fix for 165865 : Preferences Behavior-Markers page
(bzr r11633)
Diffstat (limited to 'src')
| -rw-r--r-- | src/ui/dialog/inkscape-preferences.cpp | 19 | ||||
| -rw-r--r-- | src/ui/dialog/inkscape-preferences.h | 2 |
2 files changed, 13 insertions, 8 deletions
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp index 97b0083c2..143a8b8b0 100644 --- a/src/ui/dialog/inkscape-preferences.cpp +++ b/src/ui/dialog/inkscape-preferences.cpp @@ -1087,14 +1087,6 @@ void InkscapePreferences::initPageBehavior() _markers_color_custom.init ( _("Color custom markers the same color as object"), "/options/markers/colorCustomMarkers", false); _markers_color_update.init ( _("Update marker color when object color changes"), "/options/markers/colorUpdateMarkers", true); - _page_behavior.add_group_header( _("Markers")); - _page_behavior.add_line( true, "", _markers_color_stock, "", - _("Stroke color same as object, fill color either object fill color or marker fill color")); - _page_behavior.add_line( true, "", _markers_color_custom, "", - _("Stroke color same as object, fill color either object fill color or marker fill color")); - _page_behavior.add_line( true, "", _markers_color_update, "", - _("Update marker color when object color changes")); - // Selecting options _sel_all.init ( _("Select in all layers"), "/options/kbselection/inlayer", PREFS_SELECTION_ALL, false, 0); _sel_current.init ( _("Select only within current layer"), "/options/kbselection/inlayer", PREFS_SELECTION_LAYER, true, &_sel_all); @@ -1294,6 +1286,17 @@ void InkscapePreferences::initPageBehavior() _("Ungroup groups created when setting clip/mask")); this->AddPage(_page_mask, _("Clippaths and masks"), iter_behavior, PREFS_PAGE_BEHAVIOR_MASKS); + + + _page_markers.add_group_header( _("Stroke Style Markers")); + _page_markers.add_line( true, "", _markers_color_stock, "", + _("Stroke color same as object, fill color either object fill color or marker fill color")); + _page_markers.add_line( true, "", _markers_color_custom, "", + _("Stroke color same as object, fill color either object fill color or marker fill color")); + _page_markers.add_line( true, "", _markers_color_update, "", + _("Update marker color when object color changes")); + + this->AddPage(_page_markers, _("Markers"), iter_behavior, PREFS_PAGE_BEHAVIOR_MARKERS); } void InkscapePreferences::initPageRendering() diff --git a/src/ui/dialog/inkscape-preferences.h b/src/ui/dialog/inkscape-preferences.h index 06949d3e4..948a3f87b 100644 --- a/src/ui/dialog/inkscape-preferences.h +++ b/src/ui/dialog/inkscape-preferences.h @@ -68,6 +68,7 @@ enum { PREFS_PAGE_BEHAVIOR_STEPS, PREFS_PAGE_BEHAVIOR_CLONES, PREFS_PAGE_BEHAVIOR_MASKS, + PREFS_PAGE_BEHAVIOR_MARKERS, PREFS_PAGE_IO, PREFS_PAGE_IO_MOUSE, PREFS_PAGE_IO_SVGOUTPUT, @@ -151,6 +152,7 @@ protected: UI::Widget::DialogPage _page_steps; UI::Widget::DialogPage _page_clones; UI::Widget::DialogPage _page_mask; + UI::Widget::DialogPage _page_markers; UI::Widget::DialogPage _page_io; UI::Widget::DialogPage _page_mouse; |