Author: rjek Date: Fri Feb 2 11:34:13 2007 New Revision: 3161 URL: http://svn.semichrome.net?rev=3161&view=rev Log: Misc nsgtk fixes and improvements in makefile, choices dialogue and info window Modified: trunk/netsurf/gtk/gtk_gui.c trunk/netsurf/gtk/res/netsurf.glade trunk/netsurf/makefile Modified: trunk/netsurf/gtk/gtk_gui.c URL: http://svn.semichrome.net/trunk/netsurf/gtk/gtk_gui.c?rev=3161&r1=316... ============================================================================== --- trunk/netsurf/gtk/gtk_gui.c (original) +++ trunk/netsurf/gtk/gtk_gui.c Fri Feb 2 11:34:13 2007 @@ -143,6 +143,7 @@ void gui_init(int argc, char** argv) { char buf[PATH_MAX]; + PangoFontDescription *fontdesc; gtk_init(&argc, &argv); @@ -227,6 +228,9 @@ gtk_image_set_from_file(GTK_IMAGE( glade_xml_get_widget(gladeWindows, "imageLogo")), find_resource(buf, "netsurf-logo.png", "netsurf-logo.png")); + fontdesc = pango_font_description_from_string("Monospace 8"); + gtk_widget_modify_font(GTK_WIDGET( + glade_xml_get_widget(gladeWindows, "textviewGPL")), fontdesc); nsgtk_history_init(); } Modified: trunk/netsurf/gtk/res/netsurf.glade URL: http://svn.semichrome.net/trunk/netsurf/gtk/res/netsurf.glade?rev=3161&am... ============================================================================== --- trunk/netsurf/gtk/res/netsurf.glade (original) +++ trunk/netsurf/gtk/res/netsurf.glade Fri Feb 2 11:34:13 2007 @@ -1839,7 +1839,7 @@ <property name="can_focus">True</property> <property name="show_tabs">True</property> <property name="show_border">True</property> - <property name="tab_pos">GTK_POS_LEFT</property> + <property name="tab_pos">GTK_POS_TOP</property> <property name="scrollable">False</property> <property name="enable_popup">False</property> @@ -4740,10 +4740,11 @@ <child> <widget class="GtkNotebook" id="notebook4"> <property name="border_width">4</property> + <property name="width_request">575</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="show_tabs">True</property> - <property name="show_border">True</property> + <property name="show_border">False</property> <property name="tab_pos">GTK_POS_TOP</property> <property name="scrollable">False</property> <property name="enable_popup">False</property> @@ -4874,7 +4875,7 @@ <property name="window_placement">GTK_CORNER_TOP_LEFT</property> <child> - <widget class="GtkTextView" id="textview7"> + <widget class="GtkTextView" id="textviewGPL"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="editable">False</property> @@ -4889,7 +4890,7 @@ <property name="left_margin">0</property> <property name="right_margin">0</property> <property name="indent">0</property> - <property name="text" translatable="yes"> GNU GENERAL PUBLIC LICENSE + <property name="text" translatable="yes"> GNU GENERAL PUBLIC LICENSE Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc., Modified: trunk/netsurf/makefile URL: http://svn.semichrome.net/trunk/netsurf/makefile?rev=3161&r1=3160&... ============================================================================== --- trunk/netsurf/makefile (original) +++ trunk/netsurf/makefile Fri Feb 2 11:34:13 2007 @@ -130,7 +130,7 @@ CFLAGS_DEBUG = -std=c99 -D_BSD_SOURCE -DDEBUG_BUILD $(WARNFLAGS) -I.. \ $(PLATFORM_CFLAGS_DEBUG) -g CFLAGS_GTK = -Dnsgtk -std=c99 -D_BSD_SOURCE -Dgtk \ - $(WARNFLAGS) -I.. -g -O0 -Wformat=2 -DNDEBUG \ + $(WARNFLAGS) -I.. -g -O0 -Wformat=2 \ `pkg-config --cflags libglade-2.0 gtk+-2.0` `xml2-config --cflags` # Stop GCC under Cygwin throwing a fit