From d1fbe27908253c8f825715e459435967c88e35c9 Mon Sep 17 00:00:00 2001 From: Tristan Van Berkom Date: Wed, 22 Dec 2010 12:40:50 +0900 Subject: * gladeui/glade-project.[ch]: Removed dialog and added "load-progress" signal * gladeui/glade-app.c: Protect against commands executed on loading projects * src/glade-window.c: Added load progressbar to notebook tabs. --- gladeui/glade-app.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) (limited to 'gladeui/glade-app.c') diff --git a/gladeui/glade-app.c b/gladeui/glade-app.c index af99b662..1978b31e 100644 --- a/gladeui/glade-app.c +++ b/gladeui/glade-app.c @@ -1117,10 +1117,9 @@ glade_app_command_copy (void) gboolean failed = FALSE; app = glade_app_get(); - if (app->priv->active_project == NULL) - { + if (app->priv->active_project == NULL || + glade_project_is_loading (app->priv->active_project)) return; - } for (list = glade_app_get_selection (); list && list->data; list = list->next) @@ -1160,7 +1159,8 @@ glade_app_command_cut (void) gboolean failed = FALSE; app = glade_app_get(); - if (app->priv->active_project == NULL) + if (app->priv->active_project == NULL || + glade_project_is_loading (app->priv->active_project)) return; for (list = glade_app_get_selection (); @@ -1202,9 +1202,17 @@ glade_app_command_paste (GladePlaceholder *placeholder) GladeFixed *fixed = NULL; app = glade_app_get(); - if (app->priv->active_project == NULL) + if (app->priv->active_project == NULL || + glade_project_is_loading (app->priv->active_project)) return; + if (placeholder) + { + if (glade_placeholder_get_project (placeholder) == NULL || + glade_project_is_loading (glade_placeholder_get_project (placeholder))) + return; + } + list = glade_project_selection_get (app->priv->active_project); clipboard = glade_app_get_clipboard (); @@ -1325,7 +1333,8 @@ glade_app_command_delete (void) gboolean failed = FALSE; app = glade_app_get(); - if (app->priv->active_project == NULL) + if (app->priv->active_project == NULL || + glade_project_is_loading (app->priv->active_project)) return; for (list = glade_app_get_selection (); -- cgit v1.2.1