diff options
author | Rob Kendrick <rjek@netsurf-browser.org> | 2008-03-22 13:45:35 +0000 |
---|---|---|
committer | Rob Kendrick <rjek@netsurf-browser.org> | 2008-03-22 13:45:35 +0000 |
commit | 6aaa14e728aa4be5faa36f2d3a367481ddf82777 (patch) | |
tree | aedb983f9cb6e3c41a54bd63b6ba32ced3aaffb7 | |
parent | c95b8ea9276e58e9ec64972f91697d3033323320 (diff) | |
download | netsurf-6aaa14e728aa4be5faa36f2d3a367481ddf82777.tar.gz netsurf-6aaa14e728aa4be5faa36f2d3a367481ddf82777.tar.bz2 |
Add box tree dump saving, create 'debugging' sub menu to put this and debug rendering option in. Make debug rendering option cause all open windows to redraw.
svn path=/trunk/netsurf/; revision=4036
-rw-r--r-- | gtk/gtk_scaffolding.c | 46 | ||||
-rw-r--r-- | gtk/gtk_window.c | 5 | ||||
-rw-r--r-- | gtk/gtk_window.h | 3 | ||||
-rw-r--r-- | gtk/res/netsurf.glade | 618 |
4 files changed, 375 insertions, 297 deletions
diff --git a/gtk/gtk_scaffolding.c b/gtk/gtk_scaffolding.c index d7ee0f4a1..55d3c8938 100644 --- a/gtk/gtk_scaffolding.c +++ b/gtk/gtk_scaffolding.c @@ -146,6 +146,7 @@ MENUPROTO(status_bar); MENUPROTO(downloads); MENUPROTO(save_window_size); MENUPROTO(toggle_debug_rendering); +MENUPROTO(save_box_tree); /* navigate menu */ MENUPROTO(back); @@ -184,6 +185,7 @@ static struct menu_events menu_events[] = { MENUEVENT(downloads), MENUEVENT(save_window_size), MENUEVENT(toggle_debug_rendering), + MENUEVENT(save_box_tree), /* navigate menu */ MENUEVENT(back), @@ -548,11 +550,51 @@ MENUHANDLER(save_window_size) MENUHANDLER(toggle_debug_rendering) { html_redraw_debug = !html_redraw_debug; - gui_window_redraw_window(g); - + nsgtk_reflow_all_windows(); return TRUE; } +MENUHANDLER(save_box_tree) +{ + GtkWidget *save_dialog; + struct gtk_scaffolding *gw = (struct gtk_scaffolding *)g; + + save_dialog = gtk_file_chooser_dialog_new("Save File", gw->window, + GTK_FILE_CHOOSER_ACTION_SAVE, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, + NULL); + + gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(save_dialog), + getenv("HOME") ? getenv("HOME") : "/"); + + gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(save_dialog), + "boxtree.txt"); + + if (gtk_dialog_run(GTK_DIALOG(save_dialog)) == GTK_RESPONSE_ACCEPT) { + char *filename = gtk_file_chooser_get_filename( + GTK_FILE_CHOOSER(save_dialog)); + FILE *fh; + LOG(("Saving box tree dump to %s...\n", filename)); + + fh = fopen(filename, "w"); + if (fh == NULL) { + warn_user("Error saving box tree dump.", + "Unable to open file for writing."); + } else { + struct browser_window *bw; + bw = nsgtk_get_browser_window(gw->top_level); + box_dump(fh, bw->current_content->data.html.layout->children, + 0); + fclose(fh); + } + + g_free(filename); + } + + gtk_widget_destroy(save_dialog); +} + MENUHANDLER(stop) { return nsgtk_window_stop_button_clicked(GTK_WIDGET(widget), g); diff --git a/gtk/gtk_window.c b/gtk/gtk_window.c index bf77b4571..4e47e8f50 100644 --- a/gtk/gtk_window.c +++ b/gtk/gtk_window.c @@ -80,6 +80,11 @@ static void nsgtk_redraw_caret(struct gui_window *g); static GdkCursor *nsgtk_create_menu_cursor(void); +struct browser_window *nsgtk_get_browser_window(struct gui_window *g) +{ + return g->bw; +} + nsgtk_scaffolding *nsgtk_get_scaffold(struct gui_window *g) { return g->scaffold; diff --git a/gtk/gtk_window.h b/gtk/gtk_window.h index 7d62a217f..0a030e8e7 100644 --- a/gtk/gtk_window.h +++ b/gtk/gtk_window.h @@ -20,6 +20,7 @@ #define NETSURF_GTK_WINDOW_H 1 #include "desktop/gui.h" +#include "desktop/browser.h" #include "gtk/gtk_scaffolding.h" void nsgtk_reflow_all_windows(void); @@ -32,4 +33,6 @@ float nsgtk_get_scale_for_gui(struct gui_window *g); int nsgtk_gui_window_update_targets(struct gui_window *g); void nsgtk_window_destroy_browser(struct gui_window *g); +struct browser_window *nsgtk_get_browser_window(struct gui_window *g); + #endif /* NETSURF_GTK_WINDOW_H */ diff --git a/gtk/res/netsurf.glade b/gtk/res/netsurf.glade index c7eb06727..035d6a48e 100644 --- a/gtk/res/netsurf.glade +++ b/gtk/res/netsurf.glade @@ -492,10 +492,32 @@ </widget> </child> <child> - <widget class="GtkMenuItem" id="toggle_debug_rendering"> + <widget class="GtkMenuItem" id="debugging"> <property name="visible">True</property> - <property name="label" translatable="yes">T_oggle Debug Rendering</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="label" translatable="yes">De_bugging</property> <property name="use_underline">True</property> + <child> + <widget class="GtkMenu" id="menu1"> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <child> + <widget class="GtkMenuItem" id="toggle_debug_rendering"> + <property name="visible">True</property> + <property name="label" translatable="yes">T_oggle debug rendering</property> + <property name="use_underline">True</property> + </widget> + </child> + <child> + <widget class="GtkMenuItem" id="save_box_tree"> + <property name="visible">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="label" translatable="yes">_Save box tree</property> + <property name="use_underline">True</property> + </widget> + </child> + </widget> + </child> </widget> </child> </widget> @@ -743,6 +765,7 @@ </child> </widget> <packing> + <property name="expand">False</property> <property name="homogeneous">False</property> </packing> </child> @@ -778,17 +801,14 @@ <placeholder/> </child> <child> - <widget class="GtkStatusbar" id="statusbar1"> - <property name="height_request">1</property> + <widget class="GtkVScrollbar" id="coreScrollVertical"> <property name="visible">True</property> + <property name="adjustment">0 0 100 1 10 0</property> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_SHRINK | GTK_FILL</property> </packing> </child> <child> @@ -808,6 +828,7 @@ </widget> <packing> <property name="resize">False</property> + <property name="shrink">True</property> </packing> </child> <child> @@ -817,6 +838,7 @@ </widget> <packing> <property name="resize">False</property> + <property name="shrink">True</property> </packing> </child> </widget> @@ -827,14 +849,17 @@ </packing> </child> <child> - <widget class="GtkVScrollbar" id="coreScrollVertical"> + <widget class="GtkStatusbar" id="statusbar1"> + <property name="height_request">1</property> <property name="visible">True</property> - <property name="adjustment">0 0 100 1 10 0</property> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_SHRINK | GTK_FILL</property> </packing> </child> </widget> @@ -878,107 +903,107 @@ <property name="column_spacing">11</property> <property name="row_spacing">10</property> <child> - <widget class="GtkLabel" id="labelLoginHost"> + <widget class="GtkEntry" id="entryLoginUser"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">moo.yoo.com</property> + <property name="can_focus">True</property> + <property name="has_focus">True</property> + <property name="text" translatable="yes">sesame</property> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="x_options">GTK_FILL</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label57"> + <widget class="GtkEntry" id="entryLoginPass"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Password</property> + <property name="can_focus">True</property> + <property name="visibility">False</property> + <property name="invisible_char">*</property> + <property name="activates_default">True</property> + <property name="text" translatable="yes">opensesame</property> </widget> <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="top_attach">3</property> <property name="bottom_attach">4</property> - <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label56"> + <widget class="GtkLabel" id="labelLoginRealm"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Username</property> + <property name="label" translatable="yes">my sekr3t area</property> </widget> <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkLabel" id="label54"> + <widget class="GtkLabel" id="label55"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Host</property> + <property name="label" translatable="yes">Realm</property> </widget> <packing> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkLabel" id="label55"> + <widget class="GtkLabel" id="label54"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Realm</property> + <property name="label" translatable="yes">Host</property> </widget> <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkLabel" id="labelLoginRealm"> + <widget class="GtkLabel" id="label56"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">my sekr3t area</property> + <property name="label" translatable="yes">Username</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkEntry" id="entryLoginPass"> + <widget class="GtkLabel" id="label57"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="visibility">False</property> - <property name="invisible_char">*</property> - <property name="activates_default">True</property> - <property name="text" translatable="yes">opensesame</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Password</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> <property name="top_attach">3</property> <property name="bottom_attach">4</property> - <property name="y_options"></property> + <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkEntry" id="entryLoginUser"> + <widget class="GtkLabel" id="labelLoginHost"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="has_focus">True</property> - <property name="text" translatable="yes">sesame</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">moo.yoo.com</property> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="y_options"></property> + <property name="x_options">GTK_FILL</property> </packing> </child> </widget> @@ -1347,6 +1372,7 @@ <property name="tooltip" translatable="yes">Attempt to hide images from known advertisement servers.</property> <property name="label" translatable="yes">Hide advertisements</property> <property name="use_underline">True</property> + <property name="response_id">0</property> <property name="draw_indicator">True</property> </widget> <packing> @@ -1362,6 +1388,7 @@ <property name="tooltip" translatable="yes">Stop pop-up windows normally containing adverts appearing.</property> <property name="label" translatable="yes">Disable pop-up windows</property> <property name="use_underline">True</property> + <property name="response_id">0</property> <property name="draw_indicator">True</property> </widget> <packing> @@ -1378,6 +1405,7 @@ <property name="tooltip" translatable="yes">Do not allow the embedded of applets and plugins.</property> <property name="label" translatable="yes">Disable plug-ins</property> <property name="use_underline">True</property> + <property name="response_id">0</property> <property name="draw_indicator">True</property> </widget> <packing> @@ -1471,6 +1499,7 @@ <property name="tooltip" translatable="yes">Show a tooltip showing the URL of a page in the local history tree.</property> <property name="label" translatable="yes">Hover URLs by pointer in local history</property> <property name="use_underline">True</property> + <property name="response_id">0</property> <property name="draw_indicator">True</property> </widget> <packing> @@ -1521,6 +1550,7 @@ <property name="tooltip" translatable="yes">Ask before overwriting files when downloading.</property> <property name="label" translatable="yes">Request confirmation before overwriting files</property> <property name="use_underline">True</property> + <property name="response_id">0</property> <property name="draw_indicator">True</property> </widget> <packing> @@ -1535,6 +1565,7 @@ <property name="tooltip" translatable="yes">Show a drop-down list of recent addresses when typing into the address bar.</property> <property name="label" translatable="yes">Display recently visited URLs as you type</property> <property name="use_underline">True</property> + <property name="response_id">0</property> <property name="draw_indicator">True</property> </widget> <packing> @@ -1550,6 +1581,7 @@ <property name="tooltip" translatable="yes">When requesting items or pages, tell the server what linked to them.</property> <property name="label" translatable="yes">Send site referral information</property> <property name="use_underline">True</property> + <property name="response_id">0</property> <property name="active">True</property> <property name="draw_indicator">True</property> </widget> @@ -1580,9 +1612,6 @@ </packing> </child> </widget> - <packing> - <property name="tab_expand">False</property> - </packing> </child> <child> <widget class="GtkLabel" id="label71"> @@ -1591,7 +1620,6 @@ </widget> <packing> <property name="type">tab</property> - <property name="tab_expand">False</property> <property name="tab_fill">False</property> </packing> </child> @@ -1615,69 +1643,31 @@ <property name="column_spacing">3</property> <property name="row_spacing">3</property> <child> - <widget class="GtkEntry" id="entryProxyPassword"> + <widget class="GtkEntry" id="entryProxyUser"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">If your proxy server requires authentication, enter your password here.</property> - <property name="visibility">False</property> - <property name="invisible_char">*</property> + <property name="tooltip" translatable="yes">If your proxy server requires authentication, enter your username here.</property> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label76"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Proxy type</property> - </widget> - <packing> - <property name="x_options"></property> - <property name="y_options">GTK_EXPAND</property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label75"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Host</property> - </widget> - <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options"></property> - <property name="y_options">GTK_EXPAND</property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="label74"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Username</property> - </widget> - <packing> <property name="top_attach">2</property> <property name="bottom_attach">3</property> - <property name="x_options"></property> - <property name="y_options">GTK_EXPAND</property> + <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label73"> + <widget class="GtkComboBox" id="comboProxyType"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Password</property> + <property name="items" translatable="yes">No proxy +Simple proxy +Basic authentication +NTLM authentication</property> </widget> <packing> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options"></property> - <property name="y_options">GTK_EXPAND</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="y_options"></property> </packing> </child> <child> @@ -1723,30 +1713,68 @@ </packing> </child> <child> - <widget class="GtkComboBox" id="comboProxyType"> + <widget class="GtkLabel" id="label73"> <property name="visible">True</property> - <property name="items" translatable="yes">No proxy -Simple proxy -Basic authentication -NTLM authentication</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Password</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="y_options"></property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="x_options"></property> + <property name="y_options">GTK_EXPAND</property> </packing> </child> <child> - <widget class="GtkEntry" id="entryProxyUser"> + <widget class="GtkLabel" id="label74"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Username</property> + </widget> + <packing> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options"></property> + <property name="y_options">GTK_EXPAND</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label75"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Host</property> + </widget> + <packing> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options"></property> + <property name="y_options">GTK_EXPAND</property> + </packing> + </child> + <child> + <widget class="GtkLabel" id="label76"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Proxy type</property> + </widget> + <packing> + <property name="x_options"></property> + <property name="y_options">GTK_EXPAND</property> + </packing> + </child> + <child> + <widget class="GtkEntry" id="entryProxyPassword"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">If your proxy server requires authentication, enter your username here.</property> + <property name="tooltip" translatable="yes">If your proxy server requires authentication, enter your password here.</property> + <property name="visibility">False</property> + <property name="invisible_char">*</property> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> <property name="y_options"></property> </packing> </child> @@ -1787,83 +1815,83 @@ NTLM authentication</property> <property name="column_spacing">3</property> <property name="row_spacing">3</property> <child> - <widget class="GtkSpinButton" id="spinMaxFetchers"> + <widget class="GtkLabel" id="label78"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">Maximum number of concurrent items to fetch at once.</property> - <property name="adjustment">1 0 100 1 10 10</property> - <property name="climb_rate">1</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Maximum fetchers</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="y_options"></property> + <property name="y_options">GTK_EXPAND</property> </packing> </child> <child> - <widget class="GtkSpinButton" id="spinFetchesPerHost"> + <widget class="GtkLabel" id="label79"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">Maximum number of item fetches per web server.</property> - <property name="adjustment">1 0 100 1 10 10</property> - <property name="climb_rate">1</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Fetches per host</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="y_options"></property> + <property name="y_options">GTK_EXPAND</property> </packing> </child> <child> - <widget class="GtkSpinButton" id="spinCachedConnections"> + <widget class="GtkLabel" id="label80"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">Number of connections to keep incase they are needed again.</property> - <property name="adjustment">1 0 100 1 10 10</property> - <property name="climb_rate">1</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Cached connections</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> - <property name="y_options"></property> + <property name="y_options">GTK_EXPAND</property> </packing> </child> <child> - <widget class="GtkLabel" id="label80"> + <widget class="GtkSpinButton" id="spinCachedConnections"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Cached connections</property> + <property name="can_focus">True</property> + <property name="tooltip" translatable="yes">Number of connections to keep incase they are needed again.</property> + <property name="adjustment">1 0 100 1 10 10</property> + <property name="climb_rate">1</property> </widget> <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> - <property name="y_options">GTK_EXPAND</property> + <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label79"> + <widget class="GtkSpinButton" id="spinFetchesPerHost"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Fetches per host</property> + <property name="can_focus">True</property> + <property name="tooltip" translatable="yes">Maximum number of item fetches per web server.</property> + <property name="adjustment">1 0 100 1 10 10</property> + <property name="climb_rate">1</property> </widget> <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="y_options">GTK_EXPAND</property> + <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label78"> + <widget class="GtkSpinButton" id="spinMaxFetchers"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Maximum fetchers</property> + <property name="can_focus">True</property> + <property name="tooltip" translatable="yes">Maximum number of concurrent items to fetch at once.</property> + <property name="adjustment">1 0 100 1 10 10</property> + <property name="climb_rate">1</property> </widget> <packing> - <property name="y_options">GTK_EXPAND</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="y_options"></property> </packing> </child> </widget> @@ -1889,7 +1917,6 @@ NTLM authentication</property> </widget> <packing> <property name="position">1</property> - <property name="tab_expand">False</property> </packing> </child> <child> @@ -1900,7 +1927,6 @@ NTLM authentication</property> <packing> <property name="type">tab</property> <property name="position">1</property> - <property name="tab_expand">False</property> <property name="tab_fill">False</property> </packing> </child> @@ -1926,6 +1952,7 @@ NTLM authentication</property> <property name="tooltip" translatable="yes">Enable the use of Cairo, which provides better looking results at the cost of speed.</property> <property name="label" translatable="yes">Use Cairo for anti-aliased drawing</property> <property name="use_underline">True</property> + <property name="response_id">0</property> <property name="active">True</property> <property name="draw_indicator">True</property> </widget> @@ -1941,6 +1968,7 @@ NTLM authentication</property> <property name="tooltip" translatable="yes">Smoothly resize images when zooming in and out.</property> <property name="label" translatable="yes">Resample images when not at natural size</property> <property name="use_underline">True</property> + <property name="response_id">0</property> <property name="active">True</property> <property name="draw_indicator">True</property> </widget> @@ -2029,6 +2057,7 @@ NTLM authentication</property> <property name="tooltip" translatable="yes">Display only the first frame of animated images.</property> <property name="label" translatable="yes">Disable animations</property> <property name="use_underline">True</property> + <property name="response_id">0</property> <property name="draw_indicator">True</property> </widget> <packing> @@ -2061,7 +2090,6 @@ NTLM authentication</property> </widget> <packing> <property name="position">2</property> - <property name="tab_expand">False</property> </packing> </child> <child> @@ -2072,7 +2100,6 @@ NTLM authentication</property> <packing> <property name="type">tab</property> <property name="position">2</property> - <property name="tab_expand">False</property> <property name="tab_fill">False</property> </packing> </child> @@ -2097,62 +2124,49 @@ NTLM authentication</property> <property name="column_spacing">3</property> <property name="row_spacing">3</property> <child> - <widget class="GtkFontButton" id="fontSansSerif"> + <widget class="GtkLabel" id="label88"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="show_style">False</property> - <property name="show_size">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Sans-serif</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkComboBox" id="comboDefault"> + <widget class="GtkLabel" id="label89"> <property name="visible">True</property> - <property name="items" translatable="yes">Sans-serif -Serif -Monospace -Cursive -Fantasy</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Serif</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">5</property> - <property name="bottom_attach">6</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> + <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkFontButton" id="fontFantasy"> + <widget class="GtkLabel" id="label90"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="show_style">False</property> - <property name="show_size">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Monospace</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkFontButton" id="fontCursive"> + <widget class="GtkLabel" id="label91"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="show_style">False</property> - <property name="show_size">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Cursive</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> <property name="top_attach">3</property> <property name="bottom_attach">4</property> <property name="x_options">GTK_FILL</property> @@ -2160,70 +2174,76 @@ Fantasy</property> </packing> </child> <child> - <widget class="GtkFontButton" id="fontMonospace"> + <widget class="GtkLabel" id="label92"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="show_style">False</property> - <property name="show_size">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Fantasy</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkFontButton" id="fontSerif"> + <widget class="GtkLabel" id="label93"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="show_style">False</property> - <property name="show_size">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Default</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> + <property name="top_attach">5</property> + <property name="bottom_attach">6</property> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label93"> + <widget class="GtkFontButton" id="fontSerif"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Default</property> + <property name="can_focus">True</property> + <property name="response_id">0</property> + <property name="show_style">False</property> + <property name="show_size">False</property> </widget> <packing> - <property name="top_attach">5</property> - <property name="bottom_attach">6</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label92"> + <widget class="GtkFontButton" id="fontMonospace"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Fantasy</property> + <property name="can_focus">True</property> + <property name="response_id">0</property> + <property name="show_style">False</property> + <property name="show_size">False</property> </widget> <packing> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label91"> + <widget class="GtkFontButton" id="fontCursive"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Cursive</property> + <property name="can_focus">True</property> + <property name="response_id">0</property> + <property name="show_style">False</property> + <property name="show_size">False</property> </widget> <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="top_attach">3</property> <property name="bottom_attach">4</property> <property name="x_options">GTK_FILL</property> @@ -2231,39 +2251,51 @@ Fantasy</property> </packing> </child> <child> - <widget class="GtkLabel" id="label90"> + <widget class="GtkFontButton" id="fontFantasy"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Monospace</property> + <property name="can_focus">True</property> + <property name="response_id">0</property> + <property name="show_style">False</property> + <property name="show_size">False</property> </widget> <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label89"> + <widget class="GtkComboBox" id="comboDefault"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Serif</property> + <property name="items" translatable="yes">Sans-serif +Serif +Monospace +Cursive +Fantasy</property> </widget> <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">5</property> + <property name="bottom_attach">6</property> <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> + <property name="y_options">GTK_FILL</property> </packing> </child> <child> - <widget class="GtkLabel" id="label88"> + <widget class="GtkFontButton" id="fontSansSerif"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Sans-serif</property> + <property name="can_focus">True</property> + <property name="response_id">0</property> + <property name="show_style">False</property> + <property name="show_size">False</property> </widget> <packing> - <property name="x_options">GTK_FILL</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="y_options"></property> </packing> </child> @@ -2303,84 +2335,84 @@ Fantasy</property> <property name="column_spacing">3</property> <property name="row_spacing">3</property> <child> - <widget class="GtkLabel" id="label98"> + <widget class="GtkLabel" id="label95"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">pt</property> + <property name="label" translatable="yes">Default</property> </widget> <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label97"> + <widget class="GtkLabel" id="label96"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">pt</property> + <property name="label" translatable="yes">Minimum</property> </widget> <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkSpinButton" id="spinMinimumSize"> + <widget class="GtkSpinButton" id="spinDefaultSize"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">Do not allow text to be displayed any smaller than this.</property> + <property name="tooltip" translatable="yes">The base-line font size to use.</property> <property name="adjustment">1 0 100 1 10 10</property> <property name="climb_rate">1</property> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> <property name="x_options"></property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkSpinButton" id="spinDefaultSize"> + <widget class="GtkSpinButton" id="spinMinimumSize"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip" translatable="yes">The base-line font size to use.</property> + <property name="tooltip" translatable="yes">Do not allow text to be displayed any smaller than this.</property> <property name="adjustment">1 0 100 1 10 10</property> <property name="climb_rate">1</property> </widget> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="x_options"></property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label96"> + <widget class="GtkLabel" id="label97"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Minimum</property> + <property name="label" translatable="yes">pt</property> </widget> <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> + <property name="left_attach">2</property> + <property name="right_attach">3</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label95"> + <widget class="GtkLabel" id="label98"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Default</property> + <property name="label" translatable="yes">pt</property> </widget> <packing> - <property name="x_options">GTK_FILL</property> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> <property name="y_options"></property> </packing> </child> @@ -2407,7 +2439,6 @@ Fantasy</property> </widget> <packing> <property name="position">3</property> - <property name="tab_expand">False</property> </packing> </child> <child> @@ -2418,7 +2449,6 @@ Fantasy</property> <packing> <property name="type">tab</property> <property name="position">3</property> - <property name="tab_expand">False</property> <property name="tab_fill">False</property> </packing> </child> @@ -2561,6 +2591,7 @@ Fantasy</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="tooltip" translatable="yes">Flush cached items that are older than the maximum permitted age.</property> + <property name="response_id">0</property> <child> <widget class="GtkAlignment" id="alignment30"> <property name="visible">True</property> @@ -2637,7 +2668,6 @@ Fantasy</property> </widget> <packing> <property name="position">4</property> - <property name="tab_expand">False</property> </packing> </child> <child> @@ -2648,7 +2678,6 @@ Fantasy</property> <packing> <property name="type">tab</property> <property name="position">4</property> - <property name="tab_expand">False</property> <property name="tab_fill">False</property> </packing> </child> @@ -2685,6 +2714,7 @@ Fantasy</property> <property name="tooltip" translatable="yes">Revert any made changes.</property> <property name="label">gtk-cancel</property> <property name="use_stock">True</property> + <property name="response_id">0</property> <signal name="clicked" handler="gtk_widget_hide" object="wndPreferences"/> <signal name="clicked" handler="nsgtk_options_load"/> </widget> @@ -2702,6 +2732,7 @@ Fantasy</property> <property name="tooltip" translatable="yes">Apply and save these changes now.</property> <property name="label">gtk-apply</property> <property name="use_stock">True</property> + <property name="response_id">0</property> <signal name="clicked" handler="nsgtk_options_save"/> <signal name="clicked" handler="gtk_widget_hide" object="wndPreferences"/> </widget> @@ -2777,82 +2808,82 @@ Fantasy</property> <property name="n_columns">2</property> <property name="column_spacing">4</property> <child> - <widget class="GtkLabel" id="labelHistoryAddress"> + <widget class="GtkLabel" id="label117"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">http://netsurf.sf.net/</property> - <property name="ellipsize">PANGO_ELLIPSIZE_MIDDLE</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">Address</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="labelHistoryLastVisit"> + <widget class="GtkLabel" id="label118"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Fri Aug 09 00:00:00 2006</property> - <property name="ellipsize">PANGO_ELLIPSIZE_END</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">Last visited</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="labelHistoryVisits"> + <widget class="GtkLabel" id="label119"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">2</property> - <property name="ellipsize">PANGO_ELLIPSIZE_END</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">Number of visits</property> </widget> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label119"> + <widget class="GtkLabel" id="labelHistoryVisits"> <property name="visible">True</property> - <property name="xalign">1</property> - <property name="label" translatable="yes">Number of visits</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">2</property> + <property name="ellipsize">PANGO_ELLIPSIZE_END</property> </widget> <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label118"> + <widget class="GtkLabel" id="labelHistoryLastVisit"> <property name="visible">True</property> - <property name="xalign">1</property> - <property name="label" translatable="yes">Last visited</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Fri Aug 09 00:00:00 2006</property> + <property name="ellipsize">PANGO_ELLIPSIZE_END</property> </widget> <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> <property name="y_options"></property> </packing> </child> <child> - <widget class="GtkLabel" id="label117"> + <widget class="GtkLabel" id="labelHistoryAddress"> <property name="visible">True</property> - <property name="xalign">1</property> - <property name="label" translatable="yes">Address</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">http://netsurf.sf.net/</property> + <property name="ellipsize">PANGO_ELLIPSIZE_MIDDLE</property> </widget> <packing> - <property name="x_options">GTK_FILL</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> <property name="y_options"></property> </packing> </child> @@ -2945,9 +2976,6 @@ Fantasy</property> </widget> </child> </widget> - <packing> - <property name="tab_expand">False</property> - </packing> </child> <child> <widget class="GtkLabel" id="label123"> @@ -2956,7 +2984,6 @@ Fantasy</property> </widget> <packing> <property name="type">tab</property> - <property name="tab_expand">False</property> <property name="tab_fill">False</property> </packing> </child> @@ -2980,7 +3007,6 @@ Fantasy</property> </widget> <packing> <property name="position">1</property> - <property name="tab_expand">False</property> </packing> </child> <child> @@ -2991,7 +3017,6 @@ Fantasy</property> <packing> <property name="type">tab</property> <property name="position">1</property> - <property name="tab_expand">False</property> <property name="tab_fill">False</property> </packing> </child> @@ -3346,7 +3371,6 @@ OF THE POSSIBILITY OF SUCH DAMAGES. </widget> <packing> <property name="position">2</property> - <property name="tab_expand">False</property> </packing> </child> <child> @@ -3357,7 +3381,6 @@ OF THE POSSIBILITY OF SUCH DAMAGES. <packing> <property name="type">tab</property> <property name="position">2</property> - <property name="tab_expand">False</property> <property name="tab_fill">False</property> </packing> </child> @@ -3376,6 +3399,7 @@ OF THE POSSIBILITY OF SUCH DAMAGES. <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> + <property name="response_id">0</property> <signal name="clicked" handler="gtk_widget_hide" object="wndAbout"/> <child> <widget class="GtkAlignment" id="alignment31"> @@ -3484,6 +3508,7 @@ OF THE POSSIBILITY OF SUCH DAMAGES. <property name="can_default">True</property> <property name="label">gtk-ok</property> <property name="use_stock">True</property> + <property name="response_id">0</property> <signal name="clicked" handler="gtk_widget_hide" object="wndWarning"/> </widget> </child> @@ -3662,6 +3687,7 @@ OF THE POSSIBILITY OF SUCH DAMAGES. </widget> <packing> <property name="expand">False</property> + <property name="homogeneous">False</property> </packing> </child> <child> @@ -3704,6 +3730,7 @@ OF THE POSSIBILITY OF SUCH DAMAGES. </child> </widget> <packing> + <property name="expand">False</property> <property name="homogeneous">False</property> </packing> </child> @@ -3715,6 +3742,7 @@ OF THE POSSIBILITY OF SUCH DAMAGES. </widget> <packing> <property name="expand">False</property> + <property name="homogeneous">False</property> </packing> </child> </widget> |