From d43e712aff86194cfdbe8f0763a0bd173b759a81 Mon Sep 17 00:00:00 2001 From: Rob Kendrick Date: Thu, 20 Mar 2008 22:53:39 +0000 Subject: GTK UI tweaks from Mike Lester svn path=/trunk/netsurf/; revision=4002 --- gtk/gtk_gui.c | 2 +- gtk/gtk_options.c | 6 ++--- gtk/gtk_options.h | 2 +- gtk/gtk_scaffolding.c | 8 +++--- gtk/res/netsurf.glade | 73 +++++++++++++++++++++++++++------------------------ 5 files changed, 48 insertions(+), 43 deletions(-) (limited to 'gtk') diff --git a/gtk/gtk_gui.c b/gtk/gtk_gui.c index 06fc8e326..dfeec03f5 100644 --- a/gtk/gtk_gui.c +++ b/gtk/gtk_gui.c @@ -201,7 +201,7 @@ void gui_init(int argc, char** argv) die("Unable to load throbber image.\n"); find_resource(buf, "Choices", "~/.netsurf/Choices"); - LOG(("Using '%s' as Choices file", buf)); + LOG(("Using '%s' as Preferences file", buf)); options_file_location = strdup(buf); options_read(buf); diff --git a/gtk/gtk_options.c b/gtk/gtk_options.c index fda970520..91c49267c 100644 --- a/gtk/gtk_options.c +++ b/gtk/gtk_options.c @@ -29,7 +29,7 @@ #include "gtk/gtk_options.h" #include "gtk/gtk_window.h" -GtkWindow *wndChoices; +GtkWindow *wndPreferences; static GtkWidget *entryHomePageURL, *checkHideAdverts, @@ -70,8 +70,8 @@ static GtkWidget *entryHomePageURL, #define FIND_WIDGET(x) (x) = glade_xml_get_widget(gladeWindows, #x); if ((x) == NULL) LOG(("Unable to find widget '%s'!", #x)) void nsgtk_options_init(void) { - wndChoices = GTK_WINDOW(glade_xml_get_widget(gladeWindows, - "wndChoices")); + wndPreferences = GTK_WINDOW(glade_xml_get_widget(gladeWindows, + "wndPreferences")); /* get widget objects */ FIND_WIDGET(entryHomePageURL); diff --git a/gtk/gtk_options.h b/gtk/gtk_options.h index 9ba6347b0..2c70829a2 100644 --- a/gtk/gtk_options.h +++ b/gtk/gtk_options.h @@ -21,7 +21,7 @@ #include -extern GtkWindow *wndChoices; +extern GtkWindow *wndPreferences; void nsgtk_options_init(void); /** Init options and load window */ void nsgtk_options_load(void); /** Load current options into window */ diff --git a/gtk/gtk_scaffolding.c b/gtk/gtk_scaffolding.c index 5f824bbd7..d7ee0f4a1 100644 --- a/gtk/gtk_scaffolding.c +++ b/gtk/gtk_scaffolding.c @@ -131,7 +131,7 @@ MENUPROTO(close_window); MENUPROTO(quit); /* edit menu */ -MENUPROTO(choices); +MENUPROTO(preferences); /* view menu */ MENUPROTO(stop); @@ -169,7 +169,7 @@ static struct menu_events menu_events[] = { MENUEVENT(quit), /* edit menu */ - MENUEVENT(choices), + MENUEVENT(preferences), /* view menu */ MENUEVENT(stop), @@ -430,9 +430,9 @@ MENUHANDLER(quit) return TRUE; } -MENUHANDLER(choices) +MENUHANDLER(preferences) { - gtk_widget_show(GTK_WIDGET(wndChoices)); + gtk_widget_show(GTK_WIDGET(wndPreferences)); return TRUE; } diff --git a/gtk/res/netsurf.glade b/gtk/res/netsurf.glade index c0941a998..c7eb06727 100644 --- a/gtk/res/netsurf.glade +++ b/gtk/res/netsurf.glade @@ -22,7 +22,7 @@ True Opens a new browser window. - New window + _New Window True @@ -34,20 +34,11 @@ - - - True - Open an address into this browser window. - Open _location... - True - - - True Open a file on your computer into this browser window. - Open _file... + _Open File... True @@ -63,7 +54,7 @@ True Close this browser window. - _Close window + _Close Window True @@ -242,7 +233,7 @@ True False Selects all text in the current browser window. - Select _all + _Select All True @@ -268,10 +259,10 @@ - + True Change how NetSurf functions. - _Choices... + P_references... True @@ -311,7 +302,7 @@ True - Reload + _Reload True @@ -332,7 +323,7 @@ True Scale the page in the current browser window to be smaller or larger. - Scale View... + _Scale View... True @@ -396,7 +387,7 @@ True - Fullscreen + _Fullscreen True @@ -417,7 +408,7 @@ True False - Images + _Images... True @@ -426,7 +417,7 @@ True False Toggle the display of images in the foreground. - Foreground images + _Foreground Images True @@ -435,7 +426,7 @@ True False Toggle the display of images in the background. - Background images + _Background Images True @@ -446,14 +437,14 @@ True - Toolbars + _Toolbars... True True - Menu bar + _Menu Bar True True @@ -461,7 +452,7 @@ True - Button bar + _Button Bar True True @@ -469,7 +460,7 @@ True - Status bar + _Status Bar True True @@ -488,7 +479,7 @@ True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK Shows the downloads window - Downloads... + _Downloads... True @@ -496,14 +487,14 @@ True Save this window's size and position for use with new windows. - Save window size + S_ave Window Size True True - Toggle debug rendering + T_oggle Debug Rendering True @@ -596,7 +587,7 @@ True False Add the current page to your bookmarks. - _Add to bookmarks + _Add to Bookmarks True @@ -605,11 +596,25 @@ True False Open a window showing all your bookmarks. - Show book_marks... + _Show Bookmarks... True + + + True + + + + + True + Open an address into this browser window. + _Open location... + True + + + @@ -1250,9 +1255,9 @@ - + True - NetSurf Choices + NetSurf Preferences GTK_WIN_POS_CENTER True @@ -2680,7 +2685,7 @@ Fantasy Revert any made changes. gtk-cancel True - + @@ -2698,7 +2703,7 @@ Fantasy gtk-apply True - + False -- cgit v1.2.3