nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-26 01:32:25 +00:00
Code Issues Projects Releases Wiki Activity

If there are no saved sessions, put a grayed "(No sessions)" entry on the saved

Browse Source 
sessions submenu of the terminal window context menu (as Pageant does), rather
than an empty menu (which often renders poorly).

[originally from svn r8648]
This commit is contained in:
Jacob Nevins 2009-09-13 23:29:11 +00:00
parent b802ee0c16
commit 5094b58a20
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
unix/gtkwin.c
View File

@ -3199,6 +3199,7 @@ static void update_savedsess_menu(GtkMenuItem *menuitem, gpointer data)
(GtkCallback)gtk_widget_destroy, NULL); (GtkCallback)gtk_widget_destroy, NULL);
get_sesslist(&sesslist, TRUE); get_sesslist(&sesslist, TRUE);
/* skip sesslist.sessions[0] == Default Settings */
for (i = 1; i < sesslist.nsessions; i++) { for (i = 1; i < sesslist.nsessions; i++) {
GtkWidget *menuitem = GtkWidget *menuitem =
gtk_menu_item_new_with_label(sesslist.sessions[i]); gtk_menu_item_new_with_label(sesslist.sessions[i]);
@ -3213,6 +3214,13 @@ static void update_savedsess_menu(GtkMenuItem *menuitem, gpointer data)
GTK_SIGNAL_FUNC(saved_session_freedata), GTK_SIGNAL_FUNC(saved_session_freedata),
inst); inst);
} }
if (sesslist.nsessions <= 1) {
GtkWidget *menuitem =
gtk_menu_item_new_with_label("(No sessions)");
gtk_widget_set_sensitive(menuitem, FALSE);
gtk_container_add(GTK_CONTAINER(inst->sessionsmenu), menuitem);
gtk_widget_show(menuitem);
}
get_sesslist(&sesslist, FALSE); /* free up */ get_sesslist(&sesslist, FALSE); /* free up */
} }

4
windows/window.c
View File

@ -636,7 +636,7 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
guess_height = extra_height + font_height * cfg.height; guess_height = extra_height + font_height * cfg.height;
{ {
RECT r; RECT r;
get_fullscreen_rect(&r); get_fullscreen_rect(&r);
if (guess_width > r.right - r.left) if (guess_width > r.right - r.left)
guess_width = r.right - r.left; guess_width = r.right - r.left;
if (guess_height > r.bottom - r.top) if (guess_height > r.bottom - r.top)
@ -912,6 +912,8 @@ static void update_savedsess_menu(void)
AppendMenu(savedsess_menu, MF_ENABLED, AppendMenu(savedsess_menu, MF_ENABLED,
IDM_SAVED_MIN + (i-1)*MENU_SAVED_STEP, IDM_SAVED_MIN + (i-1)*MENU_SAVED_STEP,
sesslist.sessions[i]); sesslist.sessions[i]);
if (sesslist.nsessions <= 1)
AppendMenu(savedsess_menu, MF_GRAYED, IDM_SAVED_MIN, "(No sessions)");
} }
/* /*