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

Better appearance and positioning for dlg_error_msg box, and also

Browse Source 
I've just found out that it's easy to ask for the config box to be
centred on the screen by default, which is kinda cool.

[originally from svn r2962]
This commit is contained in:
Simon Tatham
2003-03-18 19:47:28 +00:00
parent 7f84c9f2da
commit 3100306c90
1 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
unix/gtkdlg.c
View File

@ -23,9 +23,7 @@
* + why the hell are the Up/Down focus movement keys sorting * + why the hell are the Up/Down focus movement keys sorting
* things by _width_? (See the Logging and Features panels * things by _width_? (See the Logging and Features panels
* for good examples.) * for good examples.)
* + the error message box is in totally the wrong place and * + window title.
* also looks ugly. Try to fix; look at how (frex) AisleRiot
* does it better.
*/ */
/* /*
@ -89,7 +87,7 @@ struct dlgparam {
* due to automatic processing and should not flag a user event. */ * due to automatic processing and should not flag a user event. */
int flags; int flags;
struct Shortcuts *shortcuts; struct Shortcuts *shortcuts;
GtkWidget *cancelbutton, *currtreeitem, **treeitems; GtkWidget *window, *cancelbutton, *currtreeitem, **treeitems;
union control *currfocus, *lastfocus; union control *currfocus, *lastfocus;
int ntreeitems; int ntreeitems;
int retval; int retval;
@ -689,14 +687,18 @@ static void errmsg_button_clicked(GtkButton *button, gpointer data)
void dlg_error_msg(void *dlg, char *msg) void dlg_error_msg(void *dlg, char *msg)
{ {
struct dlgparam *dp = (struct dlgparam *)dlg; struct dlgparam *dp = (struct dlgparam *)dlg;
GtkWidget *window, *text, *ok; GtkWidget *window, *hbox, *text, *ok;
window = gtk_dialog_new(); window = gtk_dialog_new();
text = gtk_label_new(msg); text = gtk_label_new(msg);
gtk_misc_set_alignment(GTK_MISC(text), 0.0, 0.0); gtk_misc_set_alignment(GTK_MISC(text), 0.0, 0.0);
hbox = gtk_hbox_new(FALSE, 0);
gtk_box_pack_start(GTK_BOX(hbox), text, FALSE, FALSE, 20);
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(window)->vbox), gtk_box_pack_start(GTK_BOX(GTK_DIALOG(window)->vbox),
text, FALSE, FALSE, 0); hbox, FALSE, FALSE, 20);
gtk_widget_show(text); gtk_widget_show(text);
gtk_widget_show(hbox);
gtk_window_set_title(GTK_WINDOW(window), "Error");
gtk_label_set_line_wrap(GTK_LABEL(text), TRUE); gtk_label_set_line_wrap(GTK_LABEL(text), TRUE);
ok = gtk_button_new_with_label("OK"); ok = gtk_button_new_with_label("OK");
gtk_box_pack_end(GTK_BOX(GTK_DIALOG(window)->action_area), gtk_box_pack_end(GTK_BOX(GTK_DIALOG(window)->action_area),
@ -709,6 +711,16 @@ void dlg_error_msg(void *dlg, char *msg)
gtk_signal_connect(GTK_OBJECT(window), "destroy", gtk_signal_connect(GTK_OBJECT(window), "destroy",
GTK_SIGNAL_FUNC(window_destroy), NULL); GTK_SIGNAL_FUNC(window_destroy), NULL);
gtk_window_set_modal(GTK_WINDOW(window), TRUE); gtk_window_set_modal(GTK_WINDOW(window), TRUE);
gtk_window_set_transient_for(GTK_WINDOW(window), GTK_WINDOW(dp->window));
{
gint x, y, w, h, dx, dy;
gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_NONE);
gdk_window_get_origin(GTK_WIDGET(dp->window)->window, &x, &y);
gdk_window_get_size(GTK_WIDGET(dp->window)->window, &w, &h);
dx = x + w/4;
dy = y + h/4;
gtk_widget_set_uposition(GTK_WIDGET(window), dx, dy);
}
gtk_widget_show(window); gtk_widget_show(window);
gtk_main(); gtk_main();
} }
@ -1991,7 +2003,9 @@ int do_config_box(void)
dp.currtreeitem = dp.treeitems[0]; dp.currtreeitem = dp.treeitems[0];
dp.lastfocus = NULL; dp.lastfocus = NULL;
dp.retval = 0; dp.retval = 0;
dp.window = window;
gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER);
gtk_widget_show(window); gtk_widget_show(window);
/* /*