diff --git a/panel-plugin/netload.c b/panel-plugin/netload.c index a08fa17..dc36460 100644 --- a/panel-plugin/netload.c +++ b/panel-plugin/netload.c @@ -909,12 +909,12 @@ static void monitor_create_options(XfcePanelPlugin *plugin, t_global_monitor *gl gint i; gchar buffer[BUFSIZ]; gchar *color_text[] = { - N_("Bar color (incoming):"), - N_("Bar color (outgoing):") + N_("Bar color (_incoming):"), + N_("Bar color (_outgoing):") }; gchar *maximum_text_label[] = { - N_("Maximum (incoming):"), - N_("Maximum (outgoing):") + N_("Maximum (i_ncoming):"), + N_("Maximum (out_going):") }; xfce_panel_plugin_block_menu (plugin); @@ -948,7 +948,7 @@ static void monitor_create_options(XfcePanelPlugin *plugin, t_global_monitor *gl gtk_widget_show(GTK_WIDGET(global->monitor->opt_hbox)); global->monitor->opt_use_label = - gtk_check_button_new_with_mnemonic(_("Text to display:")); + gtk_check_button_new_with_mnemonic(_("_Title:")); gtk_widget_show(global->monitor->opt_use_label); gtk_box_pack_start(GTK_BOX(global->monitor->opt_hbox), GTK_WIDGET(global->monitor->opt_use_label), @@ -979,7 +979,7 @@ static void monitor_create_options(XfcePanelPlugin *plugin, t_global_monitor *gl gtk_box_pack_start(GTK_BOX(global->monitor->opt_vbox), GTK_WIDGET(net_hbox), FALSE, FALSE, 0); - device_label = gtk_label_new(_("Network device:")); + device_label = gtk_label_new_with_mnemonic(_("Network _device:")); gtk_misc_set_alignment(GTK_MISC(device_label), 0, 0.5); gtk_widget_show(GTK_WIDGET(device_label)); gtk_box_pack_start(GTK_BOX(net_hbox), GTK_WIDGET(device_label), @@ -990,6 +990,8 @@ static void monitor_create_options(XfcePanelPlugin *plugin, t_global_monitor *gl MAX_LENGTH); gtk_entry_set_text(GTK_ENTRY(global->monitor->net_entry), global->monitor->options.network_device); + gtk_label_set_mnemonic_widget(GTK_LABEL(device_label), + global->monitor->net_entry); gtk_widget_show(global->monitor->opt_entry); gtk_box_pack_start(GTK_BOX(net_hbox), GTK_WIDGET(global->monitor->net_entry), @@ -1005,7 +1007,7 @@ static void monitor_create_options(XfcePanelPlugin *plugin, t_global_monitor *gl gtk_box_pack_start(GTK_BOX(global->monitor->opt_vbox), GTK_WIDGET(update_hbox), FALSE, FALSE, 0); - update_label = gtk_label_new(_("Update interval:")); + update_label = gtk_label_new_with_mnemonic(_("Update inter_val:")); gtk_misc_set_alignment(GTK_MISC(update_label), 0, 0.5); gtk_box_pack_start(GTK_BOX(update_hbox), GTK_WIDGET(update_label), FALSE, FALSE, 0); @@ -1013,6 +1015,8 @@ static void monitor_create_options(XfcePanelPlugin *plugin, t_global_monitor *gl gtk_spin_button_set_digits( GTK_SPIN_BUTTON(global->monitor->update_spinner), 2 ); gtk_spin_button_set_value( GTK_SPIN_BUTTON(global->monitor->update_spinner), global->monitor->options.update_interval / 1000.0 ); + gtk_label_set_mnemonic_widget(GTK_LABEL(update_label), + global->monitor->update_spinner); gtk_box_pack_start(GTK_BOX(update_hbox), GTK_WIDGET(global->monitor->update_spinner), FALSE, FALSE, 0); @@ -1029,7 +1033,7 @@ static void monitor_create_options(XfcePanelPlugin *plugin, t_global_monitor *gl gtk_widget_show(sep1); global->monitor->max_use_label = - gtk_check_button_new_with_mnemonic(_("Automatic maximum")); + gtk_check_button_new_with_mnemonic(_("Automatic _maximum")); gtk_widget_show(global->monitor->max_use_label); gtk_box_pack_start(GTK_BOX(global->monitor->opt_vbox), GTK_WIDGET(global->monitor->max_use_label), FALSE, FALSE, 0); @@ -1044,13 +1048,15 @@ static void monitor_create_options(XfcePanelPlugin *plugin, t_global_monitor *gl gtk_box_pack_start(GTK_BOX(global->monitor->opt_vbox), GTK_WIDGET(global->monitor->max_hbox[i]), FALSE, FALSE, 0); - max_label[i] = gtk_label_new(_(maximum_text_label[i])); + max_label[i] = gtk_label_new_with_mnemonic(_(maximum_text_label[i])); gtk_misc_set_alignment(GTK_MISC(max_label[i]), 0, 0.5); gtk_widget_show(GTK_WIDGET(max_label[i])); gtk_box_pack_start(GTK_BOX(global->monitor->max_hbox[i]), GTK_WIDGET(max_label[i]), FALSE, FALSE, 0); global->monitor->max_entry[i] = gtk_entry_new(); gtk_entry_set_max_length(GTK_ENTRY(global->monitor->max_entry[i]), MAX_LENGTH); + gtk_label_set_mnemonic_widget(GTK_LABEL(max_label[i]), + global->monitor->max_entry[i]); g_snprintf( buffer, BUFSIZ, "%.2f", global->monitor->options.max[i] / 1024.0 ); gtk_entry_set_text(GTK_ENTRY(global->monitor->max_entry[i]), buffer); @@ -1121,7 +1127,7 @@ static void monitor_create_options(XfcePanelPlugin *plugin, t_global_monitor *gl gtk_box_pack_start(GTK_BOX(global->monitor->opt_vbox), GTK_WIDGET(global->monitor->opt_color_hbox[i]), FALSE, FALSE, 0); - color_label[i] = gtk_label_new(_(color_text[i])); + color_label[i] = gtk_label_new_with_mnemonic(_(color_text[i])); gtk_misc_set_alignment(GTK_MISC(color_label[i]), 0, 0.5); gtk_widget_show(GTK_WIDGET(color_label[i])); gtk_box_pack_start(GTK_BOX(global->monitor->opt_color_hbox[i]), GTK_WIDGET(color_label[i]), @@ -1135,6 +1141,8 @@ static void monitor_create_options(XfcePanelPlugin *plugin, t_global_monitor *gl gtk_widget_set_size_request(global->monitor->opt_da[i], 64, 12); gtk_container_add(GTK_CONTAINER(global->monitor->opt_button[i]), global->monitor->opt_da[i]); + gtk_label_set_mnemonic_widget(GTK_LABEL(color_label[i]), + global->monitor->opt_button[i]); gtk_widget_show(GTK_WIDGET(global->monitor->opt_button[i])); gtk_widget_show(GTK_WIDGET(global->monitor->opt_da[i])); gtk_box_pack_start(GTK_BOX(global->monitor->opt_color_hbox[i]),