Commit 7d065360 authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer
Browse files

configure.in added new directory app/dialogs and link libappdialogs.c into

2004-09-13  Michael Natterer  <mitch@gimp.org>

	* configure.in
	* app/Makefile.am: added new directory app/dialogs and link
	libappdialogs.c into the gimp binary.

	* app/gui/Makefile.am
	* app/gui/gui-types.h
	* app/gui/gui-vtable.c
	* app/gui/gui.c

	* app/gui/about-dialog.[ch]
	* app/gui/authors.h
	* app/gui/color-notebook.[ch]
	* app/gui/convert-dialog.[ch]
	* app/gui/dialogs-constructors.[ch]
	* app/gui/dialogs.[ch]
	* app/gui/file-dialog-utils.[ch]
	* app/gui/file-new-dialog.[ch]
	* app/gui/file-open-dialog.[ch]
	* app/gui/file-open-location-dialog.[ch]
	* app/gui/file-save-dialog.[ch]
	* app/gui/grid-dialog.[ch]
	* app/gui/info-dialog.[ch]
	* app/gui/info-window.[ch]
	* app/gui/module-browser.[ch]
	* app/gui/offset-dialog.[ch]
	* app/gui/palette-import-dialog.[ch]
	* app/gui/preferences-dialog.[ch]
	* app/gui/quit-dialog.[ch]
	* app/gui/resize-dialog.[ch]
	* app/gui/resolution-calibrate-dialog.[ch]
	* app/gui/stroke-dialog.[ch]
	* app/gui/tips-dialog.[ch]
	* app/gui/tips-parser.[ch]
	* app/gui/user-install-dialog.[ch]: removed these files...

	* app/dialogs/Makefile.am
	* app/dialogs/dialogs-types.h

	* app/dialogs/*.[ch]: ...and added them here. Changed some
	filenames like module-browser -> module-dialog.

	* app/app_procs.c
	* app/actions/actions-types.h
	* app/actions/actions.c
	* app/actions/dialogs-actions.c
	* app/actions/dialogs-commands.c
	* app/actions/dockable-commands.c
	* app/actions/drawable-commands.c
	* app/actions/edit-commands.c
	* app/actions/file-commands.c
	* app/actions/gradient-editor-commands.c
	* app/actions/image-commands.c
	* app/actions/layers-commands.c
	* app/actions/palettes-commands.c
	* app/actions/select-commands.c
	* app/actions/templates-commands.c
	* app/actions/templates-commands.h
	* app/actions/vectors-commands.c
	* app/actions/view-commands.c
	* app/display/gimpdisplayshell-cursor.c
	* app/display/gimpdisplayshell-title.c
	* app/display/gimpdisplayshell.[ch]
	* app/tools/gimpcroptool.c
	* app/tools/gimpperspectivetool.c
	* app/tools/gimprotatetool.c
	* app/tools/gimpscaletool.c
	* app/tools/gimpsheartool.c
	* app/tools/gimptransformtool.[ch]
	* app/tools/gimpvectortool.c
	* app/widgets/gimpcolormapeditor.[ch]
	* app/widgets/gimpcolorpanel.c
	* app/widgets/gimpgradienteditor.[ch]
	* app/widgets/gimppaletteeditor.[ch]
	* app/widgets/gimptoolbox-color-area.c
	* menus/toolbox-menu.xml.in
	* tools/authorsgen/authorsgen.pl: changed accordingly.
parent 95da4fd6
/* The GIMP -- an image manipulation program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* module-browser.h
* module-dialog.h
* (C) 1999 Austin Donnelly <austin@gimp.org>
*
* This program is free software; you can redistribute it and/or modify
......@@ -19,10 +19,10 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __MODULE_BROWSER_H__
#ifndef __MODULE_DIALOG_H__
GtkWidget * module_browser_new (Gimp *gimp);
GtkWidget * module_dialog_new (Gimp *gimp);
#endif /* __MODULE_BROWSER_H__ */
#endif /* __MODULE_DIALOG_H__ */
......@@ -23,7 +23,7 @@
#include "libgimpmath/gimpmath.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "gui-types.h"
#include "dialogs-types.h"
#include "core/gimp.h"
#include "core/gimpchannel.h"
......
......@@ -24,7 +24,7 @@
#include "libgimpwidgets/gimpwidgets.h"
#include "gui-types.h"
#include "dialogs-types.h"
#include "core/gimp.h"
#include "core/gimpcontainer.h"
......
......@@ -27,7 +27,7 @@
#include "libgimpwidgets/gimpwidgets.h"
#include "libgimpwidgets/gimpcontroller.h"
#include "gui-types.h"
#include "dialogs-types.h"
#include "config/gimpconfig.h"
#include "config/gimpconfig-params.h"
......@@ -56,9 +56,10 @@
#include "menus/menus.h"
#include "gui/session.h"
#include "gui/themes.h"
#include "resolution-calibrate-dialog.h"
#include "session.h"
#include "themes.h"
#include "gimp-intl.h"
......
......@@ -24,7 +24,7 @@
#include "libgimpwidgets/gimpwidgets.h"
#include "gui-types.h"
#include "dialogs-types.h"
#include "config/gimpcoreconfig.h"
......
......@@ -24,7 +24,7 @@
#include "libgimpbase/gimpbase.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "gui-types.h"
#include "dialogs-types.h"
#include "config/gimpcoreconfig.h"
......
......@@ -24,7 +24,7 @@
#include "libgimpwidgets/gimpwidgets.h"
#include "gui-types.h"
#include "dialogs-types.h"
#include "config/gimpconfig.h"
#include "config/gimpconfig-utils.h"
......
......@@ -23,7 +23,7 @@
#include "libgimpbase/gimpbase.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "gui-types.h"
#include "dialogs-types.h"
#include "config/gimpguiconfig.h"
......
......@@ -38,7 +38,7 @@
#include "libgimpmath/gimpmath.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "gui-types.h"
#include "dialogs-types.h"
#include "config/gimpconfig-utils.h"
#include "config/gimprc.h"
......
......@@ -22,17 +22,16 @@
#include "display-types.h"
#ifdef __GNUC__
#warning FIXME #include "gui/gui-types.h"
#endif
#include "gui/gui-types.h"
#include "config/gimpguiconfig.h"
#include "core/gimp.h"
#include "core/gimpimage.h"
#include "gui/info-window.h"
#ifdef __GNUC__
#warning FIXME #include "dialogs/dialogs-types.h"
#endif
#include "dialogs/dialogs-types.h"
#include "dialogs/info-window.h"
#include "widgets/gimpcursor.h"
......
......@@ -26,11 +26,6 @@
#include "display-types.h"
#ifdef __GNUC__
#warning FIXME #include "gui/gui-types.h"
#endif
#include "gui/gui-types.h"
#include "config/gimpdisplayconfig.h"
#include "core/gimp.h"
......@@ -41,7 +36,11 @@
#include "file/file-utils.h"
#include "gui/info-window.h"
#ifdef __GNUC__
#warning FIXME #include "dialogs/dialogs-types.h"
#endif
#include "dialogs/dialogs-types.h"
#include "dialogs/info-window.h"
#include "gimpdisplay.h"
#include "gimpdisplayshell.h"
......
......@@ -25,11 +25,6 @@
#include "display-types.h"
#include "tools/tools-types.h"
#ifdef __GNUC__
#warning FIXME #include "gui/gui-types.h"
#endif
#include "gui/gui-types.h"
#include "config/gimpconfig.h"
#include "config/gimpconfig-params.h"
#include "config/gimpconfig-utils.h"
......@@ -57,7 +52,11 @@
#include "widgets/gimpuimanager.h"
#include "widgets/gimpwidgets-utils.h"
#include "gui/info-window.h"
#ifdef __GNUC__
#warning FIXME #include "dialogs/dialogs-types.h"
#endif
#include "dialogs/dialogs-types.h"
#include "dialogs/info-window.h"
#include "tools/tool_manager.h"
......
......@@ -23,8 +23,8 @@
#include <gtk/gtkwindow.h>
/* FIXME: remove all gui/ stuff */
#include "gui/gui-types.h"
/* FIXME: remove all dialogs/ stuff */
#include "dialogs/dialogs-types.h"
/* Apply to a float the same rounding mode used in the renderer */
......
......@@ -2,59 +2,7 @@
noinst_LIBRARIES = libappgui.a
dialogs_sources = \
about-dialog.c \
about-dialog.h \
color-notebook.c \
color-notebook.h \
convert-dialog.c \
convert-dialog.h \
dialogs.c \
dialogs.h \
dialogs-constructors.c \
dialogs-constructors.h \
file-dialog-utils.c \
file-dialog-utils.h \
file-new-dialog.c \
file-new-dialog.h \
file-open-dialog.c \
file-open-dialog.h \
file-open-location-dialog.c \
file-open-location-dialog.h \
file-save-dialog.c \
file-save-dialog.h \
grid-dialog.h \
grid-dialog.c \
info-dialog.c \
info-dialog.h \
info-window.c \
info-window.h \
module-browser.c \
module-browser.h \
offset-dialog.c \
offset-dialog.h \
palette-import-dialog.c \
palette-import-dialog.h \
preferences-dialog.c \
preferences-dialog.h \
quit-dialog.c \
quit-dialog.h \
resize-dialog.c \
resize-dialog.h \
resolution-calibrate-dialog.c \
resolution-calibrate-dialog.h \
stroke-dialog.c \
stroke-dialog.h \
tips-dialog.c \
tips-dialog.h \
tips-parser.c \
tips-parser.h \
user-install-dialog.c \
user-install-dialog.h
libappgui_a_SOURCES = \
$(dialogs_sources) \
authors.h \
color-history.c \
color-history.h \
gui.c \
......
This diff is collapsed.
/* The GIMP -- an 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 2 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, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __ABOUT_DIALOG_H__
#define __ABOUT_DIALOG_H__
GtkWidget * about_dialog_create (void);
#endif /* __ABOUT_DIALOG_H__ */
/* NOTE: This file is autogenerated by authorsgen.pl. */
/*
* The main authors are Spencer Kimball and Peter Mattis.
*/
static gchar *authors[] =
{
"Lauri Alanko",
"Shawn Amundson",
"Sven Anders",
"Henrik Brix Andersen",
"Karl-Johan Andersson",
"John Beale",
"Zach Beane",
"Tom Bech",
"Marc Bless",
"Edward Blevins",
"Reagan Blundell",
"Xavier Bouchoux",
"Roberto Boyd",
"Stanislav Brabec",
"Robert Brady",
"Hans Breuer",
"Simon Budig",
"Carey Bunks",
"Seth Burgess",
"Brent Burton",
"Francisco Bustamante",
"Albert Cahalan",
"George J. Carrette",
"Sean Cier",
"Winston Chang",
"Kenneth Christiansen",
"Zbigniew Chyla",
"Branko Collin",
"Ed Connel",
"Piers Cornwell",
"Daniel Cotting",
"Jay Cox",
"Brian Degenhardt",
"Gert Dewit",
"Andreas Dilger",
"Austin Donnelly",
"Scott Draves",
"Daniel Dunbar",
"Misha Dynin",
"Daniel Egger",
"Morton Eriksen",
"Larry Ewing",
"Nick Fetchak",
"Valek Filippov",
"David Forsyth",
"Raphael Francois",
"Jochen Friedrich",
"Sami Gerdt",
"Jim Geuther",
"Graeme Gill",
"Pedro Gimeno",
"Scott Goehring",
"Heiko Goller",
"Marcelo de Gomensoro Malheiros",
"Cameron Gregory",
"Pavel Grinfeld",
"Michael Hammel",
"Henrik Hansen",
"Ville Hautamäki",
"James Henstridge",
"Eric Hernes",
"David Hodson",
"Christoph Hoegl",
"Wolfgang Hofer",
"Jan Hubička",
"Andreas Hyden",
"Ben Jackson",
"Krzysztof Jakubowski",
"Simon Janes",
"Tim Janik",
"Fellmann Joaquim",
"Andrew Kieschnick",
"Peter Kirchgessner",
"Philipp Klaus",
"David Koblas",
"Øyvind Kolås",
"Robert L Krawitz",
"Tuomas Kuosmanen",
"Karin Kylander",
"Olof S Kylander",
"Karl La Rocca",
"Chris Lahey",
"Nick Lamb",
"Marco Lamberto",
"Jens Lautenbacher",
"Laramie Leavitt",
"Elliot Lee",
"Marc Lehmann",
"Ray Lehtiniemi",
"Raph Levien",
"Wing Tung Leung",
"Adrian Likins",
"Tor Lillqvist",
"Ingo Lütkebohle",
"Josh MacDonald",
"Ed Mackey",
"Vidar Madsen",
"Ian Main",
"Kjartan Maraas",
"Kelly Martin",
"Torsten Martinsen",
"Gordon Matzigkeit",
"Gregory McLean",
"Daniele Medri",
"Federico Mena Quintero",
"Jim Meyer",
"James Mitchell",
"Hirotsuna Mizuno",
"David Monniaux",
"Adam D Moss",
"Balazs Nagy",
"Yukihiro Nakai",
"Sung-Hyun Nam",
"Shuji Narazaki",
"Felix Natter",
"Michael Natterer",
"David Neary",
"David Necas",
"Sven Neumann",
"Stephen Robert Norris",
"Tim Newsome",
"Erik Nygren",
"Miles O'Neal",
"David Odin ",
"Thom van Os",
"Garry R. Osgood",
"Alan Paeth",
"Jay Painter",
"Sergey Panov",
"Ville Pätsi",
"Asbjorn Pettersen",
"Mike Phillips",
"Artur Polaczynski",
"Raphaël Quinet",
"Tom Rathborne",
"Vincent Renardias",
"Jens Restemeier",
"Maurits Rijk",
"Daniel Risacher",
"James Robinson",
"Guillermo S. Romero",
"Tim Rowley",
"Pablo Saratxaga",
"Mike Schaeffer",
"John Schlag",
"Norbert Schmitz",
"Thorsten Schnier",
"Alexander Schulz",
"Tracy Scott",
"Craig Setera",
"Aaron Sherman",
"Manish Singh",
"Daniel Skarda",
"Carol Spears",
"Adam Spiers",
"Jakub Steiner",
"Nathan Summers",
"Mike Sweet",
"Yuri Syrota",
"Eiichi Takamori",
"Tristan Tarrant",
"Michael Taylor",
"Owen Taylor",
"Ian Tester",
"Andy Thomas",
"Kevin Turner",
"Rebecca Walter",
"Martin Weber",
"James Wang",
"Kris Wehner",
"Nigel Wetten",
"Calvin Williamson",
"Matthew Wilson",
"Shirasaki Yasuhiro",
};
/* The GIMP -- an image manipulation program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* color_notebook module (C) 1998 Austin Donnelly <austin@greenend.org.uk>
*
* 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 2 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, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include "config.h"
#include <gtk/gtk.h>
#include "libgimpcolor/gimpcolor.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "gui-types.h"
#include "core/gimpviewable.h"
#include "widgets/gimpdialogfactory.h"
#include "widgets/gimpviewabledialog.h"
#include "color-history.h"
#include "color-notebook.h"
#include "gimp-intl.h"
#define RESPONSE_RESET 1
#define COLOR_AREA_SIZE 20
struct _ColorNotebook
{
GtkWidget *shell;
GtkWidget *selection;
GtkWidget *history[COLOR_HISTORY_SIZE];
ColorNotebookCallback callback;
gpointer client_data;
gboolean wants_updates;
};
static void color_notebook_help_func (const gchar *help_id,
gpointer help_data);
static void color_notebook_response (GtkWidget *widget,
gint response_id,
ColorNotebook *cnp);
static void color_notebook_color_changed (GimpColorSelection *selection,
ColorNotebook *cnp);
static void color_history_color_clicked (GtkWidget *widget,
ColorNotebook *cnp);
static void color_history_color_changed (GtkWidget *widget,
gpointer data);
static void color_history_add_clicked (GtkWidget *widget,
ColorNotebook *cnp);
static GList *color_notebooks = NULL;
/* public functions */
ColorNotebook *
color_notebook_new (GimpViewable *viewable,
const gchar *title,
const gchar *stock_id,
const gchar *desc,
GtkWidget *parent,
GimpDialogFactory *dialog_factory,
const gchar *dialog_identifier,
const GimpRGB *color,
ColorNotebookCallback callback,
gpointer client_data,
gboolean wants_updates,
gboolean show_alpha)
{
ColorNotebook *cnp;
GtkWidget *table;
GtkWidget *button;
GtkWidget *arrow;
const gchar *role;
gint i;
g_return_val_if_fail (viewable == NULL || GIMP_IS_VIEWABLE (viewable), NULL);
g_return_val_if_fail (GTK_IS_WIDGET (parent), NULL);
g_return_val_if_fail (dialog_factory == NULL ||
GIMP_IS_DIALOG_FACTORY (dialog_factory), NULL);
g_return_val_if_fail (dialog_factory == NULL || dialog_identifier != NULL,
NULL);
g_return_val_if_fail (color != NULL, NULL);
cnp = g_new0 (ColorNotebook, 1);
cnp->callback = callback;
cnp->client_data = client_data;
cnp->wants_updates = wants_updates;
role = dialog_identifier ? dialog_identifier : "gimp-color-selector";
if (desc)
{
cnp->shell = gimp_viewable_dialog_new (viewable, title, role,
stock_id, desc,
parent,
color_notebook_help_func, NULL,
NULL);
gtk_window_set_resizable (GTK_WINDOW (cnp->shell), FALSE);
}
else
{
cnp->shell = gimp_dialog_new (title, role,
parent, 0,
color_notebook_help_func, NULL,
NULL);
}
g_object_set_data (G_OBJECT (cnp->shell), "color-notebook", cnp);
gtk_dialog_add_buttons (GTK_DIALOG (cnp->shell),
GIMP_STOCK_RESET, RESPONSE_RESET,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,
NULL);
gtk_dialog_set_default_response (GTK_DIALOG (cnp->shell), GTK_RESPONSE_OK);
g_signal_connect (cnp->shell, "response",
G_CALLBACK (color_notebook_response),
cnp);
g_object_add_weak_pointer (G_OBJECT (cnp->shell), (gpointer *) &cnp->shell);
if (dialog_factory)
gimp_dialog_factory_add_foreign (dialog_factory, dialog_identifier,