New upstream version 2.10.0~RC1

This commit is contained in:
Jeremy Bicha
2018-03-28 12:37:30 -04:00
8195 changed files with 1939281 additions and 1033470 deletions

View File

@ -14,9 +14,11 @@ libgimpmodule = $(top_builddir)/libgimpmodule/libgimpmodule-$(GIMP_API_VERSION).
libgimpwidgets = $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la
AM_CPPFLAGS = $(GTK_CFLAGS) -DTOP_SRCDIR=\"$(top_srcdir)\"
INCLUDES = -I$(top_srcdir)
AM_CPPFLAGS = \
$(GTK_CFLAGS) \
-DTOP_SRCDIR=\"$(top_srcdir)\" \
-I$(top_srcdir) \
$(GEGL_CFLAGS)
AM_LDFLAGS = $(mwindows)

View File

@ -1,7 +1,7 @@
# Makefile.in generated by automake 1.15 from Makefile.am.
# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@ -99,9 +99,12 @@ am__aclocal_m4_deps = $(top_srcdir)/m4macros/gtk-doc.m4 \
$(top_srcdir)/m4macros/ltversion.m4 \
$(top_srcdir)/m4macros/lt~obsolete.m4 \
$(top_srcdir)/acinclude.m4 $(top_srcdir)/m4macros/alsa.m4 \
$(top_srcdir)/m4macros/ax_compare_version.m4 \
$(top_srcdir)/m4macros/ax_gcc_func_attribute.m4 \
$(top_srcdir)/m4macros/ax_prog_cc_for_build.m4 \
$(top_srcdir)/m4macros/ax_prog_perl_version.m4 \
$(top_srcdir)/m4macros/binreloc.m4 \
$(top_srcdir)/m4macros/detectcflags.m4 \
$(top_srcdir)/m4macros/gimpprint.m4 \
$(top_srcdir)/m4macros/pythondev.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
@ -195,23 +198,29 @@ ALSA_LIBS = @ALSA_LIBS@
ALTIVEC_EXTRA_CFLAGS = @ALTIVEC_EXTRA_CFLAGS@
AMTAR = @AMTAR@
AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
APPSTREAM_UTIL = @APPSTREAM_UTIL@
AR = @AR@
AS = @AS@
ATK_CFLAGS = @ATK_CFLAGS@
ATK_LIBS = @ATK_LIBS@
ATK_REQUIRED_VERSION = @ATK_REQUIRED_VERSION@
AUTOCONF = @AUTOCONF@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BABL_CFLAGS = @BABL_CFLAGS@
BABL_LIBS = @BABL_LIBS@
BABL_REQUIRED_VERSION = @BABL_REQUIRED_VERSION@
BINRELOC_CFLAGS = @BINRELOC_CFLAGS@
BINRELOC_LIBS = @BINRELOC_LIBS@
BUILD_EXEEXT = @BUILD_EXEEXT@
BUILD_OBJEXT = @BUILD_OBJEXT@
BZIP2_LIBS = @BZIP2_LIBS@
CAIRO_CFLAGS = @CAIRO_CFLAGS@
CAIRO_LIBS = @CAIRO_LIBS@
CAIRO_PDF_CFLAGS = @CAIRO_PDF_CFLAGS@
CAIRO_PDF_LIBS = @CAIRO_PDF_LIBS@
CAIRO_PDF_REQUIRED_VERSION = @CAIRO_PDF_REQUIRED_VERSION@
CAIRO_REQUIRED_VERSION = @CAIRO_REQUIRED_VERSION@
CATALOGS = @CATALOGS@
CATOBJEXT = @CATOBJEXT@
@ -220,16 +229,20 @@ CCAS = @CCAS@
CCASDEPMODE = @CCASDEPMODE@
CCASFLAGS = @CCASFLAGS@
CCDEPMODE = @CCDEPMODE@
CC_FOR_BUILD = @CC_FOR_BUILD@
CC_VERSION = @CC_VERSION@
CFLAGS = @CFLAGS@
CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CURL_CFLAGS = @CURL_CFLAGS@
CURL_LIBS = @CURL_LIBS@
CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@
CPP_FOR_BUILD = @CPP_FOR_BUILD@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DATADIRNAME = @DATADIRNAME@
DBUS_BINDING_TOOL = @DBUS_BINDING_TOOL@
DBUS_GLIB_CFLAGS = @DBUS_GLIB_CFLAGS@
DBUS_GLIB_LIBS = @DBUS_GLIB_LIBS@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DESKTOP_DATADIR = @DESKTOP_DATADIR@
@ -242,35 +255,35 @@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
EXIF_CFLAGS = @EXIF_CFLAGS@
EXIF_LIBS = @EXIF_LIBS@
FGREP = @FGREP@
FILE_AA = @FILE_AA@
FILE_EXR = @FILE_EXR@
FILE_JP2_LOAD = @FILE_JP2_LOAD@
FILE_MNG = @FILE_MNG@
FILE_PDF_LOAD = @FILE_PDF_LOAD@
FILE_PDF_SAVE = @FILE_PDF_SAVE@
FILE_PNG = @FILE_PNG@
FILE_PS = @FILE_PS@
FILE_PSP = @FILE_PSP@
FILE_SVG = @FILE_SVG@
FILE_TIFF_LOAD = @FILE_TIFF_LOAD@
FILE_TIFF_SAVE = @FILE_TIFF_SAVE@
FILE_WMF = @FILE_WMF@
FILE_XMC = @FILE_XMC@
FILE_XPM = @FILE_XPM@
FONTCONFIG_CFLAGS = @FONTCONFIG_CFLAGS@
FONTCONFIG_LIBS = @FONTCONFIG_LIBS@
FONTCONFIG_WIN32_RECOMMENDED_VERSION = @FONTCONFIG_WIN32_RECOMMENDED_VERSION@
FONTCONFIG_REQUIRED_VERSION = @FONTCONFIG_REQUIRED_VERSION@
FREETYPE2_REQUIRED_VERSION = @FREETYPE2_REQUIRED_VERSION@
FREETYPE_CONFIG = @FREETYPE_CONFIG@
FREETYPE_LIBS = @FREETYPE_LIBS@
GDBUS_CODEGEN = @GDBUS_CODEGEN@
GDK_PIXBUF_CFLAGS = @GDK_PIXBUF_CFLAGS@
GDK_PIXBUF_CSOURCE = @GDK_PIXBUF_CSOURCE@
GDK_PIXBUF_LIBS = @GDK_PIXBUF_LIBS@
GDK_PIXBUF_REQUIRED_VERSION = @GDK_PIXBUF_REQUIRED_VERSION@
GEGL = @GEGL@
GEGL_CFLAGS = @GEGL_CFLAGS@
GEGL_LIBS = @GEGL_LIBS@
GEGL_REQUIRED_VERSION = @GEGL_REQUIRED_VERSION@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GEXIV2_CFLAGS = @GEXIV2_CFLAGS@
GEXIV2_LIBS = @GEXIV2_LIBS@
GEXIV2_REQUIRED_VERSION = @GEXIV2_REQUIRED_VERSION@
GIMP_API_VERSION = @GIMP_API_VERSION@
GIMP_APP_VERSION = @GIMP_APP_VERSION@
GIMP_BINARY_AGE = @GIMP_BINARY_AGE@
@ -294,6 +307,10 @@ GIMP_USER_VERSION = @GIMP_USER_VERSION@
GIMP_VERSION = @GIMP_VERSION@
GIO_CFLAGS = @GIO_CFLAGS@
GIO_LIBS = @GIO_LIBS@
GIO_UNIX_CFLAGS = @GIO_UNIX_CFLAGS@
GIO_UNIX_LIBS = @GIO_UNIX_LIBS@
GIO_WINDOWS_CFLAGS = @GIO_WINDOWS_CFLAGS@
GIO_WINDOWS_LIBS = @GIO_WINDOWS_LIBS@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
GLIB_GENMARSHAL = @GLIB_GENMARSHAL@
@ -318,10 +335,16 @@ GTK_LIBS = @GTK_LIBS@
GTK_MAC_INTEGRATION_CFLAGS = @GTK_MAC_INTEGRATION_CFLAGS@
GTK_MAC_INTEGRATION_LIBS = @GTK_MAC_INTEGRATION_LIBS@
GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
GTK_UPDATE_ICON_CACHE = @GTK_UPDATE_ICON_CACHE@
GTK_WIN32_RECOMMENDED_VERSION = @GTK_WIN32_RECOMMENDED_VERSION@
GUDEV_CFLAGS = @GUDEV_CFLAGS@
GUDEV_LIBS = @GUDEV_LIBS@
HARFBUZZ_CFLAGS = @HARFBUZZ_CFLAGS@
HARFBUZZ_LIBS = @HARFBUZZ_LIBS@
HARFBUZZ_REQUIRED_VERSION = @HARFBUZZ_REQUIRED_VERSION@
HAVE_FINITE = @HAVE_FINITE@
HAVE_ISFINITE = @HAVE_ISFINITE@
HAVE_VFORK = @HAVE_VFORK@
HTML_DIR = @HTML_DIR@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
@ -333,25 +356,28 @@ INTLLIBS = @INTLLIBS@
INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
INTLTOOL_MERGE = @INTLTOOL_MERGE@
INTLTOOL_PERL = @INTLTOOL_PERL@
INTLTOOL_REQUIRED_VERSION = @INTLTOOL_REQUIRED_VERSION@
INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@
ISO_CODES_LOCALEDIR = @ISO_CODES_LOCALEDIR@
ISO_CODES_LOCATION = @ISO_CODES_LOCATION@
JP2_LIBS = @JP2_LIBS@
JPEG_LIBS = @JPEG_LIBS@
LCMS = @LCMS@
LCMS1_CFLAGS = @LCMS1_CFLAGS@
LCMS1_LIBS = @LCMS1_LIBS@
LCMS2_CFLAGS = @LCMS2_CFLAGS@
LCMS2_LIBS = @LCMS2_LIBS@
LCMS_CFLAGS = @LCMS_CFLAGS@
LCMS_LIBS = @LCMS_LIBS@
LCMS_REQUIRED_VERSION = @LCMS_REQUIRED_VERSION@
LD = @LD@
LDFLAGS = @LDFLAGS@
LDFLAGS_FOR_BUILD = @LDFLAGS_FOR_BUILD@
LIBLZMA_REQUIRED_VERSION = @LIBLZMA_REQUIRED_VERSION@
LIBMYPAINT_CFLAGS = @LIBMYPAINT_CFLAGS@
LIBMYPAINT_LIBS = @LIBMYPAINT_LIBS@
LIBMYPAINT_REQUIRED_VERSION = @LIBMYPAINT_REQUIRED_VERSION@
LIBOBJS = @LIBOBJS@
LIBPNG_REQUIRED_VERSION = @LIBPNG_REQUIRED_VERSION@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIPO = @LIPO@
@ -360,10 +386,14 @@ LTLIBOBJS = @LTLIBOBJS@
LT_CURRENT_MINUS_AGE = @LT_CURRENT_MINUS_AGE@
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
LT_VERSION_INFO = @LT_VERSION_INFO@
LZMA_CFLAGS = @LZMA_CFLAGS@
LZMA_LIBS = @LZMA_LIBS@
MAIL = @MAIL@
MAINT = @MAINT@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MIME_INFO_CFLAGS = @MIME_INFO_CFLAGS@
MIME_INFO_LIBS = @MIME_INFO_LIBS@
MIME_TYPES = @MIME_TYPES@
MKDIR_P = @MKDIR_P@
MKINSTALLDIRS = @MKINSTALLDIRS@
@ -373,10 +403,19 @@ MNG_LIBS = @MNG_LIBS@
MSGFMT = @MSGFMT@
MSGFMT_OPTS = @MSGFMT_OPTS@
MSGMERGE = @MSGMERGE@
MYPAINT_BRUSHES_CFLAGS = @MYPAINT_BRUSHES_CFLAGS@
MYPAINT_BRUSHES_LIBS = @MYPAINT_BRUSHES_LIBS@
NATIVE_GLIB_CFLAGS = @NATIVE_GLIB_CFLAGS@
NATIVE_GLIB_LIBS = @NATIVE_GLIB_LIBS@
NM = @NM@
NMEDIT = @NMEDIT@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
OPENEXR_CFLAGS = @OPENEXR_CFLAGS@
OPENEXR_LIBS = @OPENEXR_LIBS@
OPENEXR_REQUIRED_VERSION = @OPENEXR_REQUIRED_VERSION@
OPENJPEG_CFLAGS = @OPENJPEG_CFLAGS@
OPENJPEG_LIBS = @OPENJPEG_LIBS@
OTOOL = @OTOOL@
OTOOL64 = @OTOOL64@
PACKAGE = @PACKAGE@
@ -388,9 +427,12 @@ PACKAGE_URL = @PACKAGE_URL@
PACKAGE_VERSION = @PACKAGE_VERSION@
PANGOCAIRO_CFLAGS = @PANGOCAIRO_CFLAGS@
PANGOCAIRO_LIBS = @PANGOCAIRO_LIBS@
PANGOCAIRO_REQUIRED_VERSION = @PANGOCAIRO_REQUIRED_VERSION@
PATHSEP = @PATHSEP@
PATH_SEPARATOR = @PATH_SEPARATOR@
PERL = @PERL@
PERL_REQUIRED_VERSION = @PERL_REQUIRED_VERSION@
PERL_VERSION = @PERL_VERSION@
PKG_CONFIG = @PKG_CONFIG@
PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
@ -398,11 +440,17 @@ PNG_CFLAGS = @PNG_CFLAGS@
PNG_LIBS = @PNG_LIBS@
POFILES = @POFILES@
POPPLER_CFLAGS = @POPPLER_CFLAGS@
POPPLER_DATA_CFLAGS = @POPPLER_DATA_CFLAGS@
POPPLER_DATA_LIBS = @POPPLER_DATA_LIBS@
POPPLER_DATA_REQUIRED_VERSION = @POPPLER_DATA_REQUIRED_VERSION@
POPPLER_LIBS = @POPPLER_LIBS@
POPPLER_REQUIRED_VERSION = @POPPLER_REQUIRED_VERSION@
POSUB = @POSUB@
PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
PYBIN_PATH = @PYBIN_PATH@
PYCAIRO_CFLAGS = @PYCAIRO_CFLAGS@
PYCAIRO_LIBS = @PYCAIRO_LIBS@
PYGIMP_EXTRA_CFLAGS = @PYGIMP_EXTRA_CFLAGS@
PYGTK_CFLAGS = @PYGTK_CFLAGS@
PYGTK_CODEGEN = @PYGTK_CODEGEN@
@ -417,16 +465,18 @@ PYTHON_PLATFORM = @PYTHON_PLATFORM@
PYTHON_PREFIX = @PYTHON_PREFIX@
PYTHON_VERSION = @PYTHON_VERSION@
RANLIB = @RANLIB@
RECOMMENDED_WIN32_FONTCONFIG_CFLAGS = @RECOMMENDED_WIN32_FONTCONFIG_CFLAGS@
RECOMMENDED_WIN32_FONTCONFIG_LIBS = @RECOMMENDED_WIN32_FONTCONFIG_LIBS@
RECOMMENDED_WIN32_GTK_CFLAGS = @RECOMMENDED_WIN32_GTK_CFLAGS@
RECOMMENDED_WIN32_GTK_LIBS = @RECOMMENDED_WIN32_GTK_LIBS@
RSVG_REQUIRED_VERSION = @RSVG_REQUIRED_VERSION@
RT_LIBS = @RT_LIBS@
SCREENSHOT = @SCREENSHOT@
SCREENSHOT_LIBS = @SCREENSHOT_LIBS@
SED = @SED@
SENDMAIL = @SENDMAIL@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
SOCKET_LIBS = @SOCKET_LIBS@
SSE2_EXTRA_CFLAGS = @SSE2_EXTRA_CFLAGS@
SSE4_1_EXTRA_CFLAGS = @SSE4_1_EXTRA_CFLAGS@
SSE_EXTRA_CFLAGS = @SSE_EXTRA_CFLAGS@
STRIP = @STRIP@
SVG_CFLAGS = @SVG_CFLAGS@
@ -437,15 +487,26 @@ USE_NLS = @USE_NLS@
VERSION = @VERSION@
WEBKIT_CFLAGS = @WEBKIT_CFLAGS@
WEBKIT_LIBS = @WEBKIT_LIBS@
WEBKIT_REQUIRED_VERSION = @WEBKIT_REQUIRED_VERSION@
WEBPDEMUX_CFLAGS = @WEBPDEMUX_CFLAGS@
WEBPDEMUX_LIBS = @WEBPDEMUX_LIBS@
WEBPMUX_CFLAGS = @WEBPMUX_CFLAGS@
WEBPMUX_LIBS = @WEBPMUX_LIBS@
WEBP_CFLAGS = @WEBP_CFLAGS@
WEBP_LIBS = @WEBP_LIBS@
WEBP_REQUIRED_VERSION = @WEBP_REQUIRED_VERSION@
WEB_PAGE = @WEB_PAGE@
WIN32_LARGE_ADDRESS_AWARE = @WIN32_LARGE_ADDRESS_AWARE@
WINDRES = @WINDRES@
WMF_CFLAGS = @WMF_CFLAGS@
WMF_CONFIG = @WMF_CONFIG@
WMF_LIBS = @WMF_LIBS@
WMF_REQUIRED_VERSION = @WMF_REQUIRED_VERSION@
XDG_EMAIL = @XDG_EMAIL@
XFIXES_CFLAGS = @XFIXES_CFLAGS@
XFIXES_LIBS = @XFIXES_LIBS@
XGETTEXT = @XGETTEXT@
XGETTEXT_RECOMMENDED_VERSION = @XGETTEXT_RECOMMENDED_VERSION@
XMC_CFLAGS = @XMC_CFLAGS@
XMC_LIBS = @XMC_LIBS@
XMKMF = @XMKMF@
@ -465,6 +526,8 @@ abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CC_FOR_BUILD = @ac_ct_CC_FOR_BUILD@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
@ -504,6 +567,7 @@ libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
mandir = @mandir@
manpage_gimpdir = @manpage_gimpdir@
mkdir_p = @mkdir_p@
ms_librarian = @ms_librarian@
oldincludedir = @oldincludedir@
@ -532,8 +596,12 @@ libgimpconfig = $(top_builddir)/libgimpconfig/libgimpconfig-$(GIMP_API_VERSION).
libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la $(libm)
libgimpmodule = $(top_builddir)/libgimpmodule/libgimpmodule-$(GIMP_API_VERSION).la
libgimpwidgets = $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la
AM_CPPFLAGS = $(GTK_CFLAGS) -DTOP_SRCDIR=\"$(top_srcdir)\"
INCLUDES = -I$(top_srcdir)
AM_CPPFLAGS = \
$(GTK_CFLAGS) \
-DTOP_SRCDIR=\"$(top_srcdir)\" \
-I$(top_srcdir) \
$(GEGL_CFLAGS)
AM_LDFLAGS = $(mwindows)
@ENABLE_GTK_DOC_TRUE@noinst_PROGRAMS = $(DOC_SHOOTER)
doc_shooter_SOURCES = \

View File

@ -7,6 +7,7 @@
#include <unistd.h>
#endif
#include <gegl.h>
#include <gdk/gdkx.h>
#include <gtk/gtk.h>

View File

@ -1,7 +1,7 @@
#include "config.h"
#include <glib-object.h>
#include <gio/gio.h>
#include "libgimpbase/gimpbase.h"
#include "libgimpbase/gimpbase-private.h"

View File

@ -1,6 +1,8 @@
#include "config.h"
#include <gegl.h>
#include <gdk/gdkx.h>
#include <gtk/gtk.h>
@ -173,7 +175,7 @@ create_browser (void)
gtk_box_pack_start (GTK_BOX (vbox),
gtk_label_new ("Browser"), FALSE, FALSE, 0);
return new_widget_info ("gimp-browser", vbox, MEDIUM);
return new_widget_info ("gimp-widget-browser", vbox, MEDIUM);
}
static WidgetInfo *
@ -188,7 +190,7 @@ create_button (void)
align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
gtk_container_add (GTK_CONTAINER (align), widget);
return new_widget_info ("gimp-button", align, SMALL);
return new_widget_info ("gimp-widget-button", align, SMALL);
}
static WidgetInfo *
@ -235,7 +237,7 @@ create_chain_button (void)
gtk_box_pack_end (GTK_BOX (vbox), gtk_label_new ("Chain Button"),
TRUE, TRUE, 0);
return new_widget_info ("gimp-chain-button", vbox, MEDIUM);
return new_widget_info ("gimp-widget-chain-button", vbox, MEDIUM);
}
static WidgetInfo *
@ -258,7 +260,7 @@ create_color_area (void)
gtk_box_pack_start (GTK_BOX (vbox),
gtk_label_new ("Color Area"), FALSE, FALSE, 0);
return new_widget_info ("gimp-color-area", vbox, SMALL);
return new_widget_info ("gimp-widget-color-area", vbox, SMALL);
}
static WidgetInfo *
@ -281,7 +283,7 @@ create_color_button (void)
gtk_box_pack_start (GTK_BOX (vbox),
gtk_label_new ("Color Button"), FALSE, FALSE, 0);
return new_widget_info ("gimp-color-button", vbox, SMALL);
return new_widget_info ("gimp-widget-color-button", vbox, SMALL);
}
static WidgetInfo *
@ -303,7 +305,7 @@ create_color_hex_entry (void)
gtk_box_pack_start (GTK_BOX (vbox),
gtk_label_new ("Color Hex Entry"), FALSE, FALSE, 0);
return new_widget_info ("gimp-color-hex-entry", vbox, SMALL);
return new_widget_info ("gimp-widget-color-hex-entry", vbox, SMALL);
}
static WidgetInfo *
@ -316,8 +318,8 @@ create_color_profile_combo_box (void)
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
align = gtk_alignment_new (0.5, 0.5, 0.5, 0.0);
combo = gimp_color_profile_combo_box_new (gtk_dialog_new (), NULL);
gimp_color_profile_combo_box_add (GIMP_COLOR_PROFILE_COMBO_BOX (combo),
NULL, "sRGB");
gimp_color_profile_combo_box_add_file (GIMP_COLOR_PROFILE_COMBO_BOX (combo),
NULL, "sRGB");
gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0);
gtk_container_add (GTK_CONTAINER (align), combo);
gtk_box_pack_start (GTK_BOX (vbox), align, TRUE, TRUE, 0);
@ -325,7 +327,7 @@ create_color_profile_combo_box (void)
gtk_label_new ("Color Profile Combo Box"),
FALSE, FALSE, 0);
return new_widget_info ("gimp-color-profile-combo-box", vbox, SMALL);
return new_widget_info ("gimp-widget-color-profile-combo-box", vbox, SMALL);
}
static WidgetInfo *
@ -351,7 +353,7 @@ create_color_scale (void)
gtk_box_pack_start (GTK_BOX (vbox),
gtk_label_new ("Color Scale"), FALSE, FALSE, 0);
return new_widget_info ("gimp-color-scale", vbox, SMALL);
return new_widget_info ("gimp-widget-color-scale", vbox, SMALL);
}
static WidgetInfo *
@ -375,7 +377,7 @@ create_color_selection (void)
gtk_box_pack_start (GTK_BOX (vbox),
gtk_label_new ("Color Selection"), FALSE, FALSE, 0);
return new_widget_info ("gimp-color-selection", vbox, ASIS);
return new_widget_info ("gimp-widget-color-selection", vbox, ASIS);
}
static WidgetInfo *
@ -387,10 +389,10 @@ create_dialog (void)
GtkWidget *label;
widget = gimp_dialog_new ("Gimp Dialog",
"gimp-dialog",
"gimp-widget-dialog",
NULL, 0, NULL, NULL,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,
"_Cancel", GTK_RESPONSE_CANCEL,
"_OK", GTK_RESPONSE_OK,
NULL);
@ -398,7 +400,7 @@ create_dialog (void)
content = gtk_dialog_get_content_area (GTK_DIALOG (widget));
gtk_container_add (GTK_CONTAINER (content), label);
gtk_widget_show (label);
info = new_widget_info ("gimp-dialog", widget, MEDIUM);
info = new_widget_info ("gimp-widget-dialog", widget, MEDIUM);
info->include_decorations = TRUE;
return info;
@ -420,7 +422,7 @@ create_enum_combo_box (void)
gtk_box_pack_start (GTK_BOX (vbox),
gtk_label_new ("Enum Combo Box"), FALSE, FALSE, 0);
return new_widget_info ("gimp-enum-combo-box", vbox, SMALL);
return new_widget_info ("gimp-widget-enum-combo-box", vbox, SMALL);
}
static WidgetInfo *
@ -438,7 +440,7 @@ create_enum_label (void)
gtk_box_pack_start (GTK_BOX (vbox),
gtk_label_new ("Enum Label"), FALSE, FALSE, 0);
return new_widget_info ("gimp-enum-label", vbox, SMALL);
return new_widget_info ("gimp-widget-enum-label", vbox, SMALL);
}
static WidgetInfo *
@ -458,7 +460,7 @@ create_file_entry (void)
gtk_box_pack_start (GTK_BOX (vbox),
gtk_label_new ("File Entry"), FALSE, FALSE, 0);
return new_widget_info ("gimp-file-entry", vbox, SMALL);
return new_widget_info ("gimp-widget-file-entry", vbox, SMALL);
}
static WidgetInfo *
@ -469,10 +471,11 @@ create_frame (void)
frame = gimp_frame_new ("Frame");
content = gtk_label_new ("Frame Content\nThis Frame is HIG compliant");
gtk_misc_set_alignment (GTK_MISC (content), 0.0, 0.0);
gtk_label_set_xalign (GTK_LABEL (content), 0.0);
gtk_label_set_yalign (GTK_LABEL (content), 0.0);
gtk_container_add (GTK_CONTAINER (frame), content);
return new_widget_info ("gimp-frame", frame, MEDIUM);
return new_widget_info ("gimp-widget-frame", frame, MEDIUM);
}
static WidgetInfo *
@ -480,7 +483,7 @@ create_hint_box (void)
{
GtkWidget *box = gimp_hint_box_new ("This is a user hint.");
return new_widget_info ("gimp-hint-box", box, MEDIUM);
return new_widget_info ("gimp-widget-hint-box", box, MEDIUM);
}
static WidgetInfo *
@ -499,7 +502,7 @@ create_number_pair_entry (void)
gtk_box_pack_start (GTK_BOX (vbox),
gtk_label_new ("Number Pair Entry"), FALSE, FALSE, 0);
return new_widget_info ("gimp-number-pair-entry", vbox, SMALL);
return new_widget_info ("gimp-widget-number-pair-entry", vbox, SMALL);
}
static WidgetInfo *
@ -525,7 +528,7 @@ create_int_combo_box (void)
gtk_box_pack_start (GTK_BOX (vbox),
gtk_label_new ("Int Combo Box"), FALSE, FALSE, 0);
return new_widget_info ("gimp-int-combo-box", vbox, SMALL);
return new_widget_info ("gimp-widget-int-combo-box", vbox, SMALL);
}
static WidgetInfo *
@ -544,7 +547,7 @@ create_memsize_entry (void)
gtk_box_pack_start (GTK_BOX (vbox),
gtk_label_new ("Memsize Entry"), FALSE, FALSE, 0);
return new_widget_info ("gimp-memsize-entry", vbox, SMALL);
return new_widget_info ("gimp-widget-memsize-entry", vbox, SMALL);
}
static WidgetInfo *
@ -568,7 +571,7 @@ create_offset_area (void)
gtk_box_pack_start (GTK_BOX (vbox),
gtk_label_new ("Offset Area"), FALSE, FALSE, 0);
return new_widget_info ("gimp-offset-area", vbox, LARGE);
return new_widget_info ("gimp-widget-offset-area", vbox, LARGE);
}
static WidgetInfo *
@ -587,7 +590,7 @@ create_page_selector (void)
gtk_box_pack_start (GTK_BOX (vbox),
gtk_label_new ("Page Selector"), FALSE, FALSE, 0);
return new_widget_info ("gimp-page-selector", vbox, ASIS);
return new_widget_info ("gimp-widget-page-selector", vbox, ASIS);
}
static WidgetInfo *
@ -611,7 +614,7 @@ create_path_editor (void)
g_free (path);
g_free (config);
return new_widget_info ("gimp-path-editor", vbox, ASIS);
return new_widget_info ("gimp-widget-path-editor", vbox, ASIS);
}
static WidgetInfo *
@ -629,7 +632,7 @@ create_pick_button (void)
gtk_box_pack_start (GTK_BOX (vbox),
gtk_label_new ("Pick Button"), FALSE, FALSE, 0);
return new_widget_info ("gimp-pick-button", vbox, SMALL);
return new_widget_info ("gimp-widget-pick-button", vbox, SMALL);
}
static gboolean
@ -672,7 +675,7 @@ create_preview_area (void)
gtk_box_pack_start (GTK_BOX (vbox),
gtk_label_new ("Preview Area"), FALSE, FALSE, 0);
return new_widget_info ("gimp-preview-area", vbox, MEDIUM);
return new_widget_info ("gimp-widget-preview-area", vbox, MEDIUM);
}
static WidgetInfo *
@ -697,7 +700,7 @@ create_string_combo_box (void)
gtk_box_pack_start (GTK_BOX (vbox),
gtk_label_new ("String Combo Box"), FALSE, FALSE, 0);
return new_widget_info ("gimp-string-combo-box", vbox, SMALL);
return new_widget_info ("gimp-widget-string-combo-box", vbox, SMALL);
}
static WidgetInfo *
@ -715,7 +718,7 @@ create_unit_menu (void)
gtk_box_pack_start (GTK_BOX (vbox),
gtk_label_new ("Unit Menu"), FALSE, FALSE, 0);
return new_widget_info ("gimp-unit-menu", vbox, SMALL);
return new_widget_info ("gimp-widget-unit-menu", vbox, SMALL);
}
GList *