diff -Nur d4x-2.0-old/main/face/dndtrash.cc d4x-2.0/main/face/dndtrash.cc --- d4x-2.0-old/main/face/dndtrash.cc Thu Mar 28 18:40:39 2002 +++ d4x-2.0/main/face/dndtrash.cc Mon May 13 22:57:17 2002 @@ -515,13 +515,13 @@ }; void dnd_trash_menu_prepare(){ - GtkWidget *menu_item=gtk_item_factory_get_widget(dnd_trash_item_factory,_(dnd_menu_inames[DM_SPEED_1])); + GtkWidget *menu_item=gtk_item_factory_get_widget(dnd_trash_item_factory,dnd_menu_inames[DM_SPEED_1]); GTK_CHECK_MENU_ITEM(menu_item)->active=CFG.SPEED_LIMIT==1?TRUE:FALSE; if (GTK_WIDGET_VISIBLE(menu_item)) gtk_widget_queue_draw(menu_item); - menu_item=gtk_item_factory_get_widget(dnd_trash_item_factory,_(dnd_menu_inames[DM_SPEED_2])); + menu_item=gtk_item_factory_get_widget(dnd_trash_item_factory,dnd_menu_inames[DM_SPEED_2]); GTK_CHECK_MENU_ITEM(menu_item)->active=CFG.SPEED_LIMIT==2?TRUE:FALSE; if (GTK_WIDGET_VISIBLE(menu_item)) gtk_widget_queue_draw(menu_item); - menu_item=gtk_item_factory_get_widget(dnd_trash_item_factory,_(dnd_menu_inames[DM_SPEED_3])); + menu_item=gtk_item_factory_get_widget(dnd_trash_item_factory,dnd_menu_inames[DM_SPEED_3]); GTK_CHECK_MENU_ITEM(menu_item)->active=CFG.SPEED_LIMIT==3?TRUE:FALSE; if (GTK_WIDGET_VISIBLE(menu_item)) gtk_widget_queue_draw(menu_item); }; @@ -539,7 +539,7 @@ void dnd_trash_set_del_completed(gint how){ GtkWidget *menu_item=gtk_item_factory_get_widget(dnd_trash_item_factory, - _(dnd_menu_inames[DM_DELCOMPLETED])); + dnd_menu_inames[DM_DELCOMPLETED]); if (menu_item) gtk_widget_set_sensitive(menu_item,how); }; @@ -551,23 +551,26 @@ }; void dnd_trash_init_menu() { GtkItemFactoryEntry menu_items[] = { - {_(dnd_menu_inames[DM_NEW]), (gchar *)NULL, (GtkItemFactoryCallback)init_add_window, 0, (gchar *)NULL}, - {_(dnd_menu_inames[DM_PASTE]), (gchar *)NULL, (GtkItemFactoryCallback)init_add_clipboard_window, 0, (gchar *)NULL}, - {_(dnd_menu_inames[DM_AUTOMATED]), (gchar *)NULL, (GtkItemFactoryCallback)d4x_automated_add, 0,(gchar *)NULL}, - {_(dnd_menu_inames[DM_DELCOMPLETED]), (gchar *)NULL, (GtkItemFactoryCallback)dnd_trash_delete_completed, 0, (gchar *)NULL}, - {_(dnd_menu_inames[DM_SEP]), (gchar *)NULL, (GtkItemFactoryCallback)NULL, 0, ""}, - {_(dnd_menu_inames[DM_OPTIONS]), (gchar *)NULL, (GtkItemFactoryCallback)d4x_prefs_init, 0, (gchar *)NULL}, - {_(dnd_menu_inames[DM_SPEED]), (gchar *)NULL, (GtkItemFactoryCallback)NULL, 0, ""}, - {_(dnd_menu_inames[DM_SPEED_1]), (gchar *)NULL, (GtkItemFactoryCallback)dnd_trash_menu_calback, 1, ""}, - {_(dnd_menu_inames[DM_SPEED_2]), (gchar *)NULL, (GtkItemFactoryCallback)dnd_trash_menu_calback, 2, _(dnd_menu_inames[DM_SPEED_1])}, - {_(dnd_menu_inames[DM_SPEED_3]), (gchar *)NULL, (GtkItemFactoryCallback)dnd_trash_menu_calback, 3, _(dnd_menu_inames[DM_SPEED_2])}, - {_(dnd_menu_inames[DM_SEP]), (gchar *)NULL, (GtkItemFactoryCallback)NULL, 0, ""}, - {_(dnd_menu_inames[DM_EXIT]), (gchar *)NULL, (GtkItemFactoryCallback)ask_exit, 0, (gchar *)NULL} + {dnd_menu_inames[DM_NEW], (gchar *)NULL, (GtkItemFactoryCallback)init_add_window, 0, (gchar *)NULL}, + {dnd_menu_inames[DM_PASTE], (gchar *)NULL, (GtkItemFactoryCallback)init_add_clipboard_window, 0, (gchar *)NULL}, + {dnd_menu_inames[DM_AUTOMATED], (gchar *)NULL, (GtkItemFactoryCallback)d4x_automated_add, 0,(gchar *)NULL}, + {dnd_menu_inames[DM_DELCOMPLETED], (gchar *)NULL, (GtkItemFactoryCallback)dnd_trash_delete_completed, 0, (gchar *)NULL}, + {dnd_menu_inames[DM_SEP], (gchar *)NULL, (GtkItemFactoryCallback)NULL, 0, ""}, + {dnd_menu_inames[DM_OPTIONS], (gchar *)NULL, (GtkItemFactoryCallback)d4x_prefs_init, 0, (gchar *)NULL}, + {dnd_menu_inames[DM_SPEED], (gchar *)NULL, (GtkItemFactoryCallback)NULL, 0, ""}, + {dnd_menu_inames[DM_SPEED_1], (gchar *)NULL, (GtkItemFactoryCallback)dnd_trash_menu_calback, 1, ""}, + {dnd_menu_inames[DM_SPEED_2], (gchar *)NULL, (GtkItemFactoryCallback)dnd_trash_menu_calback, 2, dnd_menu_inames[DM_SPEED_1]}, + {dnd_menu_inames[DM_SPEED_3], (gchar *)NULL, (GtkItemFactoryCallback)dnd_trash_menu_calback, 3, dnd_menu_inames[DM_SPEED_2]}, + {dnd_menu_inames[DM_SEP], (gchar *)NULL, (GtkItemFactoryCallback)NULL, 0, ""}, + {dnd_menu_inames[DM_EXIT], (gchar *)NULL, (GtkItemFactoryCallback)ask_exit, 0, (gchar *)NULL} }; int nmenu_items = sizeof(menu_items) / sizeof(menu_items[0]); GtkAccelGroup *accel_group; accel_group = gtk_accel_group_new(); dnd_trash_item_factory = gtk_item_factory_new(GTK_TYPE_MENU, "
",accel_group); + gtk_item_factory_set_translate_func (dnd_trash_item_factory, + (GtkTranslateFunc) gettext, + NULL, NULL); gtk_item_factory_create_items(dnd_trash_item_factory, nmenu_items, menu_items, NULL); dnd_trash_menu = gtk_item_factory_get_widget(dnd_trash_item_factory, "
"); gtk_signal_connect (GTK_OBJECT (dnd_trash_menu), "unmap_event", diff -Nur d4x-2.0-old/main/face/list.cc d4x-2.0/main/face/list.cc --- d4x-2.0-old/main/face/list.cc Thu Apr 4 11:03:16 2002 +++ d4x-2.0/main/face/list.cc Mon May 13 22:57:23 2002 @@ -236,17 +236,17 @@ }; void main_menu_speed_prepare(){ - GtkWidget *menu_item=gtk_item_factory_get_widget(main_menu_item_factory,_(main_menu_inames[MM_OPTIONS_SPEED_1])); + GtkWidget *menu_item=gtk_item_factory_get_widget(main_menu_item_factory,main_menu_inames[MM_OPTIONS_SPEED_1]); if (menu_item){ GTK_CHECK_MENU_ITEM(menu_item)->active=CFG.SPEED_LIMIT==1?TRUE:FALSE; if (GTK_WIDGET_VISIBLE(menu_item)) gtk_widget_queue_draw(menu_item); }; - menu_item=gtk_item_factory_get_widget(main_menu_item_factory,_(main_menu_inames[MM_OPTIONS_SPEED_2])); + menu_item=gtk_item_factory_get_widget(main_menu_item_factory,main_menu_inames[MM_OPTIONS_SPEED_2]); if (menu_item){ GTK_CHECK_MENU_ITEM(menu_item)->active=CFG.SPEED_LIMIT==2?TRUE:FALSE; if (GTK_WIDGET_VISIBLE(menu_item)) gtk_widget_queue_draw(menu_item); }; - menu_item=gtk_item_factory_get_widget(main_menu_item_factory,_(main_menu_inames[MM_OPTIONS_SPEED_3])); + menu_item=gtk_item_factory_get_widget(main_menu_item_factory,main_menu_inames[MM_OPTIONS_SPEED_3]); if (menu_item){ GTK_CHECK_MENU_ITEM(menu_item)->active=CFG.SPEED_LIMIT==3?TRUE:FALSE; if (GTK_WIDGET_VISIBLE(menu_item)) gtk_widget_queue_draw(menu_item); @@ -282,15 +282,15 @@ void init_load_accelerators(){ tString *str=ALL_HISTORIES[SAVE_HISTORY]->last(); - char *path=copy_string(_(main_menu_inames[MM_FILE_SEP])); + char *path=copy_string(main_menu_inames[MM_FILE_SEP]); char *sep=index(path+1,'/'); if (LOAD_ACCELERATORS[5]==NULL){ - LOAD_ACCELERATORS[5]=copy_string(_(main_menu_inames[MM_FILE_EXIT])); + LOAD_ACCELERATORS[5]=copy_string(main_menu_inames[MM_FILE_EXIT]); _remove_underscore(LOAD_ACCELERATORS[5]); }; gtk_item_factory_delete_item(main_menu_item_factory,LOAD_ACCELERATORS[5]); if (LOAD_ACCELERATORS[4]==NULL){ - LOAD_ACCELERATORS[4]=sum_strings(_(main_menu_inames[MM_FILE_SEP]),"1",NULL); + LOAD_ACCELERATORS[4]=sum_strings(main_menu_inames[MM_FILE_SEP],"1",NULL); }else{ gtk_item_factory_delete_item(main_menu_item_factory, LOAD_ACCELERATORS[4]); @@ -350,7 +350,7 @@ (GtkItemFactoryCallback)NULL, 0, ""}; - GtkItemFactoryEntry exit_item={_(main_menu_inames[MM_FILE_EXIT]), + GtkItemFactoryEntry exit_item={main_menu_inames[MM_FILE_EXIT], "X", (GtkItemFactoryCallback)ask_exit, 0, @@ -389,52 +389,54 @@ D4X_QUEUE->qv.invert_selection(); }; - void init_main_menu() { d4x_load_accelerators(); GtkItemFactoryEntry menu_items[] = { - {_(main_menu_inames[MM_FILE]), (gchar *)NULL, (GtkItemFactoryCallback)NULL, 0, ""}, - {_(main_menu_inames[MM_FILE_SAVE]), main_menu_kb[MM_FILE_SAVE], (GtkItemFactoryCallback)init_save_list, 0, (gchar *)NULL}, - {_(main_menu_inames[MM_FILE_LOAD]), main_menu_kb[MM_FILE_LOAD], (GtkItemFactoryCallback)init_load_list, 0, (gchar *)NULL}, - {_(main_menu_inames[MM_FILE_TXT]), main_menu_kb[MM_FILE_TXT], (GtkItemFactoryCallback)init_load_txt_list, 0, (gchar *)NULL}, - {_(main_menu_inames[MM_FILE_SEP]), (gchar *)NULL, (GtkItemFactoryCallback)NULL, 0, ""}, - {_(main_menu_inames[MM_FILE_NEW]), main_menu_kb[MM_FILE_NEW], (GtkItemFactoryCallback)init_add_window, 0, (gchar *)NULL}, - {_(main_menu_inames[MM_FILE_PASTE]), main_menu_kb[MM_FILE_PASTE], (GtkItemFactoryCallback)init_add_clipboard_window, 0, (gchar *)NULL}, - {_(main_menu_inames[MM_FILE_AUTO]), main_menu_kb[MM_FILE_AUTO], (GtkItemFactoryCallback)d4x_automated_add, 0, (gchar *)NULL}, - {_(main_menu_inames[MM_FILE_SEP]), (gchar *)NULL, (GtkItemFactoryCallback)NULL, 0, ""}, - {_(main_menu_inames[MM_FILE_EXIT]), main_menu_kb[MM_FILE_EXIT], (GtkItemFactoryCallback)ask_exit, 0, (gchar *)NULL}, - {_(main_menu_inames[MM_DOWNLOAD]), (gchar *)NULL, (GtkItemFactoryCallback)NULL, 0, ""}, - {_(main_menu_inames[MM_DOWNLOAD_LOG]), main_menu_kb[MM_DOWNLOAD_LOG], (GtkItemFactoryCallback)mmenu_open_logs, 100+MM_DOWNLOAD_LOG, (gchar *)NULL}, - {_(main_menu_inames[MM_DOWNLOAD_STOP]), main_menu_kb[MM_DOWNLOAD_STOP], (GtkItemFactoryCallback)stop_downloads, 100+MM_DOWNLOAD_STOP, (gchar *)NULL}, - {_(main_menu_inames[MM_DOWNLOAD_EDIT]), main_menu_kb[MM_DOWNLOAD_EDIT], (GtkItemFactoryCallback)open_edit_for_selected, 100+MM_DOWNLOAD_EDIT, (gchar *)NULL}, - {_(main_menu_inames[MM_DOWNLOAD_DEL]), main_menu_kb[MM_DOWNLOAD_DEL], (GtkItemFactoryCallback)ask_delete_download, 100+MM_DOWNLOAD_DEL, (gchar *)NULL}, - {_(main_menu_inames[MM_DOWNLOAD_RUN]), main_menu_kb[MM_DOWNLOAD_RUN], (GtkItemFactoryCallback)continue_downloads, 100+MM_DOWNLOAD_RUN, (gchar *)NULL}, - {_(main_menu_inames[MM_DOWNLOAD_SEP]),(gchar *)NULL, (GtkItemFactoryCallback)NULL, 0, ""}, - {_(main_menu_inames[MM_DOWNLOAD_DEL_C]),main_menu_kb[MM_DOWNLOAD_DEL_C], (GtkItemFactoryCallback)ask_delete_completed_downloads, 0, (gchar *)NULL}, - {_(main_menu_inames[MM_DOWNLOAD_DEL_F]),main_menu_kb[MM_DOWNLOAD_DEL_F], (GtkItemFactoryCallback)ask_delete_fataled_downloads, 0, (gchar *)NULL}, - {_(main_menu_inames[MM_DOWNLOAD_RERUN]),main_menu_kb[MM_DOWNLOAD_RERUN], (GtkItemFactoryCallback)_rerun_failed_downloads, 0, (gchar *)NULL}, - {_(main_menu_inames[MM_DOWNLOAD_SEP]),(gchar *)NULL, (GtkItemFactoryCallback)NULL, 0, ""}, - {_(main_menu_inames[MM_DOWNLOAD_PROTECT]),main_menu_kb[MM_DOWNLOAD_PROTECT], (GtkItemFactoryCallback)lm_inv_protect_flag, 100+MM_DOWNLOAD_PROTECT, (gchar *)NULL}, - {_(main_menu_inames[MM_DOWNLOAD_SEP]),(gchar *)NULL, (GtkItemFactoryCallback)NULL, 0, ""}, - {_(main_menu_inames[MM_DOWNLOAD_UNSELECT_ALL]),main_menu_kb[MM_DOWNLOAD_UNSELECT_ALL], (GtkItemFactoryCallback)mmenu_unselect_all, 100+MM_DOWNLOAD_UNSELECT_ALL, (gchar *)NULL}, - {_(main_menu_inames[MM_DOWNLOAD_SELECT_ALL]),main_menu_kb[MM_DOWNLOAD_SELECT_ALL], (GtkItemFactoryCallback)mmenu_select_all, 100+MM_DOWNLOAD_SELECT_ALL, (gchar *)NULL}, - {_(main_menu_inames[MM_DOWNLOAD_INVERT]),main_menu_kb[MM_DOWNLOAD_INVERT], (GtkItemFactoryCallback)mmenu_invert_selection, 100+MM_DOWNLOAD_INVERT, (gchar *)NULL}, - {_(main_menu_inames[MM_OPTIONS]), (gchar *)NULL, (GtkItemFactoryCallback)NULL, 0, ""}, - {_(main_menu_inames[MM_OPTIONS_SCHEDULER]),main_menu_kb[MM_OPTIONS_SCHEDULER], (GtkItemFactoryCallback)d4x_scheduler_init, 0, (gchar *)NULL}, - {_(main_menu_inames[MM_OPTIONS_PASSWORDS]),main_menu_kb[MM_OPTIONS_PASSWORDS], (GtkItemFactoryCallback)open_passwords_window, 0, (gchar *)NULL}, - {_(main_menu_inames[MM_OPTIONS_COMMON]),main_menu_kb[MM_OPTIONS_COMMON], (GtkItemFactoryCallback)d4x_prefs_init, 0, (gchar *)NULL}, - {_(main_menu_inames[MM_OPTIONS_FILTERS]),main_menu_kb[MM_OPTIONS_FILTERS], (GtkItemFactoryCallback)d4x_filters_window_init, 0, (gchar *)NULL}, - {_(main_menu_inames[MM_OPTIONS_SPEED]), (gchar*)NULL, (GtkItemFactoryCallback)NULL, 0, ""}, - {_(main_menu_inames[MM_OPTIONS_SPEED_1]),main_menu_kb[MM_OPTIONS_SPEED_1], (GtkItemFactoryCallback)main_menu_speed_calback, 1, ""}, - {_(main_menu_inames[MM_OPTIONS_SPEED_2]),main_menu_kb[MM_OPTIONS_SPEED_2], (GtkItemFactoryCallback)main_menu_speed_calback, 2, _(main_menu_inames[MM_OPTIONS_SPEED_1])}, - {_(main_menu_inames[MM_OPTIONS_SPEED_3]),main_menu_kb[MM_OPTIONS_SPEED_3], (GtkItemFactoryCallback)main_menu_speed_calback, 3, _(main_menu_inames[MM_OPTIONS_SPEED_2])}, - {_(main_menu_inames[MM_OPTIONS_BUTTONS]),main_menu_kb[MM_OPTIONS_BUTTONS], (GtkItemFactoryCallback)buttons_configure, 0, (gchar *)NULL}, - {_(main_menu_inames[MM_HELP]), (gchar *)NULL, (GtkItemFactoryCallback)NULL, 0, ""}, - {_(main_menu_inames[MM_HELP_ABOUT]), main_menu_kb[MM_HELP_ABOUT], (GtkItemFactoryCallback)init_about_window, 0, (gchar *)NULL}, + {main_menu_inames[MM_FILE], (gchar *)NULL, (GtkItemFactoryCallback)NULL, 0, ""}, + {main_menu_inames[MM_FILE_SAVE], main_menu_kb[MM_FILE_SAVE], (GtkItemFactoryCallback)init_save_list, 0, (gchar *)NULL}, + {main_menu_inames[MM_FILE_LOAD], main_menu_kb[MM_FILE_LOAD], (GtkItemFactoryCallback)init_load_list, 0, (gchar *)NULL}, + {main_menu_inames[MM_FILE_TXT], main_menu_kb[MM_FILE_TXT], (GtkItemFactoryCallback)init_load_txt_list, 0, (gchar *)NULL}, + {main_menu_inames[MM_FILE_SEP], (gchar *)NULL, (GtkItemFactoryCallback)NULL, 0, ""}, + {main_menu_inames[MM_FILE_NEW], main_menu_kb[MM_FILE_NEW], (GtkItemFactoryCallback)init_add_window, 0, (gchar *)NULL}, + {main_menu_inames[MM_FILE_PASTE], main_menu_kb[MM_FILE_PASTE], (GtkItemFactoryCallback)init_add_clipboard_window, 0, (gchar *)NULL}, + {main_menu_inames[MM_FILE_AUTO], main_menu_kb[MM_FILE_AUTO], (GtkItemFactoryCallback)d4x_automated_add, 0, (gchar *)NULL}, + {main_menu_inames[MM_FILE_SEP], (gchar *)NULL, (GtkItemFactoryCallback)NULL, 0, ""}, + {main_menu_inames[MM_FILE_EXIT], main_menu_kb[MM_FILE_EXIT], (GtkItemFactoryCallback)ask_exit, 0, (gchar *)NULL}, + {main_menu_inames[MM_DOWNLOAD], (gchar *)NULL, (GtkItemFactoryCallback)NULL, 0, ""}, + {main_menu_inames[MM_DOWNLOAD_LOG], main_menu_kb[MM_DOWNLOAD_LOG], (GtkItemFactoryCallback)mmenu_open_logs, 100+MM_DOWNLOAD_LOG, (gchar *)NULL}, + {main_menu_inames[MM_DOWNLOAD_STOP], main_menu_kb[MM_DOWNLOAD_STOP], (GtkItemFactoryCallback)stop_downloads, 100+MM_DOWNLOAD_STOP, (gchar *)NULL}, + {main_menu_inames[MM_DOWNLOAD_EDIT], main_menu_kb[MM_DOWNLOAD_EDIT], (GtkItemFactoryCallback)open_edit_for_selected, 100+MM_DOWNLOAD_EDIT, (gchar *)NULL}, + {main_menu_inames[MM_DOWNLOAD_DEL], main_menu_kb[MM_DOWNLOAD_DEL], (GtkItemFactoryCallback)ask_delete_download, 100+MM_DOWNLOAD_DEL, (gchar *)NULL}, + {main_menu_inames[MM_DOWNLOAD_RUN], main_menu_kb[MM_DOWNLOAD_RUN], (GtkItemFactoryCallback)continue_downloads, 100+MM_DOWNLOAD_RUN, (gchar *)NULL}, + {main_menu_inames[MM_DOWNLOAD_SEP],(gchar *)NULL, (GtkItemFactoryCallback)NULL, 0, ""}, + {main_menu_inames[MM_DOWNLOAD_DEL_C],main_menu_kb[MM_DOWNLOAD_DEL_C], (GtkItemFactoryCallback)ask_delete_completed_downloads, 0, (gchar *)NULL}, + {main_menu_inames[MM_DOWNLOAD_DEL_F],main_menu_kb[MM_DOWNLOAD_DEL_F], (GtkItemFactoryCallback)ask_delete_fataled_downloads, 0, (gchar *)NULL}, + {main_menu_inames[MM_DOWNLOAD_RERUN],main_menu_kb[MM_DOWNLOAD_RERUN], (GtkItemFactoryCallback)_rerun_failed_downloads, 0, (gchar *)NULL}, + {main_menu_inames[MM_DOWNLOAD_SEP],(gchar *)NULL, (GtkItemFactoryCallback)NULL, 0, ""}, + {main_menu_inames[MM_DOWNLOAD_PROTECT],main_menu_kb[MM_DOWNLOAD_PROTECT], (GtkItemFactoryCallback)lm_inv_protect_flag, 100+MM_DOWNLOAD_PROTECT, (gchar *)NULL}, + {main_menu_inames[MM_DOWNLOAD_SEP],(gchar *)NULL, (GtkItemFactoryCallback)NULL, 0, ""}, + {main_menu_inames[MM_DOWNLOAD_UNSELECT_ALL],main_menu_kb[MM_DOWNLOAD_UNSELECT_ALL], (GtkItemFactoryCallback)mmenu_unselect_all, 100+MM_DOWNLOAD_UNSELECT_ALL, (gchar *)NULL}, + {main_menu_inames[MM_DOWNLOAD_SELECT_ALL],main_menu_kb[MM_DOWNLOAD_SELECT_ALL], (GtkItemFactoryCallback)mmenu_select_all, 100+MM_DOWNLOAD_SELECT_ALL, (gchar *)NULL}, + {main_menu_inames[MM_DOWNLOAD_INVERT],main_menu_kb[MM_DOWNLOAD_INVERT], (GtkItemFactoryCallback)mmenu_invert_selection, 100+MM_DOWNLOAD_INVERT, (gchar *)NULL}, + {main_menu_inames[MM_OPTIONS], (gchar *)NULL, (GtkItemFactoryCallback)NULL, 0, ""}, + {main_menu_inames[MM_OPTIONS_SCHEDULER],main_menu_kb[MM_OPTIONS_SCHEDULER], (GtkItemFactoryCallback)d4x_scheduler_init, 0, (gchar *)NULL}, + {main_menu_inames[MM_OPTIONS_PASSWORDS],main_menu_kb[MM_OPTIONS_PASSWORDS], (GtkItemFactoryCallback)open_passwords_window, 0, (gchar *)NULL}, + {main_menu_inames[MM_OPTIONS_COMMON],main_menu_kb[MM_OPTIONS_COMMON], (GtkItemFactoryCallback)d4x_prefs_init, 0, (gchar *)NULL}, + {main_menu_inames[MM_OPTIONS_FILTERS],main_menu_kb[MM_OPTIONS_FILTERS], (GtkItemFactoryCallback)d4x_filters_window_init, 0, (gchar *)NULL}, + {main_menu_inames[MM_OPTIONS_SPEED], (gchar*)NULL, (GtkItemFactoryCallback)NULL, 0, ""}, + {main_menu_inames[MM_OPTIONS_SPEED_1],main_menu_kb[MM_OPTIONS_SPEED_1], (GtkItemFactoryCallback)main_menu_speed_calback, 1, ""}, + {main_menu_inames[MM_OPTIONS_SPEED_2],main_menu_kb[MM_OPTIONS_SPEED_2], (GtkItemFactoryCallback)main_menu_speed_calback, 2, main_menu_inames[MM_OPTIONS_SPEED_1]}, + {main_menu_inames[MM_OPTIONS_SPEED_3],main_menu_kb[MM_OPTIONS_SPEED_3], (GtkItemFactoryCallback)main_menu_speed_calback, 3, main_menu_inames[MM_OPTIONS_SPEED_2]}, + {main_menu_inames[MM_OPTIONS_BUTTONS],main_menu_kb[MM_OPTIONS_BUTTONS], (GtkItemFactoryCallback)buttons_configure, 0, (gchar *)NULL}, + {main_menu_inames[MM_HELP], (gchar *)NULL, (GtkItemFactoryCallback)NULL, 0, ""}, + {main_menu_inames[MM_HELP_ABOUT], main_menu_kb[MM_HELP_ABOUT], (GtkItemFactoryCallback)init_about_window, 0, (gchar *)NULL}, }; int nmenu_items = sizeof(menu_items) / sizeof(menu_items[0]); GtkAccelGroup *accel_group = gtk_accel_group_new(); main_menu_item_factory = gtk_item_factory_new(GTK_TYPE_MENU_BAR, "
",accel_group); + gtk_item_factory_set_translate_func (main_menu_item_factory, + (GtkTranslateFunc) gettext, + NULL, NULL); gtk_item_factory_create_items(main_menu_item_factory, nmenu_items, menu_items, NULL); init_load_accelerators(); MainMenu= gtk_item_factory_get_widget(main_menu_item_factory, "
"); @@ -458,7 +460,7 @@ void main_menu_completed_empty(){ GtkWidget *menu_item; - menu_item=gtk_item_factory_get_widget(main_menu_item_factory,_(main_menu_inames[MM_DOWNLOAD_DEL_C])); + menu_item=gtk_item_factory_get_widget(main_menu_item_factory,main_menu_inames[MM_DOWNLOAD_DEL_C]); if (menu_item) gtk_widget_set_sensitive(menu_item,FALSE); gtk_widget_set_sensitive(ListMenuArray[LM_DELC],FALSE); @@ -468,7 +470,7 @@ void main_menu_completed_nonempty(){ GtkWidget *menu_item; - menu_item=gtk_item_factory_get_widget(main_menu_item_factory,_(main_menu_inames[MM_DOWNLOAD_DEL_C])); + menu_item=gtk_item_factory_get_widget(main_menu_item_factory,main_menu_inames[MM_DOWNLOAD_DEL_C]); if (menu_item) gtk_widget_set_sensitive(menu_item,TRUE); gtk_widget_set_sensitive(ListMenuArray[LM_DELC],TRUE); @@ -478,10 +480,10 @@ void main_menu_failed_empty(){ GtkWidget *menu_item; - menu_item=gtk_item_factory_get_widget(main_menu_item_factory,_(main_menu_inames[MM_DOWNLOAD_DEL_F])); + menu_item=gtk_item_factory_get_widget(main_menu_item_factory,main_menu_inames[MM_DOWNLOAD_DEL_F]); if (menu_item) gtk_widget_set_sensitive(menu_item,FALSE); - menu_item=gtk_item_factory_get_widget(main_menu_item_factory,_(main_menu_inames[MM_DOWNLOAD_RERUN])); + menu_item=gtk_item_factory_get_widget(main_menu_item_factory,main_menu_inames[MM_DOWNLOAD_RERUN]); if (menu_item) gtk_widget_set_sensitive(menu_item,FALSE); gtk_widget_set_sensitive(ListMenuArray[LM_DELF],FALSE); @@ -489,10 +491,10 @@ void main_menu_failed_nonempty(){ GtkWidget *menu_item; - menu_item=gtk_item_factory_get_widget(main_menu_item_factory,_(main_menu_inames[MM_DOWNLOAD_DEL_F])); + menu_item=gtk_item_factory_get_widget(main_menu_item_factory,main_menu_inames[MM_DOWNLOAD_DEL_F]); if (menu_item) gtk_widget_set_sensitive(menu_item,TRUE); - menu_item=gtk_item_factory_get_widget(main_menu_item_factory,_(main_menu_inames[MM_DOWNLOAD_RERUN])); + menu_item=gtk_item_factory_get_widget(main_menu_item_factory,main_menu_inames[MM_DOWNLOAD_RERUN]); if (menu_item) gtk_widget_set_sensitive(menu_item,TRUE); gtk_widget_set_sensitive(ListMenuArray[LM_DELF],TRUE); @@ -546,7 +548,7 @@ }; static void d4x_save_kb(int menu){ - char *name=copy_without_underscore(_(main_menu_inames[menu])); + char *name=copy_without_underscore(main_menu_inames[menu]); GtkWidget *menu_item=gtk_item_factory_get_widget(main_menu_item_factory,name); delete[] name; if (menu_item){ diff -Nur d4x-2.0-old/main/face/qtree.cc d4x-2.0/main/face/qtree.cc --- d4x-2.0-old/main/face/qtree.cc Thu Apr 4 11:03:16 2002 +++ d4x-2.0/main/face/qtree.cc Mon May 13 22:57:01 2002 @@ -351,19 +351,22 @@ void d4xQsTree::init_menus() { GtkItemFactoryEntry menu_items1[] = { - {_("/Create new queue"), (gchar *)NULL, (GtkItemFactoryCallback)_menu_event_, 0, (gchar *)NULL}, - {_("/Create new subqueue"), (gchar *)NULL, (GtkItemFactoryCallback)_menu_event_, 1, (gchar *)NULL}, - {_("/Delete queue"), (gchar *)NULL, (GtkItemFactoryCallback)_menu_event_, 2,(gchar *)NULL}, - {_("/Properties"), (gchar *)NULL, (GtkItemFactoryCallback)_menu_event_, 3, (gchar *)NULL} + {N_("/Create new queue"), (gchar *)NULL, (GtkItemFactoryCallback)_menu_event_, 0, (gchar *)NULL}, + {N_("/Create new subqueue"), (gchar *)NULL, (GtkItemFactoryCallback)_menu_event_, 1, (gchar *)NULL}, + {N_("/Delete queue"), (gchar *)NULL, (GtkItemFactoryCallback)_menu_event_, 2,(gchar *)NULL}, + {N_("/Properties"), (gchar *)NULL, (GtkItemFactoryCallback)_menu_event_, 3, (gchar *)NULL} }; GtkItemFactoryEntry menu_items2[] = { - {_("/Create new queue"), (gchar *)NULL, (GtkItemFactoryCallback)_menu_event_, 0, (gchar *)NULL} + {N_("/Create new queue"), (gchar *)NULL, (GtkItemFactoryCallback)_menu_event_, 0, (gchar *)NULL} }; int nmenu_items1 = sizeof(menu_items1) / sizeof(menu_items1[0]); int nmenu_items2 = sizeof(menu_items2) / sizeof(menu_items2[0]); GtkAccelGroup *accel_group = gtk_accel_group_new(); GtkItemFactory *item_factory = gtk_item_factory_new(GTK_TYPE_MENU, "
",accel_group); + gtk_item_factory_set_translate_func (item_factory, + (GtkTranslateFunc) gettext, + NULL, NULL); gtk_item_factory_create_items(item_factory, nmenu_items1, menu_items1, this); menu1 = gtk_item_factory_get_widget(item_factory, "
");