From: oes <oes@users.sourceforge.net>
Date: Thu, 5 Sep 2002 08:59:01 +0000 (+0000)
Subject: Synced with the stable branch:
X-Git-Tag: v_3_1_archive_branchpoint~177
X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=def5649d6ad9cae1689a38ff3044859ab69bb6ad

Synced with the stable 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)
---

diff --git a/src/w32res.h b/src/w32res.h
index 5302580e..38ba8d4a 100644
--- a/src/w32res.h
+++ b/src/w32res.h
@@ -1,9 +1,9 @@
 #ifndef W32RES_H_INCLUDED
 #define W32RES_H_INCLUDED
-#define W32RES_H_VERSION "$Id: w32res.h,v 1.13 2002/03/26 22:57:10 jongfoster Exp $"
+#define W32RES_H_VERSION "$Id: w32res.h,v 2.0 2002/06/04 14:34:21 jongfoster Exp $"
 /*********************************************************************
  *
- * File        :  $Source: /cvsroot/ijbswa/current/w32res.h,v $
+ * File        :  $Source: /cvsroot/ijbswa//current/src/w32res.h,v $
  *
  * Purpose     :  Identifiers for Windows GUI resources.
  *
@@ -34,6 +34,9 @@
  *
  * Revisions   :
  *    $Log: w32res.h,v $
+ *    Revision 2.0  2002/06/04 14:34:21  jongfoster
+ *    Moving source files to src/
+ *
  *    Revision 1.13  2002/03/26 22:57:10  jongfoster
  *    Web server name should begin www.
  *
@@ -133,7 +136,7 @@
 #define IDI_ANIMATED7                     207
 #define IDI_ANIMATED8                     208
 
-#define ID_SHOWWINDOW                     4000
+#define ID_TOGGLE_SHOWWINDOW              4000
 #define ID_HELP_ABOUT                     4001
 #define ID_FILE_EXIT                      4002
 #define ID_VIEW_CLEARLOG                  4003
@@ -151,11 +154,12 @@
 
 /* Break these out so they are easier to extend, but keep consecutive */
 #define ID_TOOLS_EDITCONFIG               5000
-#define ID_TOOLS_EDITACTIONS              5001
-#define ID_TOOLS_EDITFILTERS              5002
+#define ID_TOOLS_EDITDEFAULTACTIONS       5001
+#define ID_TOOLS_EDITUSERACTIONS          5002
+#define ID_TOOLS_EDITFILTERS              5003
 
 #ifdef FEATURE_TRUST
-#define ID_TOOLS_EDITTRUST                5003
+#define ID_TOOLS_EDITTRUST                5004
 #endif /* def FEATURE_TRUST */
 
 /*