Commit e8ee5475 authored by Michael Natterer's avatar Michael Natterer 😴

app: move all propgui files from app/widgets/ to new folder app/propgui/

We are getting more and app/widgets/ is already too large.
parent fd257971
......@@ -24,6 +24,7 @@ SUBDIRS = \
file \
pdb \
widgets \
propgui \
display \
tools \
dialogs \
......@@ -189,6 +190,7 @@ gimp_@GIMP_APP_VERSION@_LDADD = \
dialogs/libappdialogs.a \
tools/libapptools.a \
display/libappdisplay.a \
propgui/libapppropgui.a \
widgets/libappwidgets.a \
$(libgimpwidgets) \
$(GTK_LIBS) \
......
......@@ -19,7 +19,7 @@
#define __DISPLAY_TYPES_H__
#include "widgets/widgets-types.h"
#include "propgui/propgui-types.h"
#include "display/display-enums.h"
......
/Makefile
/Makefile.in
/.deps
/.libs
/*.lo
/libapppropgui.a
/libapppropgui.la
## Process this file with automake to produce Makefile.in
AM_CPPFLAGS = \
-DISO_CODES_LOCATION=\"$(ISO_CODES_LOCATION)\" \
-DISO_CODES_LOCALEDIR=\"$(ISO_CODES_LOCALEDIR)\" \
-DG_LOG_DOMAIN=\"Gimp-PropGUI\" \
-I$(top_builddir) \
-I$(top_srcdir) \
-I$(top_builddir)/app \
-I$(top_srcdir)/app \
$(GEGL_CFLAGS) \
$(GTK_CFLAGS) \
-I$(includedir)
noinst_LIBRARIES = libapppropgui.a
libapppropgui_a_SOURCES = \
propgui-types.h \
\
gimppropgui.c \
gimppropgui.h \
gimppropgui-channel-mixer.c \
gimppropgui-channel-mixer.h \
gimppropgui-color-balance.c \
gimppropgui-color-balance.h \
gimppropgui-color-rotate.c \
gimppropgui-color-rotate.h \
gimppropgui-convolution-matrix.c \
gimppropgui-convolution-matrix.h \
gimppropgui-diffration-patterns.c \
gimppropgui-diffration-patterns.h \
gimppropgui-eval.c \
gimppropgui-eval.h \
gimppropgui-generic.c \
gimppropgui-generic.h \
gimppropgui-hue-saturation.c \
gimppropgui-hue-saturation.h \
gimppropgui-spiral.c \
gimppropgui-spiral.h
......@@ -26,7 +26,7 @@
#include "libgimpwidgets/gimpwidgets.h"
#include "widgets-types.h"
#include "propgui-types.h"
#include "core/gimpcontext.h"
......
......@@ -24,16 +24,17 @@
#include "libgimpwidgets/gimpwidgets.h"
#include "widgets-types.h"
#include "propgui-types.h"
#include "operations/gimpcolorbalanceconfig.h"
#include "core/gimpcontext.h"
#include "widgets/gimppropwidgets.h"
#include "widgets/gimpspinscale.h"
#include "gimppropgui.h"
#include "gimppropgui-color-balance.h"
#include "gimppropwidgets.h"
#include "gimpspinscale.h"
#include "gimp-intl.h"
......
......@@ -26,14 +26,15 @@
#include "libgimpwidgets/gimpwidgets.h"
#include "widgets-types.h"
#include "propgui-types.h"
#include "core/gimpcontext.h"
#include "widgets/gimppropwidgets.h"
#include "gimppropgui.h"
#include "gimppropgui-color-rotate.h"
#include "gimppropgui-generic.h"
#include "gimppropwidgets.h"
#include "gimp-intl.h"
......
......@@ -26,7 +26,7 @@
#include "libgimpwidgets/gimpwidgets.h"
#include "widgets-types.h"
#include "propgui-types.h"
#include "core/gimpcontext.h"
......
......@@ -26,7 +26,7 @@
#include "libgimpwidgets/gimpwidgets.h"
#include "widgets-types.h"
#include "propgui-types.h"
#include "core/gimpcontext.h"
......
......@@ -88,7 +88,7 @@
#include <gegl-paramspecs.h>
#include <gtk/gtk.h>
#include "widgets-types.h"
#include "propgui-types.h"
#include "gimppropgui-eval.h"
......
......@@ -33,15 +33,16 @@
#include "libgimpconfig/gimpconfig.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "widgets-types.h"
#include "propgui-types.h"
#include "gegl/gimp-gegl-utils.h"
#include "core/gimpcontext.h"
#include "widgets/gimppropwidgets.h"
#include "gimppropgui.h"
#include "gimppropgui-generic.h"
#include "gimppropwidgets.h"
#include "gimp-intl.h"
......
......@@ -24,16 +24,17 @@
#include "libgimpwidgets/gimpwidgets.h"
#include "widgets-types.h"
#include "propgui-types.h"
#include "operations/gimphuesaturationconfig.h"
#include "operations/gimpoperationhuesaturation.h"
#include "core/gimpcontext.h"
#include "widgets/gimppropwidgets.h"
#include "gimppropgui.h"
#include "gimppropgui-hue-saturation.h"
#include "gimppropwidgets.h"
#include "gimp-intl.h"
......
......@@ -26,7 +26,7 @@
#include "libgimpmath/gimpmath.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "widgets-types.h"
#include "propgui-types.h"
#include "core/gimpcontext.h"
......
......@@ -33,15 +33,18 @@
#include "libgimpconfig/gimpconfig.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "widgets-types.h"
#include "propgui-types.h"
#include "gegl/gimp-gegl-utils.h"
#include "core/gimpcontext.h"
#include "gimpcolorpanel.h"
#include "gimpmessagebox.h"
#include "gimpspinscale.h"
#include "widgets/gimpcolorpanel.h"
#include "widgets/gimpmessagebox.h"
#include "widgets/gimpspinscale.h"
#include "widgets/gimppropwidgets.h"
#include "widgets/gimpwidgets-utils.h"
#include "gimppropgui.h"
#include "gimppropgui-channel-mixer.h"
#include "gimppropgui-color-balance.h"
......@@ -52,8 +55,6 @@
#include "gimppropgui-eval.h"
#include "gimppropgui-generic.h"
#include "gimppropgui-hue-saturation.h"
#include "gimppropwidgets.h"
#include "gimpwidgets-utils.h"
#include "gimp-intl.h"
......
......@@ -24,32 +24,6 @@
/* A view on all of an object's properties */
typedef enum
{
GIMP_CONTROLLER_TYPE_LINE
} GimpControllerType;
typedef void (* GimpControllerLineCallback) (gpointer data,
GeglRectangle *area,
gdouble x1,
gdouble y1,
gdouble x2,
gdouble y2);
typedef GtkWidget * (* GimpCreatePickerFunc) (gpointer creator,
const gchar *property_name,
const gchar *icon_name,
const gchar *tooltip,
gboolean pick_abyss);
typedef GCallback (* GimpCreateControllerFunc) (gpointer creator,
GimpControllerType controller_type,
GCallback callback,
gpointer callback_data,
gpointer *set_func_data);
GtkWidget * gimp_prop_widget_new (GObject *config,
const gchar *property_name,
GeglRectangle *area,
......
/* GIMP - The GNU Image Manipulation Program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __PROPGUI_TYPES_H__
#define __PROPGUI_TYPES_H__
#include "widgets/widgets-types.h"
/* enums, move to propgui-enums.h if we get more */
typedef enum
{
GIMP_CONTROLLER_TYPE_LINE
} GimpControllerType;
/* function types */
typedef void (* GimpControllerLineCallback) (gpointer data,
GeglRectangle *area,
gdouble x1,
gdouble y1,
gdouble x2,
gdouble y2);
typedef GtkWidget * (* GimpCreatePickerFunc) (gpointer creator,
const gchar *property_name,
const gchar *icon_name,
const gchar *tooltip,
gboolean pick_abyss);
typedef GCallback (* GimpCreateControllerFunc) (gpointer creator,
GimpControllerType controller_type,
GCallback callback,
gpointer callback_data,
gpointer *set_func_data);
#endif /* __PROPGUI_TYPES_H__ */
......@@ -89,6 +89,7 @@ LDADD = \
../actions/libappactions.a \
../dialogs/libappdialogs.a \
../display/libappdisplay.a \
../propgui/libapppropgui.a \
../widgets/libappwidgets.a \
../xcf/libappxcf.a \
../pdb/libappinternal-procs.a \
......
......@@ -21,9 +21,6 @@
#define __GIMP_FILTER_TOOL_WIDGETS_H__
#include "widgets/gimppropgui.h" /* FIXME remove */
GimpToolWidget * gimp_filter_tool_create_widget (GimpFilterTool *filter_tool,
GimpControllerType controller_type,
GCallback callback,
......
......@@ -45,7 +45,8 @@
#include "widgets/gimpbuffersourcebox.h"
#include "widgets/gimphelp-ids.h"
#include "widgets/gimppickablebutton.h"
#include "widgets/gimppropgui.h"
#include "propgui/gimppropgui.h"
#include "display/gimpdisplay.h"
#include "display/gimptoolgui.h"
......
......@@ -299,26 +299,6 @@ libappwidgets_a_sources = \
gimpprogressbox.h \
gimpprogressdialog.c \
gimpprogressdialog.h \
gimppropgui.c \
gimppropgui.h \
gimppropgui-channel-mixer.c \
gimppropgui-channel-mixer.h \
gimppropgui-color-balance.c \
gimppropgui-color-balance.h \
gimppropgui-color-rotate.c \
gimppropgui-color-rotate.h \
gimppropgui-convolution-matrix.c \
gimppropgui-convolution-matrix.h \
gimppropgui-diffration-patterns.c \
gimppropgui-diffration-patterns.h \
gimppropgui-eval.c \
gimppropgui-eval.h \
gimppropgui-generic.c \
gimppropgui-generic.h \
gimppropgui-hue-saturation.c \
gimppropgui-hue-saturation.h \
gimppropgui-spiral.c \
gimppropgui-spiral.h \
gimppropwidgets.c \
gimppropwidgets.h \
gimpradioaction.c \
......
......@@ -25,14 +25,15 @@
#include "libgimpwidgets/gimpwidgets.h"
#include "widgets-types.h"
#include "propgui/propgui-types.h" /* ugly, but what the heck */
#include "core/gimpimage.h"
#include "core/gimpimage-symmetry.h"
#include "core/gimpsymmetry.h"
#include "propgui/gimppropgui.h"
#include "gimpmenufactory.h"
#include "gimppropgui.h"
#include "gimpsymmetryeditor.h"
#include "gimp-intl.h"
......
......@@ -2493,6 +2493,7 @@ app/menus/Makefile
app/paint/Makefile
app/pdb/Makefile
app/plug-in/Makefile
app/propgui/Makefile
app/text/Makefile
app/tools/Makefile
app/vectors/Makefile
......
......@@ -77,6 +77,7 @@ GTKDOC_LIBS = \
$(top_builddir)/app/menus/libappmenus.a \
$(top_builddir)/app/tools/libapptools.a \
$(top_builddir)/app/display/libappdisplay.a \
$(top_builddir)/app/propgui/libapppropgui.a \
$(top_builddir)/app/widgets/libappwidgets.a \
$(top_builddir)/app/pdb/libappinternal-procs.a \
$(top_builddir)/app/xcf/libappxcf.a \
......
......@@ -369,6 +369,15 @@ app/plug-in/gimptemporaryprocedure.c
app/plug-in/plug-in-enums.c
app/plug-in/plug-in-rc.c
app/propgui/gimppropgui-channel-mixer.c
app/propgui/gimppropgui-color-balance.c
app/propgui/gimppropgui-color-rotate.c
app/propgui/gimppropgui-convolution-matrix.c
app/propgui/gimppropgui-diffration-patterns.c
app/propgui/gimppropgui-generic.c
app/propgui/gimppropgui-hue-saturation.c
app/propgui/gimppropgui.c
app/text/gimpfont.c
app/text/gimptext-compat.c
app/text/gimptextlayer.c
......@@ -544,14 +553,6 @@ app/widgets/gimppdbdialog.c
app/widgets/gimppickablepopup.c
app/widgets/gimppluginview.c
app/widgets/gimpprogressdialog.c
app/widgets/gimppropgui-channel-mixer.c
app/widgets/gimppropgui-color-balance.c
app/widgets/gimppropgui-color-rotate.c
app/widgets/gimppropgui-convolution-matrix.c
app/widgets/gimppropgui-diffration-patterns.c
app/widgets/gimppropgui-generic.c
app/widgets/gimppropgui-hue-saturation.c
app/widgets/gimppropgui.c
app/widgets/gimppropwidgets.c
app/widgets/gimpsavedialog.c
app/widgets/gimpsearchpopup.c
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment