From a73e5f92baa51f76f70126ed64cabac4fa811764 Mon Sep 17 00:00:00 2001 From: tweenk Date: Sat, 21 Feb 2009 01:59:56 +0000 Subject: [PATCH] Move files from the src/dialogs/ directory to the places where they should be. Build libinkscape.a - should reduce link time. --- src/Makefile.am | 125 +++++++++++------- src/Makefile_insert | 48 +------ src/conditions.cpp | 2 +- src/desktop-events.cpp | 43 +++--- src/dialogs/Makefile_insert | 28 ---- src/dialogs/in-dt-coordsys.cpp | 37 ------ src/dialogs/in-dt-coordsys.h | 18 --- src/dialogs/item-properties.cpp | 19 ++- src/dialogs/object-attributes.cpp | 9 +- src/dialogs/xml-tree.cpp | 27 +++- src/document.cpp | 28 ++-- src/extension/error-file.cpp | 2 +- src/file.cpp | 62 ++++----- src/helper/png-write.cpp | 2 +- src/{dialogs => }/rdf.cpp | 0 src/{dialogs => }/rdf.h | 0 src/ui/Makefile_insert | 8 +- src/ui/dialog/Makefile_insert | 24 ++++ src/ui/dialog/align-and-distribute.cpp | 2 +- .../dialog}/calligraphic-profile-rename.cpp | 0 .../dialog}/calligraphic-profile-rename.h | 0 src/ui/dialog/dialog-manager.cpp | 13 +- src/ui/dialog/document-metadata.cpp | 16 +-- src/{dialogs => ui/dialog}/extensions.cpp | 0 src/{dialogs => ui/dialog}/extensions.h | 0 src/ui/dialog/fill-and-stroke.cpp | 12 +- .../dialog/guides.cpp} | 2 +- .../guidelinedialog.h => ui/dialog/guides.h} | 0 .../dialog/icon-preview.cpp} | 16 +-- .../dialog/icon-preview.h} | 0 .../dialog}/layer-properties.cpp | 0 src/{dialogs => ui/dialog}/layer-properties.h | 0 .../layers-panel.cpp => ui/dialog/layers.cpp} | 35 +++-- .../layers-panel.h => ui/dialog/layers.h} | 0 src/ui/dialog/panel-dialog.h | 2 +- src/{dialogs => ui/dialog}/swatches.cpp | 19 ++- src/{dialogs => ui/dialog}/swatches.h | 2 +- src/ui/previewable.h | 2 +- src/ui/previewfillable.h | 2 +- src/ui/previewholder.h | 2 +- src/ui/view/edit-widget.h | 6 +- src/ui/widget/Makefile_insert | 2 + src/ui/widget/entity-entry.cpp | 6 +- src/{widgets => ui/widget}/layer-selector.cpp | 21 ++- src/{widgets => ui/widget}/layer-selector.h | 0 src/ui/widget/licensor.cpp | 2 +- src/ui/widget/panel.cpp | 2 +- src/{dialogs => }/unclump.cpp | 0 src/{dialogs => }/unclump.h | 0 src/verbs.cpp | 10 +- src/widgets/Makefile_insert | 14 +- src/widgets/desktop-widget.cpp | 46 +++---- src/{dialogs => widgets}/eek-color-def.cpp | 0 src/{dialogs => widgets}/eek-color-def.h | 0 src/{dialogs => widgets}/eek-preview.cpp | 0 src/{dialogs => widgets}/eek-preview.h | 0 src/{dialogs => widgets}/fill-style.cpp | 2 +- src/{dialogs => widgets}/fill-style.h | 0 .../sp-attribute-widget.cpp | 0 .../sp-attribute-widget.h | 0 src/{dialogs => widgets}/stroke-style.cpp | 2 +- src/{dialogs => widgets}/stroke-style.h | 0 src/widgets/toolbox.cpp | 2 +- 63 files changed, 325 insertions(+), 397 deletions(-) delete mode 100644 src/dialogs/in-dt-coordsys.cpp delete mode 100644 src/dialogs/in-dt-coordsys.h rename src/{dialogs => }/rdf.cpp (100%) rename src/{dialogs => }/rdf.h (100%) rename src/{widgets => ui/dialog}/calligraphic-profile-rename.cpp (100%) rename src/{widgets => ui/dialog}/calligraphic-profile-rename.h (100%) rename src/{dialogs => ui/dialog}/extensions.cpp (100%) rename src/{dialogs => ui/dialog}/extensions.h (100%) rename src/{dialogs/guidelinedialog.cpp => ui/dialog/guides.cpp} (99%) rename src/{dialogs/guidelinedialog.h => ui/dialog/guides.h} (100%) rename src/{dialogs/iconpreview.cpp => ui/dialog/icon-preview.cpp} (99%) rename src/{dialogs/iconpreview.h => ui/dialog/icon-preview.h} (100%) rename src/{dialogs => ui/dialog}/layer-properties.cpp (100%) rename src/{dialogs => ui/dialog}/layer-properties.h (100%) rename src/{dialogs/layers-panel.cpp => ui/dialog/layers.cpp} (99%) rename src/{dialogs/layers-panel.h => ui/dialog/layers.h} (100%) rename src/{dialogs => ui/dialog}/swatches.cpp (99%) rename src/{dialogs => ui/dialog}/swatches.h (98%) rename src/{widgets => ui/widget}/layer-selector.cpp (99%) rename src/{widgets => ui/widget}/layer-selector.h (100%) rename src/{dialogs => }/unclump.cpp (100%) rename src/{dialogs => }/unclump.h (100%) rename src/{dialogs => widgets}/eek-color-def.cpp (100%) rename src/{dialogs => widgets}/eek-color-def.h (100%) rename src/{dialogs => widgets}/eek-preview.cpp (100%) rename src/{dialogs => widgets}/eek-preview.h (100%) rename src/{dialogs => widgets}/fill-style.cpp (99%) rename src/{dialogs => widgets}/fill-style.h (100%) rename src/{dialogs => widgets}/sp-attribute-widget.cpp (100%) rename src/{dialogs => widgets}/sp-attribute-widget.h (100%) rename src/{dialogs => widgets}/stroke-style.cpp (99%) rename src/{dialogs => widgets}/stroke-style.h (100%) diff --git a/src/Makefile.am b/src/Makefile.am index dece3edcf..517e89f1a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,10 +1,7 @@ ## Process this file with automake to produce Makefile.in - # ################################################ -# # G L O B A L -# # ################################################ # Should work in either automake1.7 or 1.8, but 1.6 doesn't @@ -16,6 +13,40 @@ AUTOMAKE_OPTIONS = 1.7 subdir-objects # Executables compiled by "make" and installed by "make install" bin_PROGRAMS = inkscape inkview +# Libraries which should be compiled by "make" but not installed. +# Use this only for libraries that are really standalone, rather than for +# source tree subdirectories. +if WITH_INKBOARD +libpedro = pedro/libpedro.a +endif +noinst_LIBRARIES = \ + libinkscape.a \ + dom/libdom.a \ + libcroco/libcroco.a \ + libavoid/libavoid.a \ + libgdl/libgdl.a \ + libcola/libcola.a \ + libvpsc/libvpsc.a \ + livarot/libvarot.a \ + 2geom/lib2geom.a \ + $(libpedro) \ + libinkversion.a + +all_libs = \ + $(noinst_LIBRARIES) \ + $(INKSCAPE_LIBS) \ + $(GNOME_VFS_LIBS) \ + $(XFT_LIBS) \ + $(FREETYPE_LIBS) \ + $(kdeldadd) \ + $(win32ldflags) \ + $(CARBON_LDFLAGS) \ + $(PERL_LIBS) \ + $(PYTHON_LIBS) \ + $(INKBOARD_LIBS) \ + $(LIBWPG_LIBS) \ + $(IMAGEMAGICK_LIBS) + # Add sources common for Inkscape and Inkview to this variable. ink_common_sources = # Add Inkscape-only sources here. @@ -23,11 +54,6 @@ inkscape_SOURCES = # Add Inkview-only sources here. inkview_SOURCES = -# Libraries which should be compiled by "make" but not installed. -# Use this only for libraries that are really standalone, rather than for -# source tree subdirectories. -noinst_LIBRARIES = $(inkscape_private_libs) - INCLUDES = \ $(PERL_CFLAGS) $(PYTHON_CFLAGS) \ $(FREETYPE_CFLAGS) \ @@ -70,43 +96,6 @@ inkjar_dir = inkjar inkjar_libs = inkjar/libinkjar.a endif -# Extra files to remove when doing "make distclean" -DISTCLEANFILES = \ - helper/sp-marshal.cpp \ - helper/sp-marshal.h \ - inkscape-version.cpp - -if WITH_INKBOARD -libpedro = pedro/libpedro.a -endif - -inkscape_private_libs = \ - dom/libdom.a \ - libcroco/libcroco.a \ - libavoid/libavoid.a \ - libgdl/libgdl.a \ - libcola/libcola.a \ - libvpsc/libvpsc.a \ - livarot/libvarot.a \ - 2geom/lib2geom.a \ - $(libpedro) \ - libinkversion.a - -all_libs = \ - $(inkscape_private_libs) \ - $(INKSCAPE_LIBS) \ - $(GNOME_VFS_LIBS) \ - $(XFT_LIBS) \ - $(FREETYPE_LIBS) \ - $(kdeldadd) \ - $(win32ldflags) \ - $(CARBON_LDFLAGS) \ - $(PERL_LIBS) \ - $(PYTHON_LIBS) \ - $(INKBOARD_LIBS) \ - $(LIBWPG_LIBS) \ - $(IMAGEMAGICK_LIBS) - # Include all partial makefiles from subdirectories include Makefile_insert include application/Makefile_insert @@ -208,19 +197,57 @@ EXTRA_DIST = \ traits/reference.h \ $(jabber_whiteboard_SOURCES) +# Extra files to remove when doing "make distclean" +DISTCLEANFILES = \ + helper/sp-marshal.cpp \ + helper/sp-marshal.h \ + inkscape-version.cpp + # ################################################ -# # B I N A R I E S -# # ################################################ -inkscape_SOURCES += main.cpp $(ink_common_sources) $(win32_sources) +# this should speed up the build +libinkscape_a_SOURCES = $(ink_common_sources) + +inkscape_SOURCES += main.cpp $(win32_sources) inkscape_LDADD = $(all_libs) inkscape_LDFLAGS = --export-dynamic $(kdeldflags) -inkview_SOURCES += inkview.cpp $(ink_common_sources) $(win32_sources) +inkview_SOURCES += inkview.cpp $(win32_sources) inkview_LDADD = $(all_libs) +# ################################################ +# VERSION REPORTING +# ################################################ + +libinkversion_a_SOURCES = inkscape-version.cpp inkscape-version.h + +if USE_SVN_VERSION +inkscape_version_deps = $(top_srcdir)/.svn/entries +endif + +# If this is an SVN snapshot build, regenerate this file every time +# someone updates the SVN working directory. +inkscape-version.cpp: $(inkscape_version_deps) + VER_PREFIX="$(VERSION)"; \ + if test -x "$(srcdir)/.svn" -a ! -z `which svn`; then \ + VER_SVNREV=" r`svn info $(srcdir) | sed -n -e '/^Revision:/s/Revision: \(.*\)/\1/p'`"; \ + if test ! -z "`svn status -q $(srcdir)`"; then \ + VER_CUSTOM=" custom"; \ + fi; \ + fi; \ + VERSION="$$VER_PREFIX$$VER_SVNREV$$VER_CUSTOM"; \ + echo "namespace Inkscape { " \ + "char const *version_string = \"$$VERSION\"; " \ + "}" > inkscape-version.new.cpp; \ + if cmp -s inkscape-version.new.cpp inkscape-version.cpp; then \ + rm inkscape-version.new.cpp; \ + else \ + mv inkscape-version.new.cpp inkscape-version.cpp; \ + fi; \ + echo $$VERSION + # ################################# # ## TESTING STUFF (make check) ### # ################################# diff --git a/src/Makefile_insert b/src/Makefile_insert index 360f69cc4..a3babf265 100644 --- a/src/Makefile_insert +++ b/src/Makefile_insert @@ -1,22 +1,5 @@ ## Makefile.am fragment, included by src/Makefile.am. - -# ################################################ -# -# I N K S C A P E -# -# ################################################ - -# libinkpre.a: any object that's sharable between inkscape & inkview, -# and isn't needed by object files in subdirectories (i.e. libinkpre.a -# comes before subdirectory libraries on the link line). -# -# Excludes winmain.cpp (a gui wrapper around main): I'm guessing that -# it needs to be explicitly listed as a source of each graphical -# binary: it isn't (to my knowledge) called by main (whether directly -# or indirectly), so I don't think that putting it in a library will -# suffice to get it linked in. Windows devel please confirm. -- pjrm. - ink_common_sources += \ algorithms/find-last-if.h \ algorithms/longest-common-suffix.h \ @@ -137,6 +120,7 @@ ink_common_sources += \ print.cpp print.h \ profile-manager.cpp profile-manager.h \ proj_pt.cpp proj_pt.h \ + rdf.cpp rdf.h \ rect-context.cpp rect-context.h \ require-config.h \ round.h \ @@ -254,8 +238,7 @@ ink_common_sources += \ tools-switch.cpp tools-switch.h \ transf_mat_3x4.cpp transf_mat_3x4.h \ tweak-context.h tweak-context.cpp \ - ui/context-menu.cpp \ - ui/context-menu.h \ + unclump.cpp unclump.h \ undo-stack-observer.h \ unicoderange.cpp unicoderange.h \ unit-constants.h \ @@ -276,33 +259,6 @@ selection.$(OBJEXT): helper/sp-marshal.h sp-object.$(OBJEXT): helper/sp-marshal.h view.$(OBJEXT): helper/sp-marshal.h -libinkversion_a_SOURCES = inkscape-version.cpp inkscape-version.h - -if USE_SVN_VERSION -inkscape_version_deps = $(top_srcdir)/.svn/entries -endif - -# If this is an SVN snapshot build, regenerate this file every time -# someone updates the SVN working directory. -inkscape-version.cpp: $(inkscape_version_deps) - VER_PREFIX="$(VERSION)"; \ - if test -x "$(srcdir)/.svn" -a ! -z `which svn`; then \ - VER_SVNREV=" r`svn info $(srcdir) | sed -n -e '/^Revision:/s/Revision: \(.*\)/\1/p'`"; \ - if test ! -z "`svn status -q $(srcdir)`"; then \ - VER_CUSTOM=" custom"; \ - fi; \ - fi; \ - VERSION="$$VER_PREFIX$$VER_SVNREV$$VER_CUSTOM"; \ - echo "namespace Inkscape { " \ - "char const *version_string = \"$$VERSION\"; " \ - "}" > inkscape-version.new.cpp; \ - if cmp -s inkscape-version.new.cpp inkscape-version.cpp; then \ - rm inkscape-version.new.cpp; \ - else \ - mv inkscape-version.new.cpp inkscape-version.cpp; \ - fi; \ - echo $$VERSION - # ###################### # ### CxxTest stuff #### # ###################### diff --git a/src/conditions.cpp b/src/conditions.cpp index 9a46f27d1..4a18a6913 100644 --- a/src/conditions.cpp +++ b/src/conditions.cpp @@ -19,7 +19,7 @@ #include #include "conditions.h" #include "xml/repr.h" -#include "dialogs/rdf.h" +#include "rdf.h" typedef bool (* condition_evaluator)(SPItem const *item, gchar const *value); diff --git a/src/desktop-events.cpp b/src/desktop-events.cpp index 46fb00cca..73cd64665 100644 --- a/src/desktop-events.cpp +++ b/src/desktop-events.cpp @@ -1,9 +1,7 @@ -#define __SP_DESKTOP_EVENTS_C__ - -/* - * Event handlers for SPDesktop - * - * Author: +/** @file + * @brief Event handlers for SPDesktop + */ +/* Author: * Lauris Kaplinski * * Copyright (C) 1999-2002 Lauris Kaplinski @@ -16,30 +14,31 @@ #endif #include #include +#include <2geom/line.h> +#include + +#include "desktop.h" +#include "desktop-handles.h" +#include "dialogs/dialog-events.h" +#include "display/canvas-axonomgrid.h" +#include "display/canvas-grid.h" #include "display/guideline.h" #include "display/snap-indicator.h" +#include "document.h" +#include "event-context.h" +#include "helper/action.h" #include "helper/unit-menu.h" #include "helper/units.h" -#include "desktop.h" -#include "document.h" +#include "message-context.h" +#include "preferences.h" +#include "snap.h" #include "sp-guide.h" +#include "sp-metrics.h" #include "sp-namedview.h" -#include "desktop-handles.h" -#include "event-context.h" +#include "tools-switch.h" +#include "ui/dialog/guides.h" #include "widgets/desktop-widget.h" -#include "sp-metrics.h" -#include -#include "dialogs/dialog-events.h" -#include "message-context.h" #include "xml/repr.h" -#include "dialogs/guidelinedialog.h" -#include "snap.h" -#include "display/canvas-grid.h" -#include "display/canvas-axonomgrid.h" -#include "preferences.h" -#include "helper/action.h" -#include "tools-switch.h" -#include <2geom/line.h> static void snoop_extended(GdkEvent* event, SPDesktop *desktop); static void init_extended(); diff --git a/src/dialogs/Makefile_insert b/src/dialogs/Makefile_insert index f7404a8b2..32a11e831 100644 --- a/src/dialogs/Makefile_insert +++ b/src/dialogs/Makefile_insert @@ -5,47 +5,19 @@ ink_common_sources += \ dialogs/clonetiler.h \ dialogs/dialog-events.cpp \ dialogs/dialog-events.h \ - dialogs/eek-color-def.cpp \ - dialogs/eek-color-def.h \ - dialogs/eek-preview.cpp \ - dialogs/eek-preview.h \ dialogs/export.cpp \ dialogs/export.h \ - dialogs/extensions.cpp \ - dialogs/extensions.h \ - dialogs/fill-style.cpp \ - dialogs/fill-style.h \ dialogs/find.cpp \ dialogs/find.h \ - dialogs/guidelinedialog.cpp \ - dialogs/guidelinedialog.h \ - dialogs/iconpreview.cpp \ - dialogs/iconpreview.h \ - dialogs/in-dt-coordsys.cpp \ - dialogs/in-dt-coordsys.h \ dialogs/input.cpp \ dialogs/input.h \ dialogs/item-properties.cpp \ dialogs/item-properties.h \ - dialogs/layer-properties.cpp \ - dialogs/layer-properties.h \ - dialogs/layers-panel.cpp \ - dialogs/layers-panel.h \ dialogs/object-attributes.cpp \ dialogs/object-attributes.h \ - dialogs/rdf.cpp \ - dialogs/rdf.h \ - dialogs/sp-attribute-widget.cpp \ - dialogs/sp-attribute-widget.h \ dialogs/spellcheck.cpp \ dialogs/spellcheck.h \ - dialogs/stroke-style.cpp \ - dialogs/stroke-style.h \ - dialogs/swatches.cpp \ - dialogs/swatches.h \ dialogs/text-edit.cpp \ dialogs/text-edit.h \ - dialogs/unclump.cpp \ - dialogs/unclump.h \ dialogs/xml-tree.cpp \ dialogs/xml-tree.h diff --git a/src/dialogs/in-dt-coordsys.cpp b/src/dialogs/in-dt-coordsys.cpp deleted file mode 100644 index 54d9ac326..000000000 --- a/src/dialogs/in-dt-coordsys.cpp +++ /dev/null @@ -1,37 +0,0 @@ -#include "sp-root.h" - -/** Returns true iff \a item is suitable to be included in the selection, in particular - whether it has a bounding box in the desktop coordinate system for rendering resize handles. - - Descendents of nodes (markers etc.) return false, for example. -*/ -bool in_dt_coordsys(SPObject const &item) -{ - /* Definition based on sp_item_i2doc_affine. */ - SPObject const *child = &item; - g_return_val_if_fail(child != NULL, false); - for(;;) { - if (!SP_IS_ITEM(child)) { - return false; - } - SPObject const * const parent = SP_OBJECT_PARENT(child); - if (parent == NULL) { - break; - } - child = parent; - } - g_assert(SP_IS_ROOT(child)); - /* Relevance: Otherwise, I'm not sure whether to return true or false. */ - return true; -} - -/* - Local Variables: - mode:c++ - c-file-style:"stroustrup" - c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +)) - indent-tabs-mode:nil - fill-column:99 - End: -*/ -// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 : diff --git a/src/dialogs/in-dt-coordsys.h b/src/dialogs/in-dt-coordsys.h deleted file mode 100644 index c2ec96d8e..000000000 --- a/src/dialogs/in-dt-coordsys.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef SEEN_IN_DT_COORDSYS -#define SEEN_IN_DT_COORDSYS -#include "forward.h" - -bool in_dt_coordsys(SPObject const &item); - -#endif /* !SEEN_IN_DT_COORDSYS */ - -/* - Local Variables: - mode:c++ - c-file-style:"stroustrup" - c-file-offsets:((innamespace . 0)(inline-open . 0)(case-label . +)) - indent-tabs-mode:nil - fill-column:99 - End: -*/ -// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 : diff --git a/src/dialogs/item-properties.cpp b/src/dialogs/item-properties.cpp index 076358082..44a479b6c 100644 --- a/src/dialogs/item-properties.cpp +++ b/src/dialogs/item-properties.cpp @@ -26,21 +26,20 @@ #include #include +#include "../desktop-handles.h" +#include "dialog-events.h" +#include "../document.h" #include -#include "helper/window.h" -#include "../widgets/sp-widget.h" +#include "../helper/window.h" #include "../inkscape.h" -#include "../document.h" -#include "../desktop-handles.h" +#include "../interface.h" +#include "../macros.h" +#include "../preferences.h" #include "../selection.h" #include "../sp-item.h" -#include "../macros.h" #include "../verbs.h" -#include "../interface.h" -#include "sp-attribute-widget.h" - -#include "dialog-events.h" -#include "../preferences.h" +#include "../widgets/sp-attribute-widget.h" +#include "../widgets/sp-widget.h" #define MIN_ONSCREEN_DISTANCE 50 diff --git a/src/dialogs/object-attributes.cpp b/src/dialogs/object-attributes.cpp index d9bcf1489..320840f76 100644 --- a/src/dialogs/object-attributes.cpp +++ b/src/dialogs/object-attributes.cpp @@ -13,17 +13,16 @@ #include #include #include +#include +#include +#include #include "helper/window.h" #include "macros.h" #include "sp-anchor.h" -#include "sp-attribute-widget.h" +#include "widgets/sp-attribute-widget.h" #include "../xml/repr.h" -#include -#include -#include - struct SPAttrDesc { gchar const *label; gchar const *attribute; diff --git a/src/dialogs/xml-tree.cpp b/src/dialogs/xml-tree.cpp index 65ae9a8a3..cf3599517 100644 --- a/src/dialogs/xml-tree.cpp +++ b/src/dialogs/xml-tree.cpp @@ -22,7 +22,6 @@ #include "../document.h" #include "../event-context.h" #include "helper/window.h" -#include "in-dt-coordsys.h" #include "../inkscape.h" #include "../interface.h" #include "macros.h" @@ -142,6 +141,7 @@ static void cmd_set_attr(GtkObject *object, gpointer data); static gboolean sp_xml_tree_key_press(GtkWidget *widget, GdkEventKey *event); +static bool in_dt_coordsys(SPObject const &item); /* * \brief Sets the XML status bar when the tree is selected. @@ -1574,6 +1574,31 @@ void cmd_unindent_node(GtkObject */*object*/, gpointer /*data*/) } // end of cmd_unindent_node() +/** Returns true iff \a item is suitable to be included in the selection, in particular + whether it has a bounding box in the desktop coordinate system for rendering resize handles. + + Descendents of nodes (markers etc.) return false, for example. +*/ +bool in_dt_coordsys(SPObject const &item) +{ + /* Definition based on sp_item_i2doc_affine. */ + SPObject const *child = &item; + g_return_val_if_fail(child != NULL, false); + for(;;) { + if (!SP_IS_ITEM(child)) { + return false; + } + SPObject const * const parent = SP_OBJECT_PARENT(child); + if (parent == NULL) { + break; + } + child = parent; + } + g_assert(SP_IS_ROOT(child)); + /* Relevance: Otherwise, I'm not sure whether to return true or false. */ + return true; +} + /* Local Variables: diff --git a/src/document.cpp b/src/document.cpp index 4f5487032..fe6ce011b 100644 --- a/src/document.cpp +++ b/src/document.cpp @@ -40,29 +40,27 @@ #include #include #include + #include "application/application.h" #include "application/editor.h" -#include "xml/repr.h" +#include "desktop.h" +#include "dir-util.h" +#include "display/nr-arena-item.h" +#include "document-private.h" #include "helper/units.h" #include "inkscape-private.h" #include "inkscape-version.h" -#include "sp-object-repr.h" -#include "sp-namedview.h" -#include "desktop.h" -#include "document-private.h" -#include "dir-util.h" -#include "unit-constants.h" -#include "preferences.h" #include "libavoid/router.h" -#include "sp-item-group.h" -#include "profile-manager.h" #include "persp3d.h" - -#include "display/nr-arena-item.h" - -#include "dialogs/rdf.h" - +#include "preferences.h" +#include "profile-manager.h" +#include "rdf.h" +#include "sp-item-group.h" +#include "sp-namedview.h" +#include "sp-object-repr.h" #include "transf_mat_3x4.h" +#include "unit-constants.h" +#include "xml/repr.h" #define SP_DOCUMENT_UPDATE_PRIORITY (G_PRIORITY_HIGH_IDLE - 1) diff --git a/src/extension/error-file.cpp b/src/extension/error-file.cpp index 7e40522b3..5a3f8dcd2 100644 --- a/src/extension/error-file.cpp +++ b/src/extension/error-file.cpp @@ -17,7 +17,7 @@ #include "inkscape.h" #include "preferences.h" -#include "dialogs/extensions.h" +#include "ui/dialog/extensions.h" #include "extension/extension.h" #include "error-file.h" diff --git a/src/file.cpp b/src/file.cpp index 5c729eeeb..396e9095f 100644 --- a/src/file.cpp +++ b/src/file.cpp @@ -1,9 +1,7 @@ -#define __SP_FILE_C__ - -/* - * File/Print operations - * - * Authors: +/** @file + * @brief File/Print operations + */ +/* Authors: * Lauris Kaplinski * Chema Celorio * bulia byak @@ -30,45 +28,41 @@ #include #include +#include #include -#include "document-private.h" -#include "selection-chemistry.h" -#include "ui/view/view-widget.h" +#include "application/application.h" +#include "application/editor.h" +#include "desktop.h" +#include "desktop-handles.h" +#include "dialogs/export.h" #include "dir-util.h" +#include "document-private.h" +#include "extension/db.h" +#include "extension/input.h" +#include "extension/output.h" +#include "extension/system.h" +#include "file.h" #include "helper/png-write.h" -#include "dialogs/export.h" -#include +#include "id-clash.h" +#include "inkscape.h" #include "inkscape.h" -#include "desktop.h" -#include "selection.h" #include "interface.h" -#include "style.h" -#include "print.h" -#include "file.h" +#include "io/sys.h" #include "message.h" #include "message-stack.h" -#include "ui/dialog/filedialog.h" -#include "ui/dialog/ocaldialogs.h" -#include "preferences.h" #include "path-prefix.h" - +#include "preferences.h" +#include "print.h" +#include "rdf.h" +#include "selection-chemistry.h" +#include "selection.h" #include "sp-namedview.h" -#include "desktop-handles.h" - -#include "extension/db.h" -#include "extension/input.h" -#include "extension/output.h" -/* #include "extension/menu.h" */ -#include "extension/system.h" - -#include "io/sys.h" -#include "application/application.h" -#include "application/editor.h" -#include "inkscape.h" +#include "style.h" +#include "ui/dialog/filedialog.h" +#include "ui/dialog/ocaldialogs.h" +#include "ui/view/view-widget.h" #include "uri.h" -#include "id-clash.h" -#include "dialogs/rdf.h" #ifdef WITH_GNOME_VFS # include diff --git a/src/helper/png-write.cpp b/src/helper/png-write.cpp index 753b0df45..ee17e7079 100644 --- a/src/helper/png-write.cpp +++ b/src/helper/png-write.cpp @@ -31,7 +31,7 @@ #include #include #include "preferences.h" -#include "dialogs/rdf.h" +#include "rdf.h" /* This is an example of how to use libpng to read and write PNG files. * The file libpng.txt is much more verbose then this. If you have not diff --git a/src/dialogs/rdf.cpp b/src/rdf.cpp similarity index 100% rename from src/dialogs/rdf.cpp rename to src/rdf.cpp diff --git a/src/dialogs/rdf.h b/src/rdf.h similarity index 100% rename from src/dialogs/rdf.h rename to src/rdf.h diff --git a/src/ui/Makefile_insert b/src/ui/Makefile_insert index e91c22025..3eb6c6b13 100644 --- a/src/ui/Makefile_insert +++ b/src/ui/Makefile_insert @@ -1,9 +1,11 @@ ## Makefile.am fragment sourced by src/Makefile.am. ink_common_sources += \ - ui/clipboard.cpp \ - ui/clipboard.h \ - ui/icon-names.h \ + ui/context-menu.cpp \ + ui/context-menu.h \ + ui/clipboard.cpp \ + ui/clipboard.h \ + ui/icon-names.h \ ui/previewable.h \ ui/previewfillable.h \ ui/previewholder.cpp \ diff --git a/src/ui/dialog/Makefile_insert b/src/ui/dialog/Makefile_insert index bf3b6baeb..6a9ebf61f 100644 --- a/src/ui/dialog/Makefile_insert +++ b/src/ui/dialog/Makefile_insert @@ -1,11 +1,23 @@ ## Makefile.am fragment sourced by src/Makefile.am. +if WITH_INKBOARD +inkboard_dialogs = \ + whiteboard-connect.cpp \ + whiteboard-connect.h \ + whiteboard-sharewithchat.cpp \ + whiteboard-sharewithchat.h \ + whiteboard-sharewithuser.cpp \ + whiteboard-sharewithuser.h +endif + ink_common_sources += \ ui/dialog/aboutbox.cpp \ ui/dialog/aboutbox.h \ ui/dialog/align-and-distribute.cpp \ ui/dialog/align-and-distribute.h \ ui/dialog/behavior.h \ + ui/dialog/calligraphic-profile-rename.h \ + ui/dialog/calligraphic-profile-rename.cpp \ ui/dialog/debug.cpp \ ui/dialog/debug.h \ ui/dialog/dialog.cpp \ @@ -20,6 +32,8 @@ ink_common_sources += \ ui/dialog/document-properties.h \ ui/dialog/extension-editor.cpp \ ui/dialog/extension-editor.h \ + ui/dialog/extensions.cpp \ + ui/dialog/extensions.h \ ui/dialog/filedialog.cpp \ ui/dialog/filedialog.h \ ui/dialog/filedialogimpl-gtkmm.cpp \ @@ -34,10 +48,18 @@ ink_common_sources += \ ui/dialog/find.h \ ui/dialog/floating-behavior.cpp \ ui/dialog/floating-behavior.h \ + ui/dialog/guides.cpp \ + ui/dialog/guides.h \ + ui/dialog/icon-preview.cpp \ + ui/dialog/icon-preview.h \ ui/dialog/inkscape-preferences.cpp \ ui/dialog/inkscape-preferences.h \ ui/dialog/input.cpp \ ui/dialog/input.h \ + ui/dialog/layer-properties.cpp \ + ui/dialog/layer-properties.h \ + ui/dialog/layers.cpp \ + ui/dialog/layers.h \ ui/dialog/livepatheffect-editor.cpp \ ui/dialog/livepatheffect-editor.h \ ui/dialog/memory.cpp \ @@ -53,6 +75,8 @@ ink_common_sources += \ ui/dialog/scriptdialog.h \ ui/dialog/svg-fonts-dialog.cpp \ ui/dialog/svg-fonts-dialog.h \ + ui/dialog/swatches.cpp \ + ui/dialog/swatches.h \ ui/dialog/tile.cpp \ ui/dialog/tile.h \ ui/dialog/tracedialog.cpp \ diff --git a/src/ui/dialog/align-and-distribute.cpp b/src/ui/dialog/align-and-distribute.cpp index 0a59c004f..d8c4bc005 100644 --- a/src/ui/dialog/align-and-distribute.cpp +++ b/src/ui/dialog/align-and-distribute.cpp @@ -21,7 +21,7 @@ #include #include "desktop-handles.h" -#include "dialogs/unclump.h" +#include "unclump.h" #include "document.h" #include "enums.h" #include "graphlayout/graphlayout.h" diff --git a/src/widgets/calligraphic-profile-rename.cpp b/src/ui/dialog/calligraphic-profile-rename.cpp similarity index 100% rename from src/widgets/calligraphic-profile-rename.cpp rename to src/ui/dialog/calligraphic-profile-rename.cpp diff --git a/src/widgets/calligraphic-profile-rename.h b/src/ui/dialog/calligraphic-profile-rename.h similarity index 100% rename from src/widgets/calligraphic-profile-rename.h rename to src/ui/dialog/calligraphic-profile-rename.h diff --git a/src/ui/dialog/dialog-manager.cpp b/src/ui/dialog/dialog-manager.cpp index 7a8947adf..d1b818d23 100644 --- a/src/ui/dialog/dialog-manager.cpp +++ b/src/ui/dialog/dialog-manager.cpp @@ -31,22 +31,21 @@ #include "ui/dialog/memory.h" #include "ui/dialog/messages.h" #include "ui/dialog/scriptdialog.h" -#ifdef ENABLE_SVG_FONTS -#include "ui/dialog/svg-fonts-dialog.h" -#endif // ENABLE_SVG_FONTS #include "ui/dialog/tile.h" #include "ui/dialog/tracedialog.h" #include "ui/dialog/transformation.h" #include "ui/dialog/undo-history.h" #include "ui/dialog/panel-dialog.h" - -#include "dialogs/layers-panel.h" -#include "dialogs/iconpreview.h" - +#include "ui/dialog/layers.h" +#include "ui/dialog/icon-preview.h" #include "ui/dialog/floating-behavior.h" #include "ui/dialog/dock-behavior.h" #include "preferences.h" +#ifdef ENABLE_SVG_FONTS +#include "ui/dialog/svg-fonts-dialog.h" +#endif // ENABLE_SVG_FONTS + namespace Inkscape { namespace UI { namespace Dialog { diff --git a/src/ui/dialog/document-metadata.cpp b/src/ui/dialog/document-metadata.cpp index 32838309a..96cad1fbe 100644 --- a/src/ui/dialog/document-metadata.cpp +++ b/src/ui/dialog/document-metadata.cpp @@ -17,18 +17,14 @@ # include #endif - - -#include "ui/widget/entity-entry.h" - -#include "xml/node-event-vector.h" -#include "dialogs/rdf.h" - -#include "inkscape.h" -#include "verbs.h" -#include "desktop-handles.h" #include "desktop.h" +#include "desktop-handles.h" +#include "inkscape.h" +#include "rdf.h" #include "sp-namedview.h" +#include "ui/widget/entity-entry.h" +#include "verbs.h" +#include "xml/node-event-vector.h" #include "document-metadata.h" diff --git a/src/dialogs/extensions.cpp b/src/ui/dialog/extensions.cpp similarity index 100% rename from src/dialogs/extensions.cpp rename to src/ui/dialog/extensions.cpp diff --git a/src/dialogs/extensions.h b/src/ui/dialog/extensions.h similarity index 100% rename from src/dialogs/extensions.h rename to src/ui/dialog/extensions.h diff --git a/src/ui/dialog/fill-and-stroke.cpp b/src/ui/dialog/fill-and-stroke.cpp index d28dc7955..fe63c6e24 100644 --- a/src/ui/dialog/fill-and-stroke.cpp +++ b/src/ui/dialog/fill-and-stroke.cpp @@ -21,15 +21,13 @@ #include "selection.h" #include "style.h" #include "svg/css-ostringstream.h" +#include "ui/icon-names.h" #include "verbs.h" -#include "xml/repr.h" +#include "widgets/fill-style.h" #include "widgets/icon.h" -#include "ui/icon-names.h" - -#include "dialogs/fill-style.h" -#include "dialogs/stroke-style.h" - -#include +#include "widgets/paint-selector.h" +#include "widgets/stroke-style.h" +#include "xml/repr.h" namespace Inkscape { namespace UI { diff --git a/src/dialogs/guidelinedialog.cpp b/src/ui/dialog/guides.cpp similarity index 99% rename from src/dialogs/guidelinedialog.cpp rename to src/ui/dialog/guides.cpp index f0115ee91..c5d2ae488 100644 --- a/src/dialogs/guidelinedialog.cpp +++ b/src/ui/dialog/guides.cpp @@ -31,7 +31,7 @@ #include "xml/repr.h" #include <2geom/point.h> #include <2geom/angle.h> -#include "guidelinedialog.h" +#include "guides.h" namespace Inkscape { namespace UI { diff --git a/src/dialogs/guidelinedialog.h b/src/ui/dialog/guides.h similarity index 100% rename from src/dialogs/guidelinedialog.h rename to src/ui/dialog/guides.h diff --git a/src/dialogs/iconpreview.cpp b/src/ui/dialog/icon-preview.cpp similarity index 99% rename from src/dialogs/iconpreview.cpp rename to src/ui/dialog/icon-preview.cpp index 4d402d235..336afc3c5 100644 --- a/src/dialogs/iconpreview.cpp +++ b/src/ui/dialog/icon-preview.cpp @@ -15,26 +15,24 @@ # include #endif -#include "iconpreview.h" - #include - #include -#include //for GTK_RESPONSE* types #include #include #include -#include "preferences.h" -#include "inkscape.h" -#include "document.h" -#include "desktop-handles.h" -#include "selection.h" #include "desktop.h" +#include "desktop-handles.h" #include "display/nr-arena.h" +#include "document.h" +#include "inkscape.h" +#include "preferences.h" +#include "selection.h" #include "sp-root.h" #include "xml/repr.h" +#include "icon-preview.h" + extern "C" { // takes doc, root, icon, and icon name to produce pixels guchar * diff --git a/src/dialogs/iconpreview.h b/src/ui/dialog/icon-preview.h similarity index 100% rename from src/dialogs/iconpreview.h rename to src/ui/dialog/icon-preview.h diff --git a/src/dialogs/layer-properties.cpp b/src/ui/dialog/layer-properties.cpp similarity index 100% rename from src/dialogs/layer-properties.cpp rename to src/ui/dialog/layer-properties.cpp diff --git a/src/dialogs/layer-properties.h b/src/ui/dialog/layer-properties.h similarity index 100% rename from src/dialogs/layer-properties.h rename to src/ui/dialog/layer-properties.h diff --git a/src/dialogs/layers-panel.cpp b/src/ui/dialog/layers.cpp similarity index 99% rename from src/dialogs/layers-panel.cpp rename to src/ui/dialog/layers.cpp index c826777a2..0e75401ab 100644 --- a/src/dialogs/layers-panel.cpp +++ b/src/ui/dialog/layers.cpp @@ -12,35 +12,30 @@ # include #endif -#include - #include #include - +#include #include +#include +#include "desktop.h" +#include "desktop-style.h" +#include "document.h" +#include "helper/action.h" #include "inkscape.h" - -#include "layers-panel.h" - -#include "layer-manager.h" #include "layer-fns.h" - -#include "verbs.h" -#include "helper/action.h" - -#include "document.h" -#include "desktop.h" -#include "sp-object.h" -#include "sp-item.h" -#include "widgets/icon.h" -#include "ui/widget/imagetoggler.h" -#include +#include "layer-manager.h" #include "preferences.h" -#include "xml/repr.h" +#include "sp-item.h" +#include "sp-object.h" #include "svg/css-ostringstream.h" -#include "desktop-style.h" #include "ui/icon-names.h" +#include "ui/widget/imagetoggler.h" +#include "verbs.h" +#include "widgets/icon.h" +#include "xml/repr.h" + +#include "layers.h" //#define DUMP_LAYERS 1 diff --git a/src/dialogs/layers-panel.h b/src/ui/dialog/layers.h similarity index 100% rename from src/dialogs/layers-panel.h rename to src/ui/dialog/layers.h diff --git a/src/ui/dialog/panel-dialog.h b/src/ui/dialog/panel-dialog.h index f087f40e4..7dbb6dd4a 100644 --- a/src/ui/dialog/panel-dialog.h +++ b/src/ui/dialog/panel-dialog.h @@ -19,7 +19,7 @@ #include "verbs.h" #include "dialog.h" -#include "dialogs/swatches.h" +#include "ui/dialog/swatches.h" #include "ui/dialog/floating-behavior.h" #include "ui/dialog/dock-behavior.h" #include "preferences.h" diff --git a/src/dialogs/swatches.cpp b/src/ui/dialog/swatches.cpp similarity index 99% rename from src/dialogs/swatches.cpp rename to src/ui/dialog/swatches.cpp index 4546efe13..dfb60c04e 100644 --- a/src/dialogs/swatches.cpp +++ b/src/ui/dialog/swatches.cpp @@ -18,25 +18,24 @@ #include #include #include - #include #include -#include "inkscape.h" + #include "desktop.h" -#include "message-context.h" -#include "document.h" #include "desktop-handles.h" +#include "desktop-style.h" +#include "document.h" #include "extension/db.h" #include "inkscape.h" -#include "svg/svg-color.h" -#include "desktop-style.h" +#include "inkscape.h" #include "io/sys.h" +#include "message-context.h" #include "path-prefix.h" -#include "swatches.h" -#include "sp-item.h" #include "preferences.h" - -#include "eek-preview.h" +#include "sp-item.h" +#include "svg/svg-color.h" +#include "swatches.h" +#include "widgets/eek-preview.h" namespace Inkscape { namespace UI { diff --git a/src/dialogs/swatches.h b/src/ui/dialog/swatches.h similarity index 98% rename from src/dialogs/swatches.h rename to src/ui/dialog/swatches.h index 00c73ff84..08fc9f79b 100644 --- a/src/dialogs/swatches.h +++ b/src/ui/dialog/swatches.h @@ -15,7 +15,7 @@ #include "ui/widget/panel.h" #include "ui/previewholder.h" -#include "dialogs/eek-color-def.h" +#include "widgets/eek-color-def.h" using eek::ColorDef; diff --git a/src/ui/previewable.h b/src/ui/previewable.h index c517e4f28..ef1ca3ce2 100644 --- a/src/ui/previewable.h +++ b/src/ui/previewable.h @@ -14,7 +14,7 @@ #include -#include "../dialogs/eek-preview.h" +#include "../widgets/eek-preview.h" namespace Inkscape { namespace UI { diff --git a/src/ui/previewfillable.h b/src/ui/previewfillable.h index 6f02b60a8..f863af121 100644 --- a/src/ui/previewfillable.h +++ b/src/ui/previewfillable.h @@ -14,7 +14,7 @@ #include "previewable.h" -#include "../dialogs/eek-preview.h" +#include "../widgets/eek-preview.h" namespace Inkscape { namespace UI { diff --git a/src/ui/previewholder.h b/src/ui/previewholder.h index 812d4b27d..3c1a16195 100644 --- a/src/ui/previewholder.h +++ b/src/ui/previewholder.h @@ -17,7 +17,7 @@ #include #include #include "previewfillable.h" -#include "../dialogs/eek-preview.h" +#include "../widgets/eek-preview.h" namespace Inkscape { namespace UI { diff --git a/src/ui/view/edit-widget.h b/src/ui/view/edit-widget.h index ea3205696..2bb708305 100644 --- a/src/ui/view/edit-widget.h +++ b/src/ui/view/edit-widget.h @@ -28,12 +28,12 @@ #include "ui/dialog/dialog-manager.h" #include "ui/view/edit-widget-interface.h" #include "ui/widget/dock.h" -#include "ui/widget/selected-style.h" +#include "ui/widget/layer-selector.h" #include "ui/widget/ruler.h" -#include "ui/widget/toolbox.h" +#include "ui/widget/selected-style.h" #include "ui/widget/svg-canvas.h" +#include "ui/widget/toolbox.h" #include "ui/widget/zoom-status.h" -#include "widgets/layer-selector.h" struct SPDesktop; struct SPDocument; diff --git a/src/ui/widget/Makefile_insert b/src/ui/widget/Makefile_insert index 9b4048ea9..b6069631b 100644 --- a/src/ui/widget/Makefile_insert +++ b/src/ui/widget/Makefile_insert @@ -31,6 +31,8 @@ ink_common_sources += \ ui/widget/imagetoggler.h \ ui/widget/labelled.cpp \ ui/widget/labelled.h \ + ui/widget/layer-selector.cpp \ + ui/widget/layer-selector.h \ ui/widget/licensor.cpp \ ui/widget/licensor.h \ ui/widget/notebook-page.cpp \ diff --git a/src/ui/widget/entity-entry.cpp b/src/ui/widget/entity-entry.cpp index 980d225b2..e9f09f574 100644 --- a/src/ui/widget/entity-entry.cpp +++ b/src/ui/widget/entity-entry.cpp @@ -19,11 +19,9 @@ #include #include -#include "ui/widget/registry.h" - -#include "dialogs/rdf.h" - #include "inkscape.h" +#include "rdf.h" +#include "ui/widget/registry.h" #include "entity-entry.h" diff --git a/src/widgets/layer-selector.cpp b/src/ui/widget/layer-selector.cpp similarity index 99% rename from src/widgets/layer-selector.cpp rename to src/ui/widget/layer-selector.cpp index d51b31e67..51084b127 100644 --- a/src/widgets/layer-selector.cpp +++ b/src/ui/widget/layer-selector.cpp @@ -17,22 +17,19 @@ #include #include -#include "desktop-handles.h" - -#include "widgets/layer-selector.h" -#include "widgets/shrink-wrap-button.h" -#include "widgets/icon.h" - -#include "util/reverse-list.h" -#include "util/filter-list.h" - -#include "sp-item.h" #include "desktop.h" +#include "desktop-handles.h" #include "document.h" -#include "dialogs/layer-properties.h" #include "layer-manager.h" -#include "xml/node-event-vector.h" +#include "sp-item.h" +#include "ui/dialog/layer-properties.h" +#include "ui/widget/layer-selector.h" +#include "util/filter-list.h" +#include "util/reverse-list.h" #include "verbs.h" +#include "widgets/icon.h" +#include "widgets/shrink-wrap-button.h" +#include "xml/node-event-vector.h" namespace Inkscape { namespace Widgets { diff --git a/src/widgets/layer-selector.h b/src/ui/widget/layer-selector.h similarity index 100% rename from src/widgets/layer-selector.h rename to src/ui/widget/layer-selector.h diff --git a/src/ui/widget/licensor.cpp b/src/ui/widget/licensor.cpp index 24bd5595f..05f00edfc 100644 --- a/src/ui/widget/licensor.cpp +++ b/src/ui/widget/licensor.cpp @@ -20,7 +20,7 @@ #include "ui/widget/entity-entry.h" #include "ui/widget/registry.h" -#include "dialogs/rdf.h" +#include "rdf.h" #include "inkscape.h" #include "licensor.h" diff --git a/src/ui/widget/panel.cpp b/src/ui/widget/panel.cpp index 9811cc89c..82f75c3ff 100644 --- a/src/ui/widget/panel.cpp +++ b/src/ui/widget/panel.cpp @@ -29,7 +29,7 @@ #include "preferences.h" #include "desktop-handles.h" #include "inkscape.h" -#include "dialogs/eek-preview.h" +#include "widgets/eek-preview.h" namespace Inkscape { namespace UI { diff --git a/src/dialogs/unclump.cpp b/src/unclump.cpp similarity index 100% rename from src/dialogs/unclump.cpp rename to src/unclump.cpp diff --git a/src/dialogs/unclump.h b/src/unclump.h similarity index 100% rename from src/dialogs/unclump.h rename to src/unclump.h diff --git a/src/verbs.cpp b/src/verbs.cpp index ce624b14c..834e1511d 100644 --- a/src/verbs.cpp +++ b/src/verbs.cpp @@ -38,15 +38,10 @@ #include "desktop.h" #include "desktop-handles.h" #include "dialogs/clonetiler.h" -#include "dialogs/extensions.h" #include "dialogs/find.h" -#include "dialogs/iconpreview.h" #include "dialogs/input.h" #include "dialogs/item-properties.h" -#include "dialogs/layer-properties.h" -#include "dialogs/layers-panel.h" #include "dialogs/spellcheck.h" -#include "dialogs/swatches.h" #include "dialogs/text-edit.h" #include "dialogs/xml-tree.h" #include "display/curve.h" @@ -78,7 +73,12 @@ #include "tools-switch.h" #include "ui/dialog/dialog-manager.h" #include "ui/dialog/document-properties.h" +#include "ui/dialog/extensions.h" +#include "ui/dialog/icon-preview.h" #include "ui/dialog/inkscape-preferences.h" +#include "ui/dialog/layer-properties.h" +#include "ui/dialog/layers.h" +#include "ui/dialog/swatches.h" #include "ui/icon-names.h" #ifdef WITH_INKBOARD diff --git a/src/widgets/Makefile_insert b/src/widgets/Makefile_insert index 32a8a71e5..13f2b33eb 100644 --- a/src/widgets/Makefile_insert +++ b/src/widgets/Makefile_insert @@ -3,12 +3,16 @@ ink_common_sources += \ widgets/button.cpp \ widgets/button.h \ - widgets/calligraphic-profile-rename.cpp \ - widgets/calligraphic-profile-rename.h \ widgets/dash-selector.cpp \ widgets/dash-selector.h \ widgets/desktop-widget.cpp \ widgets/desktop-widget.h \ + widgets/eek-color-def.cpp \ + widgets/eek-color-def.h \ + widgets/eek-preview.cpp \ + widgets/eek-preview.h \ + widgets/fill-style.cpp \ + widgets/fill-style.h \ widgets/font-selector.cpp \ widgets/font-selector.h \ widgets/gradient-image.cpp \ @@ -21,8 +25,6 @@ ink_common_sources += \ widgets/gradient-vector.h \ widgets/icon.cpp \ widgets/icon.h \ - widgets/layer-selector.cpp \ - widgets/layer-selector.h \ widgets/paint-selector.cpp \ widgets/paint-selector.h \ widgets/ruler.cpp \ @@ -31,6 +33,8 @@ ink_common_sources += \ widgets/select-toolbar.h \ widgets/shrink-wrap-button.cpp \ widgets/shrink-wrap-button.h \ + widgets/sp-attribute-widget.cpp \ + widgets/sp-attribute-widget.h \ widgets/sp-color-gtkselector.cpp \ widgets/sp-color-gtkselector.h \ widgets/sp-color-icc-selector.cpp \ @@ -61,6 +65,8 @@ ink_common_sources += \ widgets/sp-xmlview-content.h \ widgets/sp-xmlview-tree.cpp \ widgets/sp-xmlview-tree.h \ + widgets/stroke-style.cpp \ + widgets/stroke-style.h \ widgets/toolbox.cpp \ widgets/toolbox.h \ widgets/widget-sizes.h diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp index 324e5b008..356a09418 100644 --- a/src/widgets/desktop-widget.cpp +++ b/src/widgets/desktop-widget.cpp @@ -27,39 +27,39 @@ #include #include -#include "macros.h" -#include "inkscape-private.h" -#include "desktop-handles.h" +#include "box3d-context.h" +#include "color-profile-fns.h" +#include "conn-avoid-ref.h" #include "desktop-events.h" -#include "document.h" +#include "desktop-handles.h" #include "desktop-widget.h" -#include "sp-namedview.h" -#include "interface.h" -#include "toolbox.h" -#include "preferences.h" -#include "file.h" #include "display/canvas-arena.h" #include "display/nr-arena.h" +#include "document.h" +#include "ege-color-prof-tracker.h" +#include "ege-select-one-action.h" #include +#include "file.h" #include "helper/units.h" +#include "inkscape-private.h" +#include "interface.h" +#include "macros.h" +#include "preferences.h" +#include "sp-image.h" +#include "sp-item.h" +#include "sp-namedview.h" +#include "toolbox.h" +#include "ui/dialog/dialog-manager.h" +#include "ui/dialog/swatches.h" +#include "ui/widget/dock.h" +#include "ui/widget/layer-selector.h" +#include "ui/widget/selected-style.h" #include "widgets/button.h" #include "widgets/ruler.h" -#include "widgets/widget-sizes.h" -#include "widgets/spw-utilities.h" #include "widgets/spinbutton-events.h" -#include "widgets/layer-selector.h" +#include "widgets/spw-utilities.h" #include "widgets/toolbox.h" -#include "ui/dialog/dialog-manager.h" -#include "ui/widget/dock.h" -#include "ui/widget/selected-style.h" -#include "sp-item.h" -#include "dialogs/swatches.h" -#include "conn-avoid-ref.h" -#include "ege-select-one-action.h" -#include "ege-color-prof-tracker.h" -#include "color-profile-fns.h" -#include "box3d-context.h" -#include "sp-image.h" +#include "widgets/widget-sizes.h" #if defined (SOLARIS) && (SOLARIS == 8) #include "round.h" diff --git a/src/dialogs/eek-color-def.cpp b/src/widgets/eek-color-def.cpp similarity index 100% rename from src/dialogs/eek-color-def.cpp rename to src/widgets/eek-color-def.cpp diff --git a/src/dialogs/eek-color-def.h b/src/widgets/eek-color-def.h similarity index 100% rename from src/dialogs/eek-color-def.h rename to src/widgets/eek-color-def.h diff --git a/src/dialogs/eek-preview.cpp b/src/widgets/eek-preview.cpp similarity index 100% rename from src/dialogs/eek-preview.cpp rename to src/widgets/eek-preview.cpp diff --git a/src/dialogs/eek-preview.h b/src/widgets/eek-preview.h similarity index 100% rename from src/dialogs/eek-preview.h rename to src/widgets/eek-preview.h diff --git a/src/dialogs/fill-style.cpp b/src/widgets/fill-style.cpp similarity index 99% rename from src/dialogs/fill-style.cpp rename to src/widgets/fill-style.cpp index 24e46f056..5e9d30bcd 100644 --- a/src/dialogs/fill-style.cpp +++ b/src/widgets/fill-style.cpp @@ -35,7 +35,7 @@ #include "widgets/sp-widget.h" #include "xml/repr.h" -#include "dialogs/fill-style.h" +#include "widgets/fill-style.h" // These can be deleted once we sort out the libart dependence. diff --git a/src/dialogs/fill-style.h b/src/widgets/fill-style.h similarity index 100% rename from src/dialogs/fill-style.h rename to src/widgets/fill-style.h diff --git a/src/dialogs/sp-attribute-widget.cpp b/src/widgets/sp-attribute-widget.cpp similarity index 100% rename from src/dialogs/sp-attribute-widget.cpp rename to src/widgets/sp-attribute-widget.cpp diff --git a/src/dialogs/sp-attribute-widget.h b/src/widgets/sp-attribute-widget.h similarity index 100% rename from src/dialogs/sp-attribute-widget.h rename to src/widgets/sp-attribute-widget.h diff --git a/src/dialogs/stroke-style.cpp b/src/widgets/stroke-style.cpp similarity index 99% rename from src/dialogs/stroke-style.cpp rename to src/widgets/stroke-style.cpp index 566ee5117..b1678f266 100644 --- a/src/dialogs/stroke-style.cpp +++ b/src/widgets/stroke-style.cpp @@ -54,7 +54,7 @@ #include "widgets/spw-utilities.h" #include "xml/repr.h" -#include "dialogs/stroke-style.h" +#include "widgets/stroke-style.h" /* Paint */ diff --git a/src/dialogs/stroke-style.h b/src/widgets/stroke-style.h similarity index 100% rename from src/dialogs/stroke-style.h rename to src/widgets/stroke-style.h diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp index 14acb188a..e3dcbcc14 100644 --- a/src/widgets/toolbox.cpp +++ b/src/widgets/toolbox.cpp @@ -36,7 +36,6 @@ #include "../box3d-context.h" #include "../box3d.h" -#include "calligraphic-profile-rename.h" #include "../conn-avoid-ref.h" #include "../connection-pool.h" #include "../connector-context.h" @@ -87,6 +86,7 @@ #include "../svg/css-ostringstream.h" #include "../tools-switch.h" #include "../tweak-context.h" +#include "../ui/dialog/calligraphic-profile-rename.h" #include "../ui/icon-names.h" #include "../ui/widget/style-swatch.h" #include "../verbs.h" -- 2.30.2