[Winpt-commits] r243 - trunk/Include

[scm-commit@wald.intevation.org]

Author: twoaday
Date: 2006-07-03 16:10:00 +0200 (Mon, 03 Jul 2006)
New Revision: 243

Modified:
   trunk/Include/wptDlgs.h
   trunk/Include/wptFileManager.h
   trunk/Include/wptKeyManager.h
Log:


Modified: trunk/Include/wptDlgs.h
===================================================================
--- trunk/Include/wptDlgs.h	2006-06-29 11:18:27 UTC (rev 242)
+++ trunk/Include/wptDlgs.h	2006-07-03 14:10:00 UTC (rev 243)
@@ -287,7 +287,7 @@
 
 void progress_callback (void *opaque, const char *what, int type,
 		        int off, int max);
-void wait_for_progress_cb (void);
+int wait_for_progress_cb (DWORD millis);
 
 /*-- Misc --*/
 BOOL CALLBACK first_run_dlg_proc( HWND dlg, 

Modified: trunk/Include/wptFileManager.h
===================================================================
--- trunk/Include/wptFileManager.h	2006-06-29 11:18:27 UTC (rev 242)
+++ trunk/Include/wptFileManager.h	2006-07-03 14:10:00 UTC (rev 243)
@@ -1,5 +1,5 @@
 /* wptFileManager.h - File manager routines
- *	Copyright (C) 2001-2005 Timo Schulz
+ *	Copyright (C) 2001-2006 Timo Schulz
  *
  * This file is part of WinPT.
  *
@@ -37,19 +37,39 @@
     FM_ENCRYPT_ZIP  = 11
 };
 
-/* Sort by constants. */
-enum fm_sort_t {
-    FM_SORT_NONE    = 0,
-    FM_SORT_STAT    = 1,
-    FM_SORT_NAME    = 2,
-    FM_SORT_OP	    = 3
+
+/* Symbolic column IDs. */
+enum {
+    FM_COL_STAT = 0,
+    FM_COL_NAME = 1,
+    FM_COL_OP   = 2
 };
 
+
+/* File Manager model to represent the list view. */
+struct fm_model_s {
+    struct fm_model_s *next;
+    char *status;
+    char *name;
+    char *op;
+};
+typedef fm_model_s *fm_model_t;
+
+
+/* File Manager dialog handle. */
+struct fm_info_s {
+    HWND statbar;
+    HMENU menu;
+    listview_ctrl_t lv;
+    fm_model_t model;
+};
+typedef struct fm_info_s *fm_info_t;
+
 /* File manager handle. */
 struct fm_state_s {
     gpgme_ctx_t ctx;		/* currently used gpgme context. */
     gpgme_key_t *recp;		/* selected recipients. */
-    int		n_recp;
+    int		n_recp;		/* number of recipients. */
     char *output;		/* output file name. */
     char *opaque;
     int cancel;			/* 1=if user cancelled operation. */
@@ -67,7 +87,7 @@
     unsigned int wipe:1;	/* 1=if original file should be wiped. */
     unsigned int req_signer:1;	/* 1=if user wants to select a signer. */
 };
-typedef struct fm_state_s * fm_state_t;
+typedef struct fm_state_s *fm_state_t;
 
 
 /* Signature verification context for a file. */
@@ -112,10 +132,11 @@
 int fm_parse_files (listview_ctrl_t lv, HWND dlg, int cmd);
 int fm_state_new (fm_state_t *ctx);
 void fm_state_release (fm_state_t ctx);
-int fm_build (listview_ctrl_t *lv, HWND ctrl);
-void fm_delete (listview_ctrl_t lv);
-int fm_add_dropped_files (listview_ctrl_t lv, HDROP dd_files);
-int fm_add_opened_files (listview_ctrl_t lv, HWND dlg);
+void fm_reset (fm_info_t fm);
+void fm_build (fm_info_t *r_fm, HWND ctrl);
+void fm_delete (fm_info_t fm);
+int fm_add_dropped_files (fm_info_t fm, HDROP dd_files);
+int fm_add_opened_files (fm_info_t fm, HWND dlg);
 void fm_remove_crit_file_attrs (const char *fname, int force);
 int fm_get_current_pos (listview_ctrl_t lv);
 int fm_sort (listview_ctrl_t lv, int sortby);

Modified: trunk/Include/wptKeyManager.h
===================================================================
--- trunk/Include/wptKeyManager.h	2006-06-29 11:18:27 UTC (rev 242)
+++ trunk/Include/wptKeyManager.h	2006-07-03 14:10:00 UTC (rev 243)
@@ -76,7 +76,7 @@
 int km_delete_keys( listview_ctrl_t lv, HWND dlg );
 int km_send_to_keyserver( listview_ctrl_t lv, HWND dlg, const char * host, unsigned short port);
 int km_send_to_mail_recipient( listview_ctrl_t lv, HWND dlg );
-void km_refresh_from_keyserver(listview_ctrl_t lv, HWND dlg);
+int km_refresh_from_keyserver(listview_ctrl_t lv, HWND dlg);
 int km_check_if_protected( listview_ctrl_t lv, int pos );
 int km_enable_disable_key( listview_ctrl_t lv, HWND dlg, int pos, int enable );
 void km_set_clip_info( const char *uid );
@@ -88,15 +88,4 @@
 			    struct keycache_s **r_ctx);
 void km_key_show_revoc_info (winpt_key_t k);
 
-#if 0
-gpg_optfile_t km_groupdb_open( void );
-int km_groupdb_expand_recipients( const char *name, gpgme_recipients_t rset );
-int km_groups_new( km_group_t *r_gc, HWND ctrl );
-void km_groups_release( km_group_t gc );
-void km_groups_sync( km_group_t gc );
-int km_groups_load( km_group_t gc );
-int km_groups_add( km_group_t gc, listview_ctrl_t lv, int km_index );
-int km_groups_del( km_group_t gc );
-#endif
-
 #endif /* WPT_KEYMANAGER_H */