-#ifndef _W32RES_H
-#define _W32RES_H
-#define W32RES_H_VERSION "$Id: w32res.h,v 1.7 2001/06/07 23:08:12 jongfoster Exp $"
+#ifndef W32RES_H_INCLUDED
+#define W32RES_H_INCLUDED
+#define W32RES_H_VERSION "$Id: w32res.h,v 1.16 2008/11/02 14:37:47 ler762 Exp $"
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/w32res.h,v $
*
* Purpose : Identifiers for Windows GUI resources.
*
- * Copyright : Written by and Copyright (C) 2001 the SourceForge
- * IJBSWA team. http://ijbswa.sourceforge.net
+ * Copyright : Written by and Copyright (C) 2001-2002 members of
+ * the Privoxy team. http://www.privoxy.org/
*
* Based on the Internet Junkbuster originally written
* by and Copyright (C) 1997 Anonymous Coders and
*
* Revisions :
* $Log: w32res.h,v $
+ * Revision 1.16 2008/11/02 14:37:47 ler762
+ * commit the part of the patches I've been using that were written by torford and gjmurphy
+ * [ 1824315 ] Minor code cleanup
+ * [ 1781135 ] Patch - Add clear log, select all, and Accelerators for w32
+ * http://sourceforge.net/tracker/?func=detail&atid=311118&aid=1781135&group_id=11118
+ * The full patch adds control keys A(select all), C(copy) and D(delete all) to the
+ * Privoxy log window menu. Select all and copy work for me without the patch
+ * (albeit without showing the accelerator keys on the menu), so the only part of the
+ * patch I've been using for the last year or so has been the ctrl-d to delete
+ * everything in the Privoxy log window.
+ *
+ * Revision 1.15 2006/07/18 14:48:48 david__schmidt
+ * Reorganizing the repository: swapping out what was HEAD (the old 3.1 branch)
+ * with what was really the latest development (the v_3_0_branch branch)
+ *
+ * Revision 1.13.2.1 2002/08/21 17:59:06 oes
+ * - "Show Privoxy Window" now a toggle
+ * - Temp kludge to let user and default action file be edited through win32 GUI (FR 592080)
+ *
+ * Revision 1.13 2002/03/26 22:57:10 jongfoster
+ * Web server name should begin www.
+ *
+ * Revision 1.12 2002/03/24 12:07:36 jongfoster
+ * Consistern name for filters file
+ *
+ * Revision 1.11 2002/03/24 12:03:47 jongfoster
+ * Name change
+ *
+ * Revision 1.10 2001/07/30 22:08:36 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.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.
*
*
*********************************************************************/
-#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_JUNKBUSTER2 202
-#define IDI_JUNKBUSTER3 203
-#define IDI_JUNKBUSTER4 204
-#define IDI_JUNKBUSTER5 205
-#define IDI_JUNKBUSTER6 206
-#define IDI_JUNKBUSTER7 207
-#define IDI_JUNKBUSTER8 208
+#define IDI_MAINICON 200
+#define IDI_ANIMATED1 201
+#define IDI_ANIMATED2 202
+#define IDI_ANIMATED3 203
+#define IDI_ANIMATED4 204
+#define IDI_ANIMATED5 205
+#define IDI_ANIMATED6 206
+#define IDI_ANIMATED7 207
+#define IDI_ANIMATED8 208
+#define IDI_OFF 209
-#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_TOGGLE_SHOWWINDOW 4000
+#define ID_HELP_ABOUT 4001
#define ID_FILE_EXIT 4002
#define ID_VIEW_CLEARLOG 4003
#define ID_VIEW_LOGMESSAGES 4004
#define ID_HELP_MANUAL 4009
#define ID_HELP_GPL 4010
#define ID_HELP_STATUS 4011
-#ifdef TOGGLE
-#define ID_TOGGLE_IJB 4012
-#endif
+#ifdef FEATURE_TOGGLE
+#define ID_TOGGLE_ENABLED 4012
+#endif /* def FEATURE_TOGGLE */
/* Break these out so they are easier to extend, but keep consecutive */
-#define ID_TOOLS_EDITJUNKBUSTER 5000
-#define ID_TOOLS_EDITACTIONS 5001
-#define ID_TOOLS_EDITPERLRE 5002
+#define ID_TOOLS_EDITCONFIG 5000
+#define ID_TOOLS_EDITDEFAULTACTIONS 5001
+#define ID_TOOLS_EDITUSERACTIONS 5002
+#define ID_TOOLS_EDITFILTERS 5003
-#ifdef TRUST_FILES
-#define ID_TOOLS_EDITTRUST 5003
-#endif /* def TRUST_FILES */
+#ifdef FEATURE_TRUST
+#define ID_TOOLS_EDITTRUST 5004
+#endif /* def FEATURE_TRUST */
-/*
- * The following symbols are declared in <afxres.h> in VC++.
- * However, mingw32 doesn't have that header. Let's
- * always declare them here, for consistency.
- * These are the VC++ values.
- */
-#define IDC_STATIC (-1)
#define ID_EDIT_COPY 30000
-#endif /* ndef _W32RES_H */
+#endif /* ndef W32RES_H_INCLUDED */
/*
Local Variables: