X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/458620c588efd8076b03b4d1cb71a96f75e61859..ced93033b2d27cbba04c2044ad428c12943892bb:/disobedience/login.c diff --git a/disobedience/login.c b/disobedience/login.c index 0c50a9c..e53e947 100644 --- a/disobedience/login.c +++ b/disobedience/login.c @@ -125,10 +125,12 @@ static void login_save(GtkButton attribute((unused)) *button, GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, - "File %s already exists", path); + "File %s already exists.", path); + gtk_window_set_title(GTK_WINDOW(yorn), + "Configuration file already exists"); gtk_dialog_add_buttons(GTK_DIALOG(yorn), - "Overwrite", GTK_RESPONSE_ACCEPT, - "Cancel", GTK_RESPONSE_REJECT, + "Overwrite it", GTK_RESPONSE_ACCEPT, + "Don't save after all", GTK_RESPONSE_REJECT, (char *)0); if(gtk_dialog_run(GTK_DIALOG(yorn)) != GTK_RESPONSE_ACCEPT) goto done; @@ -184,17 +186,17 @@ static const struct button buttons[] = { { "Login", login_ok, - "Login with these settings", + "(Re-)connect using these settings", }, { GTK_STOCK_SAVE, login_save, - "Save these settings", + "Save these settings and close window", }, { - GTK_STOCK_CANCEL, + GTK_STOCK_CLOSE, login_cancel, - "Discard all changes and close window" + "Discard changes and close window" }, }; @@ -213,13 +215,16 @@ void login_box(void) { default_connect(); /* Create a new login window */ login_window = gtk_window_new(GTK_WINDOW_TOPLEVEL); + gtk_widget_modify_bg(login_window, GTK_STATE_NORMAL, &tool_bg); g_signal_connect(login_window, "destroy", G_CALLBACK(gtk_widget_destroyed), &login_window); gtk_window_set_title(GTK_WINDOW(login_window), "Login Details"); /* Construct the form */ table = gtk_table_new(NLWIS + 1/*rows*/, 2/*columns*/, FALSE/*homogenous*/); + gtk_widget_modify_bg(table, GTK_STATE_NORMAL, &tool_bg); for(n = 0; n < NLWIS; ++n) { label = gtk_label_new(lwis[n].description); + gtk_widget_modify_fg(table, GTK_STATE_NORMAL, &tool_fg); gtk_misc_set_alignment(GTK_MISC(label), 1/*right*/, 0/*bottom*/); gtk_table_attach(GTK_TABLE(table), label, 0, 1, /* left/right_attach */