From da0635c960abba59bb592ce67230daca75352773 Mon Sep 17 00:00:00 2001 From: torhus Date: Fri, 18 Aug 2017 21:59:31 +0200 Subject: Adjust use of ellipsis (...) in menus according to Gnome HIG (#2035) * Adjust use of ellipses (...) in menus according to Gnome HIG https://developer.gnome.org/hig/stable/writing-style.html.en --- src/common/hexchat.c | 4 ++-- src/common/util.h | 2 ++ src/fe-gtk/menu.c | 60 ++++++++++++++++++++++++++-------------------------- 3 files changed, 34 insertions(+), 32 deletions(-) (limited to 'src') diff --git a/src/common/hexchat.c b/src/common/hexchat.c index c34c7c57..1c5adeb2 100644 --- a/src/common/hexchat.c +++ b/src/common/hexchat.c @@ -883,9 +883,9 @@ xchat_init (void) "NAME ENDSUB\n" "CMD \n\n", _("_Open Dialog Window"), "gtk-go-up", - _("_Send a File"), "gtk-floppy", + _("_Send a File" ELLIPSIS), "gtk-floppy", _("_User Info (WhoIs)"), "gtk-info", - _("_Add to Friends List"), "gtk-add", + _("_Add to Friends List" ELLIPSIS), "gtk-add", _("_Ignore"), "gtk-stop", _("O_perator Actions"), diff --git a/src/common/util.h b/src/common/util.h index 947b1a8a..2ec1fa92 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -35,6 +35,8 @@ #define rfc_tolower(c) (rfc_tolowertab[(unsigned char)(c)]) +#define ELLIPSIS "\xe2\x80\xa6" + extern const unsigned char rfc_tolowertab[]; char *expand_homedir (char *file); diff --git a/src/fe-gtk/menu.c b/src/fe-gtk/menu.c index 11e414e4..c34c84ef 100644 --- a/src/fe-gtk/menu.c +++ b/src/fe-gtk/menu.c @@ -1143,7 +1143,7 @@ usermenu_create (GtkWidget *menu) { menu_create (menu, usermenu_list, "", FALSE); menu_quick_item (0, 0, menu, XCMENU_SHADED, 0, 0); /* sep */ - menu_quick_item_with_callback (menu_usermenu, _("Edit This Menu..."), menu, 0); + menu_quick_item_with_callback (menu_usermenu, _("Edit This Menu" ELLIPSIS), menu, 0); } static void @@ -1392,7 +1392,7 @@ menu_join (GtkWidget * wid, gpointer none) dialog = gtk_dialog_new_with_buttons (_("Join Channel"), GTK_WINDOW (parent_window), 0, - _("Retrieve channel list..."), GTK_RESPONSE_HELP, + _("Retrieve channel list"), GTK_RESPONSE_HELP, GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL); @@ -1745,18 +1745,18 @@ menu_about (GtkWidget *wid, gpointer sess) static struct mymenu mymenu[] = { {N_("He_xChat"), 0, 0, M_NEWMENU, MENU_ID_HEXCHAT, 0, 1}, - {N_("Network Li_st..."), menu_open_server_list, (char *)&pix_book, M_MENUPIX, 0, 0, 1, GDK_KEY_s}, + {N_("Network Li_st"), menu_open_server_list, (char *)&pix_book, M_MENUPIX, 0, 0, 1, GDK_KEY_s}, {0, 0, 0, M_SEP, 0, 0, 0}, {N_("_New"), 0, GTK_STOCK_NEW, M_MENUSUB, 0, 0, 1}, - {N_("Server Tab..."), menu_newserver_tab, 0, M_MENUITEM, 0, 0, 1, GDK_KEY_t}, - {N_("Channel Tab..."), menu_newchannel_tab, 0, M_MENUITEM, 0, 0, 1}, - {N_("Server Window..."), menu_newserver_window, 0, M_MENUITEM, 0, 0, 1, GDK_KEY_n}, - {N_("Channel Window..."), menu_newchannel_window, 0, M_MENUITEM, 0, 0, 1}, + {N_("Server Tab"), menu_newserver_tab, 0, M_MENUITEM, 0, 0, 1, GDK_KEY_t}, + {N_("Channel Tab"), menu_newchannel_tab, 0, M_MENUITEM, 0, 0, 1}, + {N_("Server Window"), menu_newserver_window, 0, M_MENUITEM, 0, 0, 1, GDK_KEY_n}, + {N_("Channel Window"), menu_newchannel_window, 0, M_MENUITEM, 0, 0, 1}, {0, 0, 0, M_END, 0, 0, 0}, {0, 0, 0, M_SEP, 0, 0, 0}, - {N_("_Load Plugin or Script..."), menu_loadplugin, GTK_STOCK_REVERT_TO_SAVED, M_MENUSTOCK, 0, 0, 1}, + {N_("_Load Plugin or Script" ELLIPSIS), menu_loadplugin, GTK_STOCK_REVERT_TO_SAVED, M_MENUSTOCK, 0, 0, 1}, {0, 0, 0, M_SEP, 0, 0, 0}, /* 11 */ #define DETACH_OFFSET (12) {0, menu_detach, GTK_STOCK_REDO, M_MENUSTOCK, 0, 0, 1}, /* 12 */ @@ -1791,8 +1791,8 @@ static struct mymenu mymenu[] = { {N_("_Server"), 0, 0, M_NEWMENU, 0, 0, 1}, {N_("_Disconnect"), menu_disconnect, GTK_STOCK_DISCONNECT, M_MENUSTOCK, MENU_ID_DISCONNECT, 0, 1}, {N_("_Reconnect"), menu_reconnect, GTK_STOCK_CONNECT, M_MENUSTOCK, MENU_ID_RECONNECT, 0, 1}, - {N_("_Join a Channel..."), menu_join, GTK_STOCK_JUMP_TO, M_MENUSTOCK, MENU_ID_JOIN, 0, 1}, - {N_("_List of Channels..."), menu_chanlist, GTK_STOCK_INDEX, M_MENUITEM, 0, 0, 1}, + {N_("_Join a Channel" ELLIPSIS), menu_join, GTK_STOCK_JUMP_TO, M_MENUSTOCK, MENU_ID_JOIN, 0, 1}, + {N_("_List of Channels"), menu_chanlist, GTK_STOCK_INDEX, M_MENUITEM, 0, 0, 1}, {0, 0, 0, M_SEP, 0, 0, 0}, #define AWAY_OFFSET (41) {N_("Marked _Away"), menu_away, 0, M_MENUTOG, MENU_ID_AWAY, 0, 1, GDK_KEY_a}, @@ -1802,35 +1802,35 @@ static struct mymenu mymenu[] = { {N_("S_ettings"), 0, 0, M_NEWMENU, 0, 0, 1}, {N_("_Preferences"), menu_settings, GTK_STOCK_PREFERENCES, M_MENUSTOCK, 0, 0, 1}, {0, 0, 0, M_SEP, 0, 0, 0}, - {N_("Auto Replace..."), menu_rpopup, 0, M_MENUITEM, 0, 0, 1}, - {N_("CTCP Replies..."), menu_ctcpguiopen, 0, M_MENUITEM, 0, 0, 1}, - {N_("Dialog Buttons..."), menu_dlgbuttons, 0, M_MENUITEM, 0, 0, 1}, - {N_("Keyboard Shortcuts..."), menu_keypopup, 0, M_MENUITEM, 0, 0, 1}, - {N_("Text Events..."), menu_evtpopup, 0, M_MENUITEM, 0, 0, 1}, - {N_("URL Handlers..."), menu_urlhandlers, 0, M_MENUITEM, 0, 0, 1}, - {N_("User Commands..."), menu_usercommands, 0, M_MENUITEM, 0, 0, 1}, - {N_("Userlist Buttons..."), menu_ulbuttons, 0, M_MENUITEM, 0, 0, 1}, - {N_("Userlist Popup..."), menu_ulpopup, 0, M_MENUITEM, 0, 0, 1}, /* 52 */ + {N_("Auto Replace"), menu_rpopup, 0, M_MENUITEM, 0, 0, 1}, + {N_("CTCP Replies"), menu_ctcpguiopen, 0, M_MENUITEM, 0, 0, 1}, + {N_("Dialog Buttons"), menu_dlgbuttons, 0, M_MENUITEM, 0, 0, 1}, + {N_("Keyboard Shortcuts"), menu_keypopup, 0, M_MENUITEM, 0, 0, 1}, + {N_("Text Events"), menu_evtpopup, 0, M_MENUITEM, 0, 0, 1}, + {N_("URL Handlers"), menu_urlhandlers, 0, M_MENUITEM, 0, 0, 1}, + {N_("User Commands"), menu_usercommands, 0, M_MENUITEM, 0, 0, 1}, + {N_("Userlist Buttons"), menu_ulbuttons, 0, M_MENUITEM, 0, 0, 1}, + {N_("Userlist Popup"), menu_ulpopup, 0, M_MENUITEM, 0, 0, 1}, /* 52 */ {N_("_Window"), 0, 0, M_NEWMENU, 0, 0, 1}, - {N_("_Ban List..."), menu_banlist, 0, M_MENUITEM, 0, 0, 1}, - {N_("Character Chart..."), ascii_open, 0, M_MENUITEM, 0, 0, 1}, - {N_("Direct Chat..."), menu_dcc_chat_win, 0, M_MENUITEM, 0, 0, 1}, - {N_("File _Transfers..."), menu_dcc_win, 0, M_MENUITEM, 0, 0, 1}, - {N_("Friends List..."), notify_opengui, 0, M_MENUITEM, 0, 0, 1}, - {N_("Ignore List..."), ignore_gui_open, 0, M_MENUITEM, 0, 0, 1}, - {N_("_Plugins and Scripts..."), menu_pluginlist, 0, M_MENUITEM, 0, 0, 1}, - {N_("_Raw Log..."), menu_rawlog, 0, M_MENUITEM, 0, 0, 1}, /* 61 */ - {N_("_URL Grabber..."), url_opengui, 0, M_MENUITEM, 0, 0, 1}, + {N_("_Ban List"), menu_banlist, 0, M_MENUITEM, 0, 0, 1}, + {N_("Character Chart"), ascii_open, 0, M_MENUITEM, 0, 0, 1}, + {N_("Direct Chat"), menu_dcc_chat_win, 0, M_MENUITEM, 0, 0, 1}, + {N_("File _Transfers"), menu_dcc_win, 0, M_MENUITEM, 0, 0, 1}, + {N_("Friends List"), notify_opengui, 0, M_MENUITEM, 0, 0, 1}, + {N_("Ignore List"), ignore_gui_open, 0, M_MENUITEM, 0, 0, 1}, + {N_("_Plugins and Scripts"), menu_pluginlist, 0, M_MENUITEM, 0, 0, 1}, + {N_("_Raw Log"), menu_rawlog, 0, M_MENUITEM, 0, 0, 1}, /* 61 */ + {N_("_URL Grabber"), url_opengui, 0, M_MENUITEM, 0, 0, 1}, {0, 0, 0, M_SEP, 0, 0, 0}, {N_("Reset Marker Line"), menu_resetmarker, 0, M_MENUITEM, 0, 0, 1, GDK_KEY_m}, {N_("Move to Marker Line"), menu_movetomarker, 0, M_MENUITEM, 0, 0, 1, GDK_KEY_M}, {N_("_Copy Selection"), menu_copy_selection, 0, M_MENUITEM, 0, 0, 1, GDK_KEY_C}, {N_("C_lear Text"), menu_flushbuffer, GTK_STOCK_CLEAR, M_MENUSTOCK, 0, 0, 1}, - {N_("Save Text..."), menu_savebuffer, GTK_STOCK_SAVE, M_MENUSTOCK, 0, 0, 1}, + {N_("Save Text" ELLIPSIS), menu_savebuffer, GTK_STOCK_SAVE, M_MENUSTOCK, 0, 0, 1}, #define SEARCH_OFFSET (70) {N_("Search"), 0, GTK_STOCK_JUSTIFY_LEFT, M_MENUSUB, 0, 0, 1}, - {N_("Search Text..."), menu_search, GTK_STOCK_FIND, M_MENUSTOCK, 0, 0, 1, GDK_KEY_f}, + {N_("Search Text" ELLIPSIS), menu_search, GTK_STOCK_FIND, M_MENUSTOCK, 0, 0, 1, GDK_KEY_f}, {N_("Search Next" ), menu_search_next, GTK_STOCK_FIND, M_MENUSTOCK, 0, 0, 1, GDK_KEY_g}, {N_("Search Previous" ), menu_search_prev, GTK_STOCK_FIND, M_MENUSTOCK, 0, 0, 1, GDK_KEY_G}, {0, 0, 0, M_END, 0, 0, 0}, -- cgit 1.4.1