From 1ac9c56aa3d3133baf36ef51a45d125d6c9c6c76 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Sun, 15 Apr 2001 17:03:52 +0000 Subject: [PATCH] app/Makefile.am removed 2001-04-15 Michael Natterer * 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. --- ChangeLog | 11 +++++++ app/Makefile.am | 52 +++++++++++++++---------------- app/gui/Makefile.am | 55 +++++++++++++++++++++++++++++++++ app/gui/palette-editor.c | 20 ++++-------- app/gui/palette-editor.h | 14 +++++---- app/gui/palette-select.c | 7 +---- app/palette.c | 20 ++++-------- app/palette.h | 14 +++++---- app/paletteP.h | 27 ---------------- app/palette_select.c | 7 +---- app/widgets/gimppaletteeditor.c | 20 ++++-------- app/widgets/gimppaletteeditor.h | 14 +++++---- 12 files changed, 136 insertions(+), 125 deletions(-) delete mode 100644 app/paletteP.h diff --git a/ChangeLog b/ChangeLog index 3c3a4f10c0..383fef158e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2001-04-15 Michael Natterer + + * 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 * app/Makefile.am: grouped the files together which will go to gui/. diff --git a/app/Makefile.am b/app/Makefile.am index 139885d433..8cf6da63a4 100644 --- a/app/Makefile.am +++ b/app/Makefile.am @@ -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 \ diff --git a/app/gui/Makefile.am b/app/gui/Makefile.am index cdabcef312..6ad58ed268 100644 --- a/app/gui/Makefile.am +++ b/app/gui/Makefile.am @@ -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\" diff --git a/app/gui/palette-editor.c b/app/gui/palette-editor.c index 14196f1c45..5017c20d8f 100644 --- a/app/gui/palette-editor.c +++ b/app/gui/palette-editor.c @@ -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); -} diff --git a/app/gui/palette-editor.h b/app/gui/palette-editor.h index 1531e9f4f5..70d552b5b3 100644 --- a/app/gui/palette-editor.h +++ b/app/gui/palette-editor.h @@ -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__ */ diff --git a/app/gui/palette-select.c b/app/gui/palette-select.c index 7640af039a..339a5d32cb 100644 --- a/app/gui/palette-select.c +++ b/app/gui/palette-select.c @@ -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); } diff --git a/app/palette.c b/app/palette.c index 14196f1c45..5017c20d8f 100644 --- a/app/palette.c +++ b/app/palette.c @@ -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); -} diff --git a/app/palette.h b/app/palette.h index 1531e9f4f5..70d552b5b3 100644 --- a/app/palette.h +++ b/app/palette.h @@ -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__ */ diff --git a/app/paletteP.h b/app/paletteP.h deleted file mode 100644 index 10fdc8c3c1..0000000000 --- a/app/paletteP.h +++ /dev/null @@ -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__ */ diff --git a/app/palette_select.c b/app/palette_select.c index 7640af039a..339a5d32cb 100644 --- a/app/palette_select.c +++ b/app/palette_select.c @@ -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); } diff --git a/app/widgets/gimppaletteeditor.c b/app/widgets/gimppaletteeditor.c index 14196f1c45..5017c20d8f 100644 --- a/app/widgets/gimppaletteeditor.c +++ b/app/widgets/gimppaletteeditor.c @@ -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); -} diff --git a/app/widgets/gimppaletteeditor.h b/app/widgets/gimppaletteeditor.h index 1531e9f4f5..70d552b5b3 100644 --- a/app/widgets/gimppaletteeditor.h +++ b/app/widgets/gimppaletteeditor.h @@ -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__ */