#include <cairo/cairo-xlib.h>
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
-#ifdef __APPLE__
+#ifdef OSXAPP
# include <gtkmacintegration/gtkosxapplication.h>
#endif
gtk_window_set_title(GTK_WINDOW(shells[dlg]), title);
}
-int
-SetWidgetFont (GtkWidget *w, char *s)
+void
+SetWidgetFont (GtkWidget *w, char **s)
{
PangoFontDescription *pfd;
- if (!s || *s == '#') return 0; // no spec, or spec of color: fail
- if(!*(char**)s) return 1; // empty spec: do nothing, but succeed
- pfd = pango_font_description_from_string(*(char**)s);
+ if (!s || !*s || !**s) return; // uses no font, no font spec or empty font spec
+ pfd = pango_font_description_from_string(*s);
gtk_widget_modify_font(w, pfd);
- return 1;
}
void
{
char *msg = mb[i].string;
if(!msg) break;
-#ifdef __APPLE__
+#ifdef OSXAPP
if(!strcmp(msg, "Quit ")) continue; // Quit item will appear automatically in App menu
if(!strcmp(msg, "About XBoard")) msg = "About"; // 'XBoard' will be appended automatically when moved to App menu 1st item
#endif
GdkModifierType accelerator_mods;
gtk_accelerator_parse(mb[i].accel, &accelerator_key, &accelerator_mods);
-#ifdef __APPLE__
+#ifdef OSXAPP
if(accelerator_mods & GDK_CONTROL_MASK) { // in OSX use Meta where Linux uses Ctrl
accelerator_mods &= ~GDK_CONTROL_MASK; // clear Ctrl flag
accelerator_mods |= GDK_META_MASK; // set Meta flag
g_signal_connect(opt->handle, "key-press-event", G_CALLBACK (TypeInProc), (gpointer) (dlg<<16 | (opt - dialogOptions[dlg])));
break;
case 5: // game list
-printf("use %s\n", appData.gameListFont);
- SetWidgetFont(opt->handle, (char*) &appData.gameListFont);
g_signal_connect(opt->handle, "button-press-event", G_CALLBACK (GameListEvent), (gpointer) 0 );
case 4: // game-list filter
g_signal_connect(opt->handle, "key-press-event", G_CALLBACK (GameListEvent), (gpointer) (intptr_t) nr );
/* no label so let textview occupy all columns */
Pack(hbox, table, sw, left, left+r, top, GTK_EXPAND);
}
- SetWidgetFont(textview, option[i].textValue);
+ SetWidgetFont(textview, option[i].font);
if ( *(char**)option[i].target != NULL )
gtk_text_buffer_set_text (textbuffer, *(char**)option[i].target, -1);
else
option[i].handle = (void *) (label = gtk_label_new(option[i].name));
/* Left Justify */
gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
- SetWidgetFont(label, option[i].textValue);
+ SetWidgetFont(label, option[i].font);
if(option[i].min & BORDER) {
GtkWidget *frame = gtk_frame_new(NULL);
gtk_container_add(GTK_CONTAINER(frame), label);
g_signal_connect(label, "button-press-event", G_CALLBACK(MemoEvent), (gpointer) &option[i]);
gtk_widget_set_sensitive(label, TRUE);
}
- Pack(hbox, table, label, left, left+2, top, 0);
+ Pack(hbox, table, label, left, left+3, top, 0);
break;
case SaveButton:
case Button:
button = gtk_button_new_with_label (option[i].name);
+ SetWidgetFont(gtk_bin_get_child(GTK_BIN(button)), option[i].font);
/* set button color on view board dialog */
if(option[i].choice && ((char*)option[i].choice)[0] == '#' && !currentCps) {
}
/* set button color on new variant dialog */
- if(!SetWidgetFont(gtk_bin_get_child(GTK_BIN(button)), option[i].textValue))
if(option[i].textValue) {
+ static char *b = "Bold";
gdk_color_parse( option[i].textValue, &color );
gtk_widget_modify_bg ( GTK_WIDGET(button), GTK_STATE_NORMAL, &color );
gtk_widget_set_sensitive(button, option[i].value >= 0 && (appData.noChessProgram
|| strstr(first.variants, VariantName(option[i].value))));
+ if(engineVariant[100] ? !strcmp(engineVariant+100, option[i].name) :
+ gameInfo.variant ? option[i].value == gameInfo.variant : !strcmp(option[i].name, "Normal"))
+ SetWidgetFont(gtk_bin_get_child(GTK_BIN(button)), &b);
}
Pack(hbox, table, button, left, left+1, top, 0);
GtkListStore *store;
option[i].handle = (void *) (list = gtk_tree_view_new());
+ SetWidgetFont(option[i].handle, option[i].font);
gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(list), FALSE);
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes("List Items", renderer, "text", 0, NULL);
break;
case Graph:
option[i].handle = (void*) (graph = gtk_drawing_area_new());
-// gtk_widget_set_size_request(graph, option[i].max, option[i].value);
+ gtk_widget_set_size_request(graph, option[i].max, option[i].value);
if(0){ GtkAllocation a;
a.x = 0; a.y = 0; a.width = option[i].max, a.height = option[i].value;
gtk_widget_set_allocation(graph, &a);
case DropDown:
top--;
msg = _(option[i].name); // write name on the menu button
-#ifndef __APPLE__
+#ifndef OSXAPP
if(tinyLayout) { strcpy(def, msg); def[tinyLayout] = NULLCHAR; msg = def; } // clip menu text to keep menu bar small
#endif
// XtSetArg(args[j], XtNmenuName, XtNewString(option[i].name)); j++;
break;
case BarEnd:
top--;
-#ifndef __APPLE__
+#ifndef OSXAPP
gtk_table_attach(GTK_TABLE(table), menuBar, left, left+r, top, top+1, GTK_FILL | GTK_EXPAND, GTK_FILL, 2, 1);
if(option[i].target) ((ButtonCallback*)option[i].target)(boxStart); // callback that can make sizing decisions
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)
+ gtk_widget_set_size_request(option[i].handle, -1, -1); // remove size requests after realization, so user can shrink
+
return 1; // tells caller he must do initialization (e.g. add specific event handlers)
}
projects / xboard.git / blobdiff