app/Makefile.am removed

2001-04-15  Michael Natterer  <mitch@gimp.org>

	* app/Makefile.am
	* app/paletteP.h: removed

	* app/palette.[ch]
	* app/palette_select.c: changed accordingly.

	* app/Makefile.am
	* app/gui/Makefile.am: some more preparation for file moving.
This commit is contained in:
Michael Natterer 2001-04-15 17:03:52 +00:00 committed by Michael Natterer
parent aa77e7140d
commit 1ac9c56aa3
12 changed files with 136 additions and 125 deletions

View File

@ -1,3 +1,14 @@
2001-04-15 Michael Natterer <mitch@gimp.org>
* app/Makefile.am
* app/paletteP.h: removed
* app/palette.[ch]
* app/palette_select.c: changed accordingly.
* app/Makefile.am
* app/gui/Makefile.am: some more preparation for file moving.
2001-04-15 Michael Natterer <mitch@gimp.org>
* app/Makefile.am: grouped the files together which will go to gui/.

View File

@ -40,20 +40,8 @@ gimp_SOURCES = \
colormap_dialog.h \
commands.c \
commands.h \
cursorutil.c \
cursorutil.h \
devices.c \
devices.h \
dialog_handler.c \
dialog_handler.h \
errorconsole.c \
errorconsole.h \
file_new_dialog.c \
file_new_dialog.h \
gimpdnd.c \
gimpdnd.h \
gimpui.c \
gimpui.h \
gradient_editor.c \
gradient_editor.h \
gradient_select.h \
@ -64,36 +52,22 @@ gimp_SOURCES = \
info_dialog.h \
info_window.c \
info_window.h \
interface.c \
interface.h \
layer_select.c \
layer_select.h \
layers_dialog.c \
layers_dialog.h \
layers_dialogP.h \
lc_dialog.c \
lc_dialog.h \
lc_dialogP.h \
menus.c \
menus.h \
nav_window.c \
nav_window.h \
ops_buttons.c \
ops_buttons.h \
palette.c \
palette.h \
palette_import.c \
palette_import.h \
palette_select.c \
palette_select.h \
paletteP.h \
paths_dialog.c \
paths_dialog.h \
paths_dialogP.h \
preferences_dialog.c \
preferences_dialog.h \
resolution_calibrate.c \
resolution_calibrate.h \
session.c \
session.h \
test_commands.c \
@ -103,6 +77,32 @@ gimp_SOURCES = \
toolbox.c \
toolbox.h \
\
cursorutil.c \
cursorutil.h \
devices.c \
devices.h \
dialog_handler.c \
dialog_handler.h \
errorconsole.c \
errorconsole.h \
gimpdnd.c \
gimpdnd.h \
gimpui.c \
gimpui.h \
interface.c \
interface.h \
layers_dialogP.h \
lc_dialog.c \
lc_dialog.h \
lc_dialogP.h \
nav_window.c \
nav_window.h \
ops_buttons.c \
ops_buttons.h \
paths_dialogP.h \
resolution_calibrate.c \
resolution_calibrate.h \
\
app_procs.c \
app_procs.h \
appenums.h \

View File

@ -10,6 +10,61 @@ libappgui_la_SOURCES = \
dialogs-constructors.c \
dialogs-constructors.h
## about-dialog.c \
## about-dialog.h \
## brush-editor.c \
## brush-editor.h \
## brush-select.c \
## brush-select.h \
## channels-dialog.c \
## channels-dialog.h \
## color-area.c \
## color-area.h \
## color-notebook.c \
## color-notebook.h \
## color-select.c \
## color-select.h \
## colormap-dialog.c \
## colormap-dialog.h \
## commands.c \
## commands.h \
## file-new-dialog.c \
## file-new-dialog.h \
## gradient-editor.c \
## gradient-editor.h \
## gradient-select.h \
## gradient-select.c \
## indicator-area.c \
## indicator-area.h \
## info-dialog.c \
## info-dialog.h \
## info-window.c \
## info-window.h \
## layer-select.c \
## layer-select.h \
## layers-dialog.c \
## layers-dialog.h \
## menus.c \
## menus.h \
## palette-editor.c \
## palette-editor.h \
## palette-import-dialog.c \
## palette-import-dialog.h \
## palette-select.c \
## palette-select.h \
## paths-dialog.c \
## paths-dialog.h \
## preferences-dialog.c \
## preferences-dialog.h \
## session.c \
## session.h \
## test-commands.c \
## test-commands.h \
## tips-dialog.c \
## tips-dialog.h \
## toolbox.c \
## toolbox.h
AM_CPPFLAGS = \
-DG_LOG_DOMAIN=\"Gimp-GUI\"

View File

@ -43,7 +43,6 @@
#include "palette.h"
#include "palette_import.h"
#include "palette_select.h"
#include "paletteP.h"
#include "session.h"
#include "libgimp/gimpenv.h"
@ -158,7 +157,6 @@ static void palette_dialog_drop_color (GtkWidget *widget,
gpointer data);
static void palette_dialog_invalidate_preview (GimpPalette *palette,
PaletteDialog *palette_dialog);
static void palette_dialog_edit_palette (GimpData *data);
PaletteDialog *top_level_edit_palette = NULL;
@ -294,9 +292,13 @@ palette_set_active_color (gint r,
/* called from palette_select.c ********************************************/
void
palette_create_edit (GimpPalette *palette)
void
palette_dialog_edit_palette (GimpData *data)
{
GimpPalette *palette;
palette = GIMP_PALETTE (data);
if (top_level_edit_palette == NULL)
{
top_level_edit_palette = palette_dialog_new (TRUE);
@ -1432,13 +1434,3 @@ palette_dialog_invalidate_preview (GimpPalette *palette,
palette_dialog_redraw (palette_dialog);
}
}
static void
palette_dialog_edit_palette (GimpData *data)
{
GimpPalette *palette;
palette = GIMP_PALETTE (data);
palette_create_edit (palette);
}

View File

@ -26,13 +26,15 @@
#define COLOR_UPDATE 2
void palette_dialog_create (void);
void palette_dialog_free (void);
void palette_dialog_create (void);
void palette_dialog_free (void);
void palette_set_active_color (gint r,
gint g,
gint b,
gint state);
void palette_dialog_edit_palette (GimpData *data);
void palette_set_active_color (gint r,
gint g,
gint b,
gint state);
#endif /* __PALETTE_H__ */

View File

@ -39,7 +39,6 @@
#include "gimppalette.h"
#include "palette_select.h"
#include "palette.h"
#include "paletteP.h"
#include "session.h"
#include "libgimp/gimpintl.h"
@ -217,9 +216,5 @@ palette_select_close_callback (GtkWidget *widget,
static void
palette_select_edit_palette (GimpData *data)
{
GimpPalette *palette;
palette = GIMP_PALETTE (data);
palette_create_edit (palette);
palette_dialog_edit_palette (data);
}

View File

@ -43,7 +43,6 @@
#include "palette.h"
#include "palette_import.h"
#include "palette_select.h"
#include "paletteP.h"
#include "session.h"
#include "libgimp/gimpenv.h"
@ -158,7 +157,6 @@ static void palette_dialog_drop_color (GtkWidget *widget,
gpointer data);
static void palette_dialog_invalidate_preview (GimpPalette *palette,
PaletteDialog *palette_dialog);
static void palette_dialog_edit_palette (GimpData *data);
PaletteDialog *top_level_edit_palette = NULL;
@ -294,9 +292,13 @@ palette_set_active_color (gint r,
/* called from palette_select.c ********************************************/
void
palette_create_edit (GimpPalette *palette)
void
palette_dialog_edit_palette (GimpData *data)
{
GimpPalette *palette;
palette = GIMP_PALETTE (data);
if (top_level_edit_palette == NULL)
{
top_level_edit_palette = palette_dialog_new (TRUE);
@ -1432,13 +1434,3 @@ palette_dialog_invalidate_preview (GimpPalette *palette,
palette_dialog_redraw (palette_dialog);
}
}
static void
palette_dialog_edit_palette (GimpData *data)
{
GimpPalette *palette;
palette = GIMP_PALETTE (data);
palette_create_edit (palette);
}

View File

@ -26,13 +26,15 @@
#define COLOR_UPDATE 2
void palette_dialog_create (void);
void palette_dialog_free (void);
void palette_dialog_create (void);
void palette_dialog_free (void);
void palette_set_active_color (gint r,
gint g,
gint b,
gint state);
void palette_dialog_edit_palette (GimpData *data);
void palette_set_active_color (gint r,
gint g,
gint b,
gint state);
#endif /* __PALETTE_H__ */

View File

@ -1,27 +0,0 @@
/* 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 __PALETTE_P_H__
#define __PALETTE_P_H__
void palette_select_palette_init (void);
void palette_create_edit (GimpPalette *palette);
#endif /* __PALETTE_P_H__ */

View File

@ -39,7 +39,6 @@
#include "gimppalette.h"
#include "palette_select.h"
#include "palette.h"
#include "paletteP.h"
#include "session.h"
#include "libgimp/gimpintl.h"
@ -217,9 +216,5 @@ palette_select_close_callback (GtkWidget *widget,
static void
palette_select_edit_palette (GimpData *data)
{
GimpPalette *palette;
palette = GIMP_PALETTE (data);
palette_create_edit (palette);
palette_dialog_edit_palette (data);
}

View File

@ -43,7 +43,6 @@
#include "palette.h"
#include "palette_import.h"
#include "palette_select.h"
#include "paletteP.h"
#include "session.h"
#include "libgimp/gimpenv.h"
@ -158,7 +157,6 @@ static void palette_dialog_drop_color (GtkWidget *widget,
gpointer data);
static void palette_dialog_invalidate_preview (GimpPalette *palette,
PaletteDialog *palette_dialog);
static void palette_dialog_edit_palette (GimpData *data);
PaletteDialog *top_level_edit_palette = NULL;
@ -294,9 +292,13 @@ palette_set_active_color (gint r,
/* called from palette_select.c ********************************************/
void
palette_create_edit (GimpPalette *palette)
void
palette_dialog_edit_palette (GimpData *data)
{
GimpPalette *palette;
palette = GIMP_PALETTE (data);
if (top_level_edit_palette == NULL)
{
top_level_edit_palette = palette_dialog_new (TRUE);
@ -1432,13 +1434,3 @@ palette_dialog_invalidate_preview (GimpPalette *palette,
palette_dialog_redraw (palette_dialog);
}
}
static void
palette_dialog_edit_palette (GimpData *data)
{
GimpPalette *palette;
palette = GIMP_PALETTE (data);
palette_create_edit (palette);
}

View File

@ -26,13 +26,15 @@
#define COLOR_UPDATE 2
void palette_dialog_create (void);
void palette_dialog_free (void);
void palette_dialog_create (void);
void palette_dialog_free (void);
void palette_set_active_color (gint r,
gint g,
gint b,
gint state);
void palette_dialog_edit_palette (GimpData *data);
void palette_set_active_color (gint r,
gint g,
gint b,
gint state);
#endif /* __PALETTE_H__ */