Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
GNOME
GIMP
Commits
fb8a4ebe
Commit
fb8a4ebe
authored
Aug 13, 1998
by
Sven Neumann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
A few fixes here and there...
--Sven
parent
794931f0
Changes
29
Hide whitespace changes
Inline
Side-by-side
Showing
29 changed files
with
135 additions
and
74 deletions
+135
-74
ChangeLog
ChangeLog
+10
-0
app/actions/plug-in-commands.c
app/actions/plug-in-commands.c
+5
-3
app/color_area.c
app/color_area.c
+1
-1
app/core/gimplist.c
app/core/gimplist.c
+2
-1
app/core/gimpprojection.c
app/core/gimpprojection.c
+6
-3
app/display/gimpdisplay.c
app/display/gimpdisplay.c
+6
-3
app/gdisplay.c
app/gdisplay.c
+6
-3
app/gimplist.c
app/gimplist.c
+2
-1
app/gui/color-area.c
app/gui/color-area.c
+1
-1
app/gui/plug-in-commands.c
app/gui/plug-in-commands.c
+5
-3
app/gui/plug-in-menus.c
app/gui/plug-in-menus.c
+5
-3
app/menus/plug-in-menus.c
app/menus/plug-in-menus.c
+5
-3
app/plug-in/gimpplugin-message.c
app/plug-in/gimpplugin-message.c
+5
-3
app/plug-in/gimpplugin-progress.c
app/plug-in/gimpplugin-progress.c
+5
-3
app/plug-in/gimpplugin.c
app/plug-in/gimpplugin.c
+5
-3
app/plug-in/gimppluginmanager-call.c
app/plug-in/gimppluginmanager-call.c
+5
-3
app/plug-in/gimppluginmanager-run.c
app/plug-in/gimppluginmanager-run.c
+5
-3
app/plug-in/gimppluginmanager.c
app/plug-in/gimppluginmanager.c
+5
-3
app/plug-in/gimppluginshm.c
app/plug-in/gimppluginshm.c
+5
-3
app/plug-in/plug-in-def.c
app/plug-in/plug-in-def.c
+5
-3
app/plug-in/plug-in-message.c
app/plug-in/plug-in-message.c
+5
-3
app/plug-in/plug-in-params.c
app/plug-in/plug-in-params.c
+5
-3
app/plug-in/plug-in-progress.c
app/plug-in/plug-in-progress.c
+5
-3
app/plug-in/plug-in-run.c
app/plug-in/plug-in-run.c
+5
-3
app/plug-in/plug-in-shm.c
app/plug-in/plug-in-shm.c
+5
-3
app/plug-in/plug-in.c
app/plug-in/plug-in.c
+5
-3
app/plug-in/plug-ins.c
app/plug-in/plug-ins.c
+5
-3
app/plug_in.c
app/plug_in.c
+5
-3
app/widgets/gimptoolbox-color-area.c
app/widgets/gimptoolbox-color-area.c
+1
-1
No files found.
ChangeLog
View file @
fb8a4ebe
Thu Aug 13 20:48:48 MEST 1998 Sven Neumann <sven@gimp.org>
* app/color_area.c: Add event-masks so the tooltip is shown.
* app/gdisplay.c
* app/plug_in.c: Check range of progress-percentage to avoid
warnings.
* app/gimplist.c: Include stdio.h to fix compiler warning.
Thu Aug 13 11:32:04 MEST 1998 Sven Neumann <sven@gimp.org>
* app/app_procs.c
...
...
app/actions/plug-in-commands.c
View file @
fb8a4ebe
...
...
@@ -3086,15 +3086,17 @@ plug_in_progress_update (PlugIn *plug_in,
if
(
plug_in
->
progress_gdisp_ID
>
0
)
{
gdisp
=
gdisplay_get_ID
(
plug_in
->
progress_gdisp_ID
);
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
gdisp
->
progressbar
),
percentage
);
if
(
percentage
>=
0
.
0
&&
percentage
<=
1
.
0
)
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
gdisp
->
progressbar
),
percentage
);
}
else
{
#ifdef SEPARATE_PROGRESS_BAR
if
(
!
plug_in
->
progress
)
plug_in_progress_init
(
plug_in
,
NULL
,
-
1
);
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
plug_in
->
progress_bar
),
percentage
);
if
(
percentage
>=
0
.
0
&&
percentage
<=
1
.
0
)
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
plug_in
->
progress_bar
),
percentage
);
#else
progress_update
(
percentage
);
#endif
...
...
app/color_area.c
View file @
fb8a4ebe
...
...
@@ -276,7 +276,7 @@ color_area_create (int width,
{
color_area
=
gtk_drawing_area_new
();
gtk_drawing_area_size
(
GTK_DRAWING_AREA
(
color_area
),
width
,
height
);
gtk_widget_set_events
(
color_area
,
GDK_EXPOSURE_MASK
|
GDK_BUTTON_PRESS_MASK
);
gtk_widget_set_events
(
color_area
,
GDK_EXPOSURE_MASK
|
GDK_BUTTON_PRESS_MASK
|
GDK_ENTER_NOTIFY_MASK
|
GDK_LEAVE_NOTIFY_MASK
);
gtk_signal_connect
(
GTK_OBJECT
(
color_area
),
"event"
,
(
GtkSignalFunc
)
color_area_events
,
NULL
);
...
...
app/core/gimplist.c
View file @
fb8a4ebe
...
...
@@ -15,6 +15,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include <stdio.h>
#include "gimpsignal.h"
#include "gimplistP.h"
...
...
@@ -144,7 +145,7 @@ gimp_list_remove (GimpList* list, gpointer val)
if
(
!
g_slist_find
(
list
->
list
,
val
))
{
printf
(
"
can't find val
\n
"
);
f
printf
(
stderr
,
"gimp_list_remove:
can't find val
\n
"
);
return
FALSE
;
}
GIMP_LIST_CLASS
(
GTK_OBJECT
(
list
)
->
klass
)
->
remove
(
list
,
val
);
...
...
app/core/gimpprojection.c
View file @
fb8a4ebe
...
...
@@ -364,7 +364,6 @@ gdisplay_flush (GDisplay *gdisp)
(
void
*
)
gdisp
);
}
void
gdisplay_draw_guides
(
GDisplay
*
gdisp
)
{
...
...
@@ -668,6 +667,7 @@ gdisplay_update_cursor (GDisplay *gdisp, int x, int y)
int
new_cursor
;
char
buffer
[
CURSOR_STR_LENGTH
];
int
t_x
,
t_y
;
GimpDrawable
*
active_drawable
;
new_cursor
=
gdisp
->
draw_cursor
&&
gdisp
->
proximity
;
...
...
@@ -688,7 +688,9 @@ gdisplay_update_cursor (GDisplay *gdisp, int x, int y)
gdisplay_untransform_coords
(
gdisp
,
x
,
y
,
&
t_x
,
&
t_y
,
TRUE
,
TRUE
);
if
(
t_x
<
0
||
t_y
<
0
||
t_x
>
gdisp
->
gimage
->
width
||
t_y
>
gdisp
->
gimage
->
height
)
active_drawable
=
gimp_image_active_drawable
(
gdisp
->
gimage
);
if
(
t_x
<
0
||
t_y
<
0
||
t_x
>
active_drawable
->
width
||
t_y
>
active_drawable
->
height
)
{
gtk_label_set
(
GTK_LABEL
(
gdisp
->
cursor_label
),
""
);
}
...
...
@@ -1202,7 +1204,8 @@ gdisplay_active ()
/* If the popup shell is valid, then get the gdisplay associated with that shell */
event
=
gtk_get_current_event
();
event_widget
=
gtk_get_event_widget
(
event
);
gdk_event_free
(
event
);
if
(
event
!=
NULL
)
gdk_event_free
(
event
);
if
(
event_widget
==
NULL
)
return
NULL
;
...
...
app/display/gimpdisplay.c
View file @
fb8a4ebe
...
...
@@ -364,7 +364,6 @@ gdisplay_flush (GDisplay *gdisp)
(
void
*
)
gdisp
);
}
void
gdisplay_draw_guides
(
GDisplay
*
gdisp
)
{
...
...
@@ -668,6 +667,7 @@ gdisplay_update_cursor (GDisplay *gdisp, int x, int y)
int
new_cursor
;
char
buffer
[
CURSOR_STR_LENGTH
];
int
t_x
,
t_y
;
GimpDrawable
*
active_drawable
;
new_cursor
=
gdisp
->
draw_cursor
&&
gdisp
->
proximity
;
...
...
@@ -688,7 +688,9 @@ gdisplay_update_cursor (GDisplay *gdisp, int x, int y)
gdisplay_untransform_coords
(
gdisp
,
x
,
y
,
&
t_x
,
&
t_y
,
TRUE
,
TRUE
);
if
(
t_x
<
0
||
t_y
<
0
||
t_x
>
gdisp
->
gimage
->
width
||
t_y
>
gdisp
->
gimage
->
height
)
active_drawable
=
gimp_image_active_drawable
(
gdisp
->
gimage
);
if
(
t_x
<
0
||
t_y
<
0
||
t_x
>
active_drawable
->
width
||
t_y
>
active_drawable
->
height
)
{
gtk_label_set
(
GTK_LABEL
(
gdisp
->
cursor_label
),
""
);
}
...
...
@@ -1202,7 +1204,8 @@ gdisplay_active ()
/* If the popup shell is valid, then get the gdisplay associated with that shell */
event
=
gtk_get_current_event
();
event_widget
=
gtk_get_event_widget
(
event
);
gdk_event_free
(
event
);
if
(
event
!=
NULL
)
gdk_event_free
(
event
);
if
(
event_widget
==
NULL
)
return
NULL
;
...
...
app/gdisplay.c
View file @
fb8a4ebe
...
...
@@ -364,7 +364,6 @@ gdisplay_flush (GDisplay *gdisp)
(
void
*
)
gdisp
);
}
void
gdisplay_draw_guides
(
GDisplay
*
gdisp
)
{
...
...
@@ -668,6 +667,7 @@ gdisplay_update_cursor (GDisplay *gdisp, int x, int y)
int
new_cursor
;
char
buffer
[
CURSOR_STR_LENGTH
];
int
t_x
,
t_y
;
GimpDrawable
*
active_drawable
;
new_cursor
=
gdisp
->
draw_cursor
&&
gdisp
->
proximity
;
...
...
@@ -688,7 +688,9 @@ gdisplay_update_cursor (GDisplay *gdisp, int x, int y)
gdisplay_untransform_coords
(
gdisp
,
x
,
y
,
&
t_x
,
&
t_y
,
TRUE
,
TRUE
);
if
(
t_x
<
0
||
t_y
<
0
||
t_x
>
gdisp
->
gimage
->
width
||
t_y
>
gdisp
->
gimage
->
height
)
active_drawable
=
gimp_image_active_drawable
(
gdisp
->
gimage
);
if
(
t_x
<
0
||
t_y
<
0
||
t_x
>
active_drawable
->
width
||
t_y
>
active_drawable
->
height
)
{
gtk_label_set
(
GTK_LABEL
(
gdisp
->
cursor_label
),
""
);
}
...
...
@@ -1202,7 +1204,8 @@ gdisplay_active ()
/* If the popup shell is valid, then get the gdisplay associated with that shell */
event
=
gtk_get_current_event
();
event_widget
=
gtk_get_event_widget
(
event
);
gdk_event_free
(
event
);
if
(
event
!=
NULL
)
gdk_event_free
(
event
);
if
(
event_widget
==
NULL
)
return
NULL
;
...
...
app/gimplist.c
View file @
fb8a4ebe
...
...
@@ -15,6 +15,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include <stdio.h>
#include "gimpsignal.h"
#include "gimplistP.h"
...
...
@@ -144,7 +145,7 @@ gimp_list_remove (GimpList* list, gpointer val)
if
(
!
g_slist_find
(
list
->
list
,
val
))
{
printf
(
"
can't find val
\n
"
);
f
printf
(
stderr
,
"gimp_list_remove:
can't find val
\n
"
);
return
FALSE
;
}
GIMP_LIST_CLASS
(
GTK_OBJECT
(
list
)
->
klass
)
->
remove
(
list
,
val
);
...
...
app/gui/color-area.c
View file @
fb8a4ebe
...
...
@@ -276,7 +276,7 @@ color_area_create (int width,
{
color_area
=
gtk_drawing_area_new
();
gtk_drawing_area_size
(
GTK_DRAWING_AREA
(
color_area
),
width
,
height
);
gtk_widget_set_events
(
color_area
,
GDK_EXPOSURE_MASK
|
GDK_BUTTON_PRESS_MASK
);
gtk_widget_set_events
(
color_area
,
GDK_EXPOSURE_MASK
|
GDK_BUTTON_PRESS_MASK
|
GDK_ENTER_NOTIFY_MASK
|
GDK_LEAVE_NOTIFY_MASK
);
gtk_signal_connect
(
GTK_OBJECT
(
color_area
),
"event"
,
(
GtkSignalFunc
)
color_area_events
,
NULL
);
...
...
app/gui/plug-in-commands.c
View file @
fb8a4ebe
...
...
@@ -3086,15 +3086,17 @@ plug_in_progress_update (PlugIn *plug_in,
if
(
plug_in
->
progress_gdisp_ID
>
0
)
{
gdisp
=
gdisplay_get_ID
(
plug_in
->
progress_gdisp_ID
);
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
gdisp
->
progressbar
),
percentage
);
if
(
percentage
>=
0
.
0
&&
percentage
<=
1
.
0
)
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
gdisp
->
progressbar
),
percentage
);
}
else
{
#ifdef SEPARATE_PROGRESS_BAR
if
(
!
plug_in
->
progress
)
plug_in_progress_init
(
plug_in
,
NULL
,
-
1
);
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
plug_in
->
progress_bar
),
percentage
);
if
(
percentage
>=
0
.
0
&&
percentage
<=
1
.
0
)
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
plug_in
->
progress_bar
),
percentage
);
#else
progress_update
(
percentage
);
#endif
...
...
app/gui/plug-in-menus.c
View file @
fb8a4ebe
...
...
@@ -3086,15 +3086,17 @@ plug_in_progress_update (PlugIn *plug_in,
if
(
plug_in
->
progress_gdisp_ID
>
0
)
{
gdisp
=
gdisplay_get_ID
(
plug_in
->
progress_gdisp_ID
);
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
gdisp
->
progressbar
),
percentage
);
if
(
percentage
>=
0
.
0
&&
percentage
<=
1
.
0
)
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
gdisp
->
progressbar
),
percentage
);
}
else
{
#ifdef SEPARATE_PROGRESS_BAR
if
(
!
plug_in
->
progress
)
plug_in_progress_init
(
plug_in
,
NULL
,
-
1
);
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
plug_in
->
progress_bar
),
percentage
);
if
(
percentage
>=
0
.
0
&&
percentage
<=
1
.
0
)
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
plug_in
->
progress_bar
),
percentage
);
#else
progress_update
(
percentage
);
#endif
...
...
app/menus/plug-in-menus.c
View file @
fb8a4ebe
...
...
@@ -3086,15 +3086,17 @@ plug_in_progress_update (PlugIn *plug_in,
if
(
plug_in
->
progress_gdisp_ID
>
0
)
{
gdisp
=
gdisplay_get_ID
(
plug_in
->
progress_gdisp_ID
);
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
gdisp
->
progressbar
),
percentage
);
if
(
percentage
>=
0
.
0
&&
percentage
<=
1
.
0
)
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
gdisp
->
progressbar
),
percentage
);
}
else
{
#ifdef SEPARATE_PROGRESS_BAR
if
(
!
plug_in
->
progress
)
plug_in_progress_init
(
plug_in
,
NULL
,
-
1
);
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
plug_in
->
progress_bar
),
percentage
);
if
(
percentage
>=
0
.
0
&&
percentage
<=
1
.
0
)
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
plug_in
->
progress_bar
),
percentage
);
#else
progress_update
(
percentage
);
#endif
...
...
app/plug-in/gimpplugin-message.c
View file @
fb8a4ebe
...
...
@@ -3086,15 +3086,17 @@ plug_in_progress_update (PlugIn *plug_in,
if
(
plug_in
->
progress_gdisp_ID
>
0
)
{
gdisp
=
gdisplay_get_ID
(
plug_in
->
progress_gdisp_ID
);
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
gdisp
->
progressbar
),
percentage
);
if
(
percentage
>=
0
.
0
&&
percentage
<=
1
.
0
)
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
gdisp
->
progressbar
),
percentage
);
}
else
{
#ifdef SEPARATE_PROGRESS_BAR
if
(
!
plug_in
->
progress
)
plug_in_progress_init
(
plug_in
,
NULL
,
-
1
);
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
plug_in
->
progress_bar
),
percentage
);
if
(
percentage
>=
0
.
0
&&
percentage
<=
1
.
0
)
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
plug_in
->
progress_bar
),
percentage
);
#else
progress_update
(
percentage
);
#endif
...
...
app/plug-in/gimpplugin-progress.c
View file @
fb8a4ebe
...
...
@@ -3086,15 +3086,17 @@ plug_in_progress_update (PlugIn *plug_in,
if
(
plug_in
->
progress_gdisp_ID
>
0
)
{
gdisp
=
gdisplay_get_ID
(
plug_in
->
progress_gdisp_ID
);
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
gdisp
->
progressbar
),
percentage
);
if
(
percentage
>=
0
.
0
&&
percentage
<=
1
.
0
)
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
gdisp
->
progressbar
),
percentage
);
}
else
{
#ifdef SEPARATE_PROGRESS_BAR
if
(
!
plug_in
->
progress
)
plug_in_progress_init
(
plug_in
,
NULL
,
-
1
);
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
plug_in
->
progress_bar
),
percentage
);
if
(
percentage
>=
0
.
0
&&
percentage
<=
1
.
0
)
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
plug_in
->
progress_bar
),
percentage
);
#else
progress_update
(
percentage
);
#endif
...
...
app/plug-in/gimpplugin.c
View file @
fb8a4ebe
...
...
@@ -3086,15 +3086,17 @@ plug_in_progress_update (PlugIn *plug_in,
if
(
plug_in
->
progress_gdisp_ID
>
0
)
{
gdisp
=
gdisplay_get_ID
(
plug_in
->
progress_gdisp_ID
);
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
gdisp
->
progressbar
),
percentage
);
if
(
percentage
>=
0
.
0
&&
percentage
<=
1
.
0
)
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
gdisp
->
progressbar
),
percentage
);
}
else
{
#ifdef SEPARATE_PROGRESS_BAR
if
(
!
plug_in
->
progress
)
plug_in_progress_init
(
plug_in
,
NULL
,
-
1
);
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
plug_in
->
progress_bar
),
percentage
);
if
(
percentage
>=
0
.
0
&&
percentage
<=
1
.
0
)
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
plug_in
->
progress_bar
),
percentage
);
#else
progress_update
(
percentage
);
#endif
...
...
app/plug-in/gimppluginmanager-call.c
View file @
fb8a4ebe
...
...
@@ -3086,15 +3086,17 @@ plug_in_progress_update (PlugIn *plug_in,
if
(
plug_in
->
progress_gdisp_ID
>
0
)
{
gdisp
=
gdisplay_get_ID
(
plug_in
->
progress_gdisp_ID
);
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
gdisp
->
progressbar
),
percentage
);
if
(
percentage
>=
0
.
0
&&
percentage
<=
1
.
0
)
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
gdisp
->
progressbar
),
percentage
);
}
else
{
#ifdef SEPARATE_PROGRESS_BAR
if
(
!
plug_in
->
progress
)
plug_in_progress_init
(
plug_in
,
NULL
,
-
1
);
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
plug_in
->
progress_bar
),
percentage
);
if
(
percentage
>=
0
.
0
&&
percentage
<=
1
.
0
)
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
plug_in
->
progress_bar
),
percentage
);
#else
progress_update
(
percentage
);
#endif
...
...
app/plug-in/gimppluginmanager-run.c
View file @
fb8a4ebe
...
...
@@ -3086,15 +3086,17 @@ plug_in_progress_update (PlugIn *plug_in,
if
(
plug_in
->
progress_gdisp_ID
>
0
)
{
gdisp
=
gdisplay_get_ID
(
plug_in
->
progress_gdisp_ID
);
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
gdisp
->
progressbar
),
percentage
);
if
(
percentage
>=
0
.
0
&&
percentage
<=
1
.
0
)
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
gdisp
->
progressbar
),
percentage
);
}
else
{
#ifdef SEPARATE_PROGRESS_BAR
if
(
!
plug_in
->
progress
)
plug_in_progress_init
(
plug_in
,
NULL
,
-
1
);
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
plug_in
->
progress_bar
),
percentage
);
if
(
percentage
>=
0
.
0
&&
percentage
<=
1
.
0
)
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
plug_in
->
progress_bar
),
percentage
);
#else
progress_update
(
percentage
);
#endif
...
...
app/plug-in/gimppluginmanager.c
View file @
fb8a4ebe
...
...
@@ -3086,15 +3086,17 @@ plug_in_progress_update (PlugIn *plug_in,
if
(
plug_in
->
progress_gdisp_ID
>
0
)
{
gdisp
=
gdisplay_get_ID
(
plug_in
->
progress_gdisp_ID
);
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
gdisp
->
progressbar
),
percentage
);
if
(
percentage
>=
0
.
0
&&
percentage
<=
1
.
0
)
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
gdisp
->
progressbar
),
percentage
);
}
else
{
#ifdef SEPARATE_PROGRESS_BAR
if
(
!
plug_in
->
progress
)
plug_in_progress_init
(
plug_in
,
NULL
,
-
1
);
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
plug_in
->
progress_bar
),
percentage
);
if
(
percentage
>=
0
.
0
&&
percentage
<=
1
.
0
)
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
plug_in
->
progress_bar
),
percentage
);
#else
progress_update
(
percentage
);
#endif
...
...
app/plug-in/gimppluginshm.c
View file @
fb8a4ebe
...
...
@@ -3086,15 +3086,17 @@ plug_in_progress_update (PlugIn *plug_in,
if
(
plug_in
->
progress_gdisp_ID
>
0
)
{
gdisp
=
gdisplay_get_ID
(
plug_in
->
progress_gdisp_ID
);
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
gdisp
->
progressbar
),
percentage
);
if
(
percentage
>=
0
.
0
&&
percentage
<=
1
.
0
)
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
gdisp
->
progressbar
),
percentage
);
}
else
{
#ifdef SEPARATE_PROGRESS_BAR
if
(
!
plug_in
->
progress
)
plug_in_progress_init
(
plug_in
,
NULL
,
-
1
);
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
plug_in
->
progress_bar
),
percentage
);
if
(
percentage
>=
0
.
0
&&
percentage
<=
1
.
0
)
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
plug_in
->
progress_bar
),
percentage
);
#else
progress_update
(
percentage
);
#endif
...
...
app/plug-in/plug-in-def.c
View file @
fb8a4ebe
...
...
@@ -3086,15 +3086,17 @@ plug_in_progress_update (PlugIn *plug_in,
if
(
plug_in
->
progress_gdisp_ID
>
0
)
{
gdisp
=
gdisplay_get_ID
(
plug_in
->
progress_gdisp_ID
);
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
gdisp
->
progressbar
),
percentage
);
if
(
percentage
>=
0
.
0
&&
percentage
<=
1
.
0
)
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
gdisp
->
progressbar
),
percentage
);
}
else
{
#ifdef SEPARATE_PROGRESS_BAR
if
(
!
plug_in
->
progress
)
plug_in_progress_init
(
plug_in
,
NULL
,
-
1
);
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
plug_in
->
progress_bar
),
percentage
);
if
(
percentage
>=
0
.
0
&&
percentage
<=
1
.
0
)
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
plug_in
->
progress_bar
),
percentage
);
#else
progress_update
(
percentage
);
#endif
...
...
app/plug-in/plug-in-message.c
View file @
fb8a4ebe
...
...
@@ -3086,15 +3086,17 @@ plug_in_progress_update (PlugIn *plug_in,
if
(
plug_in
->
progress_gdisp_ID
>
0
)
{
gdisp
=
gdisplay_get_ID
(
plug_in
->
progress_gdisp_ID
);
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
gdisp
->
progressbar
),
percentage
);
if
(
percentage
>=
0
.
0
&&
percentage
<=
1
.
0
)
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
gdisp
->
progressbar
),
percentage
);
}
else
{
#ifdef SEPARATE_PROGRESS_BAR
if
(
!
plug_in
->
progress
)
plug_in_progress_init
(
plug_in
,
NULL
,
-
1
);
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
plug_in
->
progress_bar
),
percentage
);
if
(
percentage
>=
0
.
0
&&
percentage
<=
1
.
0
)
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
plug_in
->
progress_bar
),
percentage
);
#else
progress_update
(
percentage
);
#endif
...
...
app/plug-in/plug-in-params.c
View file @
fb8a4ebe
...
...
@@ -3086,15 +3086,17 @@ plug_in_progress_update (PlugIn *plug_in,
if
(
plug_in
->
progress_gdisp_ID
>
0
)
{
gdisp
=
gdisplay_get_ID
(
plug_in
->
progress_gdisp_ID
);
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
gdisp
->
progressbar
),
percentage
);
if
(
percentage
>=
0
.
0
&&
percentage
<=
1
.
0
)
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
gdisp
->
progressbar
),
percentage
);
}
else
{
#ifdef SEPARATE_PROGRESS_BAR
if
(
!
plug_in
->
progress
)
plug_in_progress_init
(
plug_in
,
NULL
,
-
1
);
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
plug_in
->
progress_bar
),
percentage
);
if
(
percentage
>=
0
.
0
&&
percentage
<=
1
.
0
)
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
plug_in
->
progress_bar
),
percentage
);
#else
progress_update
(
percentage
);
#endif
...
...
app/plug-in/plug-in-progress.c
View file @
fb8a4ebe
...
...
@@ -3086,15 +3086,17 @@ plug_in_progress_update (PlugIn *plug_in,
if
(
plug_in
->
progress_gdisp_ID
>
0
)
{
gdisp
=
gdisplay_get_ID
(
plug_in
->
progress_gdisp_ID
);
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
gdisp
->
progressbar
),
percentage
);
if
(
percentage
>=
0
.
0
&&
percentage
<=
1
.
0
)
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
gdisp
->
progressbar
),
percentage
);
}
else
{
#ifdef SEPARATE_PROGRESS_BAR
if
(
!
plug_in
->
progress
)
plug_in_progress_init
(
plug_in
,
NULL
,
-
1
);
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
plug_in
->
progress_bar
),
percentage
);
if
(
percentage
>=
0
.
0
&&
percentage
<=
1
.
0
)
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
plug_in
->
progress_bar
),
percentage
);
#else
progress_update
(
percentage
);
#endif
...
...
app/plug-in/plug-in-run.c
View file @
fb8a4ebe
...
...
@@ -3086,15 +3086,17 @@ plug_in_progress_update (PlugIn *plug_in,
if
(
plug_in
->
progress_gdisp_ID
>
0
)
{
gdisp
=
gdisplay_get_ID
(
plug_in
->
progress_gdisp_ID
);
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
gdisp
->
progressbar
),
percentage
);
if
(
percentage
>=
0
.
0
&&
percentage
<=
1
.
0
)
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
gdisp
->
progressbar
),
percentage
);
}
else
{
#ifdef SEPARATE_PROGRESS_BAR
if
(
!
plug_in
->
progress
)
plug_in_progress_init
(
plug_in
,
NULL
,
-
1
);
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
plug_in
->
progress_bar
),
percentage
);
if
(
percentage
>=
0
.
0
&&
percentage
<=
1
.
0
)
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
plug_in
->
progress_bar
),
percentage
);
#else
progress_update
(
percentage
);
#endif
...
...
app/plug-in/plug-in-shm.c
View file @
fb8a4ebe
...
...
@@ -3086,15 +3086,17 @@ plug_in_progress_update (PlugIn *plug_in,
if
(
plug_in
->
progress_gdisp_ID
>
0
)
{
gdisp
=
gdisplay_get_ID
(
plug_in
->
progress_gdisp_ID
);
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
gdisp
->
progressbar
),
percentage
);
if
(
percentage
>=
0
.
0
&&
percentage
<=
1
.
0
)
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
gdisp
->
progressbar
),
percentage
);
}
else
{
#ifdef SEPARATE_PROGRESS_BAR
if
(
!
plug_in
->
progress
)
plug_in_progress_init
(
plug_in
,
NULL
,
-
1
);
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
plug_in
->
progress_bar
),
percentage
);
if
(
percentage
>=
0
.
0
&&
percentage
<=
1
.
0
)
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
plug_in
->
progress_bar
),
percentage
);
#else
progress_update
(
percentage
);
#endif
...
...
app/plug-in/plug-in.c
View file @
fb8a4ebe
...
...
@@ -3086,15 +3086,17 @@ plug_in_progress_update (PlugIn *plug_in,
if
(
plug_in
->
progress_gdisp_ID
>
0
)
{
gdisp
=
gdisplay_get_ID
(
plug_in
->
progress_gdisp_ID
);
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
gdisp
->
progressbar
),
percentage
);
if
(
percentage
>=
0
.
0
&&
percentage
<=
1
.
0
)
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
gdisp
->
progressbar
),
percentage
);
}
else
{
#ifdef SEPARATE_PROGRESS_BAR
if
(
!
plug_in
->
progress
)
plug_in_progress_init
(
plug_in
,
NULL
,
-
1
);
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
plug_in
->
progress_bar
),
percentage
);
if
(
percentage
>=
0
.
0
&&
percentage
<=
1
.
0
)
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
plug_in
->
progress_bar
),
percentage
);
#else
progress_update
(
percentage
);
#endif
...
...
app/plug-in/plug-ins.c
View file @
fb8a4ebe
...
...
@@ -3086,15 +3086,17 @@ plug_in_progress_update (PlugIn *plug_in,
if
(
plug_in
->
progress_gdisp_ID
>
0
)
{
gdisp
=
gdisplay_get_ID
(
plug_in
->
progress_gdisp_ID
);
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
gdisp
->
progressbar
),
percentage
);
if
(
percentage
>=
0
.
0
&&
percentage
<=
1
.
0
)
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
gdisp
->
progressbar
),
percentage
);
}
else
{
#ifdef SEPARATE_PROGRESS_BAR
if
(
!
plug_in
->
progress
)
plug_in_progress_init
(
plug_in
,
NULL
,
-
1
);
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
plug_in
->
progress_bar
),
percentage
);
if
(
percentage
>=
0
.
0
&&
percentage
<=
1
.
0
)
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
plug_in
->
progress_bar
),
percentage
);
#else
progress_update
(
percentage
);
#endif
...
...
app/plug_in.c
View file @
fb8a4ebe
...
...
@@ -3086,15 +3086,17 @@ plug_in_progress_update (PlugIn *plug_in,
if
(
plug_in
->
progress_gdisp_ID
>
0
)
{
gdisp
=
gdisplay_get_ID
(
plug_in
->
progress_gdisp_ID
);
gtk_progress_bar_update
(
GTK_PROGRESS_BAR
(
gdisp
->
progressbar
),
percentage
);
if
(
percentage
>=
0
.
0
&&
percentage
<=
1
.
0
)