From ab1fc79a07a34220fd26b7edf4405e079914de96 Mon Sep 17 00:00:00 2001 From: Jehan Date: Wed, 16 Feb 2022 11:09:30 +0100 Subject: [PATCH] app, libgimpwidgets: move GimpSpinScale to libgimpwidgets. There is really nothing specific to the core application, it is quite a generic widget, so it would be nice for plug-ins to be able to use this widget. --- app/dialogs/channel-options-dialog.c | 1 - app/dialogs/layer-options-dialog.c | 1 - app/propgui/gimppropgui-color-balance.c | 1 - app/propgui/gimppropgui-generic.c | 1 - app/propgui/gimppropgui.c | 1 - app/tools/gimpbrightnesscontrasttool.c | 1 - app/tools/gimpforegroundselectoptions.c | 1 - app/tools/gimphandletransformoptions.c | 1 - app/tools/gimpnpointdeformationoptions.c | 1 - app/tools/gimppaintoptions-gui.c | 1 - app/tools/gimppaintselectoptions.c | 1 - app/tools/gimprectangleselectoptions.c | 1 - app/tools/gimpseamlesscloneoptions.c | 1 - app/tools/gimpsheartool.c | 1 - app/tools/gimptransform3dtool.c | 1 - app/tools/gimptransformgridoptions.c | 1 - app/tools/gimpwarpoptions.c | 1 - app/widgets/Makefile.am | 2 -- app/widgets/gimpbrusheditor.c | 1 - app/widgets/gimpbrushfactoryview.c | 1 - app/widgets/gimpbrushselect.c | 1 - app/widgets/gimplayertreeview.c | 1 - app/widgets/gimppropwidgets.c | 1 - app/widgets/meson.build | 1 - libgimpwidgets/Makefile.gi | 2 ++ {app/widgets => libgimpwidgets}/gimpspinscale.c | 5 ++--- {app/widgets => libgimpwidgets}/gimpspinscale.h | 11 +++++++++++ libgimpwidgets/gimpwidgets.h | 1 + libgimpwidgets/meson.build | 1 + 29 files changed, 17 insertions(+), 28 deletions(-) rename {app/widgets => libgimpwidgets}/gimpspinscale.c (99%) rename {app/widgets => libgimpwidgets}/gimpspinscale.h (93%) diff --git a/app/dialogs/channel-options-dialog.c b/app/dialogs/channel-options-dialog.c index 368cdefa94..97ba1943a3 100644 --- a/app/dialogs/channel-options-dialog.c +++ b/app/dialogs/channel-options-dialog.c @@ -30,7 +30,6 @@ #include "core/gimpimage.h" #include "widgets/gimpcolorpanel.h" -#include "widgets/gimpspinscale.h" #include "widgets/gimpviewabledialog.h" #include "channel-options-dialog.h" diff --git a/app/dialogs/layer-options-dialog.c b/app/dialogs/layer-options-dialog.c index 566a5026ec..b982402a94 100644 --- a/app/dialogs/layer-options-dialog.c +++ b/app/dialogs/layer-options-dialog.c @@ -38,7 +38,6 @@ #include "widgets/gimpcontainertreeview.h" #include "widgets/gimplayermodebox.h" -#include "widgets/gimpspinscale.h" #include "widgets/gimpviewabledialog.h" #include "item-options-dialog.h" diff --git a/app/propgui/gimppropgui-color-balance.c b/app/propgui/gimppropgui-color-balance.c index 3a10fa2518..2793ca4df1 100644 --- a/app/propgui/gimppropgui-color-balance.c +++ b/app/propgui/gimppropgui-color-balance.c @@ -31,7 +31,6 @@ #include "core/gimpcontext.h" #include "widgets/gimppropwidgets.h" -#include "widgets/gimpspinscale.h" #include "gimppropgui.h" #include "gimppropgui-color-balance.h" diff --git a/app/propgui/gimppropgui-generic.c b/app/propgui/gimppropgui-generic.c index 4098730dd9..63d25ae95c 100644 --- a/app/propgui/gimppropgui-generic.c +++ b/app/propgui/gimppropgui-generic.c @@ -40,7 +40,6 @@ #include "core/gimpcontext.h" #include "widgets/gimppropwidgets.h" -#include "widgets/gimpspinscale.h" #include "widgets/gimpwidgets-utils.h" #include "gimppropgui.h" diff --git a/app/propgui/gimppropgui.c b/app/propgui/gimppropgui.c index b22018a17f..331c8cb5c9 100644 --- a/app/propgui/gimppropgui.c +++ b/app/propgui/gimppropgui.c @@ -41,7 +41,6 @@ #include "widgets/gimpcolorpanel.h" #include "widgets/gimpmessagebox.h" -#include "widgets/gimpspinscale.h" #include "widgets/gimppropwidgets.h" #include "gimppropgui.h" diff --git a/app/tools/gimpbrightnesscontrasttool.c b/app/tools/gimpbrightnesscontrasttool.c index 4f43fcfecd..74d48da5aa 100644 --- a/app/tools/gimpbrightnesscontrasttool.c +++ b/app/tools/gimpbrightnesscontrasttool.c @@ -35,7 +35,6 @@ #include "widgets/gimphelp-ids.h" #include "widgets/gimppropwidgets.h" -#include "widgets/gimpspinscale.h" #include "widgets/gimpwidgets-constructors.h" #include "display/gimpdisplay.h" diff --git a/app/tools/gimpforegroundselectoptions.c b/app/tools/gimpforegroundselectoptions.c index 220936f637..4fcbc78d0a 100644 --- a/app/tools/gimpforegroundselectoptions.c +++ b/app/tools/gimpforegroundselectoptions.c @@ -29,7 +29,6 @@ #include "widgets/gimpcolorpanel.h" #include "widgets/gimppropwidgets.h" -#include "widgets/gimpspinscale.h" #include "widgets/gimpwidgets-constructors.h" #include "widgets/gimpwidgets-utils.h" diff --git a/app/tools/gimphandletransformoptions.c b/app/tools/gimphandletransformoptions.c index af884390e0..7b81e095af 100644 --- a/app/tools/gimphandletransformoptions.c +++ b/app/tools/gimphandletransformoptions.c @@ -30,7 +30,6 @@ #include "core/gimptoolinfo.h" #include "widgets/gimppropwidgets.h" -#include "widgets/gimpspinscale.h" #include "widgets/gimpwidgets-utils.h" #include "gimphandletransformoptions.h" diff --git a/app/tools/gimpnpointdeformationoptions.c b/app/tools/gimpnpointdeformationoptions.c index 07b583f388..8fdc8a14ff 100644 --- a/app/tools/gimpnpointdeformationoptions.c +++ b/app/tools/gimpnpointdeformationoptions.c @@ -29,7 +29,6 @@ #include "tools-types.h" #include "widgets/gimppropwidgets.h" -#include "widgets/gimpspinscale.h" #include "gimpnpointdeformationoptions.h" #include "gimptooloptions-gui.h" diff --git a/app/tools/gimppaintoptions-gui.c b/app/tools/gimppaintoptions-gui.c index ec477a0f2b..04b4ff5403 100644 --- a/app/tools/gimppaintoptions-gui.c +++ b/app/tools/gimppaintoptions-gui.c @@ -30,7 +30,6 @@ #include "widgets/gimplayermodebox.h" #include "widgets/gimppropwidgets.h" -#include "widgets/gimpspinscale.h" #include "widgets/gimpviewablebox.h" #include "widgets/gimpwidgets-constructors.h" #include "widgets/gimpwidgets-utils.h" diff --git a/app/tools/gimppaintselectoptions.c b/app/tools/gimppaintselectoptions.c index 902ffe8040..00d892f99b 100644 --- a/app/tools/gimppaintselectoptions.c +++ b/app/tools/gimppaintselectoptions.c @@ -27,7 +27,6 @@ #include "tools-types.h" #include "widgets/gimppropwidgets.h" -#include "widgets/gimpspinscale.h" #include "widgets/gimpwidgets-constructors.h" #include "widgets/gimpwidgets-utils.h" diff --git a/app/tools/gimprectangleselectoptions.c b/app/tools/gimprectangleselectoptions.c index 7864715f8c..1a9b8636cf 100644 --- a/app/tools/gimprectangleselectoptions.c +++ b/app/tools/gimprectangleselectoptions.c @@ -29,7 +29,6 @@ #include "core/gimptoolinfo.h" #include "widgets/gimppropwidgets.h" -#include "widgets/gimpspinscale.h" #include "gimprectangleoptions.h" #include "gimprectangleselectoptions.h" diff --git a/app/tools/gimpseamlesscloneoptions.c b/app/tools/gimpseamlesscloneoptions.c index e2f85253c2..269c4cdea1 100644 --- a/app/tools/gimpseamlesscloneoptions.c +++ b/app/tools/gimpseamlesscloneoptions.c @@ -29,7 +29,6 @@ #include "tools-types.h" #include "widgets/gimppropwidgets.h" -#include "widgets/gimpspinscale.h" #include "gimpseamlesscloneoptions.h" #include "gimptooloptions-gui.h" diff --git a/app/tools/gimpsheartool.c b/app/tools/gimpsheartool.c index c90a3d84e1..77160bf26f 100644 --- a/app/tools/gimpsheartool.c +++ b/app/tools/gimpsheartool.c @@ -28,7 +28,6 @@ #include "core/gimp-transform-utils.h" #include "widgets/gimphelp-ids.h" -#include "widgets/gimpspinscale.h" #include "display/gimpdisplay.h" #include "display/gimptoolgui.h" diff --git a/app/tools/gimptransform3dtool.c b/app/tools/gimptransform3dtool.c index ef6e9801e2..1872697a37 100644 --- a/app/tools/gimptransform3dtool.c +++ b/app/tools/gimptransform3dtool.c @@ -33,7 +33,6 @@ #include "widgets/gimphelp-ids.h" #include "widgets/gimppivotselector.h" -#include "widgets/gimpspinscale.h" #include "widgets/gimpwidgets-utils.h" #include "display/gimpdisplay.h" diff --git a/app/tools/gimptransformgridoptions.c b/app/tools/gimptransformgridoptions.c index a48b437053..da70bac25f 100644 --- a/app/tools/gimptransformgridoptions.c +++ b/app/tools/gimptransformgridoptions.c @@ -30,7 +30,6 @@ #include "core/gimptoolinfo.h" #include "widgets/gimppropwidgets.h" -#include "widgets/gimpspinscale.h" #include "widgets/gimpwidgets-utils.h" #include "gimpperspectivetool.h" diff --git a/app/tools/gimpwarpoptions.c b/app/tools/gimpwarpoptions.c index ace0b5d87b..74786dd0ca 100644 --- a/app/tools/gimpwarpoptions.c +++ b/app/tools/gimpwarpoptions.c @@ -29,7 +29,6 @@ #include "tools-types.h" #include "widgets/gimppropwidgets.h" -#include "widgets/gimpspinscale.h" #include "gimpwarpoptions.h" #include "gimptooloptions-gui.h" diff --git a/app/widgets/Makefile.am b/app/widgets/Makefile.am index 78e6cd3f91..201a6bc4c0 100644 --- a/app/widgets/Makefile.am +++ b/app/widgets/Makefile.am @@ -365,8 +365,6 @@ libappwidgets_a_sources = \ gimpsettingseditor.h \ gimpsizebox.c \ gimpsizebox.h \ - gimpspinscale.c \ - gimpspinscale.h \ gimpstringaction.c \ gimpstringaction.h \ gimpstrokeeditor.c \ diff --git a/app/widgets/gimpbrusheditor.c b/app/widgets/gimpbrusheditor.c index ae4240c72f..442c1a61e8 100644 --- a/app/widgets/gimpbrusheditor.c +++ b/app/widgets/gimpbrusheditor.c @@ -36,7 +36,6 @@ #include "gimpbrusheditor.h" #include "gimpdocked.h" -#include "gimpspinscale.h" #include "gimpview.h" #include "gimpviewrenderer.h" diff --git a/app/widgets/gimpbrushfactoryview.c b/app/widgets/gimpbrushfactoryview.c index c1e7f67b3b..e9d0dcf91c 100644 --- a/app/widgets/gimpbrushfactoryview.c +++ b/app/widgets/gimpbrushfactoryview.c @@ -37,7 +37,6 @@ #include "gimpcontainerview.h" #include "gimpeditor.h" #include "gimpmenufactory.h" -#include "gimpspinscale.h" #include "gimpviewrenderer.h" #include "gimp-intl.h" diff --git a/app/widgets/gimpbrushselect.c b/app/widgets/gimpbrushselect.c index b5e374ecb2..70c1cb7199 100644 --- a/app/widgets/gimpbrushselect.c +++ b/app/widgets/gimpbrushselect.c @@ -42,7 +42,6 @@ #include "gimpbrushselect.h" #include "gimpcontainerbox.h" #include "gimplayermodebox.h" -#include "gimpspinscale.h" #include "gimp-intl.h" diff --git a/app/widgets/gimplayertreeview.c b/app/widgets/gimplayertreeview.c index 9759b95da2..4c22edf1f1 100644 --- a/app/widgets/gimplayertreeview.c +++ b/app/widgets/gimplayertreeview.c @@ -62,7 +62,6 @@ #include "gimphelp-ids.h" #include "gimplayermodebox.h" #include "gimplayertreeview.h" -#include "gimpspinscale.h" #include "gimpuimanager.h" #include "gimpviewrenderer.h" #include "gimpwidgets-utils.h" diff --git a/app/widgets/gimppropwidgets.c b/app/widgets/gimppropwidgets.c index 6a6929dd8a..dbd58bece8 100644 --- a/app/widgets/gimppropwidgets.c +++ b/app/widgets/gimppropwidgets.c @@ -49,7 +49,6 @@ #include "gimplanguagecombobox.h" #include "gimplanguageentry.h" #include "gimplayermodebox.h" -#include "gimpspinscale.h" #include "gimpview.h" #include "gimppolar.h" #include "gimppropwidgets.h" diff --git a/app/widgets/meson.build b/app/widgets/meson.build index cd363e6d16..d63f20cabb 100644 --- a/app/widgets/meson.build +++ b/app/widgets/meson.build @@ -182,7 +182,6 @@ libappwidgets_sources = [ 'gimpsettingsbox.c', 'gimpsettingseditor.c', 'gimpsizebox.c', - 'gimpspinscale.c', 'gimpstringaction.c', 'gimpstrokeeditor.c', 'gimpsymmetryeditor.c', diff --git a/libgimpwidgets/Makefile.gi b/libgimpwidgets/Makefile.gi index 0aa7104ce8..e5f65f44dd 100644 --- a/libgimpwidgets/Makefile.gi +++ b/libgimpwidgets/Makefile.gi @@ -52,6 +52,7 @@ libgimpwidgets_introspectable_headers = \ ../libgimpwidgets/gimpscrolledpreview.h \ ../libgimpwidgets/gimpsizeentry.h \ ../libgimpwidgets/gimpspinbutton.h \ + ../libgimpwidgets/gimpspinscale.h \ ../libgimpwidgets/gimpstringcombobox.h \ ../libgimpwidgets/gimpunitcombobox.h \ ../libgimpwidgets/gimpunitstore.h \ @@ -116,6 +117,7 @@ libgimpwidgets_introspectable = \ ../libgimpwidgets/gimpscrolledpreview.c \ ../libgimpwidgets/gimpsizeentry.c \ ../libgimpwidgets/gimpspinbutton.c \ + ../libgimpwidgets/gimpspinscale.c \ ../libgimpwidgets/gimpstringcombobox.c \ ../libgimpwidgets/gimpunitcombobox.c \ ../libgimpwidgets/gimpunitstore.c \ diff --git a/app/widgets/gimpspinscale.c b/libgimpwidgets/gimpspinscale.c similarity index 99% rename from app/widgets/gimpspinscale.c rename to libgimpwidgets/gimpspinscale.c index 22d070b976..7a7329c820 100644 --- a/app/widgets/gimpspinscale.c +++ b/libgimpwidgets/gimpspinscale.c @@ -26,14 +26,13 @@ #include #include "libgimpbase/gimpbase.h" -#include "libgimpwidgets/gimpwidgets.h" #include "libgimpmath/gimpmath.h" -#include "widgets-types.h" +#include "gimpwidgetstypes.h" #include "gimpspinscale.h" -#include "gimp-intl.h" +#include "libgimp/libgimp-intl.h" #define RELATIVE_CHANGE_SPEED 0.1 diff --git a/app/widgets/gimpspinscale.h b/libgimpwidgets/gimpspinscale.h similarity index 93% rename from app/widgets/gimpspinscale.h rename to libgimpwidgets/gimpspinscale.h index 3b99da5e36..bce7e5f0b7 100644 --- a/app/widgets/gimpspinscale.h +++ b/libgimpwidgets/gimpspinscale.h @@ -18,9 +18,17 @@ * along with this program. If not, see . */ +#if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION) +#error "Only can be included directly." +#endif + #ifndef __GIMP_SPIN_SCALE_H__ #define __GIMP_SPIN_SCALE_H__ +#include + +G_BEGIN_DECLS + #define GIMP_TYPE_SPIN_SCALE (gimp_spin_scale_get_type ()) #define GIMP_SPIN_SCALE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_SPIN_SCALE, GimpSpinScale)) @@ -70,4 +78,7 @@ void gimp_spin_scale_set_constrain_drag (GimpSpinScale *scale, gboolean constrain); gboolean gimp_spin_scale_get_constrain_drag (GimpSpinScale *scale); + +G_END_DECLS + #endif /* __GIMP_SPIN_SCALE_H__ */ diff --git a/libgimpwidgets/gimpwidgets.h b/libgimpwidgets/gimpwidgets.h index 48d87f20fa..84bc0b2473 100644 --- a/libgimpwidgets/gimpwidgets.h +++ b/libgimpwidgets/gimpwidgets.h @@ -79,6 +79,7 @@ #include #include #include +#include #include #include #include diff --git a/libgimpwidgets/meson.build b/libgimpwidgets/meson.build index 1dc45627f1..7004d8cb3e 100644 --- a/libgimpwidgets/meson.build +++ b/libgimpwidgets/meson.build @@ -72,6 +72,7 @@ libgimpwidgets_sources_introspectable = files( 'gimpscrolledpreview.c', 'gimpsizeentry.c', 'gimpspinbutton.c', + 'gimpspinscale.c', 'gimpstringcombobox.c', 'gimpunitcombobox.c', 'gimpunitstore.c',