X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=w32res.h;h=2bff98885f9dc2f1a70fc03d15d843080246426c;hp=7fb57b6a09a40124190cc153f734e50dd3922bf7;hb=622f8b00129cfb6abeb0d90f095b5ca5dd9d6c35;hpb=c75584ebcc79f939fb4ec9c8f842cef6692640c7 diff --git a/w32res.h b/w32res.h index 7fb57b6a..2bff9888 100644 --- a/w32res.h +++ b/w32res.h @@ -1,9 +1,9 @@ -#ifndef _W32RES_H -#define _W32RES_H -#define W32RES_H_VERSION "$Id: w32res.h,v 1.1 2001/05/13 21:57:07 administrator Exp $" +#ifndef W32RES_H_INCLUDED +#define W32RES_H_INCLUDED +#define W32RES_H_VERSION "$Id: w32res.h,v 1.9 2001/07/29 18:43:08 jongfoster Exp $" /********************************************************************* * - * File : $Source: /home/administrator/cvs/ijb/w32res.h,v $ + * File : $Source: /cvsroot/ijbswa/current/w32res.h,v $ * * Purpose : Identifiers for Windows GUI resources. * @@ -34,20 +34,79 @@ * * Revisions : * $Log: w32res.h,v $ + * Revision 1.9 2001/07/29 18:43:08 jongfoster + * Changing #ifdef _FILENAME_H to FILENAME_H_INCLUDED, to conform to + * ANSI C rules. + * + * Revision 1.8 2001/07/13 14:04:59 oes + * Removed all #ifdef PCRS + * + * Revision 1.7 2001/06/07 23:08:12 jongfoster + * Forward and ACL edit options removed. + * + * Revision 1.6 2001/05/31 21:37:11 jongfoster + * GUI changes to rename "permissions file" to "actions file". + * + * Revision 1.5 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.4 2001/05/26 01:26:34 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 + * + * Revision 1.3 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.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:08 oes + * Initial import of version 2.9.3 source tree + * * *********************************************************************/ -#define IDS_NEW_BLOCKER 1 - -#define ID_NEW_BLOCKER 100 #define IDR_TRAYMENU 101 #define IDI_IDLE 102 #define IDR_LOGVIEW 103 #define IDR_ACCELERATOR 104 #define IDR_POPUP_SELECTION 105 -#define IDD_RULES 106 -#define IDI_DENYRULE 107 -#define IDI_ALLOWRULE 108 + #define IDI_JUNKBUSTER 200 #define IDI_JUNKBUSTER1 201 @@ -59,15 +118,6 @@ #define IDI_JUNKBUSTER7 207 #define IDI_JUNKBUSTER8 208 -#define IDC_NEW 300 -#define IDC_ACTION 301 -#define IDC_RULES 302 -#define IDC_CREATE 303 -#define IDC_MOVEUP 304 -#define IDC_MOVEDOWN 305 -#define IDC_DELETE 306 -#define IDC_SAVE 307 - #define ID_SHOWWINDOW 4000 #define ID_HELP_ABOUTJUNKBUSTER 4001 #define ID_FILE_EXIT 4002 @@ -80,36 +130,18 @@ #define ID_HELP_MANUAL 4009 #define ID_HELP_GPL 4010 #define ID_HELP_STATUS 4011 -#ifdef TOGGLE +#ifdef FEATURE_TOGGLE #define ID_TOGGLE_IJB 4012 -#endif -#define ID_RELOAD_CONFIG 4013 +#endif /* def FEATURE_TOGGLE */ /* Break these out so they are easier to extend, but keep consecutive */ #define ID_TOOLS_EDITJUNKBUSTER 5000 -#define ID_TOOLS_EDITBLOCKERS 5001 -#define ID_TOOLS_EDITCOOKIES 5002 -#define ID_TOOLS_EDITFORWARD 5003 - -#ifdef ACL_FILES -#define ID_TOOLS_EDITACLS 5005 -#endif /* def ACL_FILES */ - -#ifdef USE_IMAGE_LIST -#define ID_TOOLS_EDITIMAGE 5006 -#endif /* def USE_IMAGE_LIST */ - -#ifdef KILLPOPUPS -#define ID_TOOLS_EDITPOPUPS 5007 -#endif /* def KILLPOPUPS */ - -#ifdef PCRS -#define ID_TOOLS_EDITPERLRE 5008 -#endif /* def PCRS */ +#define ID_TOOLS_EDITACTIONS 5001 +#define ID_TOOLS_EDITPERLRE 5002 -#ifdef TRUST_FILES -#define ID_TOOLS_EDITTRUST 5004 -#endif /* def TRUST_FILES */ +#ifdef FEATURE_TRUST +#define ID_TOOLS_EDITTRUST 5003 +#endif /* def FEATURE_TRUST */ /* * The following symbols are declared in in VC++. @@ -121,7 +153,7 @@ #define ID_EDIT_COPY 30000 -#endif /* ndef _W32RES_H */ +#endif /* ndef W32RES_H_INCLUDED */ /* Local Variables: