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.
2022-02-16 11:09:30 +01:00 · 2022-02-16 11:09:30 +01:00 · ab1fc79a07
parent 17528d787e
commit ab1fc79a07
29 changed files with 17 additions and 28 deletions
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"

--- 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"
--- 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"
--- 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"
--- 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"

--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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		\
--- 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"

--- 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"
--- 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"

--- 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"
--- 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"
--- 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',
--- 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			\
--- a/libgimpwidgets/gimpspinscale.c
+++ b/libgimpwidgets/gimpspinscale.c
@ -26,14 +26,13 @@
 #include <gdk/gdkkeysyms.h>

 #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
--- a/libgimpwidgets/gimpspinscale.h
+++ b/libgimpwidgets/gimpspinscale.h
@ -18,9 +18,17 @@
 * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

+#if !defined (__GIMP_WIDGETS_H_INSIDE__) && !defined (GIMP_WIDGETS_COMPILATION)
+#error "Only <libgimpwidgets/gimpwidgets.h> can be included directly."
+#endif
+
 #ifndef __GIMP_SPIN_SCALE_H__
 #define __GIMP_SPIN_SCALE_H__

+#include <libgimpwidgets/gimpspinbutton.h>
+
+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__  */
--- a/libgimpwidgets/gimpwidgets.h
+++ b/libgimpwidgets/gimpwidgets.h
@ -79,6 +79,7 @@
 #include <libgimpwidgets/gimpscrolledpreview.h>
 #include <libgimpwidgets/gimpsizeentry.h>
 #include <libgimpwidgets/gimpspinbutton.h>
+#include <libgimpwidgets/gimpspinscale.h>
 #include <libgimpwidgets/gimpstringcombobox.h>
 #include <libgimpwidgets/gimpunitcombobox.h>
 #include <libgimpwidgets/gimpunitstore.h>
--- 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',