summaryrefslogtreecommitdiff
path: root/options.cpp
diff options
context:
space:
mode:
authorGluzskiy Alexandr <sss123next@list.ru>2010-08-18 08:26:47 +0300
committerGluzskiy Alexandr <sss123next@list.ru>2010-08-18 08:26:47 +0300
commit45ff7b504d79072bfbd24cf12f5818ed356f94bc (patch)
treeb3e51aa789863f95d48d5e3775216fa336911c9d /options.cpp
parente07a374f12258c3798c9f49ea926db29f90d93ec (diff)
modified: gpg_wrapper.cpp
modified: init.cpp modified: main.cpp modified: messages.cpp modified: new_gpg.rc modified: new_gpg.sln modified: new_gpg.vcproj modified: options.cpp modified: resource.h modified: utilities.cpp
Diffstat (limited to 'options.cpp')
-rw-r--r--options.cpp67
1 files changed, 44 insertions, 23 deletions
diff --git a/options.cpp b/options.cpp
index a64695f..b2692c1 100644
--- a/options.cpp
+++ b/options.cpp
@@ -169,6 +169,10 @@ static BOOL CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
ListView_SetColumnWidth(hwndList, 4, LVSCW_AUTOSIZE);
i++;
}
+ tmp = UniGetContactSettingUtf(NULL, szGPGModuleName, "szLogFilePath", _T(""));
+ SetDlgItemText(hwndDlg, IDC_LOG_FILE_EDIT, tmp);
+ mir_free(tmp);
+ CheckStateLoadDB(hwndDlg, IDC_DEBUG_LOG, "bDebugLog", 0);
return TRUE;
}
@@ -209,7 +213,7 @@ static BOOL CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
cmd += _T(" --batch --yes --delete-key ");
ptmp = mir_a2t(tmp);
cmd += ptmp;
- mir_free(ptmp);
+ mir_free(ptmp);
if(pxExecute(&cmd, "", &output,&exitcode) == pxNotFound)
{
MessageBox(0, _T("Set path to gpg.exe first!"), _T("Warning"), MB_OK);
@@ -234,35 +238,45 @@ static BOOL CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
ListView_SetItemText(hwndList, item_num, 1, _T("not set"));
break;
case IDC_SELECT_KEY:
- void ShowFirstRunDialog();
- ShowFirstRunDialog();
+ {
+ void ShowFirstRunDialog();
+ ShowFirstRunDialog();
+ }
break;
- default:
- break;
case IDC_SAVE_KEY_BUTTON:
- tmp = GetFilePath(_T("Export public key"), _T("*"), _T(".asc pubkey file"), true);
- if(!tmp)
{
- break;
+ tmp = GetFilePath(_T("Export public key"), _T("*"), _T(".asc pubkey file"), true);
+ if(!tmp)
+ {
+ break;
+ }
+ wfstream f(tmp, std::ios::out);
+ delete [] tmp;
+ wstring str;
+ {
+ TCHAR *tmp = UniGetContactSettingUtf(user_data[item_num+1], szGPGModuleName, "GPGPubKey", _T(""));
+ str.append(tmp);
+ mir_free(tmp);
+ }
+ wstring::size_type s = 0;
+ while((s = str.find(_T("\r"), s)) != wstring::npos)
+ {
+ str.erase(s, 1);
+ }
+ f<<str.c_str();
+ f.close();
}
- wfstream f(tmp, std::ios::out);
- delete [] tmp;
- wstring str;
+ break;
+ case IDC_LOG_FILE_SET:
{
- TCHAR *tmp = UniGetContactSettingUtf(user_data[item_num+1], szGPGModuleName, "GPGPubKey", _T(""));
- str.append(tmp);
+ tmp = GetFilePath(_T("Set log file"), _T("*"), _T("LOG files"), 1);
+ SetDlgItemText(hwndDlg, IDC_LOG_FILE_EDIT, tmp);
mir_free(tmp);
}
- wstring::size_type s = 0;
- while((s = str.find(_T("\r"), s)) != wstring::npos)
- {
- str.erase(s, 1);
- }
- f<<str.c_str();
- f.close();
+ break;
+ default:
break;
- }
-
+ }
SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);
break;
}
@@ -286,6 +300,13 @@ static BOOL CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
case PSN_APPLY:
{
+ extern bool bDebugLog;
+ bDebugLog = CheckStateStoreDB(hwndDlg, IDC_DEBUG_LOG, "bDebugLog");
+ {
+ TCHAR tmp[512];
+ GetDlgItemText(hwndDlg, IDC_LOG_FILE_EDIT, tmp, 512);
+ DBWriteContactSettingTString(NULL, szGPGModuleName, "szLogFilePath", tmp);
+ }
return TRUE;
}
}
@@ -531,7 +552,7 @@ static BOOL CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam,LP
}
f<<str.c_str();
f.close();
- cmd += _T(" --trust-model always ");
+ cmd += _T(" --batch ");
cmd += _T(" --import \"");
cmd += tmp2;
cmd += _T("\"");