[Winpt-commits] r143 - trunk/Include

[scm-commit at wald.intevation.org]

Author: twoaday
Date: 2006-01-12 17:27:34 +0100 (Thu, 12 Jan 2006)
New Revision: 143

Removed:
   trunk/Include/wptImagelist.h
Modified:
   trunk/Include/ChangeLog
   trunk/Include/Makefile.am
   trunk/Include/wptCommonCtl.h
   trunk/Include/wptGPG.h
Log:
2006-01-11  Timo Schulz  <ts at g10code.com>
 
        * wptGPG.h (gpg_data_putc): New.
         
2006-01-10  Timo Schulz  <ts at g10code.com>
 
        * wptKeylist.h (siglist_sort): New.
         



Modified: trunk/Include/ChangeLog
===================================================================
--- trunk/Include/ChangeLog	2006-01-12 16:27:04 UTC (rev 142)
+++ trunk/Include/ChangeLog	2006-01-12 16:27:34 UTC (rev 143)
@@ -1,3 +1,7 @@
+2006-01-11  Timo Schulz  <ts at g10code.com>
+
+	* wptGPG.h (gpg_data_putc): New.
+	
 2006-01-10  Timo Schulz  <ts at g10code.com>
 
 	* wptKeylist.h (siglist_sort): New.

Modified: trunk/Include/Makefile.am
===================================================================
--- trunk/Include/Makefile.am	2006-01-12 16:27:04 UTC (rev 142)
+++ trunk/Include/Makefile.am	2006-01-12 16:27:34 UTC (rev 143)
@@ -29,7 +29,6 @@
 	wptKeyEdit.h \
 	wptKeylist.h \
         wptListView.h \
-        wptImagelist.h \
 	wptKeyManager.h \
 	wptKeyserver.h \
 	wptNLS.h \

Modified: trunk/Include/wptCommonCtl.h
===================================================================
--- trunk/Include/wptCommonCtl.h	2006-01-12 16:27:04 UTC (rev 142)
+++ trunk/Include/wptCommonCtl.h	2006-01-12 16:27:34 UTC (rev 143)
@@ -26,11 +26,15 @@
 
 /* Symbol constants for the toolbar. */
 enum km_sym_tid_t {
-    IMI_KEY_DELETE = 0,
+    IMI_KEY_NEW=0,  
+    IMI_KEY_DELETE,
     IMI_KEY_PROPS,
     IMI_KEY_SIGN,
+    IMI_KEY_SEARCH,
+    IMI_KEY_FILE_IMPORT,
+    IMI_KEY_FILE_EXPORT,
     IMI_KEY_IMPORT,
-    IMI_KEY_EXPORT,
+    IMI_KEY_EXPORT,    
     IMI_SORT_UPARROW,
     IMI_SORT_DOWNARROW,
     IMI_EXIT,

Modified: trunk/Include/wptGPG.h
===================================================================
--- trunk/Include/wptGPG.h	2006-01-12 16:27:04 UTC (rev 142)
+++ trunk/Include/wptGPG.h	2006-01-12 16:27:34 UTC (rev 143)
@@ -230,6 +230,7 @@
 gpgme_error_t gpg_data_release_and_set_file (gpgme_data_t dh, const char *fname);
 gpgme_error_t  gpg_data_mail_quote (gpgme_data_t *r_dh);
 gpgme_error_t  gpg_data_extract_plaintext (gpgme_data_t sig, gpgme_data_t *r_plain);
+void	      gpg_data_putc (gpgme_data_t hd, int c);
 
 /*-- wptGPGUtil.cpp --*/
 gpgme_error_t gpg_rebuild_cache (char **r_inf);

Deleted: trunk/Include/wptImagelist.h
===================================================================
--- trunk/Include/wptImagelist.h	2006-01-12 16:27:04 UTC (rev 142)
+++ trunk/Include/wptImagelist.h	2006-01-12 16:27:34 UTC (rev 143)
@@ -1,44 +0,0 @@
-/* wptImagelist.h - Win32 Imagelist headerfile
- *	Copyright (C) 2003 Andreas Jobs
- *	Copyright (C) 2004 Timo Schulz
- *
- * This file is part of WinPT.
- *
- * WinPT 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 your option) any later version.
- *  
- * WinPT is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License 
- * along with WinPT; if not, write to the Free Software Foundation, 
- * Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 
- */
-
-#ifndef WPT_IMAGELIST_H
-#define WPT_IMAGELIST_H
-
-extern HIMAGELIST glob_imagelist;
-
-enum km_tb_id_t {
-    IMI_KEY_DELETE = 0,
-    IMI_KEY_PROPS,
-    IMI_KEY_SIGN,
-    IMI_KEY_IMPORT,
-    IMI_KEY_EXPORT,
-    IMI_SORT_UPARROW,
-    IMI_SORT_DOWNARROW,
-    IMI_EXIT,
-    IMAGELIST_NUMIMAGES
-};
-
-
-int imagelist_load (HWND hwnd);
-int imagelist_destroy (void);
-int imagelist_getindex (int icon);
-
-#endif /* WPT_IMAGELIST_H */