X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=w32.rc;h=ec7ff2638c19e82b6f5e0777a0472b7afb5f693e;hp=fc3a03a476917d06f9fcec86077f77fe5021a007;hb=9c92714f07019beb11d7b7eefdd3bab1004cc170;hpb=b8bfdd57989b711b79071898d09b81ea38ddcd42 diff --git a/w32.rc b/w32.rc index fc3a03a4..ec7ff263 100644 --- a/w32.rc +++ b/w32.rc @@ -4,8 +4,8 @@ * * Purpose : Windows GUI resource script. * - * Copyright : Written by and Copyright (C) 2001-2002 members of - * the Privoxy team. http://privoxy.org/ + * Copyright : Written by and Copyright (C) 2001-2009 members of + * the Privoxy team. http://www.privoxy.org/ * * Based on the Internet Junkbuster originally written * by and Copyright (C) 1997 Anonymous Coders and @@ -29,96 +29,15 @@ * or write to the Free Software Foundation, Inc., 59 * Temple Place - Suite 330, Boston, MA 02111-1307, USA. * - * Revisions : - * $Log: w32.rc,v $ - * Revision 1.14 2002/03/24 12:07:36 jongfoster - * Consistern name for filters file - * - * Revision 1.13 2002/03/24 12:03:47 jongfoster - * Name change - * - * Revision 1.12 2001/07/30 22:16:07 jongfoster - * Tidying up #defines: - * - All feature #defines are now of the form FEATURE_xxx - * - Permanently turned off WIN_GUI_EDIT - * - Permanently turned on WEBDAV and SPLIT_PROXY_ARGS - * - * 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). - * Most of the global variables have been moved to a new - * struct configuration_spec, accessed through csp->config->globalname - * Most of the globals remaining are used by the Win32 GUI. - * - * Revision 1.3 2001/05/25 22:33:40 jongfoster - * CRLF->LF - * - * Revision 1.2 2001/05/20 01:21:20 jongfoster - * Version 2.9.4 checkin. - * - Merged popupfile and cookiefile, and added control over PCRS - * filtering, in new "permissionsfile". - * - Implemented LOG_LEVEL_FATAL, so that if there is a configuration - * file error you now get a message box (in the Win32 GUI) rather - * than the program exiting with no explanation. - * - Made killpopup use the PCRS MIME-type checking and HTTP-header - * skipping. - * - Removed tabs from "config" - * - Moved duplicated url parsing code in "loaders.c" to a new funcition. - * - Bumped up version number. - * - * Revision 1.1.1.1 2001/05/15 13:59:07 oes - * Initial import of version 2.9.3 source tree - * - * *********************************************************************/ -#include #include "config.h" + +#ifndef STRICT +#define STRICT +#endif +#include + #include "w32res.h" #ifdef __MINGW32__ @@ -142,15 +61,16 @@ * remains consistent on all systems. */ IDI_MAINICON ICON DISCARDABLE "icons/privoxy.ico" -IDI_ANIMATED1 ICON DISCARDABLE "icons/ico00001.ico" -IDI_ANIMATED2 ICON DISCARDABLE "icons/ico00002.ico" -IDI_ANIMATED3 ICON DISCARDABLE "icons/ico00003.ico" -IDI_ANIMATED4 ICON DISCARDABLE "icons/ico00004.ico" -IDI_ANIMATED5 ICON DISCARDABLE "icons/ico00005.ico" -IDI_ANIMATED6 ICON DISCARDABLE "icons/ico00006.ico" -IDI_ANIMATED7 ICON DISCARDABLE "icons/ico00007.ico" -IDI_ANIMATED8 ICON DISCARDABLE "icons/ico00008.ico" -IDI_IDLE ICON DISCARDABLE "icons/idle.ico" +IDI_ANIMATED1 ICON DISCARDABLE "icons/radar-01.ico" +IDI_ANIMATED2 ICON DISCARDABLE "icons/radar-02.ico" +IDI_ANIMATED3 ICON DISCARDABLE "icons/radar-03.ico" +IDI_ANIMATED4 ICON DISCARDABLE "icons/radar-04.ico" +IDI_ANIMATED5 ICON DISCARDABLE "icons/radar-05.ico" +IDI_ANIMATED6 ICON DISCARDABLE "icons/radar-06.ico" +IDI_ANIMATED7 ICON DISCARDABLE "icons/radar-07.ico" +IDI_ANIMATED8 ICON DISCARDABLE "icons/radar-08.ico" +IDI_IDLE ICON DISCARDABLE "icons/privoxy.ico" +IDI_OFF ICON DISCARDABLE "icons/off.ico" #endif /* Neutral resources */ @@ -216,21 +136,22 @@ BEGIN BEGIN MENUITEM "E&xit Privoxy", ID_FILE_EXIT MENUITEM SEPARATOR - POPUP "&Options" + POPUP "E&dit.." BEGIN - MENUITEM "&Configuration...", ID_TOOLS_EDITCONFIG - MENUITEM SEPARATOR - MENUITEM "&Actions...", ID_TOOLS_EDITACTIONS - MENUITEM "&Filters...", ID_TOOLS_EDITFILTERS + MENUITEM "&Main Configuration", ID_TOOLS_EDITCONFIG + MENUITEM "&Default Actions", ID_TOOLS_EDITDEFAULTACTIONS + MENUITEM "&User Actions", ID_TOOLS_EDITUSERACTIONS + MENUITEM "Default &Filters", ID_TOOLS_EDITDEFAULTFILTERS + MENUITEM "U&ser Filters", ID_TOOLS_EDITUSERFILTERS #ifdef FEATURE_TRUST - MENUITEM "&Trust...", ID_TOOLS_EDITTRUST + MENUITEM "&Trust list", ID_TOOLS_EDITTRUST #endif /* def FEATURE_TRUST */ END MENUITEM SEPARATOR #ifdef FEATURE_TOGGLE MENUITEM "&Enable", ID_TOGGLE_ENABLED, CHECKED #endif /* def FEATURE_TOGGLE */ - MENUITEM "Show Privoxy &Window", ID_SHOWWINDOW + MENUITEM "Show Privoxy &Window", ID_TOGGLE_SHOWWINDOW, CHECKED END END @@ -246,7 +167,7 @@ BEGIN END POPUP "&View" BEGIN - MENUITEM "&Clear Log", ID_VIEW_CLEARLOG + MENUITEM "&Clear Log\tCtrl+D", ID_VIEW_CLEARLOG MENUITEM SEPARATOR MENUITEM "&Log Messages", ID_VIEW_LOGMESSAGES, CHECKED MENUITEM "Message &Highlighting", ID_VIEW_MESSAGEHIGHLIGHTING, CHECKED @@ -259,12 +180,13 @@ BEGIN MENUITEM "&Enable", ID_TOGGLE_ENABLED, CHECKED MENUITEM SEPARATOR #endif /* def FEATURE_TOGGLE */ - MENUITEM "&Configuration...", ID_TOOLS_EDITCONFIG - MENUITEM SEPARATOR - MENUITEM "&Actions...", ID_TOOLS_EDITACTIONS - MENUITEM "&Filters...", ID_TOOLS_EDITFILTERS + MENUITEM "Edit Main &Configuration", ID_TOOLS_EDITCONFIG + MENUITEM "Edit &Default Actions", ID_TOOLS_EDITDEFAULTACTIONS + MENUITEM "Edit &User Actions", ID_TOOLS_EDITUSERACTIONS + MENUITEM "Edit Default &Filters", ID_TOOLS_EDITDEFAULTFILTERS + MENUITEM "Edit U&ser Filters", ID_TOOLS_EDITUSERFILTERS #ifdef FEATURE_TRUST - MENUITEM "&Trust...", ID_TOOLS_EDITTRUST + MENUITEM "Edit &Trust list", ID_TOOLS_EDITTRUST #endif /* def FEATURE_TRUST */ END POPUP "&Help" @@ -295,6 +217,7 @@ END IDR_ACCELERATOR ACCELERATORS DISCARDABLE BEGIN "C", ID_EDIT_COPY, VIRTKEY, CONTROL, NOINVERT + "D", ID_VIEW_CLEARLOG, VIRTKEY, CONTROL, NOINVERT END #endif /* English (U.S.) resources */