X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=gtk%2Fxoptions.c;h=b6b38b6fdb79139018c8ecf706c880ba2b7b1eb1;hb=24659044481fa42b3846cb9e801fd06abe0a102e;hp=3684bf8d80bb9a699416d1daf4f3e2999a214468;hpb=32537912b88a86118f71b82a0bf2232aee27d0e7;p=xboard.git

diff --git a/gtk/xoptions.c b/gtk/xoptions.c
index 3684bf8..b6b38b6 100644
--- a/gtk/xoptions.c
+++ b/gtk/xoptions.c
@@ -1097,8 +1097,12 @@ void GenericCallback(GtkWidget *widget, gpointer gdata)
     if(currentCps) {
         name = gtk_button_get_label (GTK_BUTTON(widget));
 	if(currentOption[data].type == SaveButton) GenericReadout(currentOption, -1);
-        snprintf(buf, MSG_SIZ,  "option %s\n", name);
-        SendToProgram(buf, currentCps);
+	if(data == 0) { // XBoard save button
+	    SaveEngineSettings(currentCps == &second); PopDown(dlg);
+	} else {
+            snprintf(buf, MSG_SIZ,  "option %s\n", name);
+            SendToProgram(buf, currentCps);
+	}
     } else ((ButtonCallback*) currentOption[data].target)(data);
 
     shells[dlg] = oldSh; // in case of multiple instances, restore previous (as this one could be popped down now)
@@ -1110,9 +1114,11 @@ BrowseCallback (GtkFileChooser *chooser, gpointer data)
     char *name = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(chooser));
     Option *opt = currentOption + (int)(intptr_t) data;
     int n = (int) (intptr_t) opt->choice;
-    Preview(n, name);
-    messedUp = TRUE;
-    if(name) g_free(name);
+    if(name) {
+	Preview(n, name);
+	messedUp = TRUE;
+	g_free(name);
+    }
     return FALSE;
 }
 
@@ -1124,7 +1130,7 @@ void BrowseGTK(GtkWidget *widget, gpointer gdata)
     GtkFileFilter *gtkfilter_all;
     int n, opt_i = (intptr_t) gdata;
     GtkFileChooserAction fc_action;
-    char buf[MSG_SIZ];
+    char buf[MSG_SIZ], *p;
 
     gtkfilter     = gtk_file_filter_new();
     gtkfilter_all = gtk_file_filter_new();
@@ -1148,6 +1154,8 @@ void BrowseGTK(GtkWidget *widget, gpointer gdata)
                       GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
                       NULL);
 
+    if(*chessDir && (!(p = strstr(chessDir, "/home/")) || strchr(p+6, '/')))
+    gtk_file_chooser_add_shortcut_folder(GTK_FILE_CHOOSER(dialog), chessDir, NULL);
     gtk_file_chooser_add_shortcut_folder(GTK_FILE_CHOOSER(dialog), dataDir, NULL);
     snprintf(buf, MSG_SIZ, "%s/themes", dataDir);
     gtk_file_chooser_add_shortcut_folder(GTK_FILE_CHOOSER(dialog), buf, NULL);
@@ -1179,8 +1187,10 @@ void BrowseGTK(GtkWidget *widget, gpointer gdata)
 
     messedUp = FALSE;
     n = (int)(intptr_t) currentOption[opt_i].choice;
-    if (n && !currentCps)
+    if (n && !currentCps) {
       g_signal_connect (GTK_DIALOG (dialog), "selection-changed", G_CALLBACK(BrowseCallback), (gpointer)(intptr_t) opt_i);
+      gtk_window_set_title(GTK_WINDOW(dialog), _("*** Board window shows preview of selection ***"));
+    }
 
     if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
       {
@@ -1859,7 +1869,7 @@ if(appData.debugMode) printf("n=%d, h=%d, w=%d\n",n,height,width);
 	gtk_window_resize(GTK_WINDOW(dialog), wp[dlgNr]->width, wp[dlgNr]->height);
     }
 
-    for(i=0; option[i].type != EndMark; i++) if(option[i].type == Graph || dlgNr == BoardWindow && option[i].handle) {
+    for(i=0; option[i].type != EndMark; i++) if(option[i].type == Graph || dlgNr == BoardWindow && option[i].handle && !appData.fixedSize) {
 	gtk_widget_set_size_request(option[i].handle, -1, -1); // remove size requests after realization, so user can shrink
 	if(option[i].type == Label) gtk_label_set_ellipsize(option[i].handle, PANGO_ELLIPSIZE_END);
     }