dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Makefile.am removed... 

2001-11-10  Michael Natterer  <mitch@gimp.org>

	* Makefile.am
	* user_install.[ch]: removed...

	* gui/Makefile.am
	* gui/user-install-dialog.[ch]: ...added here.

	* gui/file-open-dialog.[ch]: removed file_open_with_display() and
	file_open_with_proc_and_display() here...

	* file/file-open.[ch]: ...and added them here.

	* app_procs.c
	* widgets/gimpdnd.c
	* widgets/gimpdocumentview.c: changed accordingly.
This commit is contained in:
Michael Natterer 2001-11-10 19:35:21 +00:00 committed by Michael Natterer
parent 360f8321f5
commit cfeab8bc8b
18 changed files with 137 additions and 1509 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ChangeLog
View File

@ -1,3 +1,20 @@
2001-11-10 Michael Natterer <mitch@gimp.org>
* Makefile.am
* user_install.[ch]: removed...
* gui/Makefile.am
* gui/user-install-dialog.[ch]: ...added here.
* gui/file-open-dialog.[ch]: removed file_open_with_display() and
file_open_with_proc_and_display() here...
* file/file-open.[ch]: ...and added them here.
* app_procs.c
* widgets/gimpdnd.c
* widgets/gimpdocumentview.c: changed accordingly.
2001-11-10 Michael Natterer <mitch@gimp.org>
* app/Makefile.am

2
app/Makefile.am
View File

@ -27,8 +27,6 @@ gimp_SOURCES = @STRIP_BEGIN@ \
##
image_map.c \
image_map.h \
user_install.c \
user_install.h \
##
## stuff for core/
##

5
app/app_procs.c
View File

@ -41,13 +41,15 @@
#include "core/gimpdatafactory.h"
#include "core/gimpunit.h"
#include "file/file-open.h"
#include "display/gimpdisplay-foreach.h"
#include "tools/tool_manager.h"
#include "gui/file-open-dialog.h"
#include "gui/gui.h"
#include "gui/splash.h"
#include "gui/user-install-dialog.h"
#include "appenv.h"
#include "app_procs.h"
@ -57,7 +59,6 @@
#include "gimprc.h"
#include "plug_in.h"
#include "undo.h"
#include "user_install.h"
#ifdef DISPLAY_FILTERS
#include "gdisplay_color.h"

76
app/dialogs/file-open-dialog.c
View File

@ -63,23 +63,19 @@
/* local function prototypes */
static gint file_open_with_proc_and_display (Gimp *gimp,
const gchar *filename,
const gchar *raw_filename,
PlugInProcDef *file_proc);
static void file_open_dialog_create (Gimp *gimp);
static void file_open_genbutton_callback (GtkWidget *widget,
gpointer data);
static void file_open_clistrow_callback (GtkWidget *widget,
gint row,
gint column,
GdkEvent *event,
gpointer data);
static void file_open_ok_callback (GtkWidget *widget,
gpointer data);
static void file_open_type_callback (GtkWidget *widget,
gpointer data);
static GSList * clist_to_slist (GtkCList *file_list);
static void file_open_dialog_create (Gimp *gimp);
static void file_open_genbutton_callback (GtkWidget *widget,
gpointer data);
static void file_open_clistrow_callback (GtkWidget *widget,
gint row,
gint column,
GdkEvent *event,
gpointer data);
static void file_open_ok_callback (GtkWidget *widget,
gpointer data);
static void file_open_type_callback (GtkWidget *widget,
gpointer data);
static GSList * clist_to_slist (GtkCList *file_list);
@ -172,56 +168,10 @@ file_open_dialog_show (Gimp *gimp)
file_dialog_show (fileload);
}
GimpPDBStatusType
file_open_with_display (Gimp *gimp,
const gchar *filename)
{
g_return_val_if_fail (GIMP_IS_GIMP (gimp), GIMP_PDB_CALLING_ERROR);
return file_open_with_proc_and_display (gimp, filename, filename, NULL);
}
/* private functions */
static gint
file_open_with_proc_and_display (Gimp *gimp,
const gchar *filename,
const gchar *raw_filename,
PlugInProcDef *file_proc)
{
GimpImage *gimage;
gchar *absolute;
GimpPDBStatusType status;
if ((gimage = file_open_image (gimp,
filename,
raw_filename,
_("Open"),
file_proc,
RUN_INTERACTIVE,
&status)) != NULL)
{
/* enable & clear all undo steps */
gimp_image_undo_enable (gimage);
/* set the image to clean */
gimp_image_clean_all (gimage);
gimp_create_display (gimage->gimp, gimage, 0x0101);
g_object_unref (G_OBJECT (gimage));
absolute = file_open_absolute_filename (gimp, filename);
gimp_documents_add (gimp, filename);
g_free (absolute);
}
return status;
}
static void
file_open_dialog_create (Gimp *gimp)
{

9
app/dialogs/file-open-dialog.h
View File

@ -20,13 +20,10 @@
#define __FILE_OPEN_DIALOG_H__
void file_open_dialog_menu_init (Gimp *gimp);
void file_open_dialog_menu_reset (void);
void file_open_dialog_menu_init (Gimp *gimp);
void file_open_dialog_menu_reset (void);
void file_open_dialog_show (Gimp *gimp);
GimpPDBStatusType file_open_with_display (Gimp *gimp,
const gchar *filename);
void file_open_dialog_show (Gimp *gimp);
#endif /* __FILE_OPEN_DIALOG_H__ */

8
app/dialogs/user-install-dialog.c
View File

@ -34,18 +34,18 @@
#include "libgimpbase/gimpbase.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "display/display-types.h"
#include "gui-types.h"
#include "base/base-config.h"
#include "core/gimpunit.h"
#include "gui/gui.h"
#include "gui/resolution-calibrate-dialog.h"
#include "gui.h"
#include "resolution-calibrate-dialog.h"
#include "user-install-dialog.h"
#include "appenv.h"
#include "gimprc.h"
#include "user_install.h"
#include "libgimp/gimpintl.h"

50
app/file/file-open.c
View File

@ -39,6 +39,7 @@
#include "core/gimp.h"
#include "core/gimpimage.h"
#include "core/gimpdocuments.h"
#include "file-open.h"
#include "file-utils.h"
@ -139,6 +140,55 @@ file_open_image (Gimp *gimp,
return NULL;
}
GimpPDBStatusType
file_open_with_display (Gimp *gimp,
const gchar *filename)
{
g_return_val_if_fail (GIMP_IS_GIMP (gimp), GIMP_PDB_CALLING_ERROR);
return file_open_with_proc_and_display (gimp, filename, filename, NULL);
}
GimpPDBStatusType
file_open_with_proc_and_display (Gimp *gimp,
const gchar *filename,
const gchar *raw_filename,
PlugInProcDef *file_proc)
{
GimpImage *gimage;
gchar *absolute;
GimpPDBStatusType status;
g_return_val_if_fail (GIMP_IS_GIMP (gimp), GIMP_PDB_CALLING_ERROR);
if ((gimage = file_open_image (gimp,
filename,
raw_filename,
_("Open"),
file_proc,
RUN_INTERACTIVE,
&status)) != NULL)
{
/* enable & clear all undo steps */
gimp_image_undo_enable (gimage);
/* set the image to clean */
gimp_image_clean_all (gimage);
gimp_create_display (gimage->gimp, gimage, 0x0101);
g_object_unref (G_OBJECT (gimage));
absolute = file_open_absolute_filename (gimp, filename);
gimp_documents_add (gimp, filename);
g_free (absolute);
}
return status;
}
gchar *
file_open_absolute_filename (Gimp *gimp,
const gchar *name)

26
app/file/file-open.h
View File

@ -20,16 +20,24 @@
#define __FILE_OPEN_H__
GimpImage * file_open_image (Gimp *gimp,
const gchar *filename,
const gchar *raw_filename,
const gchar *open_mode,
PlugInProcDef *file_proc,
RunModeType run_mode,
GimpPDBStatusType *status);
GimpImage * file_open_image (Gimp *gimp,
const gchar *filename,
const gchar *raw_filename,
const gchar *open_mode,
PlugInProcDef *file_proc,
RunModeType run_mode,
GimpPDBStatusType *status);
gchar * file_open_absolute_filename (Gimp *gimp,
const gchar *name);
GimpPDBStatusType file_open_with_display (Gimp *gimp,
const gchar *filename);
GimpPDBStatusType file_open_with_proc_and_display (Gimp *gimp,
const gchar *filename,
const gchar *raw_filename,
PlugInProcDef *file_proc);
gchar * file_open_absolute_filename (Gimp *gimp,
const gchar *name);
#endif /* __FILE_OPEN_H__ */

2
app/gui/Makefile.am
View File

@ -113,6 +113,8 @@ libappgui_a_SOURCES = @STRIP_BEGIN@ \
toolbox.h \
tools-commands.c \
tools-commands.h \
user-install-dialog.c \
user-install-dialog.h \
view-commands.c \
view-commands.h \
@STRIP_END@

76
app/gui/file-open-dialog.c
View File

@ -63,23 +63,19 @@
/* local function prototypes */
static gint file_open_with_proc_and_display (Gimp *gimp,
const gchar *filename,
const gchar *raw_filename,
PlugInProcDef *file_proc);
static void file_open_dialog_create (Gimp *gimp);
static void file_open_genbutton_callback (GtkWidget *widget,
gpointer data);
static void file_open_clistrow_callback (GtkWidget *widget,
gint row,
gint column,
GdkEvent *event,
gpointer data);
static void file_open_ok_callback (GtkWidget *widget,
gpointer data);
static void file_open_type_callback (GtkWidget *widget,
gpointer data);
static GSList * clist_to_slist (GtkCList *file_list);
static void file_open_dialog_create (Gimp *gimp);
static void file_open_genbutton_callback (GtkWidget *widget,
gpointer data);
static void file_open_clistrow_callback (GtkWidget *widget,
gint row,
gint column,
GdkEvent *event,
gpointer data);
static void file_open_ok_callback (GtkWidget *widget,
gpointer data);
static void file_open_type_callback (GtkWidget *widget,
gpointer data);
static GSList * clist_to_slist (GtkCList *file_list);
@ -172,56 +168,10 @@ file_open_dialog_show (Gimp *gimp)
file_dialog_show (fileload);
}
GimpPDBStatusType
file_open_with_display (Gimp *gimp,
const gchar *filename)
{
g_return_val_if_fail (GIMP_IS_GIMP (gimp), GIMP_PDB_CALLING_ERROR);
return file_open_with_proc_and_display (gimp, filename, filename, NULL);
}
/* private functions */
static gint
file_open_with_proc_and_display (Gimp *gimp,
const gchar *filename,
const gchar *raw_filename,
PlugInProcDef *file_proc)
{
GimpImage *gimage;
gchar *absolute;
GimpPDBStatusType status;
if ((gimage = file_open_image (gimp,
filename,
raw_filename,
_("Open"),
file_proc,
RUN_INTERACTIVE,
&status)) != NULL)
{
/* enable & clear all undo steps */
gimp_image_undo_enable (gimage);
/* set the image to clean */
gimp_image_clean_all (gimage);
gimp_create_display (gimage->gimp, gimage, 0x0101);
g_object_unref (G_OBJECT (gimage));
absolute = file_open_absolute_filename (gimp, filename);
gimp_documents_add (gimp, filename);
g_free (absolute);
}
return status;
}
static void
file_open_dialog_create (Gimp *gimp)
{

9
app/gui/file-open-dialog.h
View File

@ -20,13 +20,10 @@
#define __FILE_OPEN_DIALOG_H__
void file_open_dialog_menu_init (Gimp *gimp);
void file_open_dialog_menu_reset (void);
void file_open_dialog_menu_init (Gimp *gimp);
void file_open_dialog_menu_reset (void);
void file_open_dialog_show (Gimp *gimp);
GimpPDBStatusType file_open_with_display (Gimp *gimp,
const gchar *filename);
void file_open_dialog_show (Gimp *gimp);
#endif /* __FILE_OPEN_DIALOG_H__ */

8
app/gui/user-install-dialog.c
View File

@ -34,18 +34,18 @@
#include "libgimpbase/gimpbase.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "display/display-types.h"
#include "gui-types.h"
#include "base/base-config.h"
#include "core/gimpunit.h"
#include "gui/gui.h"
#include "gui/resolution-calibrate-dialog.h"
#include "gui.h"
#include "resolution-calibrate-dialog.h"
#include "user-install-dialog.h"
#include "appenv.h"
#include "gimprc.h"
#include "user_install.h"
#include "libgimp/gimpintl.h"

1322
app/user_install.c
View File

File diff suppressed because it is too large Load Diff

26
app/user_install.h
View File

@ -1,26 +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 __USER_INSTALL_DIALOG_H__
#define __USER_INSTALL_DIALOG_H__
void user_install_dialog_create (Gimp *gimp);
#endif /* __USER_INSTALL_DIALOG_H__ */

2
app/widgets/gimpdnd.c
View File

@ -45,7 +45,7 @@
#include "core/gimppattern.h"
#include "core/gimptoolinfo.h"
#include "gui/file-open-dialog.h"
#include "file/file-open.h"
#include "app_procs.h"

2
app/widgets/gimpdocumentview.c
View File

@ -35,6 +35,8 @@
#include "core/gimpimage.h"
#include "core/gimpimagefile.h"
#include "file/file-open.h"
#include "display/gimpdisplay.h"
#include "display/gimpdisplay-foreach.h"

4
po/ChangeLog
View File

@ -1,3 +1,7 @@
2001-11-10 Michael Natterer <mitch@gimp.org>
* POTFILES.in: app/user_install.c -> app/gui/user-install-dialog.c
2001-11-10 Michael Natterer <mitch@gimp.org>
* POTFILES.in: app/qmask.c -> app/display/gimpdisplayshell-qmask.c

2
po/POTFILES.in
View File

@ -13,7 +13,6 @@ app/nav_window.c
app/plug_in.c
app/undo.c
app/undo_history.c
app/user_install.c
app/core/gimp.c
app/core/gimpbrush.c
@ -84,6 +83,7 @@ app/gui/splash.c
app/gui/tips-dialog.c
app/gui/tool-options-dialog.c
app/gui/toolbox.c
app/gui/user-install-dialog.c
app/pdb/image_cmds.c
app/pdb/internal_procs.c