osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

The Wireshark file icon makes more sense than a floppy disk[1]. Switch 

back to it and name it "Save" instead of "File".

  [1] http://www.hanselman.com/blog/TheFloppyDiskMeansSaveAnd14OtherOldPeopleIconsThatDontMakeSenseAnymore.aspx

svn path=/trunk/; revision=46696
This commit is contained in:
Gerald Combs 2012-12-22 17:41:40 +00:00
parent cd376e0ca8
commit 896eeaf187
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui/gtk/capture_file_dlg.c
View File

@ -986,10 +986,10 @@ file_merge_cmd_cb(GtkWidget *widget, gpointer data _U_) {
gtk_dialog_add_button(GTK_DIALOG(msg_dialog),
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
gtk_dialog_add_button(GTK_DIALOG(msg_dialog),
GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT);
WIRESHARK_STOCK_SAVE, GTK_RESPONSE_ACCEPT);
#else
gtk_dialog_add_button(GTK_DIALOG(msg_dialog),
GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT);
WIRESHARK_STOCK_SAVE, GTK_RESPONSE_ACCEPT);
gtk_dialog_add_button(GTK_DIALOG(msg_dialog),
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
#endif
@ -1122,13 +1122,13 @@ test_file_close(capture_file *cf, gboolean from_quit, const char *before_what)
gtk_dialog_add_button(GTK_DIALOG(msg_dialog),
(capture_in_progress ?
WIRESHARK_STOCK_STOP_SAVE :
GTK_STOCK_SAVE),
WIRESHARK_STOCK_SAVE),
GTK_RESPONSE_ACCEPT);
#else
gtk_dialog_add_button(GTK_DIALOG(msg_dialog),
(capture_in_progress ?
WIRESHARK_STOCK_STOP_SAVE :
GTK_STOCK_SAVE),
WIRESHARK_STOCK_SAVE),
GTK_RESPONSE_ACCEPT);
gtk_dialog_add_button(GTK_DIALOG(msg_dialog),
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);

2
ui/gtk/file_dlg.c
View File

@ -92,7 +92,7 @@ file_selection_new(const gchar *title, file_selection_action_t action)
case FILE_SELECTION_SAVE:
gtk_action = GTK_FILE_CHOOSER_ACTION_SAVE;
ok_button_text = GTK_STOCK_SAVE;
ok_button_text = WIRESHARK_STOCK_SAVE;
break;
case FILE_SELECTION_WRITE_BROWSE:

6
ui/gtk/main_menubar.c
View File

@ -1405,8 +1405,8 @@ static const GtkActionEntry main_menu_bar_entries[] = {
{ "/File/Import", NULL, "_Import...", NULL, NULL, G_CALLBACK(file_import_cmd_cb) },
{ "/File/Close", GTK_STOCK_CLOSE, "_Close", "<control>W", NULL, G_CALLBACK(file_close_cmd_cb) },
{ "/File/Save", WIRESHARK_STOCK_FILE, "_Save", "<control>S", NULL, G_CALLBACK(file_save_cmd_cb) },
{ "/File/SaveAs", WIRESHARK_STOCK_FILE, "Save _As...", "<shift><control>S", NULL, G_CALLBACK(file_save_as_cmd_cb) },
{ "/File/Save", WIRESHARK_STOCK_SAVE, "_Save", "<control>S", NULL, G_CALLBACK(file_save_cmd_cb) },
{ "/File/SaveAs", WIRESHARK_STOCK_SAVE, "Save _As...", "<shift><control>S", NULL, G_CALLBACK(file_save_as_cmd_cb) },
{ "/File/Set", NULL, "File Set", NULL, NULL, NULL },
{ "/File/ExportSpecifiedPackets", NULL, "Export Specified Packets...", NULL, NULL, G_CALLBACK(file_export_specified_packets_cmd_cb) },
@ -4134,7 +4134,7 @@ add_recent_items (guint merge_id, GtkUIManager *ui_manager)
action = g_object_new (GTK_TYPE_ACTION,
"name", action_name,
"label", item_name,
"stock_id", WIRESHARK_STOCK_FILE,
"stock_id", WIRESHARK_STOCK_SAVE,
NULL);
g_signal_connect (action, "activate",
G_CALLBACK (menu_open_recent_file_cmd_cb), NULL);

2
ui/gtk/main_toolbar.c
View File

@ -319,7 +319,7 @@ toolbar_new(void)
GTK_STOCK_OPEN, "Open a capture file...", file_open_cmd_cb, NULL);
toolbar_item(save_button, main_tb,
WIRESHARK_STOCK_FILE, "Save this capture file", file_save_cmd_cb, NULL);
WIRESHARK_STOCK_SAVE, "Save this capture file", file_save_cmd_cb, NULL);
toolbar_item(close_button, main_tb,
GTK_STOCK_CLOSE, "Close this capture file", file_close_cmd_cb, NULL);

4
ui/gtk/stock_icons.c
View File

@ -163,7 +163,7 @@ void stock_icons_init(void) {
{ WIRESHARK_STOCK_TELEPHONE, "Telephone", 0, 0, NULL },
{ WIRESHARK_STOCK_PREPARE_FILTER, "Prepare Filter", 0, 0, NULL },
{ WIRESHARK_STOCK_ANALYZE, "Analyze", 0, 0, NULL },
{ WIRESHARK_STOCK_FILE, "File", 0, 0, NULL }
{ WIRESHARK_STOCK_SAVE, "Save", 0, 0, NULL }
};
static const stock_pixmap_t pixmaps[] = {
@ -221,7 +221,7 @@ void stock_icons_init(void) {
};
static const stock_pixbuf_t pixbufs[] = {
{ WIRESHARK_STOCK_FILE, toolbar_wireshark_file_16_pb_data, toolbar_wireshark_file_24_pb_data},
{ WIRESHARK_STOCK_SAVE, toolbar_wireshark_file_16_pb_data, toolbar_wireshark_file_24_pb_data},
{ NULL, NULL, NULL }
};
/* Register our stock items */

2
ui/gtk/stock_icons.h
View File

@ -95,7 +95,7 @@
#define WIRESHARK_STOCK_TELEPHONE "Wireshark_Telephone"
#define WIRESHARK_STOCK_PREPARE_FILTER "Wireshark_Prepare_Filter"
#define WIRESHARK_STOCK_ANALYZE "Wireshark_Analyze"
#define WIRESHARK_STOCK_FILE "Wireshark_File"
#define WIRESHARK_STOCK_SAVE "Wireshark_Save"
void stock_icons_init(void);