Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/c938d1962bed31f0723707fc978bb65ab5a47ef2
...commit
http://git.netsurf-browser.org/netsurf.git/commit/c938d1962bed31f0723707fc978bb65ab5a47ef2
...tree
http://git.netsurf-browser.org/netsurf.git/tree/c938d1962bed31f0723707fc978bb65ab5a47ef2
The branch, master has been updated
via c938d1962bed31f0723707fc978bb65ab5a47ef2 (commit)
from 0f18440fd5e4296e90152744838110932c017969 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=c938d1962bed31f0723707fc978bb65ab5a47ef2
commit c938d1962bed31f0723707fc978bb65ab5a47ef2
Author: Vincent Sanders <[email protected]>
Commit: Vincent Sanders <[email protected]>
add login dialog
diff --git a/frontends/windows/about.c b/frontends/windows/about.c
index 2cd855b..f73c0c8 100644
--- a/frontends/windows/about.c
+++ b/frontends/windows/about.c
@@ -141,7 +141,7 @@ nsws_about_event_callback(HWND hwnd, UINT msg, WPARAM
wparam, LPARAM lparam)
void nsws_about_dialog_init(HINSTANCE hinst, HWND parent)
{
- int ret = DialogBox(hinst, MAKEINTRESOURCE(IDD_DLG_ABOUT), parent,
+ int ret = DialogBox(hinst, MAKEINTRESOURCE(IDD_ABOUT), parent,
nsws_about_event_callback);
if (ret == -1) {
win32_warning(messages_get("NoMemory"), 0);
diff --git a/frontends/windows/download.c b/frontends/windows/download.c
index dfcd2b5..f0163ce 100644
--- a/frontends/windows/download.c
+++ b/frontends/windows/download.c
@@ -185,7 +185,7 @@ nsws_download_event_callback(HWND hwnd, UINT msg, WPARAM
wparam, LPARAM lparam)
static bool nsws_download_window_up(struct gui_download_window *w)
{
w->hwnd = CreateDialog(hinst,
- MAKEINTRESOURCE(IDD_DLG_DOWNLOAD),
+ MAKEINTRESOURCE(IDD_DOWNLOAD),
gui_window_main_window(w->window),
nsws_download_event_callback);
if (w->hwnd == NULL) {
diff --git a/frontends/windows/prefs.c b/frontends/windows/prefs.c
index 591b574..b2cb7b2 100644
--- a/frontends/windows/prefs.c
+++ b/frontends/windows/prefs.c
@@ -718,7 +718,7 @@ void nsws_prefs_dialog_init(HINSTANCE hinst, HWND parent)
psp[0].dwSize = sizeof(PROPSHEETPAGE);
psp[0].dwFlags = 0;/*PSP_USEICONID*/
psp[0].hInstance = hinst;
- psp[0].pszTemplate = MAKEINTRESOURCE(IDD_DLG_OPTIONS_GENERAL);
+ psp[0].pszTemplate = MAKEINTRESOURCE(IDD_OPTIONS_GENERAL);
psp[0].pfnDlgProc = options_general_dialog_handler;
psp[0].lParam = 0;
psp[0].pfnCallback = NULL;
@@ -726,7 +726,7 @@ void nsws_prefs_dialog_init(HINSTANCE hinst, HWND parent)
psp[1].dwSize = sizeof(PROPSHEETPAGE);
psp[1].dwFlags = 0;/*PSP_USEICONID*/
psp[1].hInstance = hinst;
- psp[1].pszTemplate = MAKEINTRESOURCE(IDD_DLG_OPTIONS_CONNECTIONS);
+ psp[1].pszTemplate = MAKEINTRESOURCE(IDD_OPTIONS_CONNECTIONS);
psp[1].pfnDlgProc = options_connections_dialog_handler;
psp[1].lParam = 0;
psp[1].pfnCallback = NULL;
@@ -734,7 +734,7 @@ void nsws_prefs_dialog_init(HINSTANCE hinst, HWND parent)
psp[2].dwSize = sizeof(PROPSHEETPAGE);
psp[2].dwFlags = 0;/*PSP_USEICONID*/
psp[2].hInstance = hinst;
- psp[2].pszTemplate = MAKEINTRESOURCE(IDD_DLG_OPTIONS_APPERANCE);
+ psp[2].pszTemplate = MAKEINTRESOURCE(IDD_OPTIONS_APPERANCE);
psp[2].pfnDlgProc = options_appearance_dialog_handler;
psp[2].lParam = 0;
psp[2].pfnCallback = NULL;
diff --git a/frontends/windows/res/resource.rc
b/frontends/windows/res/resource.rc
index 192cd57..fb0468a 100644
--- a/frontends/windows/res/resource.rc
+++ b/frontends/windows/res/resource.rc
@@ -1,269 +1,317 @@
+// Generated by ResEdit 1.6.6
+
#include <windows.h>
#include <commctrl.h>
#include <richedit.h>
#include "../resourceid.h"
-
-IDR_NETSURF_ICON ICON DISCARDABLE "NetSurf.ico"
-IDR_TOOLBAR_BITMAP BITMAP DISCARDABLE "toolbar.bmp"
-IDR_TOOLBAR_BITMAP_GREY BITMAP DISCARDABLE "toolbarg.bmp"
-IDR_TOOLBAR_BITMAP_HOT BITMAP DISCARDABLE "toolbarh.bmp"
-IDR_NETSURF_BANNER BITMAP DISCARDABLE "banner.bmp"
-IDR_HOME_BITMAP BITMAP DISCARDABLE "home.bmp"
-
-IDR_THROBBER_FRAME0_BITMAP BITMAP DISCARDABLE "throbber/throbber0.bmp"
-IDR_THROBBER_FRAME1_BITMAP BITMAP DISCARDABLE "throbber/throbber1.bmp"
-IDR_THROBBER_FRAME2_BITMAP BITMAP DISCARDABLE "throbber/throbber2.bmp"
-IDR_THROBBER_FRAME3_BITMAP BITMAP DISCARDABLE "throbber/throbber3.bmp"
-IDR_THROBBER_FRAME4_BITMAP BITMAP DISCARDABLE "throbber/throbber4.bmp"
-IDR_THROBBER_FRAME5_BITMAP BITMAP DISCARDABLE "throbber/throbber5.bmp"
-IDR_THROBBER_FRAME6_BITMAP BITMAP DISCARDABLE "throbber/throbber6.bmp"
-IDR_THROBBER_FRAME7_BITMAP BITMAP DISCARDABLE "throbber/throbber7.bmp"
-
-IDR_MENU_MAIN MENU
-BEGIN
- POPUP "&File"
- BEGIN
- MENUITEM "&New Window",IDM_FILE_OPEN_WINDOW
- MENUITEM "Open &Location",IDM_FILE_OPEN_LOCATION
- MENUITEM "&Close",IDM_FILE_CLOSE_WINDOW
- MENUITEM SEPARATOR
- MENUITEM "&Save Page",IDM_FILE_SAVE_PAGE,GRAYED,HELP
- POPUP "Save Page &As"
- BEGIN
- MENUITEM "Text",IDM_FILE_SAVEAS_TEXT,GRAYED
- MENUITEM "PDF",IDM_FILE_SAVEAS_PDF,GRAYED
- MENUITEM "Postscript",IDM_FILE_SAVEAS_POSTSCRIPT,GRAYED
- END
- MENUITEM SEPARATOR
- MENUITEM "Print Pre&view",IDM_FILE_PRINT_PREVIEW
- MENUITEM "&Print",IDM_FILE_PRINT
- MENUITEM SEPARATOR
- MENUITEM "E&xit",IDM_FILE_QUIT
- END
- POPUP "&Edit"
- BEGIN
- MENUITEM "Cu&t",IDM_EDIT_CUT
- MENUITEM "&Copy",IDM_EDIT_COPY
- MENUITEM "&Paste",IDM_EDIT_PASTE
- MENUITEM "&Delete",IDM_EDIT_DELETE
- MENUITEM SEPARATOR
- MENUITEM "Select &All",IDM_EDIT_SELECT_ALL
- MENUITEM SEPARATOR
- MENUITEM "&Find",IDM_EDIT_SEARCH
- END
- POPUP "&View"
- BEGIN
- MENUITEM "Stop",IDM_NAV_STOP
- MENUITEM "Reload",IDM_NAV_RELOAD
- MENUITEM SEPARATOR
- POPUP "&Zoom"
- BEGIN
- MENUITEM "Zoom &In",IDM_VIEW_ZOOMPLUS
- MENUITEM "Zoom &Out",IDM_VIEW_ZOOMMINUS
- MENUITEM "&Reset",IDM_VIEW_ZOOMNORMAL
- END
- MENUITEM SEPARATOR
- MENUITEM "Page S&ource",IDM_VIEW_SOURCE
- MENUITEM "&Full Screen",IDM_VIEW_FULLSCREEN
- MENUITEM SEPARATOR
- MENUITEM "Save size and location",IDM_VIEW_SAVE_WIN_METRICS
- END
- POPUP "&Navigate"
- BEGIN
- MENUITEM "Back",IDM_NAV_BACK
- MENUITEM "Forward",IDM_NAV_FORWARD
- MENUITEM "Home",IDM_NAV_HOME
- MENUITEM SEPARATOR
- MENUITEM "Local History",IDM_NAV_LOCALHISTORY
- MENUITEM "Global History",IDM_NAV_GLOBALHISTORY
- MENUITEM SEPARATOR
- MENUITEM "Show Bookmarks",IDM_NAV_BOOKMARKS
- END
- POPUP "&Tools"
- BEGIN
- MENUITEM "&Downloads",IDM_TOOLS_DOWNLOADS
- MENUITEM "&Show Cookies",IDM_TOOLS_COOKIES
- POPUP "Debugging"
- BEGIN
- MENUITEM "Debug rendering",IDM_VIEW_TOGGLE_DEBUG_RENDERING
- MENUITEM "Save Box Tree",IDM_VIEW_DEBUGGING_SAVE_BOXTREE,GRAYED
- MENUITEM "Save DOM Tree",IDM_VIEW_DEBUGGING_SAVE_DOMTREE,GRAYED
- END
- MENUITEM SEPARATOR
- MENUITEM "Options...",IDM_EDIT_PREFERENCES
- END
- POPUP "&Help"
- BEGIN
- MENUITEM "&Contents",IDM_HELP_CONTENTS
- MENUITEM "G&uide",IDM_HELP_GUIDE
- MENUITEM "&Info",IDM_HELP_INFO
- MENUITEM SEPARATOR
- MENUITEM "&About NetSurf",IDM_HELP_ABOUT
- END
-END
-
-IDR_MENU_CONTEXT MENU
-BEGIN
- POPUP "Context"
- BEGIN
- MENUITEM "&Back",IDM_NAV_BACK
- MENUITEM "F&orward",IDM_NAV_FORWARD
- MENUITEM "&Home",IDM_NAV_HOME
- MENUITEM "&Stop",IDM_NAV_STOP
- MENUITEM "&Reload",IDM_NAV_RELOAD
- MENUITEM SEPARATOR
- MENUITEM "C&ut",IDM_EDIT_CUT,GRAYED
- MENUITEM "&Copy",IDM_EDIT_COPY,GRAYED
- MENUITEM "&Paste",IDM_EDIT_PASTE,GRAYED
- MENUITEM "&Delete",IDM_EDIT_DELETE,GRAYED
- END
-END
-
-IDD_DLG_ABOUT DIALOGEX 10,10,206,133
-CAPTION "About NetSurf"
-FONT 8,"MS Sans Serif",0,0,0
-STYLE WS_VISIBLE|WS_CAPTION|WS_SYSMENU
-EXSTYLE WS_EX_DLGMODALFRAME
-BEGIN
- CONTROL IDR_NETSURF_BANNER,IDC_IMG1,"Static",SS_BITMAP|0x40L
/*SS_REALSIZECONTROL*/,0,0,205,53
- CONTROL "NetSurf",IDC_ABOUT_VERSION,"Static",SS_LEFT,10,60,185,16
- CONTROL "NetSurf is a small fast
browser",IDC_ABOUT_TEXT,"Static",SS_LEFT,10,83,185,8
- CONTROL "Copyright 2003-2011 The NetSurf
Developers",IDC_ABOUT_COPYRIGHT,"Static",SS_LEFT,10,96,185,8
- CONTROL
"&OK",IDOK,"Button",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP,143,111,54,15
- CONTROL
"&Credits",IDC_BTN_CREDITS,"Button",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP,10,111,54,15
- CONTROL
"&Licence",IDC_BTN_LICENCE,"Button",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP,70,111,54,15
-END
-
-IDD_DLG_DOWNLOAD DIALOGEX 0,0,201,84
-CAPTION "Download"
-FONT 8,"MS Sans Serif",0,0,0
-STYLE WS_POPUP|WS_VISIBLE|WS_CAPTION|WS_SYSMENU|DS_MODALFRAME|DS_SETFONT
-EXSTYLE WS_EX_DLGMODALFRAME
-BEGIN
- CONTROL "downloading [file] [size] from [domain] to
[destination]",IDC_DOWNLOAD_LABEL,"Static",WS_CHILDWINDOW|WS_VISIBLE|WS_GROUP|SS_CENTER,6,6,189,35
- CONTROL
"progress",IDC_DOWNLOAD_PROGRESS,PROGRESS_CLASS,WS_VISIBLE,6,50,189,10
- CONTROL "&OK",IDOK,"Button",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP,141,66,54,15
- CONTROL
"&Cancel",IDCANCEL,"Button",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP,81,66,54,15
-END
-
-
-IDD_DLG_OPTIONS_GENERAL DIALOGEX 0,0,220,200
-CAPTION "General"
-FONT 8,"MS Shell Dlg"
-STYLE DS_CONTROL|DS_SHELLFONT
-BEGIN
- /* home page entry */
- CONTROL "Home Page",IDC_STATIC,"Static",SS_LEFT,7,7,40,8
- CONTROL "",IDC_STATIC,"Static",SS_ETCHEDFRAME,47,11,166,1
- CONTROL IDR_HOME_BITMAP,IDC_STATIC,"Static",SS_BITMAP,15,19,24,24
- CONTROL
"",IDC_PREFS_HOMEPAGE,"Edit",WS_TABSTOP|ES_OEMCONVERT|ES_AUTOHSCROLL,43,19,170,14,WS_EX_CLIENTEDGE
+//
+// Bitmap resources
+//
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+IDR_HOME_BITMAP BITMAP "home.bmp"
- /* Content control */
- CONTROL "Content Control",IDC_STATIC,"Static",SS_LEFT,7,40,60,8
- CONTROL "",IDC_STATIC,"Static",SS_ETCHEDFRAME,67,44,146,1
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+IDR_NETSURF_BANNER BITMAP "banner.bmp"
- CONTROL "Hide
Images",IDC_PREFS_IMAGES,"Button",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP|BS_AUTOCHECKBOX,43,52,67,10
- CONTROL "Hide
Advertisements",IDC_PREFS_ADVERTS,"Button",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP|BS_AUTOCHECKBOX,43,66,81,10
- CONTROL "Send
referer",IDC_PREFS_REFERER,"Button",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP|BS_AUTOCHECKBOX,43,80,55,10
-END
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+IDR_THROBBER_FRAME0_BITMAP BITMAP "throbber/throbber0.bmp"
-IDD_DLG_OPTIONS_CONNECTIONS DIALOGEX 0,0,220,200
-CAPTION "Connections"
-FONT 8,"MS Shell Dlg"
-STYLE DS_CONTROL|DS_SHELLFONT
-BEGIN
- /* proxy divider */
- CONTROL "Proxy",IDC_STATIC,"Static",SS_LEFT,7,7,30,8
- CONTROL "",IDC_STATIC,"Static",SS_ETCHEDFRAME,37,11,176,1
- /* proxy controls */
- CONTROL
"Type:",IDC_STATIC,"Static",WS_CHILDWINDOW|WS_VISIBLE|WS_GROUP|SS_LEFT,43,22,40,8
- CONTROL
"",IDC_PREFS_PROXYTYPE,"ComboBox",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP|CBS_DROPDOWNLIST,80,19,60,60
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+IDR_THROBBER_FRAME1_BITMAP BITMAP "throbber/throbber1.bmp"
- CONTROL
"Server:",IDC_STATIC,"Static",WS_CHILDWINDOW|WS_VISIBLE|WS_GROUP|SS_LEFT,43,39,28,8
- CONTROL
"",IDC_PREFS_PROXYHOST,"Edit",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP|ES_OEMCONVERT|ES_AUTOHSCROLL,80,36,80,14,WS_EX_CLIENTEDGE
- CONTROL
"Port:",IDC_STATIC,"Static",WS_CHILDWINDOW|WS_VISIBLE|WS_GROUP|SS_LEFT,164,39,16,8
- CONTROL
"",IDC_PREFS_PROXYPORT,"Edit",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP|ES_OEMCONVERT|ES_AUTOHSCROLL,182,36,24,14,WS_EX_CLIENTEDGE
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+IDR_THROBBER_FRAME2_BITMAP BITMAP "throbber/throbber2.bmp"
- CONTROL
"Username:",IDC_STATIC,"Static",WS_CHILDWINDOW|WS_VISIBLE|WS_GROUP|SS_LEFT,43,60,35,8
- CONTROL
"",IDC_PREFS_PROXYNAME,"Edit",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP|ES_OEMCONVERT|ES_AUTOHSCROLL,80,57,45,14,WS_EX_CLIENTEDGE
- CONTROL
"Password:",IDC_STATIC,"Static",WS_CHILDWINDOW|WS_VISIBLE|WS_GROUP|SS_LEFT,132,60,34,8
- CONTROL
"",IDC_PREFS_PROXYPASS,"Edit",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP|ES_OEMCONVERT|ES_AUTOHSCROLL|ES_PASSWORD,168,57,45,14,WS_EX_CLIENTEDGE
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+IDR_THROBBER_FRAME3_BITMAP BITMAP "throbber/throbber3.bmp"
- /* fetcher divider */
- CONTROL "Fetchers",IDC_STATIC,"Static",SS_LEFT,7,78,40,8
- CONTROL "",IDC_STATIC,"Static",SS_ETCHEDFRAME,42,82,171,1
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+IDR_THROBBER_FRAME4_BITMAP BITMAP "throbber/throbber4.bmp"
- /* max fetchers */
- CONTROL "Max
Fetchers:",IDC_STATIC,"Static",WS_CHILDWINDOW|WS_VISIBLE|WS_GROUP,43,96,64,8
- CONTROL
"",IDC_PREFS_FETCHERS,"Edit",ES_NUMBER|ES_RIGHT|WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP|WS_BORDER,111,93,30,14
- CONTROL "Max
Fetchers",IDC_PREFS_FETCHERS_SPIN,UPDOWN_CLASS,UDS_AUTOBUDDY|UDS_ALIGNRIGHT|WS_VISIBLE,341,122,11,15
- /* fetchers per host */
- CONTROL "Fetches per
host:",IDC_STATIC,"Static",WS_CHILDWINDOW|WS_VISIBLE|WS_GROUP,43,118,64,8
- CONTROL
"",IDC_PREFS_FETCH_HOST,"Edit",ES_NUMBER|ES_RIGHT|WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP|WS_BORDER,111,114,30,14
- CONTROL "Fetches per
host",IDC_PREFS_FETCH_HOST_SPIN,UPDOWN_CLASS,UDS_AUTOBUDDY|UDS_ALIGNRIGHT|WS_VISIBLE,341,140,11,15
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+IDR_THROBBER_FRAME5_BITMAP BITMAP "throbber/throbber5.bmp"
- /* cached fetchers */
- CONTROL "Cached
Fetches:",IDC_STATIC,"Static",WS_CHILDWINDOW|WS_VISIBLE|WS_GROUP,43,138,64,8
- CONTROL
"",IDC_PREFS_FETCH_HANDLES,"Edit",ES_NUMBER|ES_RIGHT|WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP|WS_BORDER,111,135,30,14
- CONTROL "Cached
Fetches",IDC_PREFS_FETCH_HANDLES_SPIN,UPDOWN_CLASS,UDS_AUTOBUDDY|UDS_ALIGNRIGHT|WS_VISIBLE,341,158,11,15
-END
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+IDR_THROBBER_FRAME6_BITMAP BITMAP "throbber/throbber6.bmp"
-IDD_DLG_OPTIONS_APPERANCE DIALOGEX 10,10,220,200
-CAPTION "Apperance"
-FONT 8,"MS Shell Dlg"
-STYLE DS_CONTROL|DS_SHELLFONT
-BEGIN
- /* proxy separator */
- CONTROL "Fonts",IDC_STATIC,"Static",SS_LEFT,7,7,20,8
- CONTROL "",IDC_STATIC,"Static",SS_ETCHEDFRAME,27,11,186,1
- /* font controls */
- CONTROL
"Sans-serif:",IDC_STATIC,"Static",WS_CHILDWINDOW|WS_VISIBLE|WS_GROUP|SS_LEFT,43,22,44,8
- CONTROL
"Sans-serif",IDC_PREFS_SANS,"Button",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP,89,19,50,14
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+IDR_THROBBER_FRAME7_BITMAP BITMAP "throbber/throbber7.bmp"
- CONTROL
"Serif:",IDC_STATIC,"Static",WS_CHILDWINDOW|WS_VISIBLE|WS_GROUP|SS_LEFT,43,40,24,8
- CONTROL
"Serif",IDC_PREFS_SERIF,"Button",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP,89,37,50,14
- CONTROL
"Monospace:",IDC_STATIC,"Static",WS_CHILDWINDOW|WS_VISIBLE|WS_GROUP|SS_LEFT,43,58,40,8
- CONTROL
"Monospace",IDC_PREFS_MONO,"Button",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP,89,55,50,14
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+IDR_TOOLBAR_BITMAP BITMAP "toolbar.bmp"
- CONTROL
"Cursive:",IDC_STATIC,"Static",WS_CHILDWINDOW|WS_VISIBLE|WS_GROUP|SS_LEFT,43,76,32,8
- CONTROL
"Cursive",IDC_PREFS_CURSIVE,"Button",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP,89,73,50,14
- CONTROL
"Fantasy:",IDC_STATIC,"Static",WS_CHILDWINDOW|WS_VISIBLE|WS_GROUP|SS_LEFT,43,94,32,8
- CONTROL
"Fantasy",IDC_PREFS_FANTASY,"Button",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP,89,91,50,14
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+IDR_TOOLBAR_BITMAP_GREY BITMAP "toolbarg.bmp"
- CONTROL
"Default:",IDC_STATIC,"Static",WS_CHILDWINDOW|WS_VISIBLE|WS_GROUP|SS_LEFT,43,112,38,8
- CONTROL
"",IDC_PREFS_FONTDEF,"ComboBox",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP|CBS_DROPDOWNLIST,89,109,50,60
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+IDR_TOOLBAR_BITMAP_HOT BITMAP "toolbarh.bmp"
- CONTROL
"Size:",IDC_STATIC,"Static",WS_CHILDWINDOW|WS_VISIBLE|WS_GROUP|SS_LEFT,147,112,16,8
- CONTROL
"",IDC_PREFS_FONT_SIZE,"Edit",ES_NUMBER|WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP,165,109,35,14,WS_EX_CLIENTEDGE
- CONTROL "Font
Size",IDC_PREFS_FONT_SIZE_SPIN,UPDOWN_CLASS,UDS_AUTOBUDDY|UDS_ALIGNRIGHT|WS_VISIBLE,75,137,11,15
- CONTROL "Minimum
Size:",IDC_STATIC,"Static",WS_CHILDWINDOW|WS_VISIBLE|WS_GROUP|SS_LEFT,43,130,52,8
- CONTROL
"",IDC_PREFS_FONT_MINSIZE,"Edit",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP,97,127,35,14,WS_EX_CLIENTEDGE
- CONTROL "Minimum Font
Size",IDC_PREFS_FONT_MINSIZE_SPIN,UPDOWN_CLASS,UDS_AUTOBUDDY|UDS_ALIGNRIGHT|WS_VISIBLE,76,159,11,15
- /* animation separator */
- CONTROL "Animation",IDC_STATIC,"Static",SS_LEFT,7,148,36,8
- CONTROL "",IDC_STATIC,"Static",SS_ETCHEDFRAME,43,152,170,1
-
- CONTROL
"Disable",IDC_PREFS_NOANIMATION,"Button",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP|BS_AUTOCHECKBOX,43,163,39,10
- CONTROL "Minimum
delay:",IDC_STATIC,"Static",WS_CHILDWINDOW|WS_VISIBLE|WS_GROUP|SS_LEFT,55,180,56,8
- CONTROL
"",IDC_PREFS_ANIMATIONDELAY,"Edit",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP,113,177,35,14,WS_EX_CLIENTEDGE
- CONTROL "Min
delay",IDC_PREFS_ANIMATIONDELAY_SPIN,UPDOWN_CLASS,UDS_AUTOBUDDY|UDS_ALIGNRIGHT|WS_VISIBLE,43,210,11,15
-
-
-
-END
+//
+// Menu resources
+//
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+IDR_MENU_CONTEXT MENU
+{
+ POPUP "Context"
+ {
+ MENUITEM "&Back", IDM_NAV_BACK
+ MENUITEM "F&orward", IDM_NAV_FORWARD
+ MENUITEM "&Home", IDM_NAV_HOME
+ MENUITEM "&Stop", IDM_NAV_STOP
+ MENUITEM "&Reload", IDM_NAV_RELOAD
+ MENUITEM SEPARATOR
+ MENUITEM "C&ut", IDM_EDIT_CUT, GRAYED
+ MENUITEM "&Copy", IDM_EDIT_COPY, GRAYED
+ MENUITEM "&Paste", IDM_EDIT_PASTE, GRAYED
+ MENUITEM "&Delete", IDM_EDIT_DELETE, GRAYED
+ }
+}
+
+
+
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+IDR_MENU_MAIN MENU
+{
+ POPUP "&File"
+ {
+ MENUITEM "&New Window", IDM_FILE_OPEN_WINDOW
+ MENUITEM "Open &Location", IDM_FILE_OPEN_LOCATION
+ MENUITEM "&Close", IDM_FILE_CLOSE_WINDOW
+ MENUITEM SEPARATOR
+ MENUITEM "&Save Page", IDM_FILE_SAVE_PAGE, HELP, GRAYED
+ POPUP "Save Page &As"
+ {
+ MENUITEM "Text", IDM_FILE_SAVEAS_TEXT, GRAYED
+ MENUITEM "PDF", IDM_FILE_SAVEAS_PDF, GRAYED
+ MENUITEM "Postscript", IDM_FILE_SAVEAS_POSTSCRIPT, GRAYED
+ }
+ MENUITEM SEPARATOR
+ MENUITEM "Print Pre&view", IDM_FILE_PRINT_PREVIEW
+ MENUITEM "&Print", IDM_FILE_PRINT
+ MENUITEM SEPARATOR
+ MENUITEM "E&xit", IDM_FILE_QUIT
+ }
+ POPUP "&Edit"
+ {
+ MENUITEM "Cu&t", IDM_EDIT_CUT
+ MENUITEM "&Copy", IDM_EDIT_COPY
+ MENUITEM "&Paste", IDM_EDIT_PASTE
+ MENUITEM "&Delete", IDM_EDIT_DELETE
+ MENUITEM SEPARATOR
+ MENUITEM "Select &All", IDM_EDIT_SELECT_ALL
+ MENUITEM SEPARATOR
+ MENUITEM "&Find", IDM_EDIT_SEARCH
+ }
+ POPUP "&View"
+ {
+ MENUITEM "Stop", IDM_NAV_STOP
+ MENUITEM "Reload", IDM_NAV_RELOAD
+ MENUITEM SEPARATOR
+ POPUP "&Zoom"
+ {
+ MENUITEM "Zoom &In", IDM_VIEW_ZOOMPLUS
+ MENUITEM "Zoom &Out", IDM_VIEW_ZOOMMINUS
+ MENUITEM "&Reset", IDM_VIEW_ZOOMNORMAL
+ }
+ MENUITEM SEPARATOR
+ MENUITEM "Page S&ource", IDM_VIEW_SOURCE
+ MENUITEM "&Full Screen", IDM_VIEW_FULLSCREEN
+ MENUITEM SEPARATOR
+ MENUITEM "Save size and location", IDM_VIEW_SAVE_WIN_METRICS
+ }
+ POPUP "&Navigate"
+ {
+ MENUITEM "Back", IDM_NAV_BACK
+ MENUITEM "Forward", IDM_NAV_FORWARD
+ MENUITEM "Home", IDM_NAV_HOME
+ MENUITEM SEPARATOR
+ MENUITEM "Local History", IDM_NAV_LOCALHISTORY
+ MENUITEM "Global History", IDM_NAV_GLOBALHISTORY
+ MENUITEM SEPARATOR
+ MENUITEM "Show Bookmarks", IDM_NAV_BOOKMARKS
+ }
+ POPUP "&Tools"
+ {
+ MENUITEM "&Downloads", IDM_TOOLS_DOWNLOADS
+ MENUITEM "&Show Cookies", IDM_TOOLS_COOKIES
+ POPUP "Debugging"
+ {
+ MENUITEM "Debug rendering", IDM_VIEW_TOGGLE_DEBUG_RENDERING
+ MENUITEM "Save Box Tree", IDM_VIEW_DEBUGGING_SAVE_BOXTREE, GRAYED
+ MENUITEM "Save DOM Tree", IDM_VIEW_DEBUGGING_SAVE_DOMTREE, GRAYED
+ }
+ MENUITEM SEPARATOR
+ MENUITEM "Options...", IDM_EDIT_PREFERENCES
+ }
+ POPUP "&Help"
+ {
+ MENUITEM "&Contents", IDM_HELP_CONTENTS
+ MENUITEM "G&uide", IDM_HELP_GUIDE
+ MENUITEM "&Info", IDM_HELP_INFO
+ MENUITEM SEPARATOR
+ MENUITEM "&About NetSurf", IDM_HELP_ABOUT
+ }
+}
+
+
+
+//
+// Dialog resources
+//
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+IDD_ABOUT DIALOGEX 10, 10, 206, 133
+STYLE DS_SHELLFONT | WS_CAPTION | WS_VISIBLE | WS_SYSMENU
+CAPTION "About NetSurf"
+FONT 8, "Ms Shell Dlg"
+{
+ CONTROL IDR_NETSURF_BANNER, IDC_IMG1, WC_STATIC, SS_BITMAP |
SS_REALSIZECONTROL, 0, 0, 205, 53, WS_EX_LEFT
+ LTEXT "NetSurf", IDC_ABOUT_VERSION, 10, 60, 185, 16, NOT
WS_GROUP | SS_LEFT, WS_EX_LEFT
+ LTEXT "NetSurf is a small fast browser", IDC_ABOUT_TEXT, 10, 83,
185, 8, NOT WS_GROUP | SS_LEFT, WS_EX_LEFT
+ LTEXT "Copyright 2003-2011 The NetSurf Developers",
IDC_ABOUT_COPYRIGHT, 10, 96, 185, 8, NOT WS_GROUP | SS_LEFT, WS_EX_LEFT
+ PUSHBUTTON "&OK", IDOK, 143, 111, 54, 15, 0, WS_EX_LEFT
+ PUSHBUTTON "&Credits", IDC_BTN_CREDITS, 10, 111, 54, 15, 0, WS_EX_LEFT
+ PUSHBUTTON "&Licence", IDC_BTN_LICENCE, 70, 111, 54, 15, 0, WS_EX_LEFT
+}
+
+
+
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+IDD_DOWNLOAD DIALOGEX 0, 0, 201, 84
+STYLE DS_MODALFRAME | DS_SHELLFONT | WS_CAPTION | WS_VISIBLE | WS_POPUP |
WS_SYSMENU
+CAPTION "Download"
+FONT 8, "Ms Shell Dlg"
+{
+ CTEXT "downloading [file] [size] from [domain] to
[destination]", IDC_DOWNLOAD_LABEL, 6, 6, 189, 35, SS_CENTER, WS_EX_LEFT
+ CONTROL "progress", IDC_DOWNLOAD_PROGRESS, PROGRESS_CLASS, 0, 6,
50, 189, 10, WS_EX_LEFT
+ PUSHBUTTON "&OK", IDOK, 141, 66, 54, 15, 0, WS_EX_LEFT
+ PUSHBUTTON "&Cancel", IDCANCEL, 81, 66, 54, 15, 0, WS_EX_LEFT
+}
+
+
+
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+IDD_LOGIN DIALOGEX 0, 0, 200, 93
+STYLE DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_CAPTION |
WS_VISIBLE | WS_POPUP | WS_SYSMENU
+CAPTION "Log In"
+FONT 8, "Ms Shell Dlg"
+{
+ LTEXT "Password:", 0, 7, 53, 35, 9, SS_LEFT, WS_EX_LEFT
+ LTEXT "User name:", 0, 7, 35, 40, 9, SS_LEFT, WS_EX_LEFT
+ EDITTEXT IDC_LOGIN_PASSWORD, 49, 50, 144, 14, ES_AUTOHSCROLL,
WS_EX_LEFT
+ LTEXT "The site foo.bar requires authorization for a realm",
IDC_LOGIN_DESCRIPTION, 49, 7, 144, 18, SS_LEFT, WS_EX_LEFT
+ EDITTEXT IDC_LOGIN_USERNAME, 49, 32, 144, 14, ES_AUTOHSCROLL,
WS_EX_LEFT
+ PUSHBUTTON "Cancel", IDCANCEL, 143, 71, 50, 14, 0, WS_EX_LEFT
+ DEFPUSHBUTTON "Log in", IDOK, 89, 71, 50, 14, 0, WS_EX_LEFT
+}
+
+
+
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+IDD_OPTIONS_APPERANCE DIALOGEX 10, 10, 220, 200
+STYLE DS_CONTROL | DS_SHELLFONT
+CAPTION "Apperance"
+FONT 8, "MS Shell Dlg", 0, 0, 1
+{
+ LTEXT "Fonts", IDC_STATIC, 7, 7, 20, 8, NOT WS_GROUP | SS_LEFT,
WS_EX_LEFT
+ CONTROL "", IDC_STATIC, WC_STATIC, SS_ETCHEDFRAME, 27, 11, 186, 1,
WS_EX_LEFT
+ LTEXT "Sans-serif:", IDC_STATIC, 43, 22, 44, 8, SS_LEFT,
WS_EX_LEFT
+ PUSHBUTTON "Sans-serif", IDC_PREFS_SANS, 89, 19, 50, 14, 0, WS_EX_LEFT
+ LTEXT "Serif:", IDC_STATIC, 43, 40, 24, 8, SS_LEFT, WS_EX_LEFT
+ PUSHBUTTON "Serif", IDC_PREFS_SERIF, 89, 37, 50, 14, 0, WS_EX_LEFT
+ LTEXT "Monospace:", IDC_STATIC, 43, 58, 40, 8, SS_LEFT,
WS_EX_LEFT
+ PUSHBUTTON "Monospace", IDC_PREFS_MONO, 89, 55, 50, 14, 0, WS_EX_LEFT
+ LTEXT "Cursive:", IDC_STATIC, 43, 76, 32, 8, SS_LEFT, WS_EX_LEFT
+ PUSHBUTTON "Cursive", IDC_PREFS_CURSIVE, 89, 73, 50, 14, 0, WS_EX_LEFT
+ LTEXT "Fantasy:", IDC_STATIC, 43, 94, 32, 8, SS_LEFT, WS_EX_LEFT
+ PUSHBUTTON "Fantasy", IDC_PREFS_FANTASY, 89, 91, 50, 14, 0, WS_EX_LEFT
+ LTEXT "Default:", IDC_STATIC, 43, 112, 38, 8, SS_LEFT, WS_EX_LEFT
+ COMBOBOX IDC_PREFS_FONTDEF, 89, 109, 50, 60, WS_TABSTOP |
CBS_DROPDOWNLIST, WS_EX_LEFT
+ LTEXT "Size:", IDC_STATIC, 147, 112, 16, 8, SS_LEFT, WS_EX_LEFT
+ EDITTEXT IDC_PREFS_FONT_SIZE, 165, 109, 35, 14, NOT WS_BORDER |
ES_NUMBER, WS_EX_CLIENTEDGE
+ CONTROL "Font Size", IDC_PREFS_FONT_SIZE_SPIN, UPDOWN_CLASS,
UDS_ALIGNRIGHT | UDS_AUTOBUDDY, 75, 137, 11, 15, WS_EX_LEFT
+ LTEXT "Minimum Size:", IDC_STATIC, 43, 130, 52, 8, SS_LEFT,
WS_EX_LEFT
+ EDITTEXT IDC_PREFS_FONT_MINSIZE, 97, 127, 35, 14, NOT WS_BORDER,
WS_EX_CLIENTEDGE
+ CONTROL "Minimum Font Size", IDC_PREFS_FONT_MINSIZE_SPIN,
UPDOWN_CLASS, UDS_ALIGNRIGHT | UDS_AUTOBUDDY, 76, 159, 11, 15, WS_EX_LEFT
+ LTEXT "Animation", IDC_STATIC, 7, 148, 36, 8, NOT WS_GROUP |
SS_LEFT, WS_EX_LEFT
+ CONTROL "", IDC_STATIC, WC_STATIC, SS_ETCHEDFRAME, 43, 152, 170,
1, WS_EX_LEFT
+ AUTOCHECKBOX "Disable", IDC_PREFS_NOANIMATION, 43, 163, 39, 10, 0,
WS_EX_LEFT
+ LTEXT "Minimum delay:", IDC_STATIC, 55, 180, 56, 8, SS_LEFT,
WS_EX_LEFT
+ EDITTEXT IDC_PREFS_ANIMATIONDELAY, 113, 177, 35, 14, NOT WS_BORDER,
WS_EX_CLIENTEDGE
+ CONTROL "Min delay", IDC_PREFS_ANIMATIONDELAY_SPIN, UPDOWN_CLASS,
UDS_ALIGNRIGHT | UDS_AUTOBUDDY, 43, 210, 11, 15, WS_EX_LEFT
+}
+
+
+
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+IDD_OPTIONS_CONNECTIONS DIALOGEX 0, 0, 220, 200
+STYLE DS_CONTROL | DS_SHELLFONT
+CAPTION "Connections"
+FONT 8, "MS Shell Dlg", 0, 0, 1
+{
+ LTEXT "Proxy", IDC_STATIC, 7, 7, 30, 8, NOT WS_GROUP | SS_LEFT,
WS_EX_LEFT
+ CONTROL "", IDC_STATIC, WC_STATIC, SS_ETCHEDFRAME, 37, 11, 176, 1,
WS_EX_LEFT
+ LTEXT "Type:", IDC_STATIC, 43, 22, 40, 8, SS_LEFT, WS_EX_LEFT
+ COMBOBOX IDC_PREFS_PROXYTYPE, 80, 19, 60, 60, WS_TABSTOP |
CBS_DROPDOWNLIST, WS_EX_LEFT
+ LTEXT "Server:", IDC_STATIC, 43, 39, 28, 8, SS_LEFT, WS_EX_LEFT
+ EDITTEXT IDC_PREFS_PROXYHOST, 80, 36, 80, 14, NOT WS_BORDER |
ES_AUTOHSCROLL | ES_OEMCONVERT, WS_EX_CLIENTEDGE
+ LTEXT "Port:", IDC_STATIC, 164, 39, 16, 8, SS_LEFT, WS_EX_LEFT
+ EDITTEXT IDC_PREFS_PROXYPORT, 182, 36, 24, 14, NOT WS_BORDER |
ES_AUTOHSCROLL | ES_OEMCONVERT, WS_EX_CLIENTEDGE
+ LTEXT "Username:", IDC_STATIC, 43, 60, 35, 8, SS_LEFT, WS_EX_LEFT
+ EDITTEXT IDC_PREFS_PROXYNAME, 80, 57, 45, 14, NOT WS_BORDER |
ES_AUTOHSCROLL | ES_OEMCONVERT, WS_EX_CLIENTEDGE
+ LTEXT "Password:", IDC_STATIC, 132, 60, 34, 8, SS_LEFT,
WS_EX_LEFT
+ EDITTEXT IDC_PREFS_PROXYPASS, 168, 57, 45, 14, NOT WS_BORDER |
ES_AUTOHSCROLL | ES_OEMCONVERT | ES_PASSWORD, WS_EX_CLIENTEDGE
+ LTEXT "Fetchers", IDC_STATIC, 7, 78, 40, 8, NOT WS_GROUP |
SS_LEFT, WS_EX_LEFT
+ CONTROL "", IDC_STATIC, WC_STATIC, SS_ETCHEDFRAME, 42, 82, 171, 1,
WS_EX_LEFT
+ LTEXT "Max Fetchers:", IDC_STATIC, 43, 96, 64, 8, SS_LEFT,
WS_EX_LEFT
+ EDITTEXT IDC_PREFS_FETCHERS, 111, 93, 30, 14, ES_RIGHT | ES_NUMBER,
WS_EX_LEFT
+ CONTROL "Max Fetchers", IDC_PREFS_FETCHERS_SPIN, UPDOWN_CLASS,
UDS_ALIGNRIGHT | UDS_AUTOBUDDY, 341, 122, 11, 15, WS_EX_LEFT
+ LTEXT "Fetches per host:", IDC_STATIC, 43, 118, 64, 8, SS_LEFT,
WS_EX_LEFT
+ EDITTEXT IDC_PREFS_FETCH_HOST, 111, 114, 30, 14, ES_RIGHT |
ES_NUMBER, WS_EX_LEFT
+ CONTROL "Fetches per host", IDC_PREFS_FETCH_HOST_SPIN,
UPDOWN_CLASS, UDS_ALIGNRIGHT | UDS_AUTOBUDDY, 341, 140, 11, 15, WS_EX_LEFT
+ LTEXT "Cached Fetches:", IDC_STATIC, 43, 138, 64, 8, SS_LEFT,
WS_EX_LEFT
+ EDITTEXT IDC_PREFS_FETCH_HANDLES, 111, 135, 30, 14, ES_RIGHT |
ES_NUMBER, WS_EX_LEFT
+ CONTROL "Cached Fetches", IDC_PREFS_FETCH_HANDLES_SPIN,
UPDOWN_CLASS, UDS_ALIGNRIGHT | UDS_AUTOBUDDY, 341, 158, 11, 15, WS_EX_LEFT
+}
+
+
+
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+IDD_OPTIONS_GENERAL DIALOGEX 0, 0, 220, 200
+STYLE DS_CONTROL | DS_SHELLFONT
+CAPTION "General"
+FONT 8, "MS Shell Dlg", 0, 0, 1
+{
+ LTEXT "Home Page", IDC_STATIC, 7, 7, 40, 8, NOT WS_GROUP |
SS_LEFT, WS_EX_LEFT
+ CONTROL "", IDC_STATIC, WC_STATIC, SS_ETCHEDFRAME, 47, 11, 166, 1,
WS_EX_LEFT
+ CONTROL IDR_HOME_BITMAP, IDC_STATIC, WC_STATIC, SS_BITMAP, 15, 19,
24, 24, WS_EX_LEFT
+ EDITTEXT IDC_PREFS_HOMEPAGE, 43, 19, 170, 14, NOT WS_BORDER |
ES_AUTOHSCROLL | ES_OEMCONVERT, WS_EX_CLIENTEDGE
+ LTEXT "Content Control", IDC_STATIC, 7, 40, 60, 8, NOT WS_GROUP
| SS_LEFT, WS_EX_LEFT
+ CONTROL "", IDC_STATIC, WC_STATIC, SS_ETCHEDFRAME, 67, 44, 146, 1,
WS_EX_LEFT
+ AUTOCHECKBOX "Hide Images", IDC_PREFS_IMAGES, 43, 52, 67, 10, 0,
WS_EX_LEFT
+ AUTOCHECKBOX "Hide Advertisements", IDC_PREFS_ADVERTS, 43, 66, 81, 10,
0, WS_EX_LEFT
+ AUTOCHECKBOX "Send referer", IDC_PREFS_REFERER, 43, 80, 55, 10, 0,
WS_EX_LEFT
+}
+
+
+
+//
+// Icon resources
+//
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+IDR_NETSURF_ICON ICON "NetSurf.ico"
diff --git a/frontends/windows/resourceid.h b/frontends/windows/resourceid.h
index 605a77c..9e70d63 100644
--- a/frontends/windows/resourceid.h
+++ b/frontends/windows/resourceid.h
@@ -16,8 +16,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _NETSURF_WINDOWS_RESOURCEID_H_
-#define _NETSURF_WINDOWS_RESOURCEID_H_
+#ifndef NETSURF_WINDOWS_RESOURCEID_H
+#define NETSURF_WINDOWS_RESOURCEID_H
#ifndef IDC_STATIC
#define IDC_STATIC (-1)
@@ -28,18 +28,18 @@
#define IDR_TOOLBAR_BITMAP_GREY 103
#define IDR_TOOLBAR_BITMAP_HOT 104
#define IDR_NETSURF_BANNER 105
-#define IDR_HOME_BITMAP 114
+#define IDR_HOME_BITMAP 106
-#define IDR_THROBBER_FRAME0_BITMAP 106
-#define IDR_THROBBER_FRAME1_BITMAP 107
-#define IDR_THROBBER_FRAME2_BITMAP 108
-#define IDR_THROBBER_FRAME3_BITMAP 109
-#define IDR_THROBBER_FRAME4_BITMAP 110
-#define IDR_THROBBER_FRAME5_BITMAP 111
-#define IDR_THROBBER_FRAME6_BITMAP 112
-#define IDR_THROBBER_FRAME7_BITMAP 113
+#define IDR_THROBBER_FRAME0_BITMAP 110
+#define IDR_THROBBER_FRAME1_BITMAP 111
+#define IDR_THROBBER_FRAME2_BITMAP 112
+#define IDR_THROBBER_FRAME3_BITMAP 113
+#define IDR_THROBBER_FRAME4_BITMAP 114
+#define IDR_THROBBER_FRAME5_BITMAP 115
+#define IDR_THROBBER_FRAME6_BITMAP 116
+#define IDR_THROBBER_FRAME7_BITMAP 117
-#define IDD_DLG_ABOUT 1000
+#define IDD_ABOUT 1000
#define IDC_IMG1 1001
#define IDC_ABOUT_VERSION 1002
#define IDC_ABOUT_TEXT 1003
@@ -47,11 +47,11 @@
#define IDC_BTN_CREDITS 1005
#define IDC_BTN_LICENCE 1006
-#define IDD_DLG_DOWNLOAD 1100
+#define IDD_DOWNLOAD 1100
#define IDC_DOWNLOAD_LABEL 1101
#define IDC_DOWNLOAD_PROGRESS 1102
-#define IDD_DLG_MAIN 1300
+#define IDD_MAIN 1300
#define IDC_MAIN_TOOLBAR 1301
#define IDC_MAIN_URLBAR 1302
#define IDC_MAIN_THROBBER 1303
@@ -59,13 +59,13 @@
#define IDC_MAIN_STATUSBAR 1305
#define IDC_MAIN_LAUNCH_URL 1306
-#define IDD_DLG_OPTIONS_GENERAL 1400
+#define IDD_OPTIONS_GENERAL 1400
#define IDC_PREFS_HOMEPAGE 1401
#define IDC_PREFS_IMAGES 1402
#define IDC_PREFS_ADVERTS 1403
#define IDC_PREFS_REFERER 1404
-#define IDD_DLG_OPTIONS_CONNECTIONS 1500
+#define IDD_OPTIONS_CONNECTIONS 1500
#define IDC_PREFS_FETCHERS 1501
#define IDC_PREFS_FETCHERS_SPIN 1502
#define IDC_PREFS_FETCH_HOST 1503
@@ -73,7 +73,7 @@
#define IDC_PREFS_FETCH_HANDLES 1505
#define IDC_PREFS_FETCH_HANDLES_SPIN 1506
-#define IDD_DLG_OPTIONS_APPERANCE 1200
+#define IDD_OPTIONS_APPERANCE 1200
#define IDC_PREFS_PROXYTYPE 1206
#define IDC_PREFS_PROXYHOST 1207
#define IDC_PREFS_PROXYPORT 1208
@@ -93,11 +93,15 @@
#define IDC_PREFS_ANIMATIONDELAY 1228
#define IDC_PREFS_ANIMATIONDELAY_SPIN 1229
-#define IDD_DLG_SSLCERT 1600
+#define IDD_SSLCERT 1600
#define IDC_SSLCERT_IMG1 1601
#define IDC_SSLCERT_BTN_ACCEPT 1602
#define IDC_SSLCERT_BTN_REJECT 1603
+#define IDD_LOGIN 1700
+#define IDC_LOGIN_USERNAME 1701
+#define IDC_LOGIN_PASSWORD 1702
+#define IDC_LOGIN_DESCRIPTION 1703
#define IDR_MENU_MAIN 10000
#define IDM_FILE_OPEN_WINDOW 10101
-----------------------------------------------------------------------
Summary of changes:
frontends/windows/about.c | 2 +-
frontends/windows/download.c | 2 +-
frontends/windows/prefs.c | 6 +-
frontends/windows/res/resource.rc | 520 ++++++++++++++++++++-----------------
frontends/windows/resourceid.h | 40 +--
5 files changed, 311 insertions(+), 259 deletions(-)
diff --git a/frontends/windows/about.c b/frontends/windows/about.c
index 2cd855b..f73c0c8 100644
--- a/frontends/windows/about.c
+++ b/frontends/windows/about.c
@@ -141,7 +141,7 @@ nsws_about_event_callback(HWND hwnd, UINT msg, WPARAM
wparam, LPARAM lparam)
void nsws_about_dialog_init(HINSTANCE hinst, HWND parent)
{
- int ret = DialogBox(hinst, MAKEINTRESOURCE(IDD_DLG_ABOUT), parent,
+ int ret = DialogBox(hinst, MAKEINTRESOURCE(IDD_ABOUT), parent,
nsws_about_event_callback);
if (ret == -1) {
win32_warning(messages_get("NoMemory"), 0);
diff --git a/frontends/windows/download.c b/frontends/windows/download.c
index dfcd2b5..f0163ce 100644
--- a/frontends/windows/download.c
+++ b/frontends/windows/download.c
@@ -185,7 +185,7 @@ nsws_download_event_callback(HWND hwnd, UINT msg, WPARAM
wparam, LPARAM lparam)
static bool nsws_download_window_up(struct gui_download_window *w)
{
w->hwnd = CreateDialog(hinst,
- MAKEINTRESOURCE(IDD_DLG_DOWNLOAD),
+ MAKEINTRESOURCE(IDD_DOWNLOAD),
gui_window_main_window(w->window),
nsws_download_event_callback);
if (w->hwnd == NULL) {
diff --git a/frontends/windows/prefs.c b/frontends/windows/prefs.c
index 591b574..b2cb7b2 100644
--- a/frontends/windows/prefs.c
+++ b/frontends/windows/prefs.c
@@ -718,7 +718,7 @@ void nsws_prefs_dialog_init(HINSTANCE hinst, HWND parent)
psp[0].dwSize = sizeof(PROPSHEETPAGE);
psp[0].dwFlags = 0;/*PSP_USEICONID*/
psp[0].hInstance = hinst;
- psp[0].pszTemplate = MAKEINTRESOURCE(IDD_DLG_OPTIONS_GENERAL);
+ psp[0].pszTemplate = MAKEINTRESOURCE(IDD_OPTIONS_GENERAL);
psp[0].pfnDlgProc = options_general_dialog_handler;
psp[0].lParam = 0;
psp[0].pfnCallback = NULL;
@@ -726,7 +726,7 @@ void nsws_prefs_dialog_init(HINSTANCE hinst, HWND parent)
psp[1].dwSize = sizeof(PROPSHEETPAGE);
psp[1].dwFlags = 0;/*PSP_USEICONID*/
psp[1].hInstance = hinst;
- psp[1].pszTemplate = MAKEINTRESOURCE(IDD_DLG_OPTIONS_CONNECTIONS);
+ psp[1].pszTemplate = MAKEINTRESOURCE(IDD_OPTIONS_CONNECTIONS);
psp[1].pfnDlgProc = options_connections_dialog_handler;
psp[1].lParam = 0;
psp[1].pfnCallback = NULL;
@@ -734,7 +734,7 @@ void nsws_prefs_dialog_init(HINSTANCE hinst, HWND parent)
psp[2].dwSize = sizeof(PROPSHEETPAGE);
psp[2].dwFlags = 0;/*PSP_USEICONID*/
psp[2].hInstance = hinst;
- psp[2].pszTemplate = MAKEINTRESOURCE(IDD_DLG_OPTIONS_APPERANCE);
+ psp[2].pszTemplate = MAKEINTRESOURCE(IDD_OPTIONS_APPERANCE);
psp[2].pfnDlgProc = options_appearance_dialog_handler;
psp[2].lParam = 0;
psp[2].pfnCallback = NULL;
diff --git a/frontends/windows/res/resource.rc
b/frontends/windows/res/resource.rc
index 192cd57..fb0468a 100644
--- a/frontends/windows/res/resource.rc
+++ b/frontends/windows/res/resource.rc
@@ -1,269 +1,317 @@
+// Generated by ResEdit 1.6.6
+
#include <windows.h>
#include <commctrl.h>
#include <richedit.h>
#include "../resourceid.h"
-
-IDR_NETSURF_ICON ICON DISCARDABLE "NetSurf.ico"
-IDR_TOOLBAR_BITMAP BITMAP DISCARDABLE "toolbar.bmp"
-IDR_TOOLBAR_BITMAP_GREY BITMAP DISCARDABLE "toolbarg.bmp"
-IDR_TOOLBAR_BITMAP_HOT BITMAP DISCARDABLE "toolbarh.bmp"
-IDR_NETSURF_BANNER BITMAP DISCARDABLE "banner.bmp"
-IDR_HOME_BITMAP BITMAP DISCARDABLE "home.bmp"
-
-IDR_THROBBER_FRAME0_BITMAP BITMAP DISCARDABLE "throbber/throbber0.bmp"
-IDR_THROBBER_FRAME1_BITMAP BITMAP DISCARDABLE "throbber/throbber1.bmp"
-IDR_THROBBER_FRAME2_BITMAP BITMAP DISCARDABLE "throbber/throbber2.bmp"
-IDR_THROBBER_FRAME3_BITMAP BITMAP DISCARDABLE "throbber/throbber3.bmp"
-IDR_THROBBER_FRAME4_BITMAP BITMAP DISCARDABLE "throbber/throbber4.bmp"
-IDR_THROBBER_FRAME5_BITMAP BITMAP DISCARDABLE "throbber/throbber5.bmp"
-IDR_THROBBER_FRAME6_BITMAP BITMAP DISCARDABLE "throbber/throbber6.bmp"
-IDR_THROBBER_FRAME7_BITMAP BITMAP DISCARDABLE "throbber/throbber7.bmp"
-
-IDR_MENU_MAIN MENU
-BEGIN
- POPUP "&File"
- BEGIN
- MENUITEM "&New Window",IDM_FILE_OPEN_WINDOW
- MENUITEM "Open &Location",IDM_FILE_OPEN_LOCATION
- MENUITEM "&Close",IDM_FILE_CLOSE_WINDOW
- MENUITEM SEPARATOR
- MENUITEM "&Save Page",IDM_FILE_SAVE_PAGE,GRAYED,HELP
- POPUP "Save Page &As"
- BEGIN
- MENUITEM "Text",IDM_FILE_SAVEAS_TEXT,GRAYED
- MENUITEM "PDF",IDM_FILE_SAVEAS_PDF,GRAYED
- MENUITEM "Postscript",IDM_FILE_SAVEAS_POSTSCRIPT,GRAYED
- END
- MENUITEM SEPARATOR
- MENUITEM "Print Pre&view",IDM_FILE_PRINT_PREVIEW
- MENUITEM "&Print",IDM_FILE_PRINT
- MENUITEM SEPARATOR
- MENUITEM "E&xit",IDM_FILE_QUIT
- END
- POPUP "&Edit"
- BEGIN
- MENUITEM "Cu&t",IDM_EDIT_CUT
- MENUITEM "&Copy",IDM_EDIT_COPY
- MENUITEM "&Paste",IDM_EDIT_PASTE
- MENUITEM "&Delete",IDM_EDIT_DELETE
- MENUITEM SEPARATOR
- MENUITEM "Select &All",IDM_EDIT_SELECT_ALL
- MENUITEM SEPARATOR
- MENUITEM "&Find",IDM_EDIT_SEARCH
- END
- POPUP "&View"
- BEGIN
- MENUITEM "Stop",IDM_NAV_STOP
- MENUITEM "Reload",IDM_NAV_RELOAD
- MENUITEM SEPARATOR
- POPUP "&Zoom"
- BEGIN
- MENUITEM "Zoom &In",IDM_VIEW_ZOOMPLUS
- MENUITEM "Zoom &Out",IDM_VIEW_ZOOMMINUS
- MENUITEM "&Reset",IDM_VIEW_ZOOMNORMAL
- END
- MENUITEM SEPARATOR
- MENUITEM "Page S&ource",IDM_VIEW_SOURCE
- MENUITEM "&Full Screen",IDM_VIEW_FULLSCREEN
- MENUITEM SEPARATOR
- MENUITEM "Save size and location",IDM_VIEW_SAVE_WIN_METRICS
- END
- POPUP "&Navigate"
- BEGIN
- MENUITEM "Back",IDM_NAV_BACK
- MENUITEM "Forward",IDM_NAV_FORWARD
- MENUITEM "Home",IDM_NAV_HOME
- MENUITEM SEPARATOR
- MENUITEM "Local History",IDM_NAV_LOCALHISTORY
- MENUITEM "Global History",IDM_NAV_GLOBALHISTORY
- MENUITEM SEPARATOR
- MENUITEM "Show Bookmarks",IDM_NAV_BOOKMARKS
- END
- POPUP "&Tools"
- BEGIN
- MENUITEM "&Downloads",IDM_TOOLS_DOWNLOADS
- MENUITEM "&Show Cookies",IDM_TOOLS_COOKIES
- POPUP "Debugging"
- BEGIN
- MENUITEM "Debug rendering",IDM_VIEW_TOGGLE_DEBUG_RENDERING
- MENUITEM "Save Box Tree",IDM_VIEW_DEBUGGING_SAVE_BOXTREE,GRAYED
- MENUITEM "Save DOM Tree",IDM_VIEW_DEBUGGING_SAVE_DOMTREE,GRAYED
- END
- MENUITEM SEPARATOR
- MENUITEM "Options...",IDM_EDIT_PREFERENCES
- END
- POPUP "&Help"
- BEGIN
- MENUITEM "&Contents",IDM_HELP_CONTENTS
- MENUITEM "G&uide",IDM_HELP_GUIDE
- MENUITEM "&Info",IDM_HELP_INFO
- MENUITEM SEPARATOR
- MENUITEM "&About NetSurf",IDM_HELP_ABOUT
- END
-END
-
-IDR_MENU_CONTEXT MENU
-BEGIN
- POPUP "Context"
- BEGIN
- MENUITEM "&Back",IDM_NAV_BACK
- MENUITEM "F&orward",IDM_NAV_FORWARD
- MENUITEM "&Home",IDM_NAV_HOME
- MENUITEM "&Stop",IDM_NAV_STOP
- MENUITEM "&Reload",IDM_NAV_RELOAD
- MENUITEM SEPARATOR
- MENUITEM "C&ut",IDM_EDIT_CUT,GRAYED
- MENUITEM "&Copy",IDM_EDIT_COPY,GRAYED
- MENUITEM "&Paste",IDM_EDIT_PASTE,GRAYED
- MENUITEM "&Delete",IDM_EDIT_DELETE,GRAYED
- END
-END
-
-IDD_DLG_ABOUT DIALOGEX 10,10,206,133
-CAPTION "About NetSurf"
-FONT 8,"MS Sans Serif",0,0,0
-STYLE WS_VISIBLE|WS_CAPTION|WS_SYSMENU
-EXSTYLE WS_EX_DLGMODALFRAME
-BEGIN
- CONTROL IDR_NETSURF_BANNER,IDC_IMG1,"Static",SS_BITMAP|0x40L
/*SS_REALSIZECONTROL*/,0,0,205,53
- CONTROL "NetSurf",IDC_ABOUT_VERSION,"Static",SS_LEFT,10,60,185,16
- CONTROL "NetSurf is a small fast
browser",IDC_ABOUT_TEXT,"Static",SS_LEFT,10,83,185,8
- CONTROL "Copyright 2003-2011 The NetSurf
Developers",IDC_ABOUT_COPYRIGHT,"Static",SS_LEFT,10,96,185,8
- CONTROL
"&OK",IDOK,"Button",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP,143,111,54,15
- CONTROL
"&Credits",IDC_BTN_CREDITS,"Button",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP,10,111,54,15
- CONTROL
"&Licence",IDC_BTN_LICENCE,"Button",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP,70,111,54,15
-END
-
-IDD_DLG_DOWNLOAD DIALOGEX 0,0,201,84
-CAPTION "Download"
-FONT 8,"MS Sans Serif",0,0,0
-STYLE WS_POPUP|WS_VISIBLE|WS_CAPTION|WS_SYSMENU|DS_MODALFRAME|DS_SETFONT
-EXSTYLE WS_EX_DLGMODALFRAME
-BEGIN
- CONTROL "downloading [file] [size] from [domain] to
[destination]",IDC_DOWNLOAD_LABEL,"Static",WS_CHILDWINDOW|WS_VISIBLE|WS_GROUP|SS_CENTER,6,6,189,35
- CONTROL
"progress",IDC_DOWNLOAD_PROGRESS,PROGRESS_CLASS,WS_VISIBLE,6,50,189,10
- CONTROL "&OK",IDOK,"Button",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP,141,66,54,15
- CONTROL
"&Cancel",IDCANCEL,"Button",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP,81,66,54,15
-END
-
-
-IDD_DLG_OPTIONS_GENERAL DIALOGEX 0,0,220,200
-CAPTION "General"
-FONT 8,"MS Shell Dlg"
-STYLE DS_CONTROL|DS_SHELLFONT
-BEGIN
- /* home page entry */
- CONTROL "Home Page",IDC_STATIC,"Static",SS_LEFT,7,7,40,8
- CONTROL "",IDC_STATIC,"Static",SS_ETCHEDFRAME,47,11,166,1
- CONTROL IDR_HOME_BITMAP,IDC_STATIC,"Static",SS_BITMAP,15,19,24,24
- CONTROL
"",IDC_PREFS_HOMEPAGE,"Edit",WS_TABSTOP|ES_OEMCONVERT|ES_AUTOHSCROLL,43,19,170,14,WS_EX_CLIENTEDGE
+//
+// Bitmap resources
+//
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+IDR_HOME_BITMAP BITMAP "home.bmp"
- /* Content control */
- CONTROL "Content Control",IDC_STATIC,"Static",SS_LEFT,7,40,60,8
- CONTROL "",IDC_STATIC,"Static",SS_ETCHEDFRAME,67,44,146,1
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+IDR_NETSURF_BANNER BITMAP "banner.bmp"
- CONTROL "Hide
Images",IDC_PREFS_IMAGES,"Button",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP|BS_AUTOCHECKBOX,43,52,67,10
- CONTROL "Hide
Advertisements",IDC_PREFS_ADVERTS,"Button",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP|BS_AUTOCHECKBOX,43,66,81,10
- CONTROL "Send
referer",IDC_PREFS_REFERER,"Button",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP|BS_AUTOCHECKBOX,43,80,55,10
-END
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+IDR_THROBBER_FRAME0_BITMAP BITMAP "throbber/throbber0.bmp"
-IDD_DLG_OPTIONS_CONNECTIONS DIALOGEX 0,0,220,200
-CAPTION "Connections"
-FONT 8,"MS Shell Dlg"
-STYLE DS_CONTROL|DS_SHELLFONT
-BEGIN
- /* proxy divider */
- CONTROL "Proxy",IDC_STATIC,"Static",SS_LEFT,7,7,30,8
- CONTROL "",IDC_STATIC,"Static",SS_ETCHEDFRAME,37,11,176,1
- /* proxy controls */
- CONTROL
"Type:",IDC_STATIC,"Static",WS_CHILDWINDOW|WS_VISIBLE|WS_GROUP|SS_LEFT,43,22,40,8
- CONTROL
"",IDC_PREFS_PROXYTYPE,"ComboBox",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP|CBS_DROPDOWNLIST,80,19,60,60
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+IDR_THROBBER_FRAME1_BITMAP BITMAP "throbber/throbber1.bmp"
- CONTROL
"Server:",IDC_STATIC,"Static",WS_CHILDWINDOW|WS_VISIBLE|WS_GROUP|SS_LEFT,43,39,28,8
- CONTROL
"",IDC_PREFS_PROXYHOST,"Edit",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP|ES_OEMCONVERT|ES_AUTOHSCROLL,80,36,80,14,WS_EX_CLIENTEDGE
- CONTROL
"Port:",IDC_STATIC,"Static",WS_CHILDWINDOW|WS_VISIBLE|WS_GROUP|SS_LEFT,164,39,16,8
- CONTROL
"",IDC_PREFS_PROXYPORT,"Edit",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP|ES_OEMCONVERT|ES_AUTOHSCROLL,182,36,24,14,WS_EX_CLIENTEDGE
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+IDR_THROBBER_FRAME2_BITMAP BITMAP "throbber/throbber2.bmp"
- CONTROL
"Username:",IDC_STATIC,"Static",WS_CHILDWINDOW|WS_VISIBLE|WS_GROUP|SS_LEFT,43,60,35,8
- CONTROL
"",IDC_PREFS_PROXYNAME,"Edit",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP|ES_OEMCONVERT|ES_AUTOHSCROLL,80,57,45,14,WS_EX_CLIENTEDGE
- CONTROL
"Password:",IDC_STATIC,"Static",WS_CHILDWINDOW|WS_VISIBLE|WS_GROUP|SS_LEFT,132,60,34,8
- CONTROL
"",IDC_PREFS_PROXYPASS,"Edit",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP|ES_OEMCONVERT|ES_AUTOHSCROLL|ES_PASSWORD,168,57,45,14,WS_EX_CLIENTEDGE
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+IDR_THROBBER_FRAME3_BITMAP BITMAP "throbber/throbber3.bmp"
- /* fetcher divider */
- CONTROL "Fetchers",IDC_STATIC,"Static",SS_LEFT,7,78,40,8
- CONTROL "",IDC_STATIC,"Static",SS_ETCHEDFRAME,42,82,171,1
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+IDR_THROBBER_FRAME4_BITMAP BITMAP "throbber/throbber4.bmp"
- /* max fetchers */
- CONTROL "Max
Fetchers:",IDC_STATIC,"Static",WS_CHILDWINDOW|WS_VISIBLE|WS_GROUP,43,96,64,8
- CONTROL
"",IDC_PREFS_FETCHERS,"Edit",ES_NUMBER|ES_RIGHT|WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP|WS_BORDER,111,93,30,14
- CONTROL "Max
Fetchers",IDC_PREFS_FETCHERS_SPIN,UPDOWN_CLASS,UDS_AUTOBUDDY|UDS_ALIGNRIGHT|WS_VISIBLE,341,122,11,15
- /* fetchers per host */
- CONTROL "Fetches per
host:",IDC_STATIC,"Static",WS_CHILDWINDOW|WS_VISIBLE|WS_GROUP,43,118,64,8
- CONTROL
"",IDC_PREFS_FETCH_HOST,"Edit",ES_NUMBER|ES_RIGHT|WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP|WS_BORDER,111,114,30,14
- CONTROL "Fetches per
host",IDC_PREFS_FETCH_HOST_SPIN,UPDOWN_CLASS,UDS_AUTOBUDDY|UDS_ALIGNRIGHT|WS_VISIBLE,341,140,11,15
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+IDR_THROBBER_FRAME5_BITMAP BITMAP "throbber/throbber5.bmp"
- /* cached fetchers */
- CONTROL "Cached
Fetches:",IDC_STATIC,"Static",WS_CHILDWINDOW|WS_VISIBLE|WS_GROUP,43,138,64,8
- CONTROL
"",IDC_PREFS_FETCH_HANDLES,"Edit",ES_NUMBER|ES_RIGHT|WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP|WS_BORDER,111,135,30,14
- CONTROL "Cached
Fetches",IDC_PREFS_FETCH_HANDLES_SPIN,UPDOWN_CLASS,UDS_AUTOBUDDY|UDS_ALIGNRIGHT|WS_VISIBLE,341,158,11,15
-END
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+IDR_THROBBER_FRAME6_BITMAP BITMAP "throbber/throbber6.bmp"
-IDD_DLG_OPTIONS_APPERANCE DIALOGEX 10,10,220,200
-CAPTION "Apperance"
-FONT 8,"MS Shell Dlg"
-STYLE DS_CONTROL|DS_SHELLFONT
-BEGIN
- /* proxy separator */
- CONTROL "Fonts",IDC_STATIC,"Static",SS_LEFT,7,7,20,8
- CONTROL "",IDC_STATIC,"Static",SS_ETCHEDFRAME,27,11,186,1
- /* font controls */
- CONTROL
"Sans-serif:",IDC_STATIC,"Static",WS_CHILDWINDOW|WS_VISIBLE|WS_GROUP|SS_LEFT,43,22,44,8
- CONTROL
"Sans-serif",IDC_PREFS_SANS,"Button",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP,89,19,50,14
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+IDR_THROBBER_FRAME7_BITMAP BITMAP "throbber/throbber7.bmp"
- CONTROL
"Serif:",IDC_STATIC,"Static",WS_CHILDWINDOW|WS_VISIBLE|WS_GROUP|SS_LEFT,43,40,24,8
- CONTROL
"Serif",IDC_PREFS_SERIF,"Button",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP,89,37,50,14
- CONTROL
"Monospace:",IDC_STATIC,"Static",WS_CHILDWINDOW|WS_VISIBLE|WS_GROUP|SS_LEFT,43,58,40,8
- CONTROL
"Monospace",IDC_PREFS_MONO,"Button",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP,89,55,50,14
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+IDR_TOOLBAR_BITMAP BITMAP "toolbar.bmp"
- CONTROL
"Cursive:",IDC_STATIC,"Static",WS_CHILDWINDOW|WS_VISIBLE|WS_GROUP|SS_LEFT,43,76,32,8
- CONTROL
"Cursive",IDC_PREFS_CURSIVE,"Button",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP,89,73,50,14
- CONTROL
"Fantasy:",IDC_STATIC,"Static",WS_CHILDWINDOW|WS_VISIBLE|WS_GROUP|SS_LEFT,43,94,32,8
- CONTROL
"Fantasy",IDC_PREFS_FANTASY,"Button",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP,89,91,50,14
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+IDR_TOOLBAR_BITMAP_GREY BITMAP "toolbarg.bmp"
- CONTROL
"Default:",IDC_STATIC,"Static",WS_CHILDWINDOW|WS_VISIBLE|WS_GROUP|SS_LEFT,43,112,38,8
- CONTROL
"",IDC_PREFS_FONTDEF,"ComboBox",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP|CBS_DROPDOWNLIST,89,109,50,60
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+IDR_TOOLBAR_BITMAP_HOT BITMAP "toolbarh.bmp"
- CONTROL
"Size:",IDC_STATIC,"Static",WS_CHILDWINDOW|WS_VISIBLE|WS_GROUP|SS_LEFT,147,112,16,8
- CONTROL
"",IDC_PREFS_FONT_SIZE,"Edit",ES_NUMBER|WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP,165,109,35,14,WS_EX_CLIENTEDGE
- CONTROL "Font
Size",IDC_PREFS_FONT_SIZE_SPIN,UPDOWN_CLASS,UDS_AUTOBUDDY|UDS_ALIGNRIGHT|WS_VISIBLE,75,137,11,15
- CONTROL "Minimum
Size:",IDC_STATIC,"Static",WS_CHILDWINDOW|WS_VISIBLE|WS_GROUP|SS_LEFT,43,130,52,8
- CONTROL
"",IDC_PREFS_FONT_MINSIZE,"Edit",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP,97,127,35,14,WS_EX_CLIENTEDGE
- CONTROL "Minimum Font
Size",IDC_PREFS_FONT_MINSIZE_SPIN,UPDOWN_CLASS,UDS_AUTOBUDDY|UDS_ALIGNRIGHT|WS_VISIBLE,76,159,11,15
- /* animation separator */
- CONTROL "Animation",IDC_STATIC,"Static",SS_LEFT,7,148,36,8
- CONTROL "",IDC_STATIC,"Static",SS_ETCHEDFRAME,43,152,170,1
-
- CONTROL
"Disable",IDC_PREFS_NOANIMATION,"Button",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP|BS_AUTOCHECKBOX,43,163,39,10
- CONTROL "Minimum
delay:",IDC_STATIC,"Static",WS_CHILDWINDOW|WS_VISIBLE|WS_GROUP|SS_LEFT,55,180,56,8
- CONTROL
"",IDC_PREFS_ANIMATIONDELAY,"Edit",WS_CHILDWINDOW|WS_VISIBLE|WS_TABSTOP,113,177,35,14,WS_EX_CLIENTEDGE
- CONTROL "Min
delay",IDC_PREFS_ANIMATIONDELAY_SPIN,UPDOWN_CLASS,UDS_AUTOBUDDY|UDS_ALIGNRIGHT|WS_VISIBLE,43,210,11,15
-
-
-
-END
+//
+// Menu resources
+//
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+IDR_MENU_CONTEXT MENU
+{
+ POPUP "Context"
+ {
+ MENUITEM "&Back", IDM_NAV_BACK
+ MENUITEM "F&orward", IDM_NAV_FORWARD
+ MENUITEM "&Home", IDM_NAV_HOME
+ MENUITEM "&Stop", IDM_NAV_STOP
+ MENUITEM "&Reload", IDM_NAV_RELOAD
+ MENUITEM SEPARATOR
+ MENUITEM "C&ut", IDM_EDIT_CUT, GRAYED
+ MENUITEM "&Copy", IDM_EDIT_COPY, GRAYED
+ MENUITEM "&Paste", IDM_EDIT_PASTE, GRAYED
+ MENUITEM "&Delete", IDM_EDIT_DELETE, GRAYED
+ }
+}
+
+
+
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+IDR_MENU_MAIN MENU
+{
+ POPUP "&File"
+ {
+ MENUITEM "&New Window", IDM_FILE_OPEN_WINDOW
+ MENUITEM "Open &Location", IDM_FILE_OPEN_LOCATION
+ MENUITEM "&Close", IDM_FILE_CLOSE_WINDOW
+ MENUITEM SEPARATOR
+ MENUITEM "&Save Page", IDM_FILE_SAVE_PAGE, HELP, GRAYED
+ POPUP "Save Page &As"
+ {
+ MENUITEM "Text", IDM_FILE_SAVEAS_TEXT, GRAYED
+ MENUITEM "PDF", IDM_FILE_SAVEAS_PDF, GRAYED
+ MENUITEM "Postscript", IDM_FILE_SAVEAS_POSTSCRIPT, GRAYED
+ }
+ MENUITEM SEPARATOR
+ MENUITEM "Print Pre&view", IDM_FILE_PRINT_PREVIEW
+ MENUITEM "&Print", IDM_FILE_PRINT
+ MENUITEM SEPARATOR
+ MENUITEM "E&xit", IDM_FILE_QUIT
+ }
+ POPUP "&Edit"
+ {
+ MENUITEM "Cu&t", IDM_EDIT_CUT
+ MENUITEM "&Copy", IDM_EDIT_COPY
+ MENUITEM "&Paste", IDM_EDIT_PASTE
+ MENUITEM "&Delete", IDM_EDIT_DELETE
+ MENUITEM SEPARATOR
+ MENUITEM "Select &All", IDM_EDIT_SELECT_ALL
+ MENUITEM SEPARATOR
+ MENUITEM "&Find", IDM_EDIT_SEARCH
+ }
+ POPUP "&View"
+ {
+ MENUITEM "Stop", IDM_NAV_STOP
+ MENUITEM "Reload", IDM_NAV_RELOAD
+ MENUITEM SEPARATOR
+ POPUP "&Zoom"
+ {
+ MENUITEM "Zoom &In", IDM_VIEW_ZOOMPLUS
+ MENUITEM "Zoom &Out", IDM_VIEW_ZOOMMINUS
+ MENUITEM "&Reset", IDM_VIEW_ZOOMNORMAL
+ }
+ MENUITEM SEPARATOR
+ MENUITEM "Page S&ource", IDM_VIEW_SOURCE
+ MENUITEM "&Full Screen", IDM_VIEW_FULLSCREEN
+ MENUITEM SEPARATOR
+ MENUITEM "Save size and location", IDM_VIEW_SAVE_WIN_METRICS
+ }
+ POPUP "&Navigate"
+ {
+ MENUITEM "Back", IDM_NAV_BACK
+ MENUITEM "Forward", IDM_NAV_FORWARD
+ MENUITEM "Home", IDM_NAV_HOME
+ MENUITEM SEPARATOR
+ MENUITEM "Local History", IDM_NAV_LOCALHISTORY
+ MENUITEM "Global History", IDM_NAV_GLOBALHISTORY
+ MENUITEM SEPARATOR
+ MENUITEM "Show Bookmarks", IDM_NAV_BOOKMARKS
+ }
+ POPUP "&Tools"
+ {
+ MENUITEM "&Downloads", IDM_TOOLS_DOWNLOADS
+ MENUITEM "&Show Cookies", IDM_TOOLS_COOKIES
+ POPUP "Debugging"
+ {
+ MENUITEM "Debug rendering", IDM_VIEW_TOGGLE_DEBUG_RENDERING
+ MENUITEM "Save Box Tree", IDM_VIEW_DEBUGGING_SAVE_BOXTREE, GRAYED
+ MENUITEM "Save DOM Tree", IDM_VIEW_DEBUGGING_SAVE_DOMTREE, GRAYED
+ }
+ MENUITEM SEPARATOR
+ MENUITEM "Options...", IDM_EDIT_PREFERENCES
+ }
+ POPUP "&Help"
+ {
+ MENUITEM "&Contents", IDM_HELP_CONTENTS
+ MENUITEM "G&uide", IDM_HELP_GUIDE
+ MENUITEM "&Info", IDM_HELP_INFO
+ MENUITEM SEPARATOR
+ MENUITEM "&About NetSurf", IDM_HELP_ABOUT
+ }
+}
+
+
+
+//
+// Dialog resources
+//
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+IDD_ABOUT DIALOGEX 10, 10, 206, 133
+STYLE DS_SHELLFONT | WS_CAPTION | WS_VISIBLE | WS_SYSMENU
+CAPTION "About NetSurf"
+FONT 8, "Ms Shell Dlg"
+{
+ CONTROL IDR_NETSURF_BANNER, IDC_IMG1, WC_STATIC, SS_BITMAP |
SS_REALSIZECONTROL, 0, 0, 205, 53, WS_EX_LEFT
+ LTEXT "NetSurf", IDC_ABOUT_VERSION, 10, 60, 185, 16, NOT
WS_GROUP | SS_LEFT, WS_EX_LEFT
+ LTEXT "NetSurf is a small fast browser", IDC_ABOUT_TEXT, 10, 83,
185, 8, NOT WS_GROUP | SS_LEFT, WS_EX_LEFT
+ LTEXT "Copyright 2003-2011 The NetSurf Developers",
IDC_ABOUT_COPYRIGHT, 10, 96, 185, 8, NOT WS_GROUP | SS_LEFT, WS_EX_LEFT
+ PUSHBUTTON "&OK", IDOK, 143, 111, 54, 15, 0, WS_EX_LEFT
+ PUSHBUTTON "&Credits", IDC_BTN_CREDITS, 10, 111, 54, 15, 0, WS_EX_LEFT
+ PUSHBUTTON "&Licence", IDC_BTN_LICENCE, 70, 111, 54, 15, 0, WS_EX_LEFT
+}
+
+
+
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+IDD_DOWNLOAD DIALOGEX 0, 0, 201, 84
+STYLE DS_MODALFRAME | DS_SHELLFONT | WS_CAPTION | WS_VISIBLE | WS_POPUP |
WS_SYSMENU
+CAPTION "Download"
+FONT 8, "Ms Shell Dlg"
+{
+ CTEXT "downloading [file] [size] from [domain] to
[destination]", IDC_DOWNLOAD_LABEL, 6, 6, 189, 35, SS_CENTER, WS_EX_LEFT
+ CONTROL "progress", IDC_DOWNLOAD_PROGRESS, PROGRESS_CLASS, 0, 6,
50, 189, 10, WS_EX_LEFT
+ PUSHBUTTON "&OK", IDOK, 141, 66, 54, 15, 0, WS_EX_LEFT
+ PUSHBUTTON "&Cancel", IDCANCEL, 81, 66, 54, 15, 0, WS_EX_LEFT
+}
+
+
+
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+IDD_LOGIN DIALOGEX 0, 0, 200, 93
+STYLE DS_3DLOOK | DS_CENTER | DS_MODALFRAME | DS_SHELLFONT | WS_CAPTION |
WS_VISIBLE | WS_POPUP | WS_SYSMENU
+CAPTION "Log In"
+FONT 8, "Ms Shell Dlg"
+{
+ LTEXT "Password:", 0, 7, 53, 35, 9, SS_LEFT, WS_EX_LEFT
+ LTEXT "User name:", 0, 7, 35, 40, 9, SS_LEFT, WS_EX_LEFT
+ EDITTEXT IDC_LOGIN_PASSWORD, 49, 50, 144, 14, ES_AUTOHSCROLL,
WS_EX_LEFT
+ LTEXT "The site foo.bar requires authorization for a realm",
IDC_LOGIN_DESCRIPTION, 49, 7, 144, 18, SS_LEFT, WS_EX_LEFT
+ EDITTEXT IDC_LOGIN_USERNAME, 49, 32, 144, 14, ES_AUTOHSCROLL,
WS_EX_LEFT
+ PUSHBUTTON "Cancel", IDCANCEL, 143, 71, 50, 14, 0, WS_EX_LEFT
+ DEFPUSHBUTTON "Log in", IDOK, 89, 71, 50, 14, 0, WS_EX_LEFT
+}
+
+
+
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+IDD_OPTIONS_APPERANCE DIALOGEX 10, 10, 220, 200
+STYLE DS_CONTROL | DS_SHELLFONT
+CAPTION "Apperance"
+FONT 8, "MS Shell Dlg", 0, 0, 1
+{
+ LTEXT "Fonts", IDC_STATIC, 7, 7, 20, 8, NOT WS_GROUP | SS_LEFT,
WS_EX_LEFT
+ CONTROL "", IDC_STATIC, WC_STATIC, SS_ETCHEDFRAME, 27, 11, 186, 1,
WS_EX_LEFT
+ LTEXT "Sans-serif:", IDC_STATIC, 43, 22, 44, 8, SS_LEFT,
WS_EX_LEFT
+ PUSHBUTTON "Sans-serif", IDC_PREFS_SANS, 89, 19, 50, 14, 0, WS_EX_LEFT
+ LTEXT "Serif:", IDC_STATIC, 43, 40, 24, 8, SS_LEFT, WS_EX_LEFT
+ PUSHBUTTON "Serif", IDC_PREFS_SERIF, 89, 37, 50, 14, 0, WS_EX_LEFT
+ LTEXT "Monospace:", IDC_STATIC, 43, 58, 40, 8, SS_LEFT,
WS_EX_LEFT
+ PUSHBUTTON "Monospace", IDC_PREFS_MONO, 89, 55, 50, 14, 0, WS_EX_LEFT
+ LTEXT "Cursive:", IDC_STATIC, 43, 76, 32, 8, SS_LEFT, WS_EX_LEFT
+ PUSHBUTTON "Cursive", IDC_PREFS_CURSIVE, 89, 73, 50, 14, 0, WS_EX_LEFT
+ LTEXT "Fantasy:", IDC_STATIC, 43, 94, 32, 8, SS_LEFT, WS_EX_LEFT
+ PUSHBUTTON "Fantasy", IDC_PREFS_FANTASY, 89, 91, 50, 14, 0, WS_EX_LEFT
+ LTEXT "Default:", IDC_STATIC, 43, 112, 38, 8, SS_LEFT, WS_EX_LEFT
+ COMBOBOX IDC_PREFS_FONTDEF, 89, 109, 50, 60, WS_TABSTOP |
CBS_DROPDOWNLIST, WS_EX_LEFT
+ LTEXT "Size:", IDC_STATIC, 147, 112, 16, 8, SS_LEFT, WS_EX_LEFT
+ EDITTEXT IDC_PREFS_FONT_SIZE, 165, 109, 35, 14, NOT WS_BORDER |
ES_NUMBER, WS_EX_CLIENTEDGE
+ CONTROL "Font Size", IDC_PREFS_FONT_SIZE_SPIN, UPDOWN_CLASS,
UDS_ALIGNRIGHT | UDS_AUTOBUDDY, 75, 137, 11, 15, WS_EX_LEFT
+ LTEXT "Minimum Size:", IDC_STATIC, 43, 130, 52, 8, SS_LEFT,
WS_EX_LEFT
+ EDITTEXT IDC_PREFS_FONT_MINSIZE, 97, 127, 35, 14, NOT WS_BORDER,
WS_EX_CLIENTEDGE
+ CONTROL "Minimum Font Size", IDC_PREFS_FONT_MINSIZE_SPIN,
UPDOWN_CLASS, UDS_ALIGNRIGHT | UDS_AUTOBUDDY, 76, 159, 11, 15, WS_EX_LEFT
+ LTEXT "Animation", IDC_STATIC, 7, 148, 36, 8, NOT WS_GROUP |
SS_LEFT, WS_EX_LEFT
+ CONTROL "", IDC_STATIC, WC_STATIC, SS_ETCHEDFRAME, 43, 152, 170,
1, WS_EX_LEFT
+ AUTOCHECKBOX "Disable", IDC_PREFS_NOANIMATION, 43, 163, 39, 10, 0,
WS_EX_LEFT
+ LTEXT "Minimum delay:", IDC_STATIC, 55, 180, 56, 8, SS_LEFT,
WS_EX_LEFT
+ EDITTEXT IDC_PREFS_ANIMATIONDELAY, 113, 177, 35, 14, NOT WS_BORDER,
WS_EX_CLIENTEDGE
+ CONTROL "Min delay", IDC_PREFS_ANIMATIONDELAY_SPIN, UPDOWN_CLASS,
UDS_ALIGNRIGHT | UDS_AUTOBUDDY, 43, 210, 11, 15, WS_EX_LEFT
+}
+
+
+
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+IDD_OPTIONS_CONNECTIONS DIALOGEX 0, 0, 220, 200
+STYLE DS_CONTROL | DS_SHELLFONT
+CAPTION "Connections"
+FONT 8, "MS Shell Dlg", 0, 0, 1
+{
+ LTEXT "Proxy", IDC_STATIC, 7, 7, 30, 8, NOT WS_GROUP | SS_LEFT,
WS_EX_LEFT
+ CONTROL "", IDC_STATIC, WC_STATIC, SS_ETCHEDFRAME, 37, 11, 176, 1,
WS_EX_LEFT
+ LTEXT "Type:", IDC_STATIC, 43, 22, 40, 8, SS_LEFT, WS_EX_LEFT
+ COMBOBOX IDC_PREFS_PROXYTYPE, 80, 19, 60, 60, WS_TABSTOP |
CBS_DROPDOWNLIST, WS_EX_LEFT
+ LTEXT "Server:", IDC_STATIC, 43, 39, 28, 8, SS_LEFT, WS_EX_LEFT
+ EDITTEXT IDC_PREFS_PROXYHOST, 80, 36, 80, 14, NOT WS_BORDER |
ES_AUTOHSCROLL | ES_OEMCONVERT, WS_EX_CLIENTEDGE
+ LTEXT "Port:", IDC_STATIC, 164, 39, 16, 8, SS_LEFT, WS_EX_LEFT
+ EDITTEXT IDC_PREFS_PROXYPORT, 182, 36, 24, 14, NOT WS_BORDER |
ES_AUTOHSCROLL | ES_OEMCONVERT, WS_EX_CLIENTEDGE
+ LTEXT "Username:", IDC_STATIC, 43, 60, 35, 8, SS_LEFT, WS_EX_LEFT
+ EDITTEXT IDC_PREFS_PROXYNAME, 80, 57, 45, 14, NOT WS_BORDER |
ES_AUTOHSCROLL | ES_OEMCONVERT, WS_EX_CLIENTEDGE
+ LTEXT "Password:", IDC_STATIC, 132, 60, 34, 8, SS_LEFT,
WS_EX_LEFT
+ EDITTEXT IDC_PREFS_PROXYPASS, 168, 57, 45, 14, NOT WS_BORDER |
ES_AUTOHSCROLL | ES_OEMCONVERT | ES_PASSWORD, WS_EX_CLIENTEDGE
+ LTEXT "Fetchers", IDC_STATIC, 7, 78, 40, 8, NOT WS_GROUP |
SS_LEFT, WS_EX_LEFT
+ CONTROL "", IDC_STATIC, WC_STATIC, SS_ETCHEDFRAME, 42, 82, 171, 1,
WS_EX_LEFT
+ LTEXT "Max Fetchers:", IDC_STATIC, 43, 96, 64, 8, SS_LEFT,
WS_EX_LEFT
+ EDITTEXT IDC_PREFS_FETCHERS, 111, 93, 30, 14, ES_RIGHT | ES_NUMBER,
WS_EX_LEFT
+ CONTROL "Max Fetchers", IDC_PREFS_FETCHERS_SPIN, UPDOWN_CLASS,
UDS_ALIGNRIGHT | UDS_AUTOBUDDY, 341, 122, 11, 15, WS_EX_LEFT
+ LTEXT "Fetches per host:", IDC_STATIC, 43, 118, 64, 8, SS_LEFT,
WS_EX_LEFT
+ EDITTEXT IDC_PREFS_FETCH_HOST, 111, 114, 30, 14, ES_RIGHT |
ES_NUMBER, WS_EX_LEFT
+ CONTROL "Fetches per host", IDC_PREFS_FETCH_HOST_SPIN,
UPDOWN_CLASS, UDS_ALIGNRIGHT | UDS_AUTOBUDDY, 341, 140, 11, 15, WS_EX_LEFT
+ LTEXT "Cached Fetches:", IDC_STATIC, 43, 138, 64, 8, SS_LEFT,
WS_EX_LEFT
+ EDITTEXT IDC_PREFS_FETCH_HANDLES, 111, 135, 30, 14, ES_RIGHT |
ES_NUMBER, WS_EX_LEFT
+ CONTROL "Cached Fetches", IDC_PREFS_FETCH_HANDLES_SPIN,
UPDOWN_CLASS, UDS_ALIGNRIGHT | UDS_AUTOBUDDY, 341, 158, 11, 15, WS_EX_LEFT
+}
+
+
+
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+IDD_OPTIONS_GENERAL DIALOGEX 0, 0, 220, 200
+STYLE DS_CONTROL | DS_SHELLFONT
+CAPTION "General"
+FONT 8, "MS Shell Dlg", 0, 0, 1
+{
+ LTEXT "Home Page", IDC_STATIC, 7, 7, 40, 8, NOT WS_GROUP |
SS_LEFT, WS_EX_LEFT
+ CONTROL "", IDC_STATIC, WC_STATIC, SS_ETCHEDFRAME, 47, 11, 166, 1,
WS_EX_LEFT
+ CONTROL IDR_HOME_BITMAP, IDC_STATIC, WC_STATIC, SS_BITMAP, 15, 19,
24, 24, WS_EX_LEFT
+ EDITTEXT IDC_PREFS_HOMEPAGE, 43, 19, 170, 14, NOT WS_BORDER |
ES_AUTOHSCROLL | ES_OEMCONVERT, WS_EX_CLIENTEDGE
+ LTEXT "Content Control", IDC_STATIC, 7, 40, 60, 8, NOT WS_GROUP
| SS_LEFT, WS_EX_LEFT
+ CONTROL "", IDC_STATIC, WC_STATIC, SS_ETCHEDFRAME, 67, 44, 146, 1,
WS_EX_LEFT
+ AUTOCHECKBOX "Hide Images", IDC_PREFS_IMAGES, 43, 52, 67, 10, 0,
WS_EX_LEFT
+ AUTOCHECKBOX "Hide Advertisements", IDC_PREFS_ADVERTS, 43, 66, 81, 10,
0, WS_EX_LEFT
+ AUTOCHECKBOX "Send referer", IDC_PREFS_REFERER, 43, 80, 55, 10, 0,
WS_EX_LEFT
+}
+
+
+
+//
+// Icon resources
+//
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+IDR_NETSURF_ICON ICON "NetSurf.ico"
diff --git a/frontends/windows/resourceid.h b/frontends/windows/resourceid.h
index 605a77c..9e70d63 100644
--- a/frontends/windows/resourceid.h
+++ b/frontends/windows/resourceid.h
@@ -16,8 +16,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _NETSURF_WINDOWS_RESOURCEID_H_
-#define _NETSURF_WINDOWS_RESOURCEID_H_
+#ifndef NETSURF_WINDOWS_RESOURCEID_H
+#define NETSURF_WINDOWS_RESOURCEID_H
#ifndef IDC_STATIC
#define IDC_STATIC (-1)
@@ -28,18 +28,18 @@
#define IDR_TOOLBAR_BITMAP_GREY 103
#define IDR_TOOLBAR_BITMAP_HOT 104
#define IDR_NETSURF_BANNER 105
-#define IDR_HOME_BITMAP 114
+#define IDR_HOME_BITMAP 106
-#define IDR_THROBBER_FRAME0_BITMAP 106
-#define IDR_THROBBER_FRAME1_BITMAP 107
-#define IDR_THROBBER_FRAME2_BITMAP 108
-#define IDR_THROBBER_FRAME3_BITMAP 109
-#define IDR_THROBBER_FRAME4_BITMAP 110
-#define IDR_THROBBER_FRAME5_BITMAP 111
-#define IDR_THROBBER_FRAME6_BITMAP 112
-#define IDR_THROBBER_FRAME7_BITMAP 113
+#define IDR_THROBBER_FRAME0_BITMAP 110
+#define IDR_THROBBER_FRAME1_BITMAP 111
+#define IDR_THROBBER_FRAME2_BITMAP 112
+#define IDR_THROBBER_FRAME3_BITMAP 113
+#define IDR_THROBBER_FRAME4_BITMAP 114
+#define IDR_THROBBER_FRAME5_BITMAP 115
+#define IDR_THROBBER_FRAME6_BITMAP 116
+#define IDR_THROBBER_FRAME7_BITMAP 117
-#define IDD_DLG_ABOUT 1000
+#define IDD_ABOUT 1000
#define IDC_IMG1 1001
#define IDC_ABOUT_VERSION 1002
#define IDC_ABOUT_TEXT 1003
@@ -47,11 +47,11 @@
#define IDC_BTN_CREDITS 1005
#define IDC_BTN_LICENCE 1006
-#define IDD_DLG_DOWNLOAD 1100
+#define IDD_DOWNLOAD 1100
#define IDC_DOWNLOAD_LABEL 1101
#define IDC_DOWNLOAD_PROGRESS 1102
-#define IDD_DLG_MAIN 1300
+#define IDD_MAIN 1300
#define IDC_MAIN_TOOLBAR 1301
#define IDC_MAIN_URLBAR 1302
#define IDC_MAIN_THROBBER 1303
@@ -59,13 +59,13 @@
#define IDC_MAIN_STATUSBAR 1305
#define IDC_MAIN_LAUNCH_URL 1306
-#define IDD_DLG_OPTIONS_GENERAL 1400
+#define IDD_OPTIONS_GENERAL 1400
#define IDC_PREFS_HOMEPAGE 1401
#define IDC_PREFS_IMAGES 1402
#define IDC_PREFS_ADVERTS 1403
#define IDC_PREFS_REFERER 1404
-#define IDD_DLG_OPTIONS_CONNECTIONS 1500
+#define IDD_OPTIONS_CONNECTIONS 1500
#define IDC_PREFS_FETCHERS 1501
#define IDC_PREFS_FETCHERS_SPIN 1502
#define IDC_PREFS_FETCH_HOST 1503
@@ -73,7 +73,7 @@
#define IDC_PREFS_FETCH_HANDLES 1505
#define IDC_PREFS_FETCH_HANDLES_SPIN 1506
-#define IDD_DLG_OPTIONS_APPERANCE 1200
+#define IDD_OPTIONS_APPERANCE 1200
#define IDC_PREFS_PROXYTYPE 1206
#define IDC_PREFS_PROXYHOST 1207
#define IDC_PREFS_PROXYPORT 1208
@@ -93,11 +93,15 @@
#define IDC_PREFS_ANIMATIONDELAY 1228
#define IDC_PREFS_ANIMATIONDELAY_SPIN 1229
-#define IDD_DLG_SSLCERT 1600
+#define IDD_SSLCERT 1600
#define IDC_SSLCERT_IMG1 1601
#define IDC_SSLCERT_BTN_ACCEPT 1602
#define IDC_SSLCERT_BTN_REJECT 1603
+#define IDD_LOGIN 1700
+#define IDC_LOGIN_USERNAME 1701
+#define IDC_LOGIN_PASSWORD 1702
+#define IDC_LOGIN_DESCRIPTION 1703
#define IDR_MENU_MAIN 10000
#define IDM_FILE_OPEN_WINDOW 10101
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
