diff --git a/src/zmapWindow/zmapWindowDrawFeatures.c b/src/zmapWindow/zmapWindowDrawFeatures.c index 5f85ad841a6a03f64969c347fb44ada299e0b9d7..7fbdefda0daf4c394c053b6bbe8cb5de2b1f614c 100755 --- a/src/zmapWindow/zmapWindowDrawFeatures.c +++ b/src/zmapWindow/zmapWindowDrawFeatures.c @@ -26,9 +26,9 @@ * * Exported functions: * HISTORY: - * Last edited: Dec 10 17:56 2008 (edgrif) + * Last edited: Dec 15 13:08 2008 (edgrif) * Created: Thu Jul 29 10:45:00 2004 (rnc) - * CVS info: $Id: zmapWindowDrawFeatures.c,v 1.217 2008-12-11 09:45:36 edgrif Exp $ + * CVS info: $Id: zmapWindowDrawFeatures.c,v 1.218 2008-12-15 14:09:11 edgrif Exp $ *------------------------------------------------------------------- */ @@ -1459,6 +1459,13 @@ void zmapMakeColumnMenu(GdkEventButton *button_event, ZMapWindow window, cbdata->feature_set = feature_set ; /* Make up the menu. */ + if (zMapUtilsUserIsDeveloper()) + { + menu_sets = g_list_append(menu_sets, zmapWindowMakeMenuDeveloperOps(NULL, NULL, cbdata)) ; + + menu_sets = g_list_append(menu_sets, separator) ; + } + menu_sets = g_list_append(menu_sets, zmapWindowMakeMenuBump(NULL, NULL, cbdata, zMapStyleGetOverlapMode(style))) ; @@ -1550,8 +1557,8 @@ static void columnMenuCB(int menu_item_id, gpointer callback_data) zmapWindowListWindow(menu_data->window, NULL, (char *)g_quark_to_string(feature->original_id), NULL, NULL, - zmapWindowFToISetSearchPerform, search_data, - zmapWindowFToISetSearchDestroy, zoom_to_item); + (ZMapWindowListSearchHashFunc)zmapWindowFToISetSearchPerform, search_data, + (GDestroyNotify)zmapWindowFToISetSearchDestroy, zoom_to_item); break ; } case 2: diff --git a/src/zmapWindow/zmapWindowFeature.c b/src/zmapWindow/zmapWindowFeature.c index c3007ee18473f2002a670bb5052db7bdec8644c8..60b738c612574dedb8a251dd25c266caa199f12e 100755 --- a/src/zmapWindow/zmapWindowFeature.c +++ b/src/zmapWindow/zmapWindowFeature.c @@ -28,9 +28,9 @@ * * Exported functions: See zmapWindow_P.h * HISTORY: - * Last edited: Dec 10 17:48 2008 (edgrif) + * Last edited: Dec 15 13:09 2008 (edgrif) * Created: Mon Jan 9 10:25:40 2006 (edgrif) - * CVS info: $Id: zmapWindowFeature.c,v 1.145 2008-12-11 09:45:06 edgrif Exp $ + * CVS info: $Id: zmapWindowFeature.c,v 1.146 2008-12-15 14:09:11 edgrif Exp $ *------------------------------------------------------------------- */ @@ -64,7 +64,6 @@ enum ITEM_MENU_SHOW_URL_IN_BROWSER, ITEM_MENU_SHOW_TRANSLATION, ITEM_MENU_TOGGLE_MARK, - ITEM_MENU_SHOW_STYLE, ITEM_MENU_ITEMS }; @@ -1670,6 +1669,14 @@ void zmapMakeItemMenu(GdkEventButton *button_event, ZMapWindow window, FooCanvas /* Make up the menu. */ + /* optional developer-only functions. */ + if (zMapUtilsUserIsDeveloper()) + { + menu_sets = g_list_append(menu_sets, zmapWindowMakeMenuDeveloperOps(NULL, NULL, menu_data)) ; + + menu_sets = g_list_append(menu_sets, separator) ; + } + /* Feature ops. */ menu_sets = g_list_append(menu_sets, makeMenuFeatureOps(NULL, NULL, menu_data)) ; @@ -1904,12 +1911,6 @@ static void itemMenuCB(int menu_item_id, gpointer callback_data) zmapWindowContextExplorerCreate(menu_data->window, (ZMapFeatureAny)feature); break; #endif - case ITEM_MENU_SHOW_STYLE: - { - zmapWindowShowStyle(feature->style) ; - - break; - } default: zMapAssertNotReached() ; /* exits... */ break ; @@ -1990,7 +1991,6 @@ static ZMapGUIMenuItem makeMenuGeneralOps(int *start_index_inout, {ZMAPGUI_MENU_NORMAL, "DNA Search Window", ITEM_MENU_SEQUENCE_SEARCH_DNA, itemMenuCB, NULL}, {ZMAPGUI_MENU_NORMAL, "Peptide Search Window", ITEM_MENU_SEQUENCE_SEARCH_PEPTIDE, itemMenuCB, NULL}, {ZMAPGUI_MENU_NORMAL, "Toggle Mark", ITEM_MENU_TOGGLE_MARK, itemMenuCB, NULL, "M"}, - {ZMAPGUI_MENU_NORMAL, "Show Style", ITEM_MENU_SHOW_STYLE, itemMenuCB, NULL, NULL}, {ZMAPGUI_MENU_NONE, NULL, ITEM_MENU_INVALID, NULL, NULL} } ;