-#ifndef _W32RES_H
-#define _W32RES_H
-#define W32RES_H_VERSION "$Id: w32res.h,v 1.4 2001/05/26 01:26:34 jongfoster 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: /cvsroot/ijbswa/current/w32res.h,v $
*
* 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
*
*********************************************************************/
-#ifdef WIN_GUI_EDIT
-#define IDS_NEW_BLOCKER 1
-
-#define ID_NEW_BLOCKER 100
-#endif /* def WIN_GUI_EDIT */
-
#define IDR_TRAYMENU 101
#define IDI_IDLE 102
#define IDR_LOGVIEW 103
#define IDR_ACCELERATOR 104
#define IDR_POPUP_SELECTION 105
-#ifdef WIN_GUI_EDIT
-#define IDD_RULES 106
-#endif /* def WIN_GUI_EDIT */
-
#define IDI_JUNKBUSTER 200
#define IDI_JUNKBUSTER1 201
#define IDI_JUNKBUSTER7 207
#define IDI_JUNKBUSTER8 208
-#ifdef WIN_GUI_EDIT
-#define IDI_DENYRULE 209
-#define IDI_ALLOWRULE 210
-
-#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
-#endif /* def WIN_GUI_EDIT */
-
#define ID_SHOWWINDOW 4000
#define ID_HELP_ABOUTJUNKBUSTER 4001
#define ID_FILE_EXIT 4002
#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
+#endif /* def FEATURE_TOGGLE */
/* Break these out so they are easier to extend, but keep consecutive */
#define ID_TOOLS_EDITJUNKBUSTER 5000
-#define ID_TOOLS_EDITPERMISSIONS 5001
-#define ID_TOOLS_EDITFORWARD 5002
-
-#ifdef ACL_FILES
-#define ID_TOOLS_EDITACLS 5003
-#endif /* def ACL_FILES */
-
-#ifdef PCRS
-#define ID_TOOLS_EDITPERLRE 5004
-#endif /* def PCRS */
+#define ID_TOOLS_EDITACTIONS 5001
+#define ID_TOOLS_EDITPERLRE 5002
-#ifdef TRUST_FILES
-#define ID_TOOLS_EDITTRUST 5005
-#endif /* def TRUST_FILES */
+#ifdef FEATURE_TRUST
+#define ID_TOOLS_EDITTRUST 5003
+#endif /* def FEATURE_TRUST */
/*
* The following symbols are declared in <afxres.h> in VC++.
#define ID_EDIT_COPY 30000
-#endif /* ndef _W32RES_H */
+#endif /* ndef W32RES_H_INCLUDED */
/*
Local Variables:
projects / privoxy.git / blobdiff