X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=w32.rc;h=2f3a291b996d6b1207aa0de4fd308452e88583ed;hp=fe5a20f761cd652a985e62ca357b8f143d04332d;hb=c54ed3a595132f0cb4599f2803b2f1b1c79651c3;hpb=1412a743dc787f574eb4ee48a74923387df74cfa diff --git a/w32.rc b/w32.rc index fe5a20f7..2f3a291b 100644 --- a/w32.rc +++ b/w32.rc @@ -31,6 +31,51 @@ * * Revisions : * $Log: w32.rc,v $ + * Revision 1.11 2001/07/21 17:53:41 jongfoster + * Adding version information block. + * + * Revision 1.10 2001/07/19 19:14:19 haroon + * - Removed all #ifdef PCRS. The .rc file extension had eluded Andreas. + * + * Revision 1.9 2001/06/07 23:08:54 jongfoster + * Forward and ACL edit options removed. + * Config edit option renamed from "&Junkbuster" to "&Configuration". + * + * Revision 1.8 2001/05/31 21:37:11 jongfoster + * GUI changes to rename "permissions file" to "actions file". + * + * Revision 1.7 2001/05/29 09:50:24 jongfoster + * Unified blocklist/imagelist/permissionslist. + * File format is still under discussion, but the internal changes + * are (mostly) done. + * + * Also modified interceptor behaviour: + * - We now intercept all URLs beginning with one of the following + * prefixes (and *only* these prefixes): + * * http://i.j.b/ + * * http://ijbswa.sf.net/config/ + * * http://ijbswa.sourceforge.net/config/ + * - New interceptors "home page" - go to http://i.j.b/ to see it. + * - Internal changes so that intercepted and fast redirect pages + * are not replaced with an image. + * - Interceptors now have the option to send a binary page direct + * to the client. (i.e. ijb-send-banner uses this) + * - Implemented show-url-info interceptor. (Which is why I needed + * the above interceptors changes - a typical URL is + * "http://i.j.b/show-url-info?url=www.somesite.com/banner.gif". + * The previous mechanism would not have intercepted that, and + * if it had been intercepted then it then it would have replaced + * it with an image.) + * + * Revision 1.6 2001/05/26 14:15:18 jongfoster + * Cosmetic fix: // -> block comment + * + * Revision 1.5 2001/05/26 13:24:31 jongfoster + * New #define, WIN_GUI_EDIT, enables the (embryonic) Win32 GUI editor. + * This #define cannot be set from ./configure - there's no point, it + * doesn't work yet. See feature request # 425722 + * (I missed this file in my original checkin) + * * Revision 1.4 2001/05/26 00:28:36 jongfoster * Automatic reloading of config file. * Removed obsolete SIGHUP support (Unix) and Reload menu option (Win32). @@ -106,7 +151,48 @@ IDI_IDLE ICON DISCARDABLE "icons/idle.ico" #ifdef _WIN32 /* LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US */ #pragma code_page(1252) -#endif //_WIN32 +#endif /* def _WIN32 */ + +/* + * File Version + */ +#ifndef _MAC + +VS_VERSION_INFO VERSIONINFO + FILEVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_POINT,0 + PRODUCTVERSION VERSION_MAJOR,VERSION_MINOR,VERSION_POINT,0 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS 0x1L +#else + FILEFLAGS 0x0L +#endif + FILEOS 0x40004L + FILETYPE 0x1L + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "040904b0" + BEGIN + VALUE "CompanyName", "The ijbswa team - ijbswa.sourceforge.net\0" + VALUE "FileDescription", "JunkBuster\0" + VALUE "FileVersion", VERSION "\0" + VALUE "InternalName", "JunkBuster\0" + VALUE "LegalCopyright", "Distributed under the GNU GPL\0" + VALUE "OriginalFilename", "junkbuster.exe\0" + VALUE "ProductName", "JunkBuster\0" + VALUE "ProductVersion", VERSION "\0" + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x409, 1200 + END +END + +#endif /* ndef _MAC */ + /* * Menus @@ -120,28 +206,18 @@ BEGIN MENUITEM SEPARATOR POPUP "&Options" BEGIN - MENUITEM "&Junkbuster...", ID_TOOLS_EDITJUNKBUSTER + MENUITEM "&Configuration...", ID_TOOLS_EDITJUNKBUSTER MENUITEM SEPARATOR - MENUITEM "&Blockers...", ID_TOOLS_EDITBLOCKERS - MENUITEM "&Permissions...", ID_TOOLS_EDITPERMISSIONS - MENUITEM "&Forward...", ID_TOOLS_EDITFORWARD -#ifdef ACL_FILES - MENUITEM "&Access Control Lists...", ID_TOOLS_EDITACLS -#endif /* def ACL_FILES */ -#ifdef USE_IMAGE_LIST - MENUITEM "&Images...", ID_TOOLS_EDITIMAGE -#endif /* def USE_IMAGE_LIST */ -#ifdef PCRS + MENUITEM "&Actions...", ID_TOOLS_EDITACTIONS MENUITEM "Perl &Regexps...", ID_TOOLS_EDITPERLRE -#endif /* def PCRS */ -#ifdef TRUST_FILES +#ifdef FEATURE_TRUST MENUITEM "&Trust...", ID_TOOLS_EDITTRUST -#endif /* def TRUST_FILES */ +#endif /* def FEATURE_TRUST */ END MENUITEM SEPARATOR -#ifdef TOGGLE +#ifdef FEATURE_TOGGLE MENUITEM "&Enable", ID_TOGGLE_IJB, CHECKED -#endif +#endif /* def FEATURE_TOGGLE */ MENUITEM "Show &JunkBuster Window", ID_SHOWWINDOW END END @@ -167,27 +243,17 @@ BEGIN END POPUP "&Options" BEGIN -#ifdef TOGGLE +#ifdef FEATURE_TOGGLE MENUITEM "&Enable", ID_TOGGLE_IJB, CHECKED MENUITEM SEPARATOR -#endif - MENUITEM "&Junkbuster...", ID_TOOLS_EDITJUNKBUSTER +#endif /* def FEATURE_TOGGLE */ + MENUITEM "&Configuration...", ID_TOOLS_EDITJUNKBUSTER MENUITEM SEPARATOR - MENUITEM "&Blockers...", ID_TOOLS_EDITBLOCKERS - MENUITEM "&Permissions...", ID_TOOLS_EDITPERMISSIONS - MENUITEM "&Forward...", ID_TOOLS_EDITFORWARD -#ifdef ACL_FILES - MENUITEM "&Access Control Lists...",ID_TOOLS_EDITACLS -#endif /* def ACL_FILES */ -#ifdef USE_IMAGE_LIST - MENUITEM "&Images...", ID_TOOLS_EDITIMAGE -#endif /* def USE_IMAGE_LIST */ -#ifdef PCRS + MENUITEM "&Actions...", ID_TOOLS_EDITACTIONS MENUITEM "Perl &Regexps...", ID_TOOLS_EDITPERLRE -#endif /* def PCRS */ -#ifdef TRUST_FILES +#ifdef FEATURE_TRUST MENUITEM "&Trust...", ID_TOOLS_EDITTRUST -#endif /* def TRUST_FILES */ +#endif /* def FEATURE_TRUST */ END POPUP "&Help" BEGIN @@ -219,70 +285,4 @@ BEGIN "C", ID_EDIT_COPY, VIRTKEY, CONTROL, NOINVERT END -#ifdef WIN_GUI_EDIT - -/* - * Icons - * - * Icon with lowest ID value placed first to ensure application icon - * remains consistent on all systems. - */ -IDI_DENYRULE ICON DISCARDABLE "icons/denyrule.ico" -IDI_ALLOWRULE ICON DISCARDABLE "icons/icon1.ico" - -/* - * Dialog - */ - -IDD_RULES DIALOG DISCARDABLE 0, 0, 239, 225 -STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Blockers" -FONT 8, "MS Sans Serif" -BEGIN - GROUPBOX "New Rule",IDC_STATIC,5,5,230,55 - LTEXT "For:",IDC_STATIC,10,15,13,8 - EDITTEXT IDC_NEW,10,25,220,12,ES_AUTOHSCROLL - COMBOBOX IDC_ACTION,10,40,75,37,CBS_DROPDOWNLIST | CBS_SORT | - WS_VSCROLL | WS_TABSTOP - PUSHBUTTON "C&reate!",IDC_CREATE,90,40,50,14 - GROUPBOX "Rules",IDC_STATIC,5,65,230,135 - CONTROL "List1",IDC_RULES,"SysListView32",LVS_REPORT | - LVS_SHOWSELALWAYS | LVS_EDITLABELS | WS_BORDER | - WS_TABSTOP,10,75,220,100 - PUSHBUTTON "Move &Up",IDC_MOVEUP,10,180,50,14,WS_DISABLED - PUSHBUTTON "Move &Down",IDC_MOVEDOWN,65,180,50,14,WS_DISABLED - PUSHBUTTON "&Delete",IDC_DELETE,120,180,50,14,WS_DISABLED - PUSHBUTTON "&Save",IDC_SAVE,130,205,50,14 - PUSHBUTTON "&Cancel",IDCANCEL,185,205,50,14 -END - - -/* - * DESIGNINFO - */ - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO DISCARDABLE -BEGIN - IDD_RULES, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 232 - TOPMARGIN, 7 - BOTTOMMARGIN, 218 - END -END -#endif // APSTUDIO_INVOKED - - -/* - * String Table - */ - -STRINGTABLE DISCARDABLE -BEGIN - IDS_NEW_BLOCKER "Create rule for ""%s""..." -END -#endif /* def WIN_GUI_EDIT */ - #endif /* English (U.S.) resources */