X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=w32res.h;h=90ff6b9ab8de0bb5f975e1c9655d765582a6cdb8;hp=7fb57b6a09a40124190cc153f734e50dd3922bf7;hb=65690f437fa5f89034b8e788f10eba449a5312e5;hpb=c75584ebcc79f939fb4ec9c8f842cef6692640c7

diff --git a/w32res.h b/w32res.h
index 7fb57b6a..90ff6b9a 100644
--- a/w32res.h
+++ b/w32res.h
@@ -1,20 +1,19 @@
-#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
 /*********************************************************************
  *
- * File        :  $Source: /home/administrator/cvs/ijb/w32res.h,v $
+ * 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.  https://www.privoxy.org/
  *
  *                Based on the Internet Junkbuster originally written
- *                by and Copyright (C) 1997 Anonymous Coders and 
+ *                by and Copyright (C) 1997 Anonymous Coders and
  *                Junkbusters Corporation.  http://www.junkbusters.com
  *
- *                This program is free software; you can redistribute it 
+ *                This program is free software; you can redistribute it
  *                and/or modify it under the terms of the GNU General
  *                Public License as published by the Free Software
  *                Foundation; either version 2 of the License, or (at
@@ -32,44 +31,28 @@
  *                or write to the Free Software Foundation, Inc., 59
  *                Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
- * Revisions   :
- *    $Log: w32res.h,v $
- *
  *********************************************************************/
 
-#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
-#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 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 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
 
-#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
@@ -80,48 +63,25 @@
 #define ID_HELP_MANUAL                    4009
 #define ID_HELP_GPL                       4010
 #define ID_HELP_STATUS                    4011
-#ifdef TOGGLE
-#define ID_TOGGLE_IJB                     4012
-#endif
-#define ID_RELOAD_CONFIG                  4013
+#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_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 */
+#define ID_TOOLS_EDITCONFIG               5000
+#define ID_TOOLS_EDITDEFAULTACTIONS       5001
+#define ID_TOOLS_EDITUSERACTIONS          5002
+#define ID_TOOLS_EDITDEFAULTFILTERS       5003
+#define ID_TOOLS_EDITUSERFILTERS          5004
 
-#ifdef KILLPOPUPS
-#define ID_TOOLS_EDITPOPUPS               5007
-#endif /* def KILLPOPUPS */
+#ifdef FEATURE_TRUST
+#define ID_TOOLS_EDITTRUST                5005
+#endif /* def FEATURE_TRUST */
 
-#ifdef PCRS
-#define ID_TOOLS_EDITPERLRE               5008
-#endif /* def PCRS */
-
-#ifdef TRUST_FILES
-#define ID_TOOLS_EDITTRUST                5004
-#endif /* def TRUST_FILES */
-
-/*
- * 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: