Commit 408148fa authored by Stéphane Démurget's avatar Stéphane Démurget

Fixed keyboard navigation between tabs and more generally global shortcuts handling.

Removed some debugging output.
parent 8a2fba31
2002-01-13 Stephane Demurget <demurgets@free.fr>
* src/anjuta_cbs.c: fixed the global shortcut handling to have a
proper tabs keyboard navigation.
* src/an_symbol_view.c,
src/anjuta_cbs.c,
src/gnome_project.c,
src/project_dbase.c,
src/tags_manager.c: removed some debugging display.
2002-01-09 Naba Kumar <kh_naba@users.sourceforge.net> 2002-01-09 Naba Kumar <kh_naba@users.sourceforge.net>
* src/message-manager-dock.c * src/message-manager-dock.c
......
...@@ -311,14 +311,13 @@ AnSymbolView *sv_populate(TMProject *tm_proj) ...@@ -311,14 +311,13 @@ AnSymbolView *sv_populate(TMProject *tm_proj)
g_message("Populating symbol view.."); g_message("Populating symbol view..");
g_print ("> sv_populate (): a\n"); fflush (stdout);
if (!sv) if (!sv)
sv_create(); sv_create();
g_print ("> sv_populate (): b\n"); fflush (stdout);
sv_disconnect(); sv_disconnect();
sv_freeze(); sv_freeze();
sv_clear(); sv_clear();
g_print ("> sv_populate (): c\n"); fflush (stdout);
if (!tm_proj || !IS_TM_PROJECT((TMWorkObject *) tm_proj)) if (!tm_proj || !IS_TM_PROJECT((TMWorkObject *) tm_proj))
{ {
sv_connect(); sv_connect();
...@@ -327,7 +326,6 @@ g_print ("> sv_populate (): c\n"); fflush (stdout); ...@@ -327,7 +326,6 @@ g_print ("> sv_populate (): c\n"); fflush (stdout);
return sv; return sv;
} }
g_print ("> sv_populate (): d\n"); fflush (stdout);
if (!tm_proj->symbol_tree) if (!tm_proj->symbol_tree)
{ {
g_message("Updating project.."); g_message("Updating project..");
...@@ -341,21 +339,18 @@ g_print ("> sv_populate (): d\n"); fflush (stdout); ...@@ -341,21 +339,18 @@ g_print ("> sv_populate (): d\n"); fflush (stdout);
} }
} }
g_print ("> sv_populate (): e\n"); fflush (stdout);
sv->project = tm_proj; sv->project = tm_proj;
root[sv_root_none_t] = NULL; root[sv_root_none_t] = NULL;
for (i = sv_root_class_t; i < sv_root_max_t; ++i) for (i = sv_root_class_t; i < sv_root_max_t; ++i)
CREATE_SV_NODE(i) CREATE_SV_NODE(i)
root[sv_root_max_t] = NULL; root[sv_root_max_t] = NULL;
g_print ("> sv_populate (): f\n"); fflush (stdout);
s = g_string_sized_new(255); s = g_string_sized_new(255);
if (!tm_proj->symbol_tree->children) if (!tm_proj->symbol_tree->children)
{ {
g_message("No symbols found!"); g_message("No symbols found!");
} }
g_print ("> sv_populate (): g\n"); fflush (stdout);
for (parent = tm_proj->symbol_tree->children; parent for (parent = tm_proj->symbol_tree->children; parent
; parent = g_slist_next(parent)) ; parent = g_slist_next(parent))
{ {
...@@ -403,10 +398,10 @@ g_print ("> sv_populate (): g\n"); fflush (stdout); ...@@ -403,10 +398,10 @@ g_print ("> sv_populate (): g\n"); fflush (stdout);
, subitem, h_file, (GtkDestroyNotify) an_hist_file_free); , subitem, h_file, (GtkDestroyNotify) an_hist_file_free);
} }
} }
g_print ("> sv_populate (): h\n"); fflush (stdout);
g_string_free(s, TRUE); g_string_free(s, TRUE);
sv_connect(); sv_connect();
sv_thaw(); sv_thaw();
g_print ("> sv_populate (): i\n"); fflush (stdout);
return sv; return sv;
} }
...@@ -356,7 +356,7 @@ enum { ...@@ -356,7 +356,7 @@ enum {
m__ = 0, m__ = 0,
mS_ = GDK_SHIFT_MASK, mS_ = GDK_SHIFT_MASK,
m_C = GDK_CONTROL_MASK, m_C = GDK_CONTROL_MASK,
mSC = GDK_SHIFT_MASK | GDK_SHIFT_MASK mSC = GDK_SHIFT_MASK | GDK_CONTROL_MASK
}; };
enum { enum {
...@@ -392,7 +392,7 @@ on_anjuta_window_key_press_event (GtkWidget *widget, ...@@ -392,7 +392,7 @@ on_anjuta_window_key_press_event (GtkWidget *widget,
for (i = 0; global_keymap[i].id; i++) for (i = 0; global_keymap[i].id; i++)
if (event->keyval == global_keymap[i].gdk_key && if (event->keyval == global_keymap[i].gdk_key &&
modifiers == global_keymap[i].modifiers) (event->state & global_keymap[i].modifiers) == global_keymap[i].modifiers)
break; break;
if (!global_keymap[i].id) if (!global_keymap[i].id)
......
...@@ -247,9 +247,7 @@ new_prj_terminated (int status, time_t t) ...@@ -247,9 +247,7 @@ new_prj_terminated (int status, time_t t)
anjuta_status (_("Project was successfully autogenerated.")); anjuta_status (_("Project was successfully autogenerated."));
} }
g_print ("> new_prj_terminated (): a\n"); fflush (stdout);
project_dbase_update_tags_image(app->project_dbase); project_dbase_update_tags_image(app->project_dbase);
g_print ("> new_prj_terminated (): b\n"); fflush (stdout);
project_dbase_show (app->project_dbase); project_dbase_show (app->project_dbase);
if (preferences_get_int (app->preferences, BEEP_ON_BUILD_COMPLETE)) if (preferences_get_int (app->preferences, BEEP_ON_BUILD_COMPLETE))
......
...@@ -835,10 +835,7 @@ done: ...@@ -835,10 +835,7 @@ done:
project_dbase_update_tree (p); project_dbase_update_tree (p);
extended_toolbar_update (); extended_toolbar_update ();
tags_manager_load (app->tags_manager); tags_manager_load (app->tags_manager);
g_print ("> project_dbase_load_project (): a\n");
project_dbase_update_tags_image(p); project_dbase_update_tags_image(p);
g_print ("> project_dbase_load_project (): b\n");
anjuta_status (_("Project loaded successfully.")); anjuta_status (_("Project loaded successfully."));
anjuta_set_active (); anjuta_set_active ();
...@@ -1160,7 +1157,6 @@ project_dbase_update_tags_image(ProjectDBase* p) ...@@ -1160,7 +1157,6 @@ project_dbase_update_tags_image(ProjectDBase* p)
if (p->project_is_open == FALSE) if (p->project_is_open == FALSE)
return; return;
g_print ("> project_dbase_update_tags_image (): a\n"); fflush (stdout);
if (p->tm_project) if (p->tm_project)
{ {
if (((NULL == TM_PROJECT(p->tm_project)->file_list) || if (((NULL == TM_PROJECT(p->tm_project)->file_list) ||
...@@ -1173,11 +1169,8 @@ g_print ("> project_dbase_update_tags_image (): a\n"); fflush (stdout); ...@@ -1173,11 +1169,8 @@ g_print ("> project_dbase_update_tags_image (): a\n"); fflush (stdout);
else if (p->top_proj_dir) else if (p->top_proj_dir)
p->tm_project = tm_project_new(p->top_proj_dir, NULL, NULL, TRUE, TRUE); p->tm_project = tm_project_new(p->top_proj_dir, NULL, NULL, TRUE, TRUE);
g_print ("> project_dbase_update_tags_image (): b\n"); fflush (stdout);
sv_populate(TM_PROJECT(p->tm_project)); sv_populate(TM_PROJECT(p->tm_project));
g_print ("> project_dbase_update_tags_image (): c\n"); fflush (stdout);
fv_populate(TM_PROJECT(p->tm_project)); fv_populate(TM_PROJECT(p->tm_project));
g_print ("> project_dbase_update_tags_image (): d\n"); fflush (stdout);
src_dir = project_dbase_get_module_dir (p, MODULE_SOURCE); src_dir = project_dbase_get_module_dir (p, MODULE_SOURCE);
...@@ -1195,9 +1188,6 @@ g_print ("> project_dbase_update_tags_image (): d\n"); fflush (stdout); ...@@ -1195,9 +1188,6 @@ g_print ("> project_dbase_update_tags_image (): d\n"); fflush (stdout);
g_free (src_dir); g_free (src_dir);
} }
g_print ("> project_dbase_update_tags_image (): e\n"); fflush (stdout);
return;
} }
static void static void
......
...@@ -735,7 +735,6 @@ tags_manager_update_image (TagsManager * tm, GList * files) ...@@ -735,7 +735,6 @@ tags_manager_update_image (TagsManager * tm, GList * files)
if (tm->update_in_progress) if (tm->update_in_progress)
return FALSE; return FALSE;
g_print ("> ENTERING in tags_manager_update_image ()\n"); fflush (stdout);
/* /*
if (g_list_length (files) == g_list_length (tm->file_list)) if (g_list_length (files) == g_list_length (tm->file_list))
return TRUE; return TRUE;
...@@ -758,11 +757,6 @@ g_print ("> ENTERING in tags_manager_update_image ()\n"); fflush (stdout); ...@@ -758,11 +757,6 @@ g_print ("> ENTERING in tags_manager_update_image ()\n"); fflush (stdout);
g_free (fn); g_free (fn);
} }
for (node = tm->update_file_list; node; node = g_list_next (node))
g_print ("> NEED TO UPDATE (%s)\n", (gchar *) node->data);
fflush (stdout);
if (tm->update_file_list) if (tm->update_file_list)
{ {
tm->update_counter = 0; tm->update_counter = 0;
...@@ -779,12 +773,10 @@ fflush (stdout); ...@@ -779,12 +773,10 @@ fflush (stdout);
tm_project_update(app->project_dbase->tm_project, FALSE tm_project_update(app->project_dbase->tm_project, FALSE
, TRUE, TRUE); , TRUE, TRUE);
g_print ("> tags_manager_update_image (): a\n"); fflush (stdout);
sv_populate(TM_PROJECT(app->project_dbase->tm_project)); sv_populate(TM_PROJECT(app->project_dbase->tm_project));
g_print ("> tags_manager_update_image (): b\n"); fflush (stdout);
fv_populate(TM_PROJECT(app->project_dbase->tm_project)); fv_populate(TM_PROJECT(app->project_dbase->tm_project));
} }
g_print ("> EXITING from tags_manager_update_image ()\n"); fflush (stdout);
return TRUE; return TRUE;
} }
...@@ -798,7 +790,7 @@ on_tags_manager_on_idle (gpointer data) ...@@ -798,7 +790,7 @@ on_tags_manager_on_idle (gpointer data)
goto error; goto error;
if (tm->update_in_progress == FALSE) if (tm->update_in_progress == FALSE)
goto error; goto error;
g_print ("> ENTERING IN tags_manager_on_idle ()\n"); fflush (stdout);
if (tm->update_counter >= g_list_length (tm->update_file_list)) if (tm->update_counter >= g_list_length (tm->update_file_list))
{ {
tags_manager_thaw (tm); tags_manager_thaw (tm);
...@@ -810,11 +802,9 @@ g_print ("> ENTERING IN tags_manager_on_idle ()\n"); fflush (stdout); ...@@ -810,11 +802,9 @@ g_print ("> ENTERING IN tags_manager_on_idle ()\n"); fflush (stdout);
tm_project_update(app->project_dbase->tm_project, FALSE tm_project_update(app->project_dbase->tm_project, FALSE
, TRUE, TRUE); , TRUE, TRUE);
g_print ("> tags_manager_on_idle (): a\n"); fflush (stdout);
sv_populate(TM_PROJECT(app->project_dbase->tm_project)); sv_populate(TM_PROJECT(app->project_dbase->tm_project));
g_print ("> tags_manager_on_idle (): b\n"); fflush (stdout);
fv_populate(TM_PROJECT(app->project_dbase->tm_project)); fv_populate(TM_PROJECT(app->project_dbase->tm_project));
g_print ("> EXITING from tags_manager_on_idle ()\n"); fflush (stdout);
return FALSE; return FALSE;
} }
if (app->project_dbase->project_is_open == FALSE) if (app->project_dbase->project_is_open == FALSE)
...@@ -827,13 +817,13 @@ g_print ("> EXITING from tags_manager_on_idle ()\n"); fflush (stdout); ...@@ -827,13 +817,13 @@ g_print ("> EXITING from tags_manager_on_idle ()\n"); fflush (stdout);
if (!fn) if (!fn)
goto error; goto error;
g_print ("> tags_manager_on_idle (): going to update (%s)\n", fn);
if (tags_manager_update (tm, fn) == FALSE) if (tags_manager_update (tm, fn) == FALSE)
goto error; goto error;
g_free (fn); g_free (fn);
tm->update_counter++; tm->update_counter++;
anjuta_set_progress (tm->update_counter); anjuta_set_progress (tm->update_counter);
g_print ("> EXITING from tags_manager_on_idle ()\n"); fflush (stdout);
return TRUE; return TRUE;
error: error:
...@@ -844,7 +834,7 @@ g_print ("> EXITING from tags_manager_on_idle ()\n"); fflush (stdout); ...@@ -844,7 +834,7 @@ g_print ("> EXITING from tags_manager_on_idle ()\n"); fflush (stdout);
glist_strings_free (tm->update_file_list); glist_strings_free (tm->update_file_list);
tm->update_file_list = NULL; tm->update_file_list = NULL;
tm->update_in_progress = FALSE; tm->update_in_progress = FALSE;
g_print ("> EXITING from tags_manager_on_idle ()\n"); fflush (stdout);
return FALSE; return FALSE;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment