4 files changed, 22 insertions, 16 deletions
diff --git a/init.cpp b/init.cpp
index 916f846..4c96d01 100644
--- a/init.cpp
+++ b/init.cpp
@@ -137,12 +137,11 @@ static int OnModulesLoaded(WPARAM wParam,LPARAM lParam)
 	int HookSendMsg(WPARAM w, LPARAM l);
 //	int TestHook(WPARAM w, LPARAM l);
 
-//	void test();
 
+	void InitCheck();
 	void FirstRun();
 	FirstRun();
-
-//	test();
+	InitCheck();
 
 	HookEvent(ME_OPT_INITIALISE, GpgOptInit);
 	HookEvent(ME_DB_EVENT_FILTER_ADD, HookSendMsg);
diff --git a/main.cpp b/main.cpp
index 8db3d14..a339d6d 100644
--- a/main.cpp
+++ b/main.cpp
@@ -19,16 +19,6 @@
 
 #include "commonheaders.h"
 
-void test()
-{
-	string out;
-	DWORD code;
-	TCHAR cmd[512];
-	_tcscpy(cmd, _T("--list-secret-keys"));
-//	pxExecute(cmd, "", &out, &code);
-//	MessageBoxA(0, out.c_str(), "test", MB_OK);
-}
-
 
 HWND hwndFirstRun = NULL, hwndSetDirs = NULL, hwndNewKey = NULL, hwndKeyGen = NULL, hwndSelectExistingKey = NULL;
 
@@ -182,6 +172,17 @@ static BOOL CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM
 		  DBWriteContactSettingByte(NULL, szModuleName, "FirstRun", 0);
 		  DestroyWindow(hwndDlg);
 		  break;
+	  case IDC_OTHER:
+		  {
+			  void ShowLoadPublicKeyDialog();
+			  extern map<int, HANDLE> user_data;
+			  extern int item_num;
+			  item_num = 0;		 //black magic here
+			  user_data[1] = 0;
+			  MessageBox(0, _T("Set secret key in following dialog.\nI do not know if password protected key is work..."), _T("Info"), MB_OK);
+			  ShowLoadPublicKeyDialog();
+		  }
+		  break;
       }
       break;
     }
@@ -839,6 +840,10 @@ void FirstRun()
 	ShowSetDirsDialog();
 }
 
+void InitCheck()
+{
+}
+
 void ImportKey()
 {
 	extern wstring new_key;
diff --git a/new_gpg.rc b/new_gpg.rc
index 465aed8..546bece 100644
--- a/new_gpg.rc
+++ b/new_gpg.rc
@@ -73,7 +73,8 @@ BEGIN
     PUSHBUTTON      "Generate key",IDC_GENERATE_KEY,13,141,54,14
     LTEXT           "Select key for use",IDC_STATIC,16,12,186,8
     EDITTEXT        IDC_KEY_PASSWORD,205,141,77,14,ES_PASSWORD | ES_AUTOHSCROLL
-    RTEXT           "Key password:",IDC_STATIC,86,142,117,8
+    RTEXT           "Key password:",IDC_STATIC,127,144,76,8
+    PUSHBUTTON      "Load other",IDC_OTHER,72,141,50,14
 END
 
 IDD_BIN_PATH DIALOGEX 0, 0, 354, 89
diff --git a/resource.h b/resource.h
index b934c1d..c8fe011 100644
--- a/resource.h
+++ b/resource.h
@@ -46,8 +46,9 @@
 #define IDC_KEY_TYPE                    1039
 #define IDC_KEY_LENGTH                  1040
 #define IDC_KEY_EXPIRE_DATE             1043
-#define IDC_LIST1                       1045
 #define IDC_EXISTING_KEY_LIST           1045
+#define IDC_BUTTON2                     1046
+#define IDC_OTHER                       1046
 
 // Next default values for new objects
 // 
@@ -55,7 +56,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NEXT_RESOURCE_VALUE        111
 #define _APS_NEXT_COMMAND_VALUE         40001
-#define _APS_NEXT_CONTROL_VALUE         1046
+#define _APS_NEXT_CONTROL_VALUE         1047
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
 #endif