From e279c05d00ab9ddc759917f41ee2700cfe86077e Mon Sep 17 00:00:00 2001 From: "Daniel St.Jacques" Date: Tue, 14 Jun 2011 23:02:42 -0400 Subject: [PATCH 1/2] Move the window control options to the bottom of the system and context menus so that the close option position is consistent with most other Windows applications. --- windows/window.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/windows/window.c b/windows/window.c index f721ed975..d47bc6096 100644 --- a/windows/window.c +++ b/windows/window.c @@ -762,7 +762,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) popup_menus[SYSMENU].menu = GetSystemMenu(hwnd, FALSE); popup_menus[CTXMENU].menu = CreatePopupMenu(); - AppendMenu(popup_menus[CTXMENU].menu, MF_ENABLED, IDM_PASTE, "&Paste"); + InsertMenu(popup_menus[CTXMENU].menu, SC_RESTORE, MF_ENABLED, IDM_PASTE, "&Paste"); savedsess_menu = CreateMenu(); get_sesslist(&sesslist, TRUE); @@ -771,26 +771,26 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) for (j = 0; j < lenof(popup_menus); j++) { m = popup_menus[j].menu; - AppendMenu(m, MF_SEPARATOR, 0, 0); - AppendMenu(m, MF_ENABLED, IDM_SHOWLOG, "&Event Log"); - AppendMenu(m, MF_SEPARATOR, 0, 0); - AppendMenu(m, MF_ENABLED, IDM_NEWSESS, "Ne&w Session..."); - AppendMenu(m, MF_ENABLED, IDM_DUPSESS, "&Duplicate Session"); - AppendMenu(m, MF_POPUP | MF_ENABLED, (UINT) savedsess_menu, + InsertMenu(m, SC_RESTORE, MF_SEPARATOR, 0, 0); + InsertMenu(m, SC_RESTORE, MF_ENABLED, IDM_SHOWLOG, "&Event Log"); + InsertMenu(m, SC_RESTORE, MF_SEPARATOR, 0, 0); + InsertMenu(m, SC_RESTORE, MF_ENABLED, IDM_NEWSESS, "Ne&w Session..."); + InsertMenu(m, SC_RESTORE, MF_ENABLED, IDM_DUPSESS, "&Duplicate Session"); + InsertMenu(m, SC_RESTORE, MF_POPUP | MF_ENABLED, (UINT) savedsess_menu, "Sa&ved Sessions"); - AppendMenu(m, MF_ENABLED, IDM_RECONF, "Chan&ge Settings..."); - AppendMenu(m, MF_SEPARATOR, 0, 0); - AppendMenu(m, MF_ENABLED, IDM_COPYALL, "C&opy All to Clipboard"); - AppendMenu(m, MF_ENABLED, IDM_CLRSB, "C&lear Scrollback"); - AppendMenu(m, MF_ENABLED, IDM_RESET, "Rese&t Terminal"); - AppendMenu(m, MF_SEPARATOR, 0, 0); - AppendMenu(m, (cfg.resize_action == RESIZE_DISABLED) ? + InsertMenu(m, SC_RESTORE, MF_ENABLED, IDM_RECONF, "Chan&ge Settings..."); + InsertMenu(m, SC_RESTORE, MF_SEPARATOR, 0, 0); + InsertMenu(m, SC_RESTORE, MF_ENABLED, IDM_COPYALL, "C&opy All to Clipboard"); + InsertMenu(m, SC_RESTORE, MF_ENABLED, IDM_CLRSB, "C&lear Scrollback"); + InsertMenu(m, SC_RESTORE, MF_ENABLED, IDM_RESET, "Rese&t Terminal"); + InsertMenu(m, SC_RESTORE, MF_SEPARATOR, 0, 0); + InsertMenu(m, SC_RESTORE, (cfg.resize_action == RESIZE_DISABLED) ? MF_GRAYED : MF_ENABLED, IDM_FULLSCREEN, "&Full Screen"); - AppendMenu(m, MF_SEPARATOR, 0, 0); + InsertMenu(m, SC_RESTORE, MF_SEPARATOR, 0, 0); if (has_help()) - AppendMenu(m, MF_ENABLED, IDM_HELP, "&Help"); + InsertMenu(m, SC_RESTORE, MF_ENABLED, IDM_HELP, "&Help"); str = dupprintf("&About %s", appname); - AppendMenu(m, MF_ENABLED, IDM_ABOUT, str); + InsertMenu(m, SC_RESTORE, MF_ENABLED, IDM_ABOUT, str); sfree(str); } } From 6788daf00c3a905be96934e2a4909fa1f6f89c1f Mon Sep 17 00:00:00 2001 From: "Daniel St.Jacques" Date: Wed, 15 Jun 2011 23:08:51 -0400 Subject: [PATCH 2/2] Remove the extra separator at the top of the context/system menus and move it after the 'About' option where it belongs. --- windows/window.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/windows/window.c b/windows/window.c index d47bc6096..82cf0e8bc 100644 --- a/windows/window.c +++ b/windows/window.c @@ -771,7 +771,6 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) for (j = 0; j < lenof(popup_menus); j++) { m = popup_menus[j].menu; - InsertMenu(m, SC_RESTORE, MF_SEPARATOR, 0, 0); InsertMenu(m, SC_RESTORE, MF_ENABLED, IDM_SHOWLOG, "&Event Log"); InsertMenu(m, SC_RESTORE, MF_SEPARATOR, 0, 0); InsertMenu(m, SC_RESTORE, MF_ENABLED, IDM_NEWSESS, "Ne&w Session..."); @@ -788,9 +787,10 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show) MF_GRAYED : MF_ENABLED, IDM_FULLSCREEN, "&Full Screen"); InsertMenu(m, SC_RESTORE, MF_SEPARATOR, 0, 0); if (has_help()) - InsertMenu(m, SC_RESTORE, MF_ENABLED, IDM_HELP, "&Help"); + InsertMenu(m, SC_RESTORE, MF_ENABLED, IDM_HELP, "&Help"); str = dupprintf("&About %s", appname); InsertMenu(m, SC_RESTORE, MF_ENABLED, IDM_ABOUT, str); + InsertMenu(m, SC_RESTORE, MF_SEPARATOR, 0, 0); sfree(str); } }