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

app/Makefile.am removed...

2002-02-22  Michael Natterer  <mitch@gimp.org>

	* app/Makefile.am
	* app/gimpprogress.[ch]: removed...

	* app/display/Makefile.am
	* app/display/gimpprogress.[ch]: ...and added here. Prefixed
	everything with "gimp_".

	* app/gui/image-commands.c
	* app/plug-in/plug-in.c
	* app/tools/gimpblendtool.c
	* app/tools/gimptransformtool.c: changed accordingly.
parent a4550e9c
2002-02-22 Michael Natterer <mitch@gimp.org>
* app/Makefile.am
* app/gimpprogress.[ch]: removed...
* app/display/Makefile.am
* app/display/gimpprogress.[ch]: ...and added here. Prefixed
everything with "gimp_".
* app/gui/image-commands.c
* app/plug-in/plug-in.c
* app/tools/gimpblendtool.c
* app/tools/gimptransformtool.c: changed accordingly.
2002-02-22 Michael Natterer <mitch@gimp.org>
 
* app/vectors/Makefile
......
......@@ -33,24 +33,17 @@ gui_sources = \
## stuff that needs to be split up in core / ui files
##
core_ui_sources = \
gimpprogress.c \
gimpprogress.h \
image_map.c \
image_map.h
##
## config stuff
## stuff which is about to be replaced by new subsystems
##
config_sources = \
bye_sources = \
general.c \
general.h \
gimprc.c \
gimprc.h
##
## stuff which is about to be replaced by new subsystems
##
bye_sources = \
gimprc.h \
ops_buttons.c \
ops_buttons.h \
path.c \
......@@ -85,7 +78,6 @@ stuff_sources = \
gimp_1_3_SOURCES = @STRIP_BEGIN@ \
$(gui_sources) \
$(core_ui_sources) \
$(config_sources) \
$(bye_sources) \
$(stuff_sources) \
@STRIP_END@
......
......@@ -34,12 +34,12 @@
#include "display/gimpdisplay.h"
#include "display/gimpdisplay-foreach.h"
#include "display/gimpprogress.h"
#include "convert-dialog.h"
#include "image-commands.h"
#include "resize-dialog.h"
#include "gimpprogress.h"
#include "undo.h"
#include "libgimp/gimpintl.h"
......@@ -462,17 +462,17 @@ image_scale_implement (ImageResize *image_scale)
if (! display_flush)
undo_push_group_start (gimage, IMAGE_SCALE_UNDO);
progress = progress_start (image_scale->gdisp,
_("Scaling..."),
TRUE, NULL, NULL);
progress = gimp_progress_start (image_scale->gdisp,
_("Scaling..."),
TRUE, NULL, NULL);
gimp_image_scale (gimage,
image_scale->resize->width,
image_scale->resize->height,
image_scale->resize->interpolation,
progress_update_and_flush, progress);
gimp_progress_update_and_flush, progress);
progress_end (progress);
gimp_progress_end (progress);
display_flush = TRUE;
}
......
......@@ -98,6 +98,7 @@
#include "widgets/gimpitemfactory.h"
#include "display/gimpdisplay.h"
#include "display/gimpprogress.h"
#include "gui/brush-select.h"
#include "gui/gradient-select.h"
......@@ -108,7 +109,6 @@
#include "plug-in-rc.h"
#include "app_procs.h"
#include "gimpprogress.h"
#include "gimprc.h"
#include "libgimp/gimpintl.h"
......@@ -908,7 +908,7 @@ plug_in_destroy (PlugIn *plug_in)
g_free (plug_in->args[5]);
if (plug_in->progress)
progress_end (plug_in->progress);
gimp_progress_end (plug_in->progress);
plug_in->progress = NULL;
if (plug_in == current_plug_in)
......@@ -1207,7 +1207,7 @@ plug_in_close (PlugIn *plug_in,
/* Destroy the progress dialog if it exists. */
if (plug_in->progress)
{
progress_end (plug_in->progress);
gimp_progress_end (plug_in->progress);
plug_in->progress = NULL;
}
......@@ -3493,13 +3493,13 @@ plug_in_progress_init (PlugIn *plug_in,
gdisp = gimp_display_get_by_ID (the_gimp, gdisp_ID);
if (plug_in->progress)
plug_in->progress = progress_restart (plug_in->progress, message,
G_CALLBACK (plug_in_progress_cancel),
plug_in);
plug_in->progress = gimp_progress_restart (plug_in->progress, message,
G_CALLBACK (plug_in_progress_cancel),
plug_in);
else
plug_in->progress = progress_start (gdisp, message, TRUE,
G_CALLBACK (plug_in_progress_cancel),
plug_in);
plug_in->progress = gimp_progress_start (gdisp, message, TRUE,
G_CALLBACK (plug_in_progress_cancel),
plug_in);
}
void
......@@ -3508,8 +3508,8 @@ plug_in_progress_update (PlugIn *plug_in,
{
if (!plug_in->progress)
plug_in_progress_init (plug_in, NULL, -1);
progress_update (plug_in->progress, percentage);
gimp_progress_update (plug_in->progress, percentage);
}
static gchar *
......
......@@ -45,6 +45,8 @@ libappdisplay_a_sources = @STRIP_BEGIN@ \
gimpdisplayshell-scroll.h \
gimpdisplayshell-selection.c \
gimpdisplayshell-selection.h \
gimpprogress.c \
gimpprogress.h \
gimpstatusbar.c \
gimpstatusbar.h \
@STRIP_END@
......
......@@ -22,12 +22,11 @@
#include "libgimpwidgets/gimpwidgets.h"
#include "display/display-types.h"
#include "display/gimpdisplay.h"
#include "display/gimpdisplayshell.h"
#include "display/gimpstatusbar.h"
#include "display-types.h"
#include "gimpdisplay.h"
#include "gimpdisplayshell.h"
#include "gimpstatusbar.h"
#include "gimpprogress.h"
#include "libgimp/gimpintl.h"
......@@ -47,56 +46,64 @@ struct _GimpProgress
gpointer cancel_data;
};
/* prototypes */
static void progress_signal_setup (GimpProgress *progress,
GCallback cancel_callback,
gpointer cancel_data);
/* local function prototypes */
/* These progress bar routines are re-entrant, and so should be
* thread-safe.
*/
static void gimp_progress_signal_setup (GimpProgress *progress,
GCallback cancel_callback,
gpointer cancel_data);
/* Start a progress bar on "gdisp" with reason "message". If "gdisp"
* is NULL, the progress bar is presented in a new dialog box. If
* "message" is NULL, then no message is used.
/**
* gimp_progress_start:
* @gdisp: The #GimpDisplay to show the progress in.
* @message: The message.
* @important: Setting this to #FALSE will cause the progress
* to silently fail if the display's statusbar
* is hidden.
* @cancel_callback: The callback to call if the "Cancel" button is clicked.
* @cancel_data: The %cancel_callback's "user_data".
*
* Start a progress bar on %gdisp with reason %message. If %gdisp
* is #NULL, the progress bar is presented in a new dialog box. If
* %message is #NULL, then no message is used.
*
* If "cancel_callback" is not NULL, it is attached to the progress
* bar cancel button's "clicked" signal, with data "cancel_data". The
* If %cancel_callback is not %NULL, it is attached to the progress
* bar cancel button's "clicked" signal, with data %cancel_data. The
* cancel button is only made sensitive if the callback is set.
*
* It is an error to progress_start() a bar on a "gdisp" for which
* It is an error to gimp_progress_start() a bar on a %gdisp for which
* there is already a progress bar active.
*
* Progress bars with "important" set to TRUE will be shown to the
* Progress bars with %important set to #TRUE will be shown to the
* user in any possible way. Unimportant progress bars will not be
* shown to the user if it would mean creating a new window.
*/
*
* Return value: The new #GimpProgress.
**/
GimpProgress *
progress_start (GimpDisplay *gdisp,
const gchar *message,
gboolean important,
GCallback cancel_callback,
gpointer cancel_data)
gimp_progress_start (GimpDisplay *gdisp,
const gchar *message,
gboolean important,
GCallback cancel_callback,
gpointer cancel_data)
{
GimpDisplayShell *shell = NULL;
GimpProgress *progress;
GtkWidget *vbox;
g_return_val_if_fail (gdisp == NULL || GIMP_IS_DISPLAY (gdisp), NULL);
if (gdisp)
shell = GIMP_DISPLAY_SHELL (gdisp->shell);
progress = g_new0 (GimpProgress, 1);
progress->gdisp = gdisp;
progress->dialog = NULL;
progress->cancel_callback = NULL;
progress->cancel_data = NULL;
/* do we have a useful gdisplay and statusarea? */
/* do we have a useful gdisplay and statusarea? */
if (gdisp && GTK_WIDGET_VISIBLE (shell->statusbar))
{
progress->gdisp = gdisp;
if (message)
{
gimp_statusbar_push (GIMP_STATUSBAR (shell->statusbar),
......@@ -109,7 +116,8 @@ progress_start (GimpDisplay *gdisp,
*/
if (GIMP_STATUSBAR (shell->statusbar)->progressid)
{
g_warning ("%d progress bars already active for display %p",
g_warning ("gimp_progress_start(): "
"%d progress bars already active for display %p",
GIMP_STATUSBAR (shell->statusbar)->progressid,
gdisp);
}
......@@ -118,14 +126,13 @@ progress_start (GimpDisplay *gdisp,
}
else
{
/* unimporant progress indications are occasionally failed */
/* unimporant progress indications are occasionally failed */
if (! important)
{
g_free (progress);
return NULL;
}
progress->gdisp = NULL;
progress->dialog = gimp_dialog_new (_("Progress"), "progress",
NULL, NULL,
GTK_WIN_POS_NONE,
......@@ -158,26 +165,35 @@ progress_start (GimpDisplay *gdisp,
gtk_widget_show (progress->dialog);
}
progress_signal_setup (progress, cancel_callback, cancel_data);
gimp_progress_signal_setup (progress, cancel_callback, cancel_data);
return progress;
}
/* Update the message and/or the callbacks for a progress and reset
/**
* gimp_progress_restart:
* @progress: The #GimpProgress to restart.
* @message: The new message.
* @cancel_callback: The new cancel_callback
* @cancel_data: The new cancel_data
*
* Update the message and/or the callbacks for a progress and reset
* the bar to zero, with the minimum of disturbance to the user.
*/
*
* Return value: The same #GimpProgress as passed in as %progress.
**/
GimpProgress *
progress_restart (GimpProgress *progress,
const char *message,
GCallback cancel_callback,
gpointer cancel_data)
gimp_progress_restart (GimpProgress *progress,
const char *message,
GCallback cancel_callback,
gpointer cancel_data)
{
GtkWidget *bar;
g_return_val_if_fail (progress != NULL, progress);
g_return_val_if_fail (progress != NULL, NULL);
/* change the message */
/* change the message */
if (progress->gdisp)
{
GimpDisplayShell *shell;
......@@ -201,19 +217,19 @@ progress_restart (GimpProgress *progress,
bar = progress->progressbar;
}
/* reset the progress bar */
/* reset the progress bar */
gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (bar), 0.0);
/* do we need to change the callbacks? */
progress_signal_setup (progress, cancel_callback, cancel_data);
/* do we need to change the callbacks? */
gimp_progress_signal_setup (progress, cancel_callback, cancel_data);
return progress;
}
void
progress_update (GimpProgress *progress,
gdouble percentage)
gimp_progress_update (GimpProgress *progress,
gdouble percentage)
{
GtkWidget *bar;
......@@ -222,7 +238,7 @@ progress_update (GimpProgress *progress,
if (percentage < 0.0 || percentage > 1.0)
return;
/* do we have a dialog box, or are we using the statusbar? */
/* do we have a dialog box, or are we using the statusbar? */
if (progress->gdisp)
{
GimpDisplayShell *shell;
......@@ -240,9 +256,14 @@ progress_update (GimpProgress *progress,
}
/* Step the progress bar by one percent, wrapping at 100% */
/**
* gimp_progress_step:
* @progress: The #GimpProgress.
*
* Step the progress bar by one percent, wrapping at 100%
**/
void
progress_step (GimpProgress *progress)
gimp_progress_step (GimpProgress *progress)
{
GtkWidget *bar;
gdouble val;
......@@ -254,6 +275,7 @@ progress_step (GimpProgress *progress)
GimpDisplayShell *shell;
shell = GIMP_DISPLAY_SHELL (progress->gdisp->shell);
bar = GIMP_STATUSBAR (shell->statusbar)->progressbar;
}
else
......@@ -265,20 +287,25 @@ progress_step (GimpProgress *progress)
if (val > 1.0)
val = 0.0;
progress_update (progress, val);
gimp_progress_update (progress, val);
}
/* Finish using the progress bar "p" */
/**
* gimp_progress_end:
* @progress: The #GimpProgress.
*
* Finish using the progress bar.
**/
void
progress_end (GimpProgress *progress)
gimp_progress_end (GimpProgress *progress)
{
g_return_if_fail (progress != NULL);
/* remove all callbacks so they don't get called while we're
* destroying widgets
*/
progress_signal_setup (progress, NULL, NULL);
gimp_progress_signal_setup (progress, NULL, NULL);
if (progress->gdisp)
{
......@@ -305,27 +332,41 @@ progress_end (GimpProgress *progress)
}
/* This function's prototype is conveniently the same as progress_func_t */
/* This function's prototype is conveniently
* the same as progress_func_t
*/
/**
* gimp_progress_update_and_flush:
* @min: The minimum, ...
* @max: ... the maximum, ...
* @curr: ... and the current progress of your operation.
* @data: The #GimpProgress you want to update.
*
* This function's prototype is conveniently
* the same as #GimpProgressFunc from libgimpcolor.
**/
void
progress_update_and_flush (gint ymin,
gint ymax,
gint curr_y,
gpointer data)
gimp_progress_update_and_flush (gint min,
gint max,
gint curr,
gpointer data)
{
progress_update ((GimpProgress *) data,
(float)(curr_y - ymin) / (float)(ymax - ymin));
gimp_progress_update ((GimpProgress *) data,
(gfloat) (curr - min) / (gfloat) (max - min));
/* HACK until we do long-running operations in the gtk idle thread */
while (gtk_events_pending())
gtk_main_iteration();
while (gtk_events_pending ())
gtk_main_iteration ();
}
/* Helper function to add or remove signals */
/* private functions */
/* Helper function to add or remove signals */
static void
progress_signal_setup (GimpProgress *progress,
GCallback cancel_callback,
gpointer cancel_data)
gimp_progress_signal_setup (GimpProgress *progress,
GCallback cancel_callback,
gpointer cancel_data)
{
GtkWidget *button;
GtkWidget *dialog;
......
......@@ -19,28 +19,25 @@
#ifndef __GIMP_PROGRESS_H__
#define __GIMP_PROGRESS_H__
/* Progress bars for use internally by the main GIMP application. */
GimpProgress * gimp_progress_start (GimpDisplay *gdisp,
const gchar *message,
gboolean important,
GCallback cancel_callback,
gpointer cancel_data);
GimpProgress * gimp_progress_restart (GimpProgress *progress,
const gchar *message,
GCallback cancel_callback,
gpointer cancel_data);
void gimp_progress_update (GimpProgress *progress,
gdouble percentage);
void gimp_progress_step (GimpProgress *progress);
void gimp_progress_end (GimpProgress *progress);
/* functions */
GimpProgress * progress_start (GimpDisplay *gdisp,
const gchar *message,
gboolean important,
GCallback cancel_callback,
gpointer cancel_data);
GimpProgress * progress_restart (GimpProgress *progress,
const gchar *message,
GCallback cancel_callback,
gpointer cancel_data);
void progress_update (GimpProgress *progress,
gdouble percentage);
void progress_step (GimpProgress *progress);
void progress_end (GimpProgress *progress);
void progress_update_and_flush (gint ymin,
gint ymax,
gint curr_x,
gpointer data);
void gimp_progress_update_and_flush (gint ymin,
gint ymax,
gint curr_x,
gpointer data);
#endif /* __GIMP_PROGRESS_H__ */
/* 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.
*/
#include "config.h"
#include <gtk/gtk.h>
#include "libgimpwidgets/gimpwidgets.h"
#include "display/display-types.h"
#include "display/gimpdisplay.h"
#include "display/gimpdisplayshell.h"
#include "display/gimpstatusbar.h"
#include "gimpprogress.h"
#include "libgimp/gimpintl.h"
struct _GimpProgress
{
GimpDisplay *gdisp; /* gdisp in use, or NULL*/
/* next four fields are only valid if gdisp is NULL */
GtkWidget *dialog; /* progress dialog, NULL if using gdisp */
GtkWidget *dialog_label;
GtkWidget *progressbar;
GtkWidget *cancelbutton;
GCallback cancel_callback; /* callback to remove, or NULL */
gpointer cancel_data;
};
/* prototypes */
static void progress_signal_setup (GimpProgress *progress,
GCallback cancel_callback,
gpointer cancel_data);
/* These progress bar routines are re-entrant, and so should be
* thread-safe.
*/
/* Start a progress bar on "gdisp" with reason "message". If "gdisp"
* is NULL, the progress bar is presented in a new dialog box. If
* "message" is NULL, then no message is used.
*
* If "cancel_callback" is not NULL, it is attached to the progress
* bar cancel button's "clicked" signal, with data "cancel_data". The
* cancel button is only made sensitive if the callback is set.
*
* It is an error to progress_start() a bar on a "gdisp" for which
* there is already a progress bar active.
*
* Progress bars with "important" set to TRUE will be shown to the
* user in any possible way. Unimportant progress bars will not be
* shown to the user if it would mean creating a new window.
*/
GimpProgress *
progress_start (GimpDisplay *gdisp,
const gchar *message,
gboolean important,
GCallback cancel_callback,
gpointer cancel_data)
{
GimpDisplayShell *shell = NULL;
GimpProgress *progress;
GtkWidget *vbox;
if (gdisp)
shell = GIMP_DISPLAY_SHELL (gdisp->shell);
progress = g_new0 (GimpProgress, 1);
progress->gdisp = gdisp;
progress->dialog = NULL;
progress->cancel_callback = NULL;
progress->cancel_data = NULL;
/* do we have a useful gdisplay and statusarea? */
if (gdisp && GTK_WIDGET_VISIBLE (shell->statusbar))
{