#ifndef _W32RES_H
#define _W32RES_H
-#define W32RES_H_VERSION "$Id: w32res.h,v 1.1 2001/05/13 21:57:07 administrator Exp $"
+#define W32RES_H_VERSION "$Id: w32res.h,v 1.3 2001/05/26 00:28:36 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.
*
*
* Revisions :
* $Log: w32res.h,v $
+ * 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
+ *
*
*********************************************************************/
+#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
#ifdef TOGGLE
#define ID_TOGGLE_IJB 4012
#endif
-#define ID_RELOAD_CONFIG 4013
/* 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_EDITPERMISSIONS 5002
#define ID_TOOLS_EDITFORWARD 5003
#ifdef ACL_FILES
#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 */