diff options
| author | Liam P. White <inkscapebronyat-signgmaildotcom> | 2014-03-04 02:23:52 +0000 |
|---|---|---|
| committer | Liam P. White <inkscapebronyat-signgmaildotcom> | 2014-03-04 02:23:52 +0000 |
| commit | d627dc64423f864c9320c73a52b47836c696bceb (patch) | |
| tree | 6dd2947cf2adc65ae0afb361e081a1fd0ae31928 /src/widgets/gradient-toolbar.cpp | |
| parent | Fixed path color when changed by Objects Dialog (diff) | |
| parent | Remove dom/* code and replace two uses of dom/uri with uri. (diff) | |
| download | inkscape-d627dc64423f864c9320c73a52b47836c696bceb.tar.gz inkscape-d627dc64423f864c9320c73a52b47836c696bceb.zip | |
Merge to trunk
(bzr r13090.1.12)
Diffstat (limited to 'src/widgets/gradient-toolbar.cpp')
| -rw-r--r-- | src/widgets/gradient-toolbar.cpp | 54 |
1 files changed, 19 insertions, 35 deletions
diff --git a/src/widgets/gradient-toolbar.cpp b/src/widgets/gradient-toolbar.cpp index 4bed3101d..4fda44c8d 100644 --- a/src/widgets/gradient-toolbar.cpp +++ b/src/widgets/gradient-toolbar.cpp @@ -17,47 +17,31 @@ #endif #include "ui/widget/color-preview.h" -#include "verbs.h" - -#include "macros.h" -#include "widgets/button.h" -#include "widgets/widget-sizes.h" -#include "widgets/spw-utilities.h" -#include "widgets/spinbutton-events.h" -#include "widgets/gradient-vector.h" -#include "widgets/gradient-image.h" -#include "style.h" - -#include "preferences.h" -#include "document-private.h" -#include "document-undo.h" -#include "desktop.h" -#include "desktop-handles.h" #include <glibmm/i18n.h> - -#include "ui/tools/gradient-tool.h" +#include "desktop-handles.h" +#include "desktop.h" +#include "document-undo.h" +#include "document.h" +#include "ege-adjustment-action.h" +#include "ege-select-one-action.h" +#include "gradient-chemistry.h" #include "gradient-drag.h" +#include "gradient-toolbar.h" +#include "ink-action.h" +#include "macros.h" +#include "preferences.h" +#include "selection.h" +#include "sp-defs.h" #include "sp-linear-gradient.h" #include "sp-radial-gradient.h" -#include "gradient-chemistry.h" -#include "gradient-selector.h" -#include "selection.h" -#include "ui/icon-names.h" - -#include "../ege-adjustment-action.h" -#include "../ege-output-action.h" -#include "../ege-select-one-action.h" -#include "../ink-action.h" -#include "../ink-comboboxentry-action.h" - #include "sp-stop.h" -#include "svg/css-ostringstream.h" -#include "svg/svg-color.h" -#include "desktop-style.h" -#include "ui/tools/gradient-tool.h" -#include "gradient-toolbar.h" - +#include "style.h" #include "toolbox.h" +#include "ui/icon-names.h" +#include "ui/tools/gradient-tool.h" +#include "verbs.h" +#include "widgets/gradient-image.h" +#include "widgets/gradient-vector.h" using Inkscape::DocumentUndo; using Inkscape::UI::ToolboxFactory; |