modified: main.cpp

	modified:   messages.cpp
	modified:   options.cpp

1 files changed, 18 insertions, 13 deletions

diff --git a/main.cpp b/main.cpp
index b3901f6..f572c90 100644
--- a/main.cpp
+++ b/main.cpp
@@ -124,14 +124,14 @@ static BOOL CALLBACK DlgProcFirstRun(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM
 					tmp = mir_a2t(out.substr(p,p2-p-1).c_str());

 					ListView_SetItemText(hwndList, iRow, 3, tmp);

 					mir_free(tmp);

+					ListView_SetColumnWidth(hwndList, 0, LVSCW_AUTOSIZE);// not sure about this

+					ListView_SetColumnWidth(hwndList, 1, LVSCW_AUTOSIZE);

+					ListView_SetColumnWidth(hwndList, 2, LVSCW_AUTOSIZE);

+					ListView_SetColumnWidth(hwndList, 3, LVSCW_AUTOSIZE);

+					ListView_SetColumnWidth(hwndList, 4, LVSCW_AUTOSIZE);

 					i++;

 				}

 			}

-			ListView_SetColumnWidth(hwndList, 0, LVSCW_AUTOSIZE);// not sure about this

-			ListView_SetColumnWidth(hwndList, 1, LVSCW_AUTOSIZE);

-			ListView_SetColumnWidth(hwndList, 2, LVSCW_AUTOSIZE);

-			ListView_SetColumnWidth(hwndList, 3, LVSCW_AUTOSIZE);

-			ListView_SetColumnWidth(hwndList, 4, LVSCW_AUTOSIZE);

 		}

 

 		return TRUE;

@@ -302,6 +302,8 @@ static BOOL CALLBACK DlgProcNewKeyDialog(HWND hwndDlg, UINT msg, WPARAM wParam,
 		TranslateDialogDefault(hwndDlg);

 		TCHAR *tmp = UniGetContactSettingUtf(new_key_hcnt, szGPGModuleName, "GPGPubKey", _T(""));

 		SetDlgItemText(hwndDlg, IDC_MESSAGE, (_tcslen(tmp) > 0)?_T("There is existing key for contact, do you want to replace with new key ?"):_T("New public key was received, do you want to import it?"));

+		EnableWindow(GetDlgItem(hwndDlg, IDC_IMPORT_AND_USE), DBGetContactSettingByte(new_key_hcnt, szGPGModuleName, "GPGEncryption", 0)?0:1);

+		SetDlgItemText(hwndDlg, ID_IMPORT, (_tcslen(tmp) > 0)?_T("Replace"):_T("Accept"));

 		mir_free(tmp);

       return TRUE;

     }

@@ -572,6 +574,11 @@ static BOOL CALLBACK DlgProcKeyGenDialog(HWND hwndDlg, UINT msg, WPARAM wParam,
 					tmp = mir_a2t(out.substr(p,p2-p-1).c_str());

 					ListView_SetItemText(hwndList_g, iRow, 3, tmp);

 					mir_free(tmp);

+					ListView_SetColumnWidth(hwndList_g, 0, LVSCW_AUTOSIZE);// not sure about this

+					ListView_SetColumnWidth(hwndList_g, 1, LVSCW_AUTOSIZE);

+					ListView_SetColumnWidth(hwndList_g, 2, LVSCW_AUTOSIZE);

+					ListView_SetColumnWidth(hwndList_g, 3, LVSCW_AUTOSIZE);

+					ListView_SetColumnWidth(hwndList_g, 4, LVSCW_AUTOSIZE);

 					i++;

 				}

 			}

@@ -702,19 +709,17 @@ static BOOL CALLBACK DlgProcLoadExistingKey(HWND hwndDlg,UINT msg,WPARAM wParam,
 					tmp = mir_a2t(out.substr(p,p2-p-1).c_str());

 					ListView_SetItemText(hwndList, iRow, 3, tmp);

 					mir_free(tmp);

+					ListView_SetColumnWidth(hwndList, 0, LVSCW_AUTOSIZE);// not sure about this

+					ListView_SetColumnWidth(hwndList, 1, LVSCW_AUTOSIZE);

+					ListView_SetColumnWidth(hwndList, 2, LVSCW_AUTOSIZE);

+					ListView_SetColumnWidth(hwndList, 3, LVSCW_AUTOSIZE);

+					ListView_SetColumnWidth(hwndList, 4, LVSCW_AUTOSIZE);

 					i++;

 				}

 			}

-			ListView_SetColumnWidth(hwndList, 0, LVSCW_AUTOSIZE);// not sure about this

-			ListView_SetColumnWidth(hwndList, 1, LVSCW_AUTOSIZE);

-			ListView_SetColumnWidth(hwndList, 2, LVSCW_AUTOSIZE);

-			ListView_SetColumnWidth(hwndList, 3, LVSCW_AUTOSIZE);

-			ListView_SetColumnWidth(hwndList, 4, LVSCW_AUTOSIZE);

 		}

 		return TRUE;
-    }
-    
- 
+    } 
   case WM_COMMAND:
     {
       switch (LOWORD(wParam))