#ifndef _W32RES_H
#define _W32RES_H
-#define W32RES_H_VERSION "$Id: w32res.h,v 1.2 2001/05/20 01:21:20 jongfoster Exp $"
+#define W32RES_H_VERSION "$Id: w32res.h,v 1.5 2001/05/29 09:50:24 jongfoster Exp $"
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/w32res.h,v $
*
* Revisions :
* $Log: w32res.h,v $
+ * 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
*
*********************************************************************/
+#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
-#define IDI_DENYRULE 107
-#define IDI_ALLOWRULE 108
+#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_MOVEDOWN 305
#define IDC_DELETE 306
#define IDC_SAVE 307
+#endif /* def WIN_GUI_EDIT */
#define ID_SHOWWINDOW 4000
#define ID_HELP_ABOUTJUNKBUSTER 4001
/* 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_EDITPERMISSIONS 5002
-#define ID_TOOLS_EDITFORWARD 5003
+#define ID_TOOLS_EDITACTIONS 5001
+#define ID_TOOLS_EDITFORWARD 5002
#ifdef ACL_FILES
-#define ID_TOOLS_EDITACLS 5005
+#define ID_TOOLS_EDITACLS 5003
#endif /* def ACL_FILES */
-#ifdef USE_IMAGE_LIST
-#define ID_TOOLS_EDITIMAGE 5006
-#endif /* def USE_IMAGE_LIST */
-
#ifdef PCRS
-#define ID_TOOLS_EDITPERLRE 5008
+#define ID_TOOLS_EDITPERLRE 5004
#endif /* def PCRS */
#ifdef TRUST_FILES
-#define ID_TOOLS_EDITTRUST 5004
+#define ID_TOOLS_EDITTRUST 5005
#endif /* def TRUST_FILES */
/*
projects / privoxy.git / blobdiff