Skip to content
GitLab
Commit 401e04f4 authored by Elliot Lee's avatar Elliot Lee
Browse files

Nobody said anything, so I'm committing these initstatus changes

parent ef0cf0af
Expand all Hide whitespace changes
Inline Side-by-side
app/actions/plug-in-commands.c
View file @ 401e04f4
......@@ -34,6 +34,7 @@
#include "libgimp/gimpprotocol.h"
#include "libgimp/gimpwire.h"
#include "app_procs.h"
#include "appenv.h"
#include "drawable.h"
#include "datafiles.h"
......@@ -191,6 +192,7 @@ plug_in_init ()
GSList *tmp, *tmp2;
PlugInDef *plug_in_def;
PlugInProcDef *proc_def;
gfloat nplugins, nth;
/* initialize the progress init and update procedure db calls. */
procedural_db_register (&progress_init_proc);
......@@ -233,12 +235,16 @@ plug_in_init ()
/* read the pluginrc file for cached data */
sprintf (filename, "%s/pluginrc", gimp_directory ());
app_init_update_status("Resource configuration", filename, -1);
parse_gimprc_file (filename);
/* query any plug-ins that have changed since we last wrote out
* the pluginrc file.
*/
tmp = plug_in_defs;
app_init_update_status("Plug-ins", "", 0);
nplugins = g_slist_length(tmp);
nth = 0;
while (tmp)
{
plug_in_def = tmp->data;
......@@ -250,6 +256,8 @@ plug_in_init ()
g_print ("query plug-in: \"%s\"\n", plug_in_def->prog);
plug_in_query (plug_in_def->prog, plug_in_def);
}
app_init_update_status(NULL, plug_in_def->prog, nth/nplugins);
nth++;
}
/* insert the proc defs */
......@@ -294,6 +302,8 @@ plug_in_init ()
/* run the available extensions */
tmp = proc_defs;
g_print ("Starting extensions: ");
app_init_update_status("Extensions", "", 0);
nplugins = g_slist_length(tmp); nth = 0;
while (tmp)
{
proc_def = tmp->data;
......@@ -304,6 +314,8 @@ plug_in_init ()
(proc_def->db_info.proc_type == PDB_EXTENSION))
{
g_print ("%s ", proc_def->db_info.name);
app_init_update_status(NULL, proc_def->db_info.name,
nth/nplugins);
plug_in_run (&proc_def->db_info, NULL, FALSE, TRUE);
}
}
......
app/app_procs.c
View file @ 401e04f4
......@@ -53,12 +53,14 @@
#include "tools.h"
#include "undo.h"
#include "xcf.h"
#include <gtk/gtk.h>
/* Function prototype for affirmation dialog when exiting application */
static void app_exit_finish (void);
static void really_quit_dialog (void);
static Argument* quit_invoker (Argument *args);
static void make_initialization_status_window(void);
static void destroy_initialization_status_window(void);
static ProcArg quit_args[] =
......@@ -104,6 +106,97 @@ gimp_init (int gimp_argc,
batch_init ();
}
static GtkWidget *win_initstatus = NULL;
static GtkWidget *label1 = NULL;
static GtkWidget *label2 = NULL;
static GtkWidget *pbar = NULL;
static gint idle_tag = -1;
static void
destroy_initialization_status_window(void)
{
if(win_initstatus)
{
gtk_widget_destroy(win_initstatus);
win_initstatus = label1 = label2 = pbar = NULL;
gtk_idle_remove(idle_tag);
}
}
static void my_idle_proc(void)
{
/* Do nothing. This is needed to stop the GIMP
from blocking in gtk_main_iteration() */
}
static void
make_initialization_status_window(void)
{
if(no_interface == FALSE)
{
GtkWidget *vbox;
win_initstatus = gtk_window_new(GTK_WINDOW_DIALOG);
gtk_window_set_title(GTK_WINDOW(win_initstatus),
"GIMP Startup");
vbox = gtk_vbox_new(TRUE, 5);
gtk_container_add(GTK_CONTAINER(win_initstatus), vbox);
label1 = gtk_label_new("");
gtk_box_pack_start_defaults(GTK_BOX(vbox), label1);
label2 = gtk_label_new("");
gtk_box_pack_start_defaults(GTK_BOX(vbox), label2);
pbar = gtk_progress_bar_new();
gtk_box_pack_start_defaults(GTK_BOX(vbox), pbar);
gtk_widget_show(vbox);
gtk_widget_show(label1);
gtk_widget_show(label2);
gtk_widget_show(pbar);
gtk_window_position(GTK_WINDOW(win_initstatus),
GTK_WIN_POS_CENTER);
gtk_widget_show(win_initstatus);
}
}
void
app_init_update_status(char *label1val,
char *label2val,
float pct_progress)
{
if(no_interface == FALSE
&& win_initstatus)
{
GdkRectangle area = {0, 0, -1, -1};
if(label1val
&& strcmp(label1val, GTK_LABEL(label1)->label))
{
gtk_label_set(GTK_LABEL(label1), label1val);
}
if(label2val
&& strcmp(label2val, GTK_LABEL(label2)->label))
{
gtk_label_set(GTK_LABEL(label2), label2val);
}
if(pct_progress >= 0
&& GTK_PROGRESS_BAR(pbar)->percentage != pct_progress)
{
gtk_progress_bar_update(GTK_PROGRESS_BAR(pbar), pct_progress);
}
gtk_widget_draw(win_initstatus, &area);
idle_tag = gtk_idle_add(my_idle_proc, NULL);
gtk_main_iteration();
gtk_idle_remove(idle_tag);
}
}
/* #define RESET_BAR() app_init_update_status("", "", 0) */
#define RESET_BAR()
void
app_init ()
{
......@@ -111,13 +204,17 @@ app_init ()
char *gimp_dir;
char *path;
make_initialization_status_window();
/*
* Initialize the procedural database
* We need to do this first because any of the init
* procedures might install or query it as needed.
*/
procedural_db_init ();
RESET_BAR();
internal_procs_init ();
RESET_BAR();
procedural_db_register (&quit_proc);
gimp_dir = gimp_directory ();
......@@ -125,20 +222,30 @@ app_init ()
{
sprintf (filename, "%s/gtkrc", gimp_dir);
g_print ("parsing \"%s\"\n", filename);
app_init_update_status("Resource configuration", filename, -1);
gtk_rc_parse (filename);
}
RESET_BAR();
file_ops_pre_init (); /* pre-initialize the file types */
RESET_BAR();
xcf_init (); /* initialize the xcf file format routines */
RESET_BAR();
parse_gimprc (); /* parse the local GIMP configuration file */
if (no_data == FALSE)
{
RESET_BAR();
brushes_init (); /* initialize the list of gimp brushes */
RESET_BAR();
patterns_init (); /* initialize the list of gimp patterns */
RESET_BAR();
palettes_init (); /* initialize the list of gimp palettes */
RESET_BAR();
gradients_init (); /* initialize the list of gimp gradients */
}
RESET_BAR();
plug_in_init (); /* initialize the plug in structures */
RESET_BAR();
file_ops_post_init (); /* post-initialize the file types */
/* Add the swap file */
......@@ -149,6 +256,8 @@ app_init ()
tile_swap_add (path, NULL, NULL);
g_free (path);
destroy_initialization_status_window();
/* Things to do only if there is an interface */
if (no_interface == FALSE)
{
......@@ -166,6 +275,7 @@ app_init ()
get_active_brush ();
get_active_pattern ();
paint_funcs_setup ();
}
static void
......
app/app_procs.h
View file @ 401e04f4
......@@ -22,5 +22,6 @@
void gimp_init (int, char **);
void app_init (void);
void app_exit (int);
void app_init_update_status(char *label1val, char *label2val, float pct_progress);
#endif /* APP_PROCS_H */
app/gimprc.c
View file @ 401e04f4
......@@ -22,6 +22,7 @@
#include <errno.h>
#include <sys/stat.h>
#include "app_procs.h"
#include "appenv.h"
#include "errors.h"
#include "fileops.h"
......@@ -291,11 +292,15 @@ parse_gimprc ()
add_gimp_directory_token (gimp_dir);
sprintf (libfilename, "%s/gimprc", DATADIR);
app_init_update_status("Resource configuration", libfilename, -1);
parse_gimprc_file (libfilename);
sprintf (filename, "%s/gimprc", gimp_dir);
if (strcmp (filename, libfilename) != 0)
parse_gimprc_file (filename);
{
app_init_update_status(NULL, filename, -1);
parse_gimprc_file (filename);
}
}
void
......
app/gui/plug-in-commands.c
View file @ 401e04f4
......@@ -34,6 +34,7 @@
#include "libgimp/gimpprotocol.h"
#include "libgimp/gimpwire.h"
#include "app_procs.h"
#include "appenv.h"
#include "drawable.h"
#include "datafiles.h"
......@@ -191,6 +192,7 @@ plug_in_init ()
GSList *tmp, *tmp2;
PlugInDef *plug_in_def;
PlugInProcDef *proc_def;
gfloat nplugins, nth;
/* initialize the progress init and update procedure db calls. */
procedural_db_register (&progress_init_proc);
......@@ -233,12 +235,16 @@ plug_in_init ()
/* read the pluginrc file for cached data */
sprintf (filename, "%s/pluginrc", gimp_directory ());
app_init_update_status("Resource configuration", filename, -1);
parse_gimprc_file (filename);
/* query any plug-ins that have changed since we last wrote out
* the pluginrc file.
*/
tmp = plug_in_defs;
app_init_update_status("Plug-ins", "", 0);
nplugins = g_slist_length(tmp);
nth = 0;
while (tmp)
{
plug_in_def = tmp->data;
......@@ -250,6 +256,8 @@ plug_in_init ()
g_print ("query plug-in: \"%s\"\n", plug_in_def->prog);
plug_in_query (plug_in_def->prog, plug_in_def);
}
app_init_update_status(NULL, plug_in_def->prog, nth/nplugins);
nth++;
}
/* insert the proc defs */
......@@ -294,6 +302,8 @@ plug_in_init ()
/* run the available extensions */
tmp = proc_defs;
g_print ("Starting extensions: ");
app_init_update_status("Extensions", "", 0);
nplugins = g_slist_length(tmp); nth = 0;
while (tmp)
{
proc_def = tmp->data;
......@@ -304,6 +314,8 @@ plug_in_init ()
(proc_def->db_info.proc_type == PDB_EXTENSION))
{
g_print ("%s ", proc_def->db_info.name);
app_init_update_status(NULL, proc_def->db_info.name,
nth/nplugins);
plug_in_run (&proc_def->db_info, NULL, FALSE, TRUE);
}
}
......
app/gui/plug-in-menus.c
View file @ 401e04f4
......@@ -34,6 +34,7 @@
#include "libgimp/gimpprotocol.h"
#include "libgimp/gimpwire.h"
#include "app_procs.h"
#include "appenv.h"
#include "drawable.h"
#include "datafiles.h"
......@@ -191,6 +192,7 @@ plug_in_init ()
GSList *tmp, *tmp2;
PlugInDef *plug_in_def;
PlugInProcDef *proc_def;
gfloat nplugins, nth;
/* initialize the progress init and update procedure db calls. */
procedural_db_register (&progress_init_proc);
......@@ -233,12 +235,16 @@ plug_in_init ()
/* read the pluginrc file for cached data */
sprintf (filename, "%s/pluginrc", gimp_directory ());
app_init_update_status("Resource configuration", filename, -1);
parse_gimprc_file (filename);
/* query any plug-ins that have changed since we last wrote out
* the pluginrc file.
*/
tmp = plug_in_defs;
app_init_update_status("Plug-ins", "", 0);
nplugins = g_slist_length(tmp);
nth = 0;
while (tmp)
{
plug_in_def = tmp->data;
......@@ -250,6 +256,8 @@ plug_in_init ()
g_print ("query plug-in: \"%s\"\n", plug_in_def->prog);
plug_in_query (plug_in_def->prog, plug_in_def);
}
app_init_update_status(NULL, plug_in_def->prog, nth/nplugins);
nth++;
}
/* insert the proc defs */
......@@ -294,6 +302,8 @@ plug_in_init ()
/* run the available extensions */
tmp = proc_defs;
g_print ("Starting extensions: ");
app_init_update_status("Extensions", "", 0);
nplugins = g_slist_length(tmp); nth = 0;
while (tmp)
{
proc_def = tmp->data;
......@@ -304,6 +314,8 @@ plug_in_init ()
(proc_def->db_info.proc_type == PDB_EXTENSION))
{
g_print ("%s ", proc_def->db_info.name);
app_init_update_status(NULL, proc_def->db_info.name,
nth/nplugins);
plug_in_run (&proc_def->db_info, NULL, FALSE, TRUE);
}
}
......
app/internal_procs.c
View file @ 401e04f4
This diff is collapsed.
app/menus/plug-in-menus.c
View file @ 401e04f4
......@@ -34,6 +34,7 @@
#include "libgimp/gimpprotocol.h"
#include "libgimp/gimpwire.h"
#include "app_procs.h"
#include "appenv.h"
#include "drawable.h"
#include "datafiles.h"
......@@ -191,6 +192,7 @@ plug_in_init ()
GSList *tmp, *tmp2;
PlugInDef *plug_in_def;
PlugInProcDef *proc_def;
gfloat nplugins, nth;
/* initialize the progress init and update procedure db calls. */
procedural_db_register (&progress_init_proc);
......@@ -233,12 +235,16 @@ plug_in_init ()
/* read the pluginrc file for cached data */
sprintf (filename, "%s/pluginrc", gimp_directory ());
app_init_update_status("Resource configuration", filename, -1);
parse_gimprc_file (filename);
/* query any plug-ins that have changed since we last wrote out
* the pluginrc file.
*/
tmp = plug_in_defs;
app_init_update_status("Plug-ins", "", 0);
nplugins = g_slist_length(tmp);
nth = 0;
while (tmp)
{
plug_in_def = tmp->data;
......@@ -250,6 +256,8 @@ plug_in_init ()
g_print ("query plug-in: \"%s\"\n", plug_in_def->prog);
plug_in_query (plug_in_def->prog, plug_in_def);
}
app_init_update_status(NULL, plug_in_def->prog, nth/nplugins);
nth++;
}
/* insert the proc defs */
......@@ -294,6 +302,8 @@ plug_in_init ()
/* run the available extensions */
tmp = proc_defs;
g_print ("Starting extensions: ");
app_init_update_status("Extensions", "", 0);
nplugins = g_slist_length(tmp); nth = 0;
while (tmp)
{
proc_def = tmp->data;
......@@ -304,6 +314,8 @@ plug_in_init ()
(proc_def->db_info.proc_type == PDB_EXTENSION))
{
g_print ("%s ", proc_def->db_info.name);
app_init_update_status(NULL, proc_def->db_info.name,
nth/nplugins);
plug_in_run (&proc_def->db_info, NULL, FALSE, TRUE);
}
}
......
app/plug-in/gimpplugin-message.c
View file @ 401e04f4
......@@ -34,6 +34,7 @@
#include "libgimp/gimpprotocol.h"
#include "libgimp/gimpwire.h"
#include "app_procs.h"
#include "appenv.h"
#include "drawable.h"
#include "datafiles.h"
......@@ -191,6 +192,7 @@ plug_in_init ()
GSList *tmp, *tmp2;
PlugInDef *plug_in_def;
PlugInProcDef *proc_def;
gfloat nplugins, nth;
/* initialize the progress init and update procedure db calls. */
procedural_db_register (&progress_init_proc);
......@@ -233,12 +235,16 @@ plug_in_init ()
/* read the pluginrc file for cached data */
sprintf (filename, "%s/pluginrc", gimp_directory ());
app_init_update_status("Resource configuration", filename, -1);
parse_gimprc_file (filename);
/* query any plug-ins that have changed since we last wrote out
* the pluginrc file.
*/
tmp = plug_in_defs;
app_init_update_status("Plug-ins", "", 0);
nplugins = g_slist_length(tmp);
nth = 0;
while (tmp)
{
plug_in_def = tmp->data;
......@@ -250,6 +256,8 @@ plug_in_init ()
g_print ("query plug-in: \"%s\"\n", plug_in_def->prog);
plug_in_query (plug_in_def->prog, plug_in_def);
}
app_init_update_status(NULL, plug_in_def->prog, nth/nplugins);
nth++;
}
/* insert the proc defs */
......@@ -294,6 +302,8 @@ plug_in_init ()
/* run the available extensions */
tmp = proc_defs;
g_print ("Starting extensions: ");
app_init_update_status("Extensions", "", 0);
nplugins = g_slist_length(tmp); nth = 0;
while (tmp)
{
proc_def = tmp->data;
......@@ -304,6 +314,8 @@ plug_in_init ()
(proc_def->db_info.proc_type == PDB_EXTENSION))
{
g_print ("%s ", proc_def->db_info.name);
app_init_update_status(NULL, proc_def->db_info.name,
nth/nplugins);
plug_in_run (&proc_def->db_info, NULL, FALSE, TRUE);
}
}
......
app/plug-in/gimpplugin-progress.c
View file @ 401e04f4
......@@ -34,6 +34,7 @@
#include "libgimp/gimpprotocol.h"
#include "libgimp/gimpwire.h"
#include "app_procs.h"
#include "appenv.h"
#include "drawable.h"
#include "datafiles.h"
......@@ -191,6 +192,7 @@ plug_in_init ()
GSList *tmp, *tmp2;
PlugInDef *plug_in_def;
PlugInProcDef *proc_def;
gfloat nplugins, nth;
/* initialize the progress init and update procedure db calls. */
procedural_db_register (&progress_init_proc);
......@@ -233,12 +235,16 @@ plug_in_init ()
/* read the pluginrc file for cached data */
sprintf (filename, "%s/pluginrc", gimp_directory ());
app_init_update_status("Resource configuration", filename, -1);
parse_gimprc_file (filename);
/* query any plug-ins that have changed since we last wrote out
* the pluginrc file.
*/
tmp = plug_in_defs;
app_init_update_status("Plug-ins", "", 0);
nplugins = g_slist_length(tmp);
nth = 0;
while (tmp)
{
plug_in_def = tmp->data;
......@@ -250,6 +256,8 @@ plug_in_init ()
g_print ("query plug-in: \"%s\"\n", plug_in_def->prog);
plug_in_query (plug_in_def->prog, plug_in_def);
}
app_init_update_status(NULL, plug_in_def->prog, nth/nplugins);
nth++;
}
/* insert the proc defs */
......@@ -294,6 +302,8 @@ plug_in_init ()
/* run the available extensions */
tmp = proc_defs;
g_print ("Starting extensions: ");
app_init_update_status("Extensions", "", 0);
nplugins = g_slist_length(tmp); nth = 0;
while (tmp)
{
proc_def = tmp->data;
......@@ -304,6 +314,8 @@ plug_in_init ()
(proc_def->db_info.proc_type == PDB_EXTENSION))
{
g_print ("%s ", proc_def->db_info.name);
app_init_update_status(NULL, proc_def->db_info.name,
nth/nplugins);
plug_in_run (&proc_def->db_info, NULL, FALSE, TRUE);
}
}
......
app/plug-in/gimpplugin.c
View file @ 401e04f4
......@@ -34,6 +34,7 @@
#include "libgimp/gimpprotocol.h"
#include "libgimp/gimpwire.h"
#include "app_procs.h"
#include "appenv.h"
#include "drawable.h"
#include "datafiles.h"
......@@ -191,6 +192,7 @@ plug_in_init ()
GSList *tmp, *tmp2;
PlugInDef *plug_in_def;
PlugInProcDef *proc_def;
gfloat nplugins, nth;
/* initialize the progress init and update procedure db calls. */
procedural_db_register (&progress_init_proc);
......@@ -233,12 +235,16 @@ plug_in_init ()
/* read the pluginrc file for cached data */
sprintf (filename, "%s/pluginrc", gimp_directory ());
app_init_update_status("Resource configuration", filename, -1);
parse_gimprc_file (filename);
/* query any plug-ins that have changed since we last wrote out
* the pluginrc file.
*/
tmp = plug_in_defs;
app_init_update_status("Plug-ins", "", 0);
nplugins = g_slist_length(tmp);
nth = 0;
while (tmp)
{
plug_in_def = tmp->data;
......@@ -250,6 +256,8 @@ plug_in_init ()
g_print ("query plug-in: \"%s\"\n", plug_in_def->prog);
plug_in_query (plug_in_def->prog, plug_in_def);
}
app_init_update_status(NULL, plug_in_def->prog, nth/nplugins);
nth++;
}
/* insert the proc defs */
......@@ -294,6 +302,8 @@ plug_in_init ()
/* run the available extensions */
tmp = proc_defs;
g_print ("Starting extensions: ");
app_init_update_status("Extensions", "", 0);
nplugins = g_slist_length(tmp); nth = 0;
while (tmp)
{
proc_def = tmp->data;
......@@ -304,6 +314,8 @@ plug_in_init ()
(proc_def->db_info.proc_type == PDB_EXTENSION))
{
g_print ("%s ", proc_def->db_info.name);
app_init_update_status(NULL, proc_def->db_info.name,
nth/nplugins);
plug_in_run (&proc_def->db_info, NULL, FALSE, TRUE);
}
}
......
app/plug-in/gimppluginmanager-call.c
View file @ 401e04f4
......@@ -34,6 +34,7 @@
#include "libgimp/gimpprotocol.h"
#include "libgimp/gimpwire.h"
#include "app_procs.h"
#include "appenv.h"
#include "drawable.h"
#include "datafiles.h"
......@@ -191,6 +192,7 @@ plug_in_init ()
GSList *tmp, *tmp2;
PlugInDef *plug_in_def;
PlugInProcDef *proc_def;
gfloat nplugins, nth;
/* initialize the progress init and update procedure db calls. */
procedural_db_register (&progress_init_proc);
......@@ -233,12 +235,16 @@ plug_in_init ()