summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGluzskiy Alexandr <sss123next@list.ru>2010-09-14 16:11:03 +0300
committerGluzskiy Alexandr <sss123next@list.ru>2010-09-14 16:11:03 +0300
commitee194854bb7069fa813db779cc135fde6fde454b (patch)
tree1a2cf7c72f067113cc16968e1747fdaaad5109a4
parent8bf21ad8fe9da1800e30487c921f14f6532dbe14 (diff)
modified: new_gpg.rc
modified: utilities.cpp
-rw-r--r--new_gpg.rc14
-rw-r--r--utilities.cpp1
2 files changed, 8 insertions, 7 deletions
diff --git a/new_gpg.rc b/new_gpg.rc
index 290c690..4ba62c2 100644
--- a/new_gpg.rc
+++ b/new_gpg.rc
@@ -112,21 +112,21 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
DEFPUSHBUTTON "ÎÊ",IDOK,7,145,50,14
PUSHBUTTON "Îòìåíà",IDCANCEL,152,145,50,14
- COMBOBOX IDC_KEY_TYPE,65,14,48,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+ COMBOBOX IDC_KEY_TYPE,65,14,48,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
LTEXT "Key type:",IDC_STATIC,8,16,32,8
LTEXT "Key length:",IDC_STATIC,7,32,38,8
LTEXT "Key password:",IDC_STATIC,7,49,53,8
- EDITTEXT IDC_KEY_PASSWD,65,46,55,14,ES_AUTOHSCROLL
+ EDITTEXT IDC_KEY_PASSWD,65,46,55,14,ES_AUTOHSCROLL | WS_GROUP
LTEXT "Real name:",IDC_STATIC,7,63,54,8
LTEXT "Email:",IDC_STATIC,7,79,47,8
LTEXT "Comment:",IDC_STATIC,7,92,53,8
LTEXT "Expire date:",IDC_STATIC,7,109,40,8
- EDITTEXT IDC_KEY_EMAIL,65,76,55,14,ES_AUTOHSCROLL
- EDITTEXT IDC_KEY_REAL_NAME,65,61,55,14,ES_AUTOHSCROLL
- EDITTEXT IDC_KEY_COMMENT,65,91,55,14,ES_AUTOHSCROLL
- EDITTEXT IDC_KEY_EXPIRE_DATE,65,106,55,14,ES_AUTOHSCROLL | ES_NUMBER
+ EDITTEXT IDC_KEY_EMAIL,65,76,55,14,ES_AUTOHSCROLL | WS_GROUP
+ EDITTEXT IDC_KEY_REAL_NAME,65,61,55,14,ES_AUTOHSCROLL | WS_GROUP
+ EDITTEXT IDC_KEY_COMMENT,65,91,55,14,ES_AUTOHSCROLL | WS_GROUP
+ EDITTEXT IDC_KEY_EXPIRE_DATE,65,106,55,14,ES_AUTOHSCROLL | ES_NUMBER | WS_GROUP
LTEXT "ex.: 2010-08-15",IDC_STATIC,127,108,54,8
- EDITTEXT IDC_KEY_LENGTH,65,30,40,14,ES_AUTOHSCROLL | ES_NUMBER
+ EDITTEXT IDC_KEY_LENGTH,65,30,40,14,ES_AUTOHSCROLL | ES_NUMBER | WS_GROUP
LTEXT "From 1024 to 4096",IDC_STATIC,113,33,62,8
LTEXT "It can take a long time, be patient",IDC_STATIC,15,132,164,8
LTEXT "0 - does not expire",IDC_STATIC,67,122,62,8
diff --git a/utilities.cpp b/utilities.cpp
index b9620d4..3eaf9a7 100644
--- a/utilities.cpp
+++ b/utilities.cpp
@@ -611,6 +611,7 @@ static JABBER_HANDLER_FUNC PrescenseHandler(IJabberInterface *ji, HXML node, voi
}
if(out.find("key ID ") != string::npos)
{
+ //need to get hcontact here, i can get jid from hxml, and get handle from jid, maybe exists better way ?
string::size_type p = out.find("key ID ") + strlen("key ID ");
string::size_type p2 = out.find("\n", p);
}