From 7a514de5df654c9fe1d26c889f4317b5650f84ec Mon Sep 17 00:00:00 2001 From: Kirill Volinsky Date: Sat, 16 May 2015 16:31:04 +0000 Subject: cleanup git-svn-id: http://svn.miranda-ng.org/main/trunk@13622 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Msg_Export/src/options.cpp | 1280 ++++++++++++++++++------------------ 1 file changed, 640 insertions(+), 640 deletions(-) (limited to 'plugins/Msg_Export/src/options.cpp') diff --git a/plugins/Msg_Export/src/options.cpp b/plugins/Msg_Export/src/options.cpp index 7a424b9df0..50b41fc0cf 100755 --- a/plugins/Msg_Export/src/options.cpp +++ b/plugins/Msg_Export/src/options.cpp @@ -91,19 +91,19 @@ public: int CALLBACK CompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort) { - if (lParamSort == 1 ) - return _tcsicmp( NickFromHandle((MCONTACT)lParam1), NickFromHandle((MCONTACT)lParam2)); - - if (lParamSort == 2 ) + if (lParamSort == 1) + return mir_tstrcmpi(NickFromHandle((MCONTACT)lParam1), NickFromHandle((MCONTACT)lParam2)); + + if (lParamSort == 2) return _DBGetString((MCONTACT)lParam1, "Protocol", "p", _T("")).compare(_DBGetString((MCONTACT)lParam2, "Protocol", "p", _T(""))); - if (lParamSort == 3 ) + if (lParamSort == 3) { - DWORD dwUin1 = db_get_dw((MCONTACT)lParam1, _DBGetStringA((MCONTACT)lParam1, "Protocol", "p", "" ).c_str(), "UIN", 0); - DWORD dwUin2 = db_get_dw((MCONTACT)lParam2, _DBGetStringA((MCONTACT)lParam2, "Protocol", "p", "" ).c_str(), "UIN", 0); - if (dwUin1 == dwUin2 ) + DWORD dwUin1 = db_get_dw((MCONTACT)lParam1, _DBGetStringA((MCONTACT)lParam1, "Protocol", "p", "").c_str(), "UIN", 0); + DWORD dwUin2 = db_get_dw((MCONTACT)lParam2, _DBGetStringA((MCONTACT)lParam2, "Protocol", "p", "").c_str(), "UIN", 0); + if (dwUin1 == dwUin2) return 0; - if (dwUin1 > dwUin2 ) + if (dwUin1 > dwUin2) return -1; return 1; } @@ -128,19 +128,19 @@ int CALLBACK CompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM lParamSort) ///////////////////////////////////////////////////////////////////// INT_PTR CALLBACK __stdcall DialogProc( - HWND hwndDlg, // handle to dialog box - UINT uMsg, // message - WPARAM /*wParam*/, // first message parameter - LPARAM /*lParam*/ // second message parameter -) + HWND hwndDlg, // handle to dialog box + UINT uMsg, // message + WPARAM /*wParam*/, // first message parameter + LPARAM /*lParam*/ // second message parameter + ) { switch (uMsg) { - case WM_INITDIALOG: - { - TranslateDialogDefault(hwndDlg); - return TRUE; - } + case WM_INITDIALOG: + { + TranslateDialogDefault(hwndDlg); + return TRUE; + } } return FALSE; } @@ -159,19 +159,19 @@ INT_PTR CALLBACK __stdcall DialogProc( // Developer : KN ///////////////////////////////////////////////////////////////////// -int nExportCompleatList(HWND hParent, bool bOnlySelected ) +int nExportCompleatList(HWND hParent, bool bOnlySelected) { - HWND hMapUser = GetDlgItem( hParent, IDC_MAP_USER_LIST); + HWND hMapUser = GetDlgItem(hParent, IDC_MAP_USER_LIST); - int nTotalContacts = ListView_GetItemCount( hMapUser); + int nTotalContacts = ListView_GetItemCount(hMapUser); int nContacts; - if (bOnlySelected ) - nContacts = ListView_GetSelectedCount( hMapUser); + if (bOnlySelected) + nContacts = ListView_GetSelectedCount(hMapUser); else nContacts = nTotalContacts; - if (!hMapUser || nContacts <= 0 ) + if (!hMapUser || nContacts <= 0) { MessageBox(hParent, TranslateT("No contacts found to export"), MSG_BOX_TITEL, MB_OK); return 0; @@ -182,38 +182,38 @@ int nExportCompleatList(HWND hParent, bool bOnlySelected ) HWND hStatus = GetDlgItem(hDlg, IDC_EXP_ALL_STATUS); SendMessage(hProg, PBM_SETRANGE, 0, MAKELPARAM(0, nContacts)); - + SetWindowText(hStatus, TranslateT("Reading database information (Phase 1 of 2)")); { // position and show proigrassbar dialog RECT rParrent; RECT rDlg; - if (GetWindowRect( hParent, &rParrent) && GetWindowRect( hDlg, &rDlg)) + if (GetWindowRect(hParent, &rParrent) && GetWindowRect(hDlg, &rDlg)) { - int x = ( (rParrent.right + rParrent.left) / 2) - ( (rDlg.right - rDlg.left) / 2); - int y = ( (rParrent.bottom + rParrent.top) / 2) - ( (rDlg.bottom - rDlg.top) / 2); - SetWindowPos( hDlg, 0, x, y, 0,0, SWP_NOSIZE | SWP_NOZORDER | SWP_SHOWWINDOW); + int x = ((rParrent.right + rParrent.left) / 2) - ((rDlg.right - rDlg.left) / 2); + int y = ((rParrent.bottom + rParrent.top) / 2) - ((rDlg.bottom - rDlg.top) / 2); + SetWindowPos(hDlg, 0, x, y, 0, 0, SWP_NOSIZE | SWP_NOZORDER | SWP_SHOWWINDOW); } else - ShowWindow( hDlg, SW_SHOWNORMAL); + ShowWindow(hDlg, SW_SHOWNORMAL); } // map with list to stored all DB history before it is exported map, less > AllEvents; - + { // reading from the database !!! LVITEM sItem = { 0 }; sItem.mask = LVIF_PARAM; - for (int nCur = 0 ; nCur < nTotalContacts ; nCur++ ) + for (int nCur = 0; nCur < nTotalContacts; nCur++) { - if (bOnlySelected ) - if ( !(ListView_GetItemState( hMapUser, nCur, LVIS_SELECTED) & LVIS_SELECTED)) + if (bOnlySelected) + if (!(ListView_GetItemState(hMapUser, nCur, LVIS_SELECTED) & LVIS_SELECTED)) continue; sItem.iItem = nCur; - if(!ListView_GetItem(hMapUser, &sItem)) + if (!ListView_GetItem(hMapUser, &sItem)) { MessageBox(hParent, TranslateT("Failed to export at least one contact"), MSG_BOX_TITEL, MB_OK); continue; @@ -221,54 +221,54 @@ int nExportCompleatList(HWND hParent, bool bOnlySelected ) MCONTACT hContact = (MCONTACT)sItem.lParam; - list &rclCurList = AllEvents[ GetFilePathFromUser( hContact) ]; - + list &rclCurList = AllEvents[GetFilePathFromUser(hContact)]; + MEVENT hDbEvent = db_event_first(hContact); - while( hDbEvent) { + while (hDbEvent) { rclCurList.push_back(CLDBEvent(hContact, hDbEvent)); hDbEvent = db_event_next(hContact, hDbEvent); } - SendMessage( hProg, PBM_SETPOS, nCur, 0); - RedrawWindow( hDlg, NULL, NULL, RDW_ALLCHILDREN | RDW_UPDATENOW); + SendMessage(hProg, PBM_SETPOS, nCur, 0); + RedrawWindow(hDlg, NULL, NULL, RDW_ALLCHILDREN | RDW_UPDATENOW); } -/* - if (hContact ) - MessageBox( hParent, LPGENT("Failed to export at least one contact"),MSG_BOX_TITEL,MB_OK); - */ + /* + if (hContact ) + MessageBox( hParent, LPGENT("Failed to export at least one contact"),MSG_BOX_TITEL,MB_OK); + */ } { // window text update - SetWindowText( hStatus, TranslateT("Sorting and writing database information (Phase 2 of 2)")); - SendMessage( hProg, PBM_SETRANGE, 0, MAKELPARAM( 0, AllEvents.size())); - SendMessage( hProg, PBM_SETPOS, 0, 0); + SetWindowText(hStatus, TranslateT("Sorting and writing database information (Phase 2 of 2)")); + SendMessage(hProg, PBM_SETRANGE, 0, MAKELPARAM(0, AllEvents.size())); + SendMessage(hProg, PBM_SETPOS, 0, 0); } { // time to write to files !!! map, less >::iterator FileIterator; - - int nCur=0; - for (FileIterator = AllEvents.begin() ; FileIterator != AllEvents.end() ; ++FileIterator ) + + int nCur = 0; + for (FileIterator = AllEvents.begin(); FileIterator != AllEvents.end(); ++FileIterator) { (FileIterator->second).sort(); // Sort is preformed here !! // events with same time will not be swaped, they will // remain in there original order list< CLDBEvent >::const_iterator iterator; - for (iterator = FileIterator->second.begin() ; iterator != FileIterator->second.end() ; ++iterator ) + for (iterator = FileIterator->second.begin(); iterator != FileIterator->second.end(); ++iterator) { MEVENT hDbEvent = (*iterator).hDbEvent; - nExportEvent( (WPARAM) (*iterator).hUser, (LPARAM)hDbEvent); + nExportEvent((WPARAM)(*iterator).hUser, (LPARAM)hDbEvent); } - SendMessage( hProg, PBM_SETPOS, ++nCur, 0); - RedrawWindow( hDlg, NULL, NULL, RDW_ALLCHILDREN | RDW_UPDATENOW); + SendMessage(hProg, PBM_SETPOS, ++nCur, 0); + RedrawWindow(hDlg, NULL, NULL, RDW_ALLCHILDREN | RDW_UPDATENOW); } } - DestroyWindow( hDlg); + DestroyWindow(hDlg); return 0; } @@ -285,42 +285,42 @@ int nExportCompleatList(HWND hParent, bool bOnlySelected ) // Developer : KN ///////////////////////////////////////////////////////////////////// -void SetToDefault( HWND hParent ) +void SetToDefault(HWND hParent) { - HWND hMapUser = GetDlgItem( hParent, IDC_MAP_USER_LIST); + HWND hMapUser = GetDlgItem(hParent, IDC_MAP_USER_LIST); - int nContacts = ListView_GetItemCount( hMapUser); + int nContacts = ListView_GetItemCount(hMapUser); - if (!hMapUser || nContacts <= 0 ) + if (!hMapUser || nContacts <= 0) { return; } - TCHAR szTemp[ 500 ]; - if ( !GetDlgItemText( hParent, IDC_DEFAULT_FILE, szTemp, SIZEOF(szTemp)) ) + TCHAR szTemp[500]; + if (!GetDlgItemText(hParent, IDC_DEFAULT_FILE, szTemp, SIZEOF(szTemp))) return; - + LVITEM sItem = { 0 }; - for (int nCur = 0 ; nCur < nContacts ; nCur++ ) + for (int nCur = 0; nCur < nContacts; nCur++) { - if ( !(ListView_GetItemState( hMapUser, nCur, LVIS_SELECTED) & LVIS_SELECTED)) + if (!(ListView_GetItemState(hMapUser, nCur, LVIS_SELECTED) & LVIS_SELECTED)) continue; sItem.iItem = nCur; sItem.mask = LVIF_PARAM; - if ( !ListView_GetItem( hMapUser, &sItem)) + if (!ListView_GetItem(hMapUser, &sItem)) continue; tstring sFileName = szTemp; ReplaceDefines((MCONTACT)sItem.lParam, sFileName); - ReplaceTimeVariables( sFileName); + ReplaceTimeVariables(sFileName); sItem.mask = LVIF_TEXT; sItem.pszText = (TCHAR*)sFileName.c_str(); - ListView_SetItem( hMapUser, &sItem); + ListView_SetItem(hMapUser, &sItem); - if ( !bUnaplyedChanges ) + if (!bUnaplyedChanges) { bUnaplyedChanges = TRUE; SendMessage(GetParent(hParent), PSM_CHANGED, 0, 0); @@ -341,14 +341,14 @@ void SetToDefault( HWND hParent ) // Developer : KN ///////////////////////////////////////////////////////////////////// -BOOL bApplyChanges( HWND hwndDlg ) +BOOL bApplyChanges(HWND hwndDlg) { BOOL bTrans; BOOL bRet = true; TCHAR szTemp[500]; int nTmp = GetDlgItemInt(hwndDlg, IDC_MAX_CLOUMN_WIDTH, &bTrans, TRUE); - if ( !bTrans || nTmp < 5 ) + if (!bTrans || nTmp < 5) { mir_sntprintf(szTemp, SIZEOF(szTemp), TranslateT("Max line width must be at least %d"), 5); MessageBox(hwndDlg, szTemp, MSG_BOX_TITEL, MB_OK); @@ -371,10 +371,10 @@ BOOL bApplyChanges( HWND hwndDlg ) GetDlgItemText(hwndDlg, IDC_FILE_VIEWER, szTemp, SIZEOF(szTemp)); sFileViewerPrg = szTemp; - bUseInternalViewer( IsDlgButtonChecked(hwndDlg, IDC_USE_INTERNAL_VIEWER ) == BST_CHECKED); + bUseInternalViewer(IsDlgButtonChecked(hwndDlg, IDC_USE_INTERNAL_VIEWER) == BST_CHECKED); bool bNewRp = IsDlgButtonChecked(hwndDlg, IDC_REPLACE_MIRANDA_HISTORY) == BST_CHECKED; - if (bReplaceHistory != bNewRp ) + if (bReplaceHistory != bNewRp) { bReplaceHistory = bNewRp; MessageBox(hwndDlg, TranslateT("You need to restart Miranda to change the history function"), MSG_BOX_TITEL, MB_OK); @@ -384,11 +384,11 @@ BOOL bApplyChanges( HWND hwndDlg ) bUseUtf8InNewFiles = IsDlgButtonChecked(hwndDlg, IDC_USE_UTF8_IN_NEW_FILES) == BST_CHECKED; bUseLessAndGreaterInExport = IsDlgButtonChecked(hwndDlg, IDC_USE_LESS_AND_GREATER_IN_EXPORT) == BST_CHECKED; - + HWND hMapUser = GetDlgItem(hwndDlg, IDC_MAP_USER_LIST); - int nCount = ListView_GetItemCount( hMapUser); - for (int nCur = 0 ; nCur < nCount ; nCur++ ) + int nCount = ListView_GetItemCount(hMapUser); + for (int nCur = 0; nCur < nCount; nCur++) { LVITEM sItem = { 0 }; sItem.iItem = nCur; @@ -396,25 +396,25 @@ BOOL bApplyChanges( HWND hwndDlg ) sItem.pszText = szTemp; sItem.cchTextMax = SIZEOF(szTemp); - if (ListView_GetItem( hMapUser, &sItem)) + if (ListView_GetItem(hMapUser, &sItem)) { MCONTACT hUser = (MCONTACT)sItem.lParam; - if (_tcslen( szTemp) > 0 ) + if (mir_tstrlen(szTemp) > 0) db_set_ts(hUser, MODULE, "FileName", szTemp); else db_unset(hUser, MODULE, "FileName"); - if (sItem.iImage ) + if (sItem.iImage) db_unset(hUser, MODULE, "EnableLog"); // default is Enabled !! else - db_set_b(hUser, MODULE, "EnableLog",0); + db_set_b(hUser, MODULE, "EnableLog", 0); } } UpdateFileToColWidth(); SaveSettings(); - + bUnaplyedChanges = FALSE; return bRet; } @@ -439,13 +439,13 @@ void ClearAllFileNames(HWND hwndDlg) sItem.pszText = _T(""); HWND hMapUser = GetDlgItem(hwndDlg, IDC_MAP_USER_LIST); - int nCount = ListView_GetItemCount( hMapUser); - for (int nCur = 0 ; nCur < nCount ; nCur++ ) + int nCount = ListView_GetItemCount(hMapUser); + for (int nCur = 0; nCur < nCount; nCur++) { sItem.iItem = nCur; - ListView_SetItem( hMapUser, &sItem); + ListView_SetItem(hMapUser, &sItem); } - if ( !bUnaplyedChanges ) + if (!bUnaplyedChanges) { bUnaplyedChanges = TRUE; SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); @@ -467,25 +467,25 @@ void ClearAllFileNames(HWND hwndDlg) void AutoFindeFileNames(HWND hwndDlg) { - + TCHAR szDefaultFile[500]; GetDlgItemText(hwndDlg, IDC_DEFAULT_FILE, szDefaultFile, SIZEOF(szDefaultFile)); - + LVITEM sItem = { 0 }; HWND hMapUser = GetDlgItem(hwndDlg, IDC_MAP_USER_LIST); - int nCount = ListView_GetItemCount( hMapUser); - for (int nCur = 0 ; nCur < nCount ; nCur++ ) + int nCount = ListView_GetItemCount(hMapUser); + for (int nCur = 0; nCur < nCount; nCur++) { - TCHAR szSearch[ 100 ]; + TCHAR szSearch[100]; sItem.mask = LVIF_TEXT; sItem.iItem = nCur; sItem.iSubItem = 1; sItem.pszText = szSearch; sItem.cchTextMax = SIZEOF(szSearch); - - if ( !ListView_GetItem( hMapUser, &sItem)) + + if (!ListView_GetItem(hMapUser, &sItem)) { continue; } @@ -493,22 +493,22 @@ void AutoFindeFileNames(HWND hwndDlg) int nShortestMatch = 0xFFFF; MCONTACT hStortest = 0; int nStortestIndex = -1; - for (int nSubCur = 0 ; nSubCur < nCount ; nSubCur++ ) + for (int nSubCur = 0; nSubCur < nCount; nSubCur++) { - if (nSubCur == nCur ) + if (nSubCur == nCur) continue; - TCHAR szSubCur[ 100 ]; + TCHAR szSubCur[100]; sItem.mask = LVIF_TEXT | LVIF_PARAM; sItem.iItem = nSubCur; sItem.iSubItem = 1; sItem.pszText = szSubCur; sItem.cchTextMax = SIZEOF(szSubCur); - if (ListView_GetItem( hMapUser, &sItem)) + if (ListView_GetItem(hMapUser, &sItem)) { - size_t nLen = _tcslen( szSubCur); - if (_tcsncicmp( szSubCur, szSearch, nLen) == 0 ) + size_t nLen = mir_tstrlen(szSubCur); + if (_tcsncicmp(szSubCur, szSearch, nLen) == 0) { - if (nLen < (size_t)nShortestMatch ) + if (nLen < (size_t)nShortestMatch) { nShortestMatch = (int)nLen; nStortestIndex = nSubCur; @@ -517,35 +517,35 @@ void AutoFindeFileNames(HWND hwndDlg) } } } - if (nShortestMatch != 0xFFFF ) + if (nShortestMatch != 0xFFFF) { tstring sFileName; szSearch[0] = 0; - ListView_GetItemText( hMapUser, nCur, 0, szSearch, SIZEOF( szSearch )); + ListView_GetItemText(hMapUser, nCur, 0, szSearch, SIZEOF(szSearch)); bool bPriHasFileName = szSearch[0] != 0; - if (bPriHasFileName ) + if (bPriHasFileName) sFileName = szSearch; szSearch[0] = 0; - ListView_GetItemText( hMapUser, nStortestIndex, 0, szSearch, SIZEOF( szSearch )); + ListView_GetItemText(hMapUser, nStortestIndex, 0, szSearch, SIZEOF(szSearch)); bool bSubHasFileName = szSearch[0] != 0; - if (bSubHasFileName ) + if (bSubHasFileName) sFileName = szSearch; if (sFileName.empty()) { sFileName = szDefaultFile; ReplaceDefines(hStortest, sFileName); - ReplaceTimeVariables( sFileName); + ReplaceTimeVariables(sFileName); } - if (!bPriHasFileName ) - ListView_SetItemText( hMapUser, nCur, 0, (TCHAR*)sFileName.c_str()); + if (!bPriHasFileName) + ListView_SetItemText(hMapUser, nCur, 0, (TCHAR*)sFileName.c_str()); - if (!bSubHasFileName ) - ListView_SetItemText( hMapUser, nStortestIndex, 0, (TCHAR*)sFileName.c_str()); + if (!bSubHasFileName) + ListView_SetItemText(hMapUser, nStortestIndex, 0, (TCHAR*)sFileName.c_str()); - if ( !bUnaplyedChanges ) + if (!bUnaplyedChanges) { bUnaplyedChanges = TRUE; SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); @@ -571,16 +571,16 @@ void AutoFindeFileNames(HWND hwndDlg) void OpenHelp(HWND hwndDlg) { TCHAR szPath[MAX_PATH]; - if (GetModuleFileName( hInstance, szPath, sizeof( szPath)) ) + if (GetModuleFileName(hInstance, szPath, SIZEOF(szPath))) { - size_t nLen = _tcslen( szPath); - if (nLen > 3 ) + size_t nLen = mir_tstrlen(szPath); + if (nLen > 3) { - szPath[nLen-1] = 't'; - szPath[nLen-2] = 'x'; - szPath[nLen-3] = 't'; + szPath[nLen - 1] = 't'; + szPath[nLen - 2] = 'x'; + szPath[nLen - 3] = 't'; - SHELLEXECUTEINFO st = {0}; + SHELLEXECUTEINFO st = { 0 }; st.cbSize = sizeof(st); st.fMask = SEE_MASK_INVOKEIDLIST; st.hwnd = NULL; @@ -613,117 +613,117 @@ void OpenHelp(HWND hwndDlg) static INT_PTR CALLBACK DlgProcMsgExportOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) { -// Used to prevent sending the PSM_CHANGED to miranda -// when initilizing + // Used to prevent sending the PSM_CHANGED to miranda + // when initilizing static BOOL bWindowTextSet = FALSE; switch (msg) { - case WM_INITDIALOG: - { - bWindowTextSet = FALSE; + case WM_INITDIALOG: + { + bWindowTextSet = FALSE; - HWND hMapUser = GetDlgItem(hwndDlg, IDC_MAP_USER_LIST); + HWND hMapUser = GetDlgItem(hwndDlg, IDC_MAP_USER_LIST); - { // init adv. win styles - DWORD dw = ListView_GetExtendedListViewStyle( hMapUser); - dw |= LVS_EX_HEADERDRAGDROP | LVS_EX_FULLROWSELECT; - ListView_SetExtendedListViewStyle( hMapUser, dw /*| LVS_EX_LABELTIP*/); - } + { // init adv. win styles + DWORD dw = ListView_GetExtendedListViewStyle(hMapUser); + dw |= LVS_EX_HEADERDRAGDROP | LVS_EX_FULLROWSELECT; + ListView_SetExtendedListViewStyle(hMapUser, dw /*| LVS_EX_LABELTIP*/); + } + + + int nColumnWidth = 100; + RECT rListSize; + if (GetWindowRect(hMapUser, &rListSize)) + { + nColumnWidth = (rListSize.right - rListSize.left - GetSystemMetrics(SM_CXVSCROLL) - 5 - nUINColWitdh - nProtoColWitdh) / 2; + if (nColumnWidth < 10) + nColumnWidth = 10; + } - - int nColumnWidth = 100; - RECT rListSize; - if (GetWindowRect( hMapUser, &rListSize)) - { - nColumnWidth = (rListSize.right - rListSize.left- GetSystemMetrics(SM_CXVSCROLL) - 5 - nUINColWitdh - nProtoColWitdh) / 2; - if (nColumnWidth < 10) - nColumnWidth = 10; - } - { // header setup !! LVCOLUMN cCol = { 0 }; cCol.mask = LVCF_TEXT | LVCF_WIDTH; cCol.cx = nColumnWidth; cCol.pszText = TranslateT("File"); - ListView_InsertColumn( hMapUser, 0, &cCol); + ListView_InsertColumn(hMapUser, 0, &cCol); cCol.pszText = TranslateT("Nick"); - ListView_InsertColumn( hMapUser, 1, &cCol); + ListView_InsertColumn(hMapUser, 1, &cCol); cCol.cx = nProtoColWitdh; cCol.pszText = TranslateT("Proto"); - ListView_InsertColumn( hMapUser, 2, &cCol); + ListView_InsertColumn(hMapUser, 2, &cCol); cCol.cx = nUINColWitdh; cCol.mask |= LVCF_FMT; cCol.fmt = LVCFMT_RIGHT; cCol.pszText = TranslateT("UIN"); - ListView_InsertColumn( hMapUser, 3, &cCol); + ListView_InsertColumn(hMapUser, 3, &cCol); /* int nOrder[3] = { 1, 2, 0 }; ListView_SetColumnOrderArray( hMapUser, 3, nOrder);*/ } - { + { HIMAGELIST hIml; - hIml = ImageList_Create( GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON),ILC_COLOR4|ILC_MASK,2,2); - ImageList_AddIcon(hIml,LoadIcon(GetModuleHandle(NULL),MAKEINTRESOURCE(IDI_NOTICK))); - ImageList_AddIcon(hIml,LoadIcon(GetModuleHandle(NULL),MAKEINTRESOURCE(IDI_TICK))); - ListView_SetImageList( hMapUser, hIml, LVSIL_SMALL); + hIml = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), ILC_COLOR4 | ILC_MASK, 2, 2); + ImageList_AddIcon(hIml, LoadIcon(GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_NOTICK))); + ImageList_AddIcon(hIml, LoadIcon(GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_TICK))); + ListView_SetImageList(hMapUser, hIml, LVSIL_SMALL); } - { + { tstring sTmp; LVITEM sItem = { 0 }; MCONTACT hContact = db_find_first(); - for (int nUser = 0; /*hContact*/ ; nUser++ ) + for (int nUser = 0; /*hContact*/; nUser++) { sItem.mask = LVIF_TEXT | LVIF_PARAM | LVIF_IMAGE; sItem.iItem = nUser; sItem.iSubItem = 0; - sItem.iImage = db_get_b(hContact,MODULE, "EnableLog", 1); + sItem.iImage = db_get_b(hContact, MODULE, "EnableLog", 1); sItem.lParam = hContact; - sTmp = _DBGetString( hContact, MODULE, "FileName", _T("")); + sTmp = _DBGetString(hContact, MODULE, "FileName", _T("")); sItem.pszText = (TCHAR*)sTmp.c_str(); - ListView_InsertItem( hMapUser, &sItem); + ListView_InsertItem(hMapUser, &sItem); sItem.mask = LVIF_TEXT; sItem.iSubItem = 1; sItem.pszText = (TCHAR*)NickFromHandle(hContact); - ListView_SetItem( hMapUser, &sItem); + ListView_SetItem(hMapUser, &sItem); sItem.iSubItem = 2; - sTmp = _DBGetString( hContact, "Protocol", "p", _T("")); - string sTmpA = _DBGetStringA( hContact, "Protocol", "p", ""); + sTmp = _DBGetString(hContact, "Protocol", "p", _T("")); + string sTmpA = _DBGetStringA(hContact, "Protocol", "p", ""); sItem.pszText = (TCHAR*)sTmp.c_str(); - ListView_SetItem( hMapUser, &sItem); - + ListView_SetItem(hMapUser, &sItem); + DWORD dwUIN = db_get_dw(hContact, sTmpA.c_str(), "UIN", 0); TCHAR szTmp[50]; - mir_sntprintf(szTmp, SIZEOF(szTmp),_T("%d"), dwUIN); + mir_sntprintf(szTmp, SIZEOF(szTmp), _T("%d"), dwUIN); sItem.iSubItem = 3; sItem.pszText = szTmp; - ListView_SetItem( hMapUser, &sItem); + ListView_SetItem(hMapUser, &sItem); - if ( !hContact) // written like this to add the current user ( handle = 0 ) - break; + if (!hContact) // written like this to add the current user ( handle = 0 ) + break; hContact = db_find_next(hContact); } - ListView_SortItems( hMapUser, CompareFunc, 1); + ListView_SortItems(hMapUser, CompareFunc, 1); sItem.mask = LVIF_STATE; sItem.iItem = 0; sItem.iSubItem = 0; sItem.state = LVIS_FOCUSED; - sItem.stateMask = LVIS_FOCUSED; - ListView_SetItem( hMapUser, &sItem); + sItem.stateMask = LVIS_FOCUSED; + ListView_SetItem(hMapUser, &sItem); } HWND hComboBox; @@ -733,417 +733,417 @@ static INT_PTR CALLBACK DlgProcMsgExportOpts(HWND hwndDlg, UINT msg, WPARAM wPar {// Export dir SetDlgItemText(hwndDlg, IDC_EXPORT_DIR, sExportDir.c_str()); hComboBox = GetDlgItem(hwndDlg, IDC_EXPORT_DIR); - SendMessage( hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("%dbpath%\\MsgExport\\")); - SendMessage( hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("C:\\Backup\\MsgExport\\")); - SendMessage( hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("%dbpath%\\MsgExport\\%group% - ")); - SendMessage( hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("%dbpath%\\MsgExport\\%group%\\")); + SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("%dbpath%\\MsgExport\\")); + SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("C:\\Backup\\MsgExport\\")); + SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("%dbpath%\\MsgExport\\%group% - ")); + SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("%dbpath%\\MsgExport\\%group%\\")); } {// default file SetDlgItemText(hwndDlg, IDC_DEFAULT_FILE, sDefaultFile.c_str()); hComboBox = GetDlgItem(hwndDlg, IDC_DEFAULT_FILE); - SendMessage( hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("%nick%.txt")); - SendMessage( hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("%UIN%.txt")); - SendMessage( hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("%group%.txt")); - SendMessage( hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("%e-mail%.txt")); - SendMessage( hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("%identifier%.txt")); - SendMessage( hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("%year%-%month%-%day%.txt")); - SendMessage( hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("%group%\\%nick%.txt")); - SendMessage( hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("%group%\\%UIN%.txt")); - SendMessage( hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("%group%\\%identifier%.txt")); - SendMessage( hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("%protocol%\\%nick%.txt")); - SendMessage( hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("History.txt")); + SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("%nick%.txt")); + SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("%UIN%.txt")); + SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("%group%.txt")); + SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("%e-mail%.txt")); + SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("%identifier%.txt")); + SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("%year%-%month%-%day%.txt")); + SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("%group%\\%nick%.txt")); + SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("%group%\\%UIN%.txt")); + SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("%group%\\%identifier%.txt")); + SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("%protocol%\\%nick%.txt")); + SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("History.txt")); } {// time format SetDlgItemText(hwndDlg, IDC_EXPORT_TIMEFORMAT, sTimeFormat.c_str()); hComboBox = GetDlgItem(hwndDlg, IDC_EXPORT_TIMEFORMAT); - SendMessage( hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("d t") ); - SendMessage( hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("d s") ); - SendMessage( hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("d m") ); - SendMessage( hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("D s") ); - SendMessage( hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("D m :")); + SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("d t")); + SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("d s")); + SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("d m")); + SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("D s")); + SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("D m :")); } {// File viewer SetDlgItemText(hwndDlg, IDC_FILE_VIEWER, sFileViewerPrg.c_str()); hComboBox = GetDlgItem(hwndDlg, IDC_FILE_VIEWER); - SendMessage( hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("") ); - SendMessage( hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("C:\\Windows\\Notepad.exe") ); - SendMessage( hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("C:\\WinNT\\Notepad.exe") ); + SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("")); + SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("C:\\Windows\\Notepad.exe")); + SendMessage(hComboBox, CB_ADDSTRING, 0, (LPARAM)_T("C:\\WinNT\\Notepad.exe")); //EnableWindow( GetDlgItem(hwndDlg, IDC_FILE_VIEWER ), ! bUseInternalViewer()); } - - CheckDlgButton(hwndDlg, IDC_USE_INTERNAL_VIEWER , bUseInternalViewer() ? BST_CHECKED : BST_UNCHECKED); + + CheckDlgButton(hwndDlg, IDC_USE_INTERNAL_VIEWER, bUseInternalViewer() ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_REPLACE_MIRANDA_HISTORY, bReplaceHistory ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_APPEND_NEWLINE, bAppendNewLine ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_USE_UTF8_IN_NEW_FILES, bUseUtf8InNewFiles ? BST_CHECKED : BST_UNCHECKED); CheckDlgButton(hwndDlg, IDC_USE_LESS_AND_GREATER_IN_EXPORT, bUseLessAndGreaterInExport ? BST_CHECKED : BST_UNCHECKED); - + TranslateDialogDefault(hwndDlg); bWindowTextSet = TRUE; return TRUE; - } - case WM_COMMAND: + } + case WM_COMMAND: + { + switch (LOWORD(wParam)) + { + case ID_EXPORTSELECTED: + case IDC_EXPORTALL: { - switch(LOWORD(wParam)) + if (bUnaplyedChanges) { - case ID_EXPORTSELECTED: - case IDC_EXPORTALL: - { - if (bUnaplyedChanges ) - { - DWORD res = MessageBox(hwndDlg, TranslateT("You have not applied the changes, do you wish to apply them first?"), MSG_BOX_TITEL, MB_YESNOCANCEL); - if (res == IDCANCEL ) - return TRUE; - if (res == IDYES ) - { - if ( !bApplyChanges(hwndDlg)) - { - return TRUE; - } - } - } - nExportCompleatList(hwndDlg, LOWORD(wParam) == ID_EXPORTSELECTED); + DWORD res = MessageBox(hwndDlg, TranslateT("You have not applied the changes, do you wish to apply them first?"), MSG_BOX_TITEL, MB_YESNOCANCEL); + if (res == IDCANCEL) return TRUE; - } - case IDC_EXPORT_DIR: - case IDC_EXPORT_TIMEFORMAT: - case IDC_DEFAULT_FILE: - case IDC_FILE_VIEWER: + if (res == IDYES) { - if (!bWindowTextSet ) - return TRUE; - - if (HIWORD(wParam) == CBN_EDITUPDATE || HIWORD(wParam) == CBN_SELCHANGE ) + if (!bApplyChanges(hwndDlg)) { - bUnaplyedChanges = TRUE; - SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); - } - return TRUE; - } - case IDC_MAX_CLOUMN_WIDTH: - { - if (!bWindowTextSet ) return TRUE; - - if (HIWORD(wParam) == EN_CHANGE ) - { - bUnaplyedChanges = TRUE; - SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); } - return TRUE; } - case IDC_USE_INTERNAL_VIEWER: -/* { - EnableWindow( - GetDlgItem(hwndDlg, IDC_FILE_VIEWER ), - BST_UNCHECKED == IsDlgButtonChecked(hwndDlg, IDC_USE_INTERNAL_VIEWER ) - ); - }// fall thru here !!*/ - case IDC_REPLACE_MIRANDA_HISTORY: - case IDC_APPEND_NEWLINE: - case IDC_USE_UTF8_IN_NEW_FILES: - case IDC_USE_LESS_AND_GREATER_IN_EXPORT: - { - if (HIWORD(wParam) == BN_CLICKED ) - { - bUnaplyedChanges = TRUE; - SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); - } - return TRUE; - } - case ID_USERLIST_USERDETAILS: + } + nExportCompleatList(hwndDlg, LOWORD(wParam) == ID_EXPORTSELECTED); + return TRUE; + } + case IDC_EXPORT_DIR: + case IDC_EXPORT_TIMEFORMAT: + case IDC_DEFAULT_FILE: + case IDC_FILE_VIEWER: + { + if (!bWindowTextSet) + return TRUE; + + if (HIWORD(wParam) == CBN_EDITUPDATE || HIWORD(wParam) == CBN_SELCHANGE) + { + bUnaplyedChanges = TRUE; + SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); + } + return TRUE; + } + case IDC_MAX_CLOUMN_WIDTH: + { + if (!bWindowTextSet) + return TRUE; + + if (HIWORD(wParam) == EN_CHANGE) + { + bUnaplyedChanges = TRUE; + SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); + } + return TRUE; + } + case IDC_USE_INTERNAL_VIEWER: + /* { + EnableWindow( + GetDlgItem(hwndDlg, IDC_FILE_VIEWER ), + BST_UNCHECKED == IsDlgButtonChecked(hwndDlg, IDC_USE_INTERNAL_VIEWER ) + ); + }// fall thru here !!*/ + case IDC_REPLACE_MIRANDA_HISTORY: + case IDC_APPEND_NEWLINE: + case IDC_USE_UTF8_IN_NEW_FILES: + case IDC_USE_LESS_AND_GREATER_IN_EXPORT: + { + if (HIWORD(wParam) == BN_CLICKED) + { + bUnaplyedChanges = TRUE; + SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); + } + return TRUE; + } + case ID_USERLIST_USERDETAILS: + { + LVITEM sItem = { 0 }; + sItem.mask = LVIF_PARAM; + HWND hMapUser = GetDlgItem(hwndDlg, IDC_MAP_USER_LIST); + sItem.iItem = ListView_GetNextItem(hMapUser, -1, LVIS_SELECTED); + if (sItem.iItem >= 0 && ListView_GetItem(hMapUser, &sItem)) + { + CallService(MS_USERINFO_SHOWDIALOG, (WPARAM)sItem.lParam, 0); + } + return TRUE; + } + case IDC_AUTO_FILENAME: + { + AutoFindeFileNames(hwndDlg); + return TRUE; + } + case IDC_CLEAR_ALL: + { + ClearAllFileNames(hwndDlg); + return TRUE; + + } + case IDC_OPEN_HELP: + { + OpenHelp(hwndDlg); + return TRUE; + } + case ID_SET_TO_DEFAULT: + { + SetToDefault(hwndDlg); + return TRUE; + } + case IDC_FILE_VIEWER_BROWSE: + { + OPENFILENAME ofn; // common dialog box structure + TCHAR szFile[260]; // buffer for file name + TCHAR buf[MAX_PATH]; + + GetDlgItemText(hwndDlg, IDC_FILE_VIEWER, szFile, SIZEOF(szFile)); + // Initialize OPENFILENAME + memset(&ofn, 0, sizeof(OPENFILENAME)); + ofn.lStructSize = sizeof(OPENFILENAME); + ofn.hwndOwner = hwndDlg; + ofn.lpstrFile = szFile; + ofn.nMaxFile = SIZEOF(szFile); + mir_sntprintf(buf, SIZEOF(buf), _T("%s (*.exe;*.com;*.bat;*.cmd)%c*.exe;*.com;*.bat;*.cmd%c%s (*.*)%c*.*%c%c"), TranslateT("Executable files"), 0, 0, TranslateT("All files"), 0, 0, 0); + ofn.lpstrFilter = buf; + ofn.nFilterIndex = 1; + //ofn.lpstrFileTitle = NULL; + //ofn.nMaxFileTitle = 0; + //ofn.lpstrInitialDir = NULL; + ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST; + + // Display the Open dialog box. + + if (GetOpenFileName(&ofn)) + { + SetDlgItemText(hwndDlg, IDC_FILE_VIEWER, szFile); + bUnaplyedChanges = TRUE; + SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); + } + // OPENFILENAME + //GetOpenFileName( + return TRUE; + } + case IDC_EXPORT_DIR_BROWSE: + { + LPMALLOC pMalloc; + + //CoInitializeEx(NULL,COINIT_APARTMENTTHREADED); + // Get the shells allocator + if (FAILED(SHGetMalloc(&pMalloc))) // we need to use this to support old Windows versions + { + MessageBox(hwndDlg, TranslateT("Failed to get the shells allocator!"), MSG_BOX_TITEL, MB_OK); + return TRUE; // TRUE because we have handled the message, sort of *S* + } + + // Allocate the Dest Dir buffer to receive browse info + TCHAR *lpDestDir = (TCHAR *)pMalloc->Alloc(MAX_PATH + 100); + if (!lpDestDir) + { + pMalloc->Release(); + MessageBox(hwndDlg, TranslateT("Failed to Allocate buffer space"), MSG_BOX_TITEL, MB_OK); + return TRUE; + } + + BROWSEINFO sBrowseInfo; + sBrowseInfo.hwndOwner = hwndDlg; + sBrowseInfo.pidlRoot = NULL; + sBrowseInfo.pszDisplayName = lpDestDir; + sBrowseInfo.lpszTitle = TranslateT("Select Destination Directory"); + sBrowseInfo.ulFlags = BIF_NEWDIALOGSTYLE | BIF_EDITBOX; + sBrowseInfo.lpfn = NULL; + sBrowseInfo.lParam = 0; + sBrowseInfo.iImage = 0; + + LPITEMIDLIST psItemIDList = SHBrowseForFolder(&sBrowseInfo); + if (psItemIDList) + { + SHGetPathFromIDList(psItemIDList, lpDestDir); + size_t n = mir_tstrlen(lpDestDir); + if (n > 0 && lpDestDir[n] != '\\') { - LVITEM sItem = { 0 }; - sItem.mask = LVIF_PARAM; - HWND hMapUser = GetDlgItem(hwndDlg, IDC_MAP_USER_LIST); - sItem.iItem = ListView_GetNextItem( hMapUser, -1, LVIS_SELECTED); - if (sItem.iItem >= 0 && ListView_GetItem( hMapUser, &sItem )) - { - CallService(MS_USERINFO_SHOWDIALOG,(WPARAM)sItem.lParam,0); - } - return TRUE; + lpDestDir[n] = '\\'; + lpDestDir[n + 1] = 0; } - case IDC_AUTO_FILENAME: + SetDlgItemText(hwndDlg, IDC_EXPORT_DIR, lpDestDir); + bUnaplyedChanges = TRUE; + SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); + // Clean up + pMalloc->Free(psItemIDList); + } + pMalloc->Free(lpDestDir); + pMalloc->Release(); + return TRUE; + } + } + break; + } + case WM_CONTEXTMENU: + { + if (wParam != (WPARAM)GetDlgItem(hwndDlg, IDC_MAP_USER_LIST)) + return FALSE; + + HMENU hMainMenu = LoadMenu(hInstance, MAKEINTRESOURCE(IDR_MSG_EXPORT)); + if (hMainMenu) + { + HMENU hMenu = GetSubMenu(hMainMenu, 0); + + POINT pt; + pt.x = (short)LOWORD(lParam); + pt.y = (short)HIWORD(lParam); + if (pt.x == -1 && pt.y == -1) + { + HWND hMapUser = GetDlgItem(hwndDlg, IDC_MAP_USER_LIST); + int nFirst = ListView_GetNextItem(hMapUser, -1, LVNI_FOCUSED); + if (nFirst >= 0) { - AutoFindeFileNames(hwndDlg); - return TRUE; + ListView_GetItemPosition(hMapUser, nFirst, &pt); } - case IDC_CLEAR_ALL: - { - ClearAllFileNames(hwndDlg); - return TRUE; - } - case IDC_OPEN_HELP: + if (pt.y < 16) + pt.y = 16; + else { - OpenHelp(hwndDlg); - return TRUE; + RECT rUserList; + GetClientRect(hMapUser, &rUserList); + if (pt.y > rUserList.bottom - 16) + pt.y = rUserList.bottom - 16; + else + pt.y += 8; } - case ID_SET_TO_DEFAULT: + pt.x = 8; + ClientToScreen(hMapUser, &pt); + } + + CallService(MS_LANGPACK_TRANSLATEMENU, (WPARAM)hMenu, 0); + TrackPopupMenu(hMenu, TPM_TOPALIGN | TPM_LEFTALIGN | TPM_RIGHTBUTTON, pt.x, pt.y, 0, hwndDlg, NULL); + + DestroyMenu(hMainMenu); + } + return TRUE; + } + case WM_NOTIFY: + { + NMHDR * p = ((LPNMHDR)lParam); + if (p->idFrom == IDC_MAP_USER_LIST) + { + switch (p->code) + { + case NM_CLICK: + { LVHITTESTINFO hti; + LVITEM lvi; + hti.pt = ((NMLISTVIEW*)lParam)->ptAction; + ListView_SubItemHitTest(p->hwndFrom, &hti); + + if (hti.flags != LVHT_ONITEMICON) + break; + + lvi.mask = LVIF_IMAGE; + lvi.iItem = hti.iItem; + lvi.iSubItem = 0; + ListView_GetItem(p->hwndFrom, &lvi); + lvi.iImage ^= 1; + ListView_SetItem(p->hwndFrom, &lvi); + SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); + break; + } + case LVN_ENDLABELEDIT: + { + NMLVDISPINFO * pdi = (NMLVDISPINFO *)lParam; + if (pdi->item.mask & LVIF_TEXT) { - SetToDefault(hwndDlg); - return TRUE; + pdi->item.mask &= LVIF_TEXT; + ListView_SetItem(p->hwndFrom, &pdi->item); + + bUnaplyedChanges = TRUE; + SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); } - case IDC_FILE_VIEWER_BROWSE: + return TRUE; + } + case LVN_KEYDOWN: + { + NMLVKEYDOWN * lpnmk = (NMLVKEYDOWN *)lParam; + if (lpnmk->wVKey == 'A' && (GetKeyState(VK_CONTROL) & 0x8000)) { - OPENFILENAME ofn; // common dialog box structure - TCHAR szFile[260]; // buffer for file name - TCHAR buf[MAX_PATH]; - - GetDlgItemText(hwndDlg, IDC_FILE_VIEWER, szFile, SIZEOF(szFile)); - // Initialize OPENFILENAME - memset(&ofn, 0, sizeof(OPENFILENAME)); - ofn.lStructSize = sizeof(OPENFILENAME); - ofn.hwndOwner = hwndDlg; - ofn.lpstrFile = szFile; - ofn.nMaxFile = SIZEOF(szFile); - mir_sntprintf(buf, SIZEOF(buf), _T("%s (*.exe;*.com;*.bat;*.cmd)%c*.exe;*.com;*.bat;*.cmd%c%s (*.*)%c*.*%c%c"), TranslateT("Executable files"), 0, 0, TranslateT("All files"), 0, 0, 0); - ofn.lpstrFilter = buf; - ofn.nFilterIndex = 1; - //ofn.lpstrFileTitle = NULL; - //ofn.nMaxFileTitle = 0; - //ofn.lpstrInitialDir = NULL; - ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST; - - // Display the Open dialog box. - - if (GetOpenFileName(&ofn)) + // select all + int nCount = ListView_GetItemCount(p->hwndFrom); + for (int nCur = 0; nCur < nCount; nCur++) { - SetDlgItemText(hwndDlg, IDC_FILE_VIEWER, szFile); - bUnaplyedChanges = TRUE; - SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); + ListView_SetItemState(p->hwndFrom, nCur, LVIS_SELECTED, LVIS_SELECTED); } - // OPENFILENAME - //GetOpenFileName( return TRUE; } - case IDC_EXPORT_DIR_BROWSE: - { - LPMALLOC pMalloc; - //CoInitializeEx(NULL,COINIT_APARTMENTTHREADED); - // Get the shells allocator - if (FAILED(SHGetMalloc(&pMalloc))) // we need to use this to support old Windows versions - { - MessageBox(hwndDlg, TranslateT("Failed to get the shells allocator!"), MSG_BOX_TITEL, MB_OK); - return TRUE; // TRUE because we have handled the message, sort of *S* - } - // Allocate the Dest Dir buffer to receive browse info - TCHAR *lpDestDir = (TCHAR *) pMalloc->Alloc(MAX_PATH+100); - if ( ! lpDestDir ) - { - pMalloc->Release(); - MessageBox(hwndDlg, TranslateT("Failed to Allocate buffer space"), MSG_BOX_TITEL, MB_OK); - return TRUE; - } - - BROWSEINFO sBrowseInfo; - sBrowseInfo.hwndOwner = hwndDlg; - sBrowseInfo.pidlRoot = NULL; - sBrowseInfo.pszDisplayName = lpDestDir; - sBrowseInfo.lpszTitle = TranslateT("Select Destination Directory"); - sBrowseInfo.ulFlags = BIF_NEWDIALOGSTYLE | BIF_EDITBOX; - sBrowseInfo.lpfn = NULL; - sBrowseInfo.lParam = 0; - sBrowseInfo.iImage = 0; - - LPITEMIDLIST psItemIDList = SHBrowseForFolder(&sBrowseInfo); - if (psItemIDList ) + if (lpnmk->wVKey == VK_F2 || + (lpnmk->wVKey >= 'A' && lpnmk->wVKey <= 'Z') || + (lpnmk->wVKey >= '1' && lpnmk->wVKey <= '9') || + lpnmk->wVKey == VK_BACK + ) + { + HWND hEdit = ListView_EditLabel(p->hwndFrom, ListView_GetSelectionMark(p->hwndFrom)); + if (hEdit && lpnmk->wVKey != VK_F2) { - SHGetPathFromIDList(psItemIDList, lpDestDir); - size_t n = _tcslen( lpDestDir); - if (n > 0 && lpDestDir[n] != '\\' ) - { - lpDestDir[n] = '\\' ; - lpDestDir[n+1] = 0; - } - SetDlgItemText(hwndDlg, IDC_EXPORT_DIR, lpDestDir); - bUnaplyedChanges = TRUE; - SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); - // Clean up - pMalloc->Free( psItemIDList); + if (isupper(lpnmk->wVKey)) + SendMessage(hEdit, WM_CHAR, tolower(lpnmk->wVKey), 0); + else + SendMessage(hEdit, WM_CHAR, lpnmk->wVKey, 0); } - pMalloc->Free( lpDestDir); - pMalloc->Release(); - return TRUE; } + return TRUE; } - break; - } - case WM_CONTEXTMENU: - { - if (wParam != (WPARAM)GetDlgItem(hwndDlg, IDC_MAP_USER_LIST)) - return FALSE; - - HMENU hMainMenu = LoadMenu(hInstance,MAKEINTRESOURCE(IDR_MSG_EXPORT)); - if (hMainMenu ) + case NM_DBLCLK: { - HMENU hMenu = GetSubMenu(hMainMenu,0); - - POINT pt; - pt.x=(short)LOWORD(lParam); - pt.y=(short)HIWORD(lParam); - if (pt.x == -1 && pt.y == -1 ) + NMITEMACTIVATE * pdi = (NMITEMACTIVATE *)lParam; + if (pdi->iItem >= 0) { - HWND hMapUser = GetDlgItem(hwndDlg, IDC_MAP_USER_LIST); - int nFirst = ListView_GetNextItem( hMapUser, -1, LVNI_FOCUSED); - if (nFirst >= 0 ) - { - ListView_GetItemPosition( hMapUser, nFirst, &pt); - } - - if (pt.y < 16 ) - pt.y = 16; - else - { - RECT rUserList; - GetClientRect( hMapUser, &rUserList); - if (pt.y > rUserList.bottom - 16 ) - pt.y = rUserList.bottom - 16; - else - pt.y += 8; - } - pt.x = 8; - ClientToScreen(hMapUser,&pt); + ListView_EditLabel(p->hwndFrom, pdi->iItem); } - - CallService(MS_LANGPACK_TRANSLATEMENU,(WPARAM)hMenu,0); - TrackPopupMenu(hMenu,TPM_TOPALIGN|TPM_LEFTALIGN|TPM_RIGHTBUTTON,pt.x,pt.y,0,hwndDlg,NULL); - - DestroyMenu(hMainMenu); + return TRUE; } - return TRUE; - } - case WM_NOTIFY: - { - NMHDR * p = ((LPNMHDR)lParam); - if (p->idFrom == IDC_MAP_USER_LIST ) + case NM_CUSTOMDRAW: { - switch (p->code) + LPNMLVCUSTOMDRAW lplvcd = (LPNMLVCUSTOMDRAW)lParam; + switch (lplvcd->nmcd.dwDrawStage) { - case NM_CLICK: - { LVHITTESTINFO hti; - LVITEM lvi; - hti.pt=((NMLISTVIEW*)lParam)->ptAction; - ListView_SubItemHitTest( p->hwndFrom,&hti); - - if (hti.flags != LVHT_ONITEMICON) - break; - - lvi.mask=LVIF_IMAGE; - lvi.iItem=hti.iItem; - lvi.iSubItem=0; - ListView_GetItem( p->hwndFrom, &lvi); - lvi.iImage^=1; - ListView_SetItem( p->hwndFrom, &lvi); - SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); - break; - } - case LVN_ENDLABELEDIT: - { - NMLVDISPINFO * pdi = (NMLVDISPINFO *) lParam; - if (pdi->item.mask & LVIF_TEXT ) - { - pdi->item.mask &= LVIF_TEXT; - ListView_SetItem( p->hwndFrom, &pdi->item); - - bUnaplyedChanges = TRUE; - SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); - } - return TRUE; - } - case LVN_KEYDOWN: - { - NMLVKEYDOWN * lpnmk = (NMLVKEYDOWN *) lParam; - if (lpnmk->wVKey == 'A' && (GetKeyState( VK_CONTROL) & 0x8000)) - { - // select all - int nCount = ListView_GetItemCount( p->hwndFrom ); - for (int nCur = 0 ; nCur < nCount ; nCur++ ) - { - ListView_SetItemState( p->hwndFrom, nCur, LVIS_SELECTED, LVIS_SELECTED); - } - return TRUE; - } - - - if (lpnmk->wVKey == VK_F2 || - ( lpnmk->wVKey >= 'A' && lpnmk->wVKey <= 'Z') || - ( lpnmk->wVKey >= '1' && lpnmk->wVKey <= '9') || - lpnmk->wVKey == VK_BACK - ) - { - HWND hEdit = ListView_EditLabel( p->hwndFrom, ListView_GetSelectionMark(p->hwndFrom)); - if (hEdit && lpnmk->wVKey != VK_F2 ) - { - if (isupper( lpnmk->wVKey)) - SendMessage( hEdit, WM_CHAR, tolower( lpnmk->wVKey ), 0); - else - SendMessage( hEdit, WM_CHAR, lpnmk->wVKey, 0); - } - } - return TRUE; - } - case NM_DBLCLK: - { - NMITEMACTIVATE * pdi = (NMITEMACTIVATE *) lParam; - if (pdi->iItem >= 0 ) - { - ListView_EditLabel( p->hwndFrom, pdi->iItem); - } - return TRUE; - } - case NM_CUSTOMDRAW: + case CDDS_PREPAINT: + { + SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, CDRF_NOTIFYITEMDRAW); + return true; + } + case CDDS_ITEMPREPAINT: + { + if (lplvcd->nmcd.lItemlParam == 0) { - LPNMLVCUSTOMDRAW lplvcd = (LPNMLVCUSTOMDRAW)lParam; - switch(lplvcd->nmcd.dwDrawStage) - { - case CDDS_PREPAINT: - { - SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, CDRF_NOTIFYITEMDRAW); - return true; - } - case CDDS_ITEMPREPAINT: - { - if (lplvcd->nmcd.lItemlParam == 0 ) - { - lplvcd->clrText = RGB( 0, 0, 255); - } - SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, CDRF_NEWFONT); - return true; - } - } - return FALSE; + lplvcd->clrText = RGB(0, 0, 255); } + SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, CDRF_NEWFONT); + return true; + } } + return FALSE; } - else + } + } + else + { + switch (p->code) { - switch (p->code) + case PSN_APPLY: + { + bApplyChanges(hwndDlg); + return TRUE; + } + case HDN_ITEMCLICK: + { + NMHEADER * phdr = (LPNMHEADER)p; + if (phdr->iButton == 0)// 0 => Left button { - case PSN_APPLY: - { - bApplyChanges(hwndDlg); - return TRUE; - } - case HDN_ITEMCLICK: - { - NMHEADER * phdr = (LPNMHEADER) p; - if (phdr->iButton == 0 )// 0 => Left button - { - HWND hMapUser = GetDlgItem(hwndDlg, IDC_MAP_USER_LIST); - ListView_SortItems( hMapUser, CompareFunc, phdr->iItem); - return TRUE; - } - return FALSE; - } + HWND hMapUser = GetDlgItem(hwndDlg, IDC_MAP_USER_LIST); + ListView_SortItems(hMapUser, CompareFunc, phdr->iItem); + return TRUE; } + return FALSE; + } } - break; } + break; + } } return FALSE; } @@ -1161,28 +1161,28 @@ static INT_PTR CALLBACK DlgProcMsgExportOpts(HWND hwndDlg, UINT msg, WPARAM wPar // Developer : KN ///////////////////////////////////////////////////////////////////// -BOOL bApplyChanges2( HWND hwndDlg ) +BOOL bApplyChanges2(HWND hwndDlg) { - if (IsDlgButtonChecked(hwndDlg, IDC_FC_PROMPT) == BST_CHECKED ) + if (IsDlgButtonChecked(hwndDlg, IDC_FC_PROMPT) == BST_CHECKED) enRenameAction = eDAPromptUser; - else if (IsDlgButtonChecked(hwndDlg, IDC_FC_RENAME) == BST_CHECKED ) + else if (IsDlgButtonChecked(hwndDlg, IDC_FC_RENAME) == BST_CHECKED) enRenameAction = eDAAutomatic; - else if (IsDlgButtonChecked(hwndDlg, IDC_FC_NOTHING) == BST_CHECKED ) + else if (IsDlgButtonChecked(hwndDlg, IDC_FC_NOTHING) == BST_CHECKED) enRenameAction = eDANothing; - if (IsDlgButtonChecked(hwndDlg, IDC_FD_PROMPT) == BST_CHECKED ) + if (IsDlgButtonChecked(hwndDlg, IDC_FD_PROMPT) == BST_CHECKED) enDeleteAction = eDAPromptUser; - else if (IsDlgButtonChecked(hwndDlg, IDC_FD_DELETE) == BST_CHECKED ) + else if (IsDlgButtonChecked(hwndDlg, IDC_FD_DELETE) == BST_CHECKED) enDeleteAction = eDAAutomatic; - else if (IsDlgButtonChecked(hwndDlg, IDC_FD_NOTHING) == BST_CHECKED ) + else if (IsDlgButtonChecked(hwndDlg, IDC_FD_NOTHING) == BST_CHECKED) enDeleteAction = eDANothing; - char szTemp[ 500 ]; - strcpy( szTemp, "DisableProt_"); + char szTemp[500]; + mir_strcpy(szTemp, "DisableProt_"); HWND hMapUser = GetDlgItem(hwndDlg, IDC_EXPORT_PROTOS); - int nCount = ListView_GetItemCount( hMapUser); - for (int nCur = 0 ; nCur < nCount ; nCur++ ) + int nCount = ListView_GetItemCount(hMapUser); + for (int nCur = 0; nCur < nCount; nCur++) { LVITEMA sItem = { 0 }; sItem.iItem = nCur; @@ -1191,10 +1191,10 @@ BOOL bApplyChanges2( HWND hwndDlg ) sItem.cchTextMax = (SIZEOF(szTemp) - 15); if (::SendMessage(hMapUser, LVM_GETITEMA, 0, (LPARAM)&sItem)) { - if (sItem.iImage ) + if (sItem.iImage) db_unset(NULL, MODULE, szTemp); // default is Enabled !! else - db_set_b(NULL, MODULE, szTemp,0); + db_set_b(NULL, MODULE, szTemp, 0); } } SaveSettings(); @@ -1223,81 +1223,81 @@ static INT_PTR CALLBACK DlgProcMsgExportOpts2(HWND hwndDlg, UINT msg, WPARAM wPa switch (msg) { - case WM_INITDIALOG: + case WM_INITDIALOG: + { + bWindowTextSet = FALSE; + switch (enRenameAction) { - bWindowTextSet = FALSE; - switch( enRenameAction ) - { - case eDAPromptUser: - CheckDlgButton(hwndDlg, IDC_FC_PROMPT, BST_CHECKED); - break; - case eDAAutomatic: - CheckDlgButton(hwndDlg, IDC_FC_RENAME, BST_CHECKED); - break; - case eDANothing: - CheckDlgButton(hwndDlg, IDC_FC_NOTHING, BST_CHECKED); - break; - } - switch( enDeleteAction ) - { - case eDAPromptUser: - CheckDlgButton(hwndDlg, IDC_FD_PROMPT, BST_CHECKED); - break; - case eDAAutomatic: - CheckDlgButton(hwndDlg, IDC_FD_DELETE, BST_CHECKED); - break; - case eDANothing: - CheckDlgButton(hwndDlg, IDC_FD_NOTHING, BST_CHECKED); - break; - } - HWND hMapUser = GetDlgItem(hwndDlg, IDC_EXPORT_PROTOS); -/* - { // init adv. win styles - DWORD dw = ListView_GetExtendedListViewStyle( hMapUser); - dw |= LVS_EX_HEADERDRAGDROP | LVS_EX_FULLROWSELECT; - ListView_SetExtendedListViewStyle( hMapUser, dw /); - } -*/ - int nColumnWidth = 100; - RECT rListSize; - if (GetWindowRect( hMapUser, &rListSize)) - { - nColumnWidth = (rListSize.right - rListSize.left- GetSystemMetrics(SM_CXVSCROLL) - 5); - if (nColumnWidth < 10) - nColumnWidth = 10; - } + case eDAPromptUser: + CheckDlgButton(hwndDlg, IDC_FC_PROMPT, BST_CHECKED); + break; + case eDAAutomatic: + CheckDlgButton(hwndDlg, IDC_FC_RENAME, BST_CHECKED); + break; + case eDANothing: + CheckDlgButton(hwndDlg, IDC_FC_NOTHING, BST_CHECKED); + break; + } + switch (enDeleteAction) + { + case eDAPromptUser: + CheckDlgButton(hwndDlg, IDC_FD_PROMPT, BST_CHECKED); + break; + case eDAAutomatic: + CheckDlgButton(hwndDlg, IDC_FD_DELETE, BST_CHECKED); + break; + case eDANothing: + CheckDlgButton(hwndDlg, IDC_FD_NOTHING, BST_CHECKED); + break; + } + HWND hMapUser = GetDlgItem(hwndDlg, IDC_EXPORT_PROTOS); + /* + { // init adv. win styles + DWORD dw = ListView_GetExtendedListViewStyle( hMapUser); + dw |= LVS_EX_HEADERDRAGDROP | LVS_EX_FULLROWSELECT; + ListView_SetExtendedListViewStyle( hMapUser, dw /); + } + */ + int nColumnWidth = 100; + RECT rListSize; + if (GetWindowRect(hMapUser, &rListSize)) + { + nColumnWidth = (rListSize.right - rListSize.left - GetSystemMetrics(SM_CXVSCROLL) - 5); + if (nColumnWidth < 10) + nColumnWidth = 10; + } { // header setup !! LVCOLUMN cCol = { 0 }; cCol.mask = LVCF_TEXT | LVCF_WIDTH; cCol.cx = nColumnWidth; cCol.pszText = TranslateT("Export Protocols"); - ListView_InsertColumn( hMapUser, 0, &cCol); + ListView_InsertColumn(hMapUser, 0, &cCol); } - { + { HIMAGELIST hIml; - hIml = ImageList_Create( GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON),ILC_COLOR4|ILC_MASK,2,2); - ImageList_AddIcon(hIml,LoadIcon(GetModuleHandle(NULL),MAKEINTRESOURCE(IDI_NOTICK))); - ImageList_AddIcon(hIml,LoadIcon(GetModuleHandle(NULL),MAKEINTRESOURCE(IDI_TICK))); - ListView_SetImageList( hMapUser, hIml, LVSIL_SMALL); - } - - { + hIml = ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), ILC_COLOR4 | ILC_MASK, 2, 2); + ImageList_AddIcon(hIml, LoadIcon(GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_NOTICK))); + ImageList_AddIcon(hIml, LoadIcon(GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_TICK))); + ListView_SetImageList(hMapUser, hIml, LVSIL_SMALL); + } + + { PROTOACCOUNT **proto; int nCount; LVITEMA sItem = { 0 }; sItem.mask = LVIF_TEXT | LVIF_IMAGE; - char szTemp[ 500 ]; + char szTemp[500]; ProtoEnumAccounts(&nCount, &proto); - for (int i=0 ; i < nCount ; i++) + for (int i = 0; i < nCount; i++) { mir_snprintf(szTemp, SIZEOF(szTemp), "DisableProt_%s", proto[i]->szModuleName); sItem.pszText = proto[i]->szModuleName; - sItem.iImage = db_get_b(NULL,MODULE,szTemp,1); - ::SendMessage( hMapUser, LVM_INSERTITEMA, 0,(LPARAM)&sItem); + sItem.iImage = db_get_b(NULL, MODULE, szTemp, 1); + ::SendMessage(hMapUser, LVM_INSERTITEMA, 0, (LPARAM)&sItem); sItem.iItem++; } } @@ -1306,78 +1306,78 @@ static INT_PTR CALLBACK DlgProcMsgExportOpts2(HWND hwndDlg, UINT msg, WPARAM wPa bWindowTextSet = TRUE; return TRUE; - } - case WM_COMMAND: + } + case WM_COMMAND: + { + switch (LOWORD(wParam)) { - switch(LOWORD(wParam)) - { - case IDC_FC_PROMPT: - case IDC_FC_RENAME: - case IDC_FC_NOTHING: - case IDC_FD_PROMPT: - case IDC_FD_DELETE: - case IDC_FD_NOTHING: - { - if (!bWindowTextSet ) - return TRUE; + case IDC_FC_PROMPT: + case IDC_FC_RENAME: + case IDC_FC_NOTHING: + case IDC_FD_PROMPT: + case IDC_FD_DELETE: + case IDC_FD_NOTHING: + { + if (!bWindowTextSet) + return TRUE; - if (HIWORD(wParam) == BN_CLICKED ) - { - bUnaplyedChanges = TRUE; - SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); - } - return TRUE; - } - case IDC_DEBUG_INFO: - { - ShowDebugInfo(); - return TRUE; - } + if (HIWORD(wParam) == BN_CLICKED) + { + bUnaplyedChanges = TRUE; + SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); } - break; + return TRUE; } - case WM_NOTIFY: + case IDC_DEBUG_INFO: { - NMHDR * p = ((LPNMHDR)lParam); - if (p->idFrom == IDC_EXPORT_PROTOS ) + ShowDebugInfo(); + return TRUE; + } + } + break; + } + case WM_NOTIFY: + { + NMHDR * p = ((LPNMHDR)lParam); + if (p->idFrom == IDC_EXPORT_PROTOS) + { + switch (p->code) { - switch (p->code) - { - case NM_CLICK: - { LVHITTESTINFO hti; - LVITEM lvi; - hti.pt=((NMLISTVIEW*)lParam)->ptAction; - ListView_SubItemHitTest( p->hwndFrom,&hti); - - if (hti.flags != LVHT_ONITEMICON) - break; - - lvi.mask=LVIF_IMAGE; - lvi.iItem=hti.iItem; - lvi.iSubItem=0; - ListView_GetItem( p->hwndFrom, &lvi); - lvi.iImage^=1; - ListView_SetItem( p->hwndFrom, &lvi); - SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); - break; - } - } + case NM_CLICK: + { LVHITTESTINFO hti; + LVITEM lvi; + hti.pt = ((NMLISTVIEW*)lParam)->ptAction; + ListView_SubItemHitTest(p->hwndFrom, &hti); + + if (hti.flags != LVHT_ONITEMICON) break; + + lvi.mask = LVIF_IMAGE; + lvi.iItem = hti.iItem; + lvi.iSubItem = 0; + ListView_GetItem(p->hwndFrom, &lvi); + lvi.iImage ^= 1; + ListView_SetItem(p->hwndFrom, &lvi); + SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); + break; } - switch (p->code) - { - case PSN_APPLY: - { - bApplyChanges2(hwndDlg); - return TRUE; - } - case HDN_ITEMCLICK: - { - return FALSE; - } } break; } + switch (p->code) + { + case PSN_APPLY: + { + bApplyChanges2(hwndDlg); + return TRUE; + } + case HDN_ITEMCLICK: + { + return FALSE; + } + } + break; + } } // return FALSE; @@ -1398,7 +1398,7 @@ static INT_PTR CALLBACK DlgProcMsgExportOpts2(HWND hwndDlg, UINT msg, WPARAM wPa // Developer : KN ///////////////////////////////////////////////////////////////////// -int OptionsInitialize(WPARAM wParam,LPARAM /*lParam*/) +int OptionsInitialize(WPARAM wParam, LPARAM /*lParam*/) { bUnaplyedChanges = FALSE; @@ -1406,14 +1406,14 @@ int OptionsInitialize(WPARAM wParam,LPARAM /*lParam*/) odp.position = 100000000; odp.hInstance = hInstance; odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_MSGEXPORT); - odp.flags = ODPF_BOLDGROUPS|ODPF_TCHAR; + odp.flags = ODPF_BOLDGROUPS | ODPF_TCHAR; odp.ptszTitle = LPGENT("Message export"); odp.ptszGroup = LPGENT("History"); odp.ptszTab = LPGENT("General"); odp.groupPosition = 100000000; odp.pfnDlgProc = DlgProcMsgExportOpts; Options_AddPage(wParam, &odp); - + odp.position = 100000001; odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_MSGEXPORT2); odp.ptszTab = LPGENT("Additional"); -- cgit v1.2.3