From a0c86284a825ddc47a94309aed721b32545697fc Mon Sep 17 00:00:00 2001 From: "(no author)" <(no author)@4f64403b-2f21-0410-a795-97e2b3489a10> Date: Sun, 14 Nov 2010 18:14:01 +0000 Subject: Removed folder selection dialog git-svn-id: https://server.scottellis.com.au/svn/mim_plugs@571 4f64403b-2f21-0410-a795-97e2b3489a10 --- updater/options.cpp | 235 +++++++--------------------------------------------- updater/resource.h | 7 -- updater/updater.rc | 24 ------ 3 files changed, 30 insertions(+), 236 deletions(-) diff --git a/updater/options.cpp b/updater/options.cpp index 312adbd..aa51a07 100644 --- a/updater/options.cpp +++ b/updater/options.cpp @@ -373,84 +373,6 @@ static INT_PTR CALLBACK DlgProcOpts1(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR return FALSE; } -static INT_PTR CALLBACK DlgProcOpts2(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) -{ - switch ( msg ) - { - case WM_INITDIALOG: - TranslateDialogDefault( hwndDlg ); - - SetDlgItemText(hwndDlg, IDC_ED_DATA, options.data_folder); - SetDlgItemText(hwndDlg, IDC_ED_BACKUPS, options.backup_folder); - SetDlgItemText(hwndDlg, IDC_ED_ZIPS, options.zip_folder); - - return FALSE; - case WM_COMMAND: - if ( HIWORD( wParam ) == EN_CHANGE && ( HWND )lParam == GetFocus()) { - switch( LOWORD( wParam )) { - case IDC_ED_DATA: - case IDC_ED_BACKUPS: - case IDC_ED_ZIPS: - SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); - } - } - if ( HIWORD( wParam ) == BN_CLICKED ) { - - TCHAR folder_buff[MAX_PATH]; - BROWSEINFO bi = {0}; - LPCITEMIDLIST pidl; - - bi.hwndOwner = hwndDlg; - bi.pidlRoot = 0; - bi.pszDisplayName = folder_buff; - bi.lpszTitle = TranslateT("Select Folder"); - bi.ulFlags = 0; - bi.lpfn = 0; - bi.lParam = 0; - bi.iImage = 0; - - if((pidl = SHBrowseForFolder(&bi)) != 0) { - SHGetPathFromIDList(pidl, folder_buff); - CoTaskMemFree((void *)pidl); - - switch( LOWORD( wParam )) { - case IDC_BTN_BRDATA: - SetDlgItemText(hwndDlg, IDC_ED_DATA, folder_buff); - SendMessage( GetParent( hwndDlg ), PSM_CHANGED, 0, 0 ); - break; - case IDC_BTN_BRBACKUPS: - SetDlgItemText(hwndDlg, IDC_ED_BACKUPS, folder_buff); - SendMessage( GetParent( hwndDlg ), PSM_CHANGED, 0, 0 ); - break; - case IDC_BTN_BRZIPS: - SetDlgItemText(hwndDlg, IDC_ED_ZIPS, folder_buff); - SendMessage( GetParent( hwndDlg ), PSM_CHANGED, 0, 0 ); - break; - } - - - return TRUE; - } - } - return FALSE; - case WM_NOTIFY: - if (((LPNMHDR)lParam)->code == (unsigned)PSN_APPLY ) { - GetDlgItemText(hwndDlg, IDC_ED_DATA, options.data_folder, MAX_PATH); - GetDlgItemText(hwndDlg, IDC_ED_BACKUPS, options.backup_folder, MAX_PATH); - GetDlgItemText(hwndDlg, IDC_ED_ZIPS, options.zip_folder, MAX_PATH); - - _tcscpy(options.temp_folder, options.data_folder); - _tcscat(options.temp_folder, _T("\\updates")); - - SaveOptions(); - - return TRUE; - } - break; - } - return FALSE; -} - int OptInit(WPARAM wParam,LPARAM lParam) { DWORD mirVir = (DWORD)CallService(MS_SYSTEM_GETVERSION, 0, 0); @@ -461,36 +383,12 @@ int OptInit(WPARAM wParam,LPARAM lParam) odp.position = -790000000; odp.hInstance = hInst; - if(ServiceExists(MS_FOLDERS_GET_PATH)) { - odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT1); - //odp.pszTitle = LPGEN("Settings"); - //odp.pszGroup = LPGEN("Updates"); - odp.ptszTitle = LPGENT("Updater"); - odp.ptszGroup = LPGENT("Services"); - odp.nIDBottomSimpleControl = 0; - odp.pfnDlgProc = DlgProcOpts1; - CallService( MS_OPT_ADDPAGE, wParam,( LPARAM )&odp ); - } else { - odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT1); - //odp.pszTitle = LPGEN("Settings"); - //odp.pszGroup = LPGEN("Updates"); - odp.ptszTitle = (mirVir >= 0x00060000 ? LPGENT("Updater") : LPGENT("Settings")); - odp.ptszGroup = (mirVir >= 0x00060000 ? LPGENT("Services") : LPGENT("Updates")); - odp.nIDBottomSimpleControl = 0; - odp.pfnDlgProc = DlgProcOpts1; - odp.ptszTab = LPGENT("Settings"); - CallService( MS_OPT_ADDPAGE, wParam,( LPARAM )&odp ); - - odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT2); - //odp.pszTitle = LPGEN("Folders"); - //odp.pszGroup = LPGEN("Updates"); - odp.ptszTitle = (mirVir >= 0x00060000 ? LPGENT("Updater") : LPGENT("Folders")); - odp.ptszGroup = (mirVir >= 0x00060000 ? LPGENT("Services") : LPGENT("Updates")); - odp.nIDBottomSimpleControl = 0; - odp.pfnDlgProc = DlgProcOpts2; - odp.ptszTab = LPGENT("Folders"); - CallService( MS_OPT_ADDPAGE, wParam,( LPARAM )&odp ); - } + odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT1); + odp.ptszTitle = LPGENT("Updater"); + odp.ptszGroup = LPGENT("Services"); + odp.nIDBottomSimpleControl = 0; + odp.pfnDlgProc = DlgProcOpts1; + CallService( MS_OPT_ADDPAGE, wParam,( LPARAM )&odp ); return 0; } @@ -510,7 +408,8 @@ void InitOptionsMenuItems() { add_update_and_exit_menu_item(); } -int FoldersPathChanged(WPARAM wParam, LPARAM lParam) { +int FoldersPathChanged(WPARAM wParam, LPARAM lParam) +{ FOLDERSGETDATA fgd = {0}; fgd.cbSize = sizeof(fgd); fgd.nMaxPathSize = MAX_PATH; @@ -524,13 +423,13 @@ int FoldersPathChanged(WPARAM wParam, LPARAM lParam) { fgd.szPathT = options.zip_folder; CallService(MS_FOLDERS_GET_PATH, (WPARAM)hArchivePath, (WPARAM)&fgd); - _tcscpy(options.temp_folder, options.data_folder); - _tcscat(options.temp_folder, _T("\\updates")); + mir_sntprintf(options.temp_folder, SIZEOF(options.temp_folder), _T("%s\\updates"), options.data_folder); return 0; } -void LoadOptions() { +void LoadOptions(void) +{ options.check_on_startup = (DBGetContactSettingByte(0, MODULE, "CheckOnStartup", 1) == 1); options.check_once = (DBGetContactSettingByte(0, MODULE, "CheckOnce", 1) == 1); options.check_daily = (DBGetContactSettingByte(0, MODULE, "CheckDaily", 1) == 1); @@ -552,89 +451,45 @@ void LoadOptions() { options.ver_req = (VersionRequirement)DBGetContactSettingByte(0, MODULE, "VersionRequirement", VR_BUILD); options.auto_dll_only = (DBGetContactSettingByte(0, MODULE, "AutoDLLOnly", 0) == 1); - if(ServiceExists(MS_FOLDERS_GET_PATH)) { + if(ServiceExists(MS_FOLDERS_GET_PATH)) + { FOLDERSDATA fd = {0}; fd.cbSize = sizeof(fd); #ifdef _UNICODE fd.flags = FF_UNICODE; #endif - strncpy(fd.szSection, "Updates", 64); + strcpy(fd.szSection, "Updates"); - strncpy(fd.szName, "Backups", 64); - fd.szFormatT = _T(MIRANDA_PATH) _T("\\updater\\backups"); + strcpy(fd.szName, "Backups"); + fd.szFormatT = _T("%miranda_userdata%\\updater\\backups"); hBackupPath = (HANDLE)CallService(MS_FOLDERS_REGISTER_PATH, 0, (LPARAM)&fd); - strncpy(fd.szName, "Data", 64); - fd.szFormatT = _T(MIRANDA_PATH) _T("\\updater\\data"); + strcpy(fd.szName, "Data"); + fd.szFormatT = _T("%miranda_userdata%\\updater\\data"); hDataPath = (HANDLE)CallService(MS_FOLDERS_REGISTER_PATH, 0, (LPARAM)&fd); - strncpy(fd.szName, "Saved Archives", 64); - fd.szFormatT = _T(MIRANDA_PATH) _T("\\updater\\archives"); + strcpy(fd.szName, "Saved Archives"); + fd.szFormatT = _T("%miranda_userdata%\\updater\\archives"); hArchivePath = (HANDLE)CallService(MS_FOLDERS_REGISTER_PATH, 0, (LPARAM)&fd); HookEvent(ME_FOLDERS_PATH_CHANGED, FoldersPathChanged); FoldersPathChanged(0, 0); - - return; } + else + { + TCHAR* mir_path = Utils_ReplaceVarsT(_T("%miranda_userdata%")); - REPLACEVARSDATA dat = {0}; - dat.cbSize = sizeof(dat); - dat.dwFlags = RVF_TCHAR; - - TCHAR* mir_path = (TCHAR*)CallService(MS_UTILS_REPLACEVARS, (WPARAM)_T("%miranda_userdata%"), (LPARAM)&dat); - - DBVARIANT dbv; - if(!DBGetString(0, MODULE, "BackupFolder", &dbv)) { - if(_tcslen(dbv.ptszVal) >= 2 && dbv.ptszVal[1] == _T(':')) // detect an absolute path? - _tcsncpy(options.backup_folder, dbv.ptszVal, MAX_PATH); - else { - _tcscpy(options.backup_folder, mir_path); - _tcscat(options.backup_folder, dbv.ptszVal); - } - DBFreeVariant(&dbv); - } else { - - _tcscpy(options.backup_folder, mir_path); - _tcscat(options.backup_folder, _T("\\Updater")); - _tcscat(options.backup_folder, _T("\\Backups")); - } + mir_sntprintf(options.backup_folder, SIZEOF(options.backup_folder), _T("%s\\Updater\\Backups"), mir_path); + mir_sntprintf(options.data_folder, SIZEOF(options.data_folder), _T("%s\\Updater\\Data"), mir_path); + mir_sntprintf(options.zip_folder, SIZEOF(options.zip_folder), _T("%s\\Updater\\Archives"), mir_path); + mir_sntprintf(options.temp_folder, SIZEOF(options.temp_folder), _T("%s\\updates"), options.data_folder); - if(!DBGetString(0, MODULE, " DataFolder", &dbv)) { - if(_tcslen(dbv.ptszVal) >= 2 && dbv.ptszVal[1] == _T(':')) // detect an absolute path? - _tcsncpy(options.data_folder, dbv.ptszVal, MAX_PATH); - else { - _tcscpy(options.data_folder, mir_path); - _tcscat(options.data_folder, dbv.ptszVal); - } - DBFreeVariant(&dbv); - } else { - _tcscpy(options.data_folder, mir_path); - _tcscat(options.data_folder, _T("\\Updater")); - _tcscat(options.data_folder, _T("\\Data")); + mir_free(mir_path); } - - if(!DBGetString(0, MODULE, "ZipFolder", &dbv)) { - if(_tcslen(dbv.ptszVal) >= 2 && dbv.ptszVal[1] == _T(':')) // detect an absolute path? - _tcsncpy(options.zip_folder, dbv.ptszVal, MAX_PATH); - else { - _tcscpy(options.zip_folder, mir_path); - _tcscat(options.zip_folder, dbv.ptszVal); - } - DBFreeVariant(&dbv); - } else { - _tcscpy(options.zip_folder, mir_path); - _tcscat(options.zip_folder, _T("\\Updater")); - _tcscat(options.zip_folder, _T("\\Archives")); - } - - _tcscpy(options.temp_folder, options.data_folder); - _tcscat(options.temp_folder, _T("\\updates")); - - mir_free(mir_path); } -void SaveOptions() { +void SaveOptions() +{ DBWriteContactSettingByte(0, MODULE, "CheckOnStartup", options.check_on_startup ? 1 : 0); DBWriteContactSettingByte(0, MODULE, "CheckOnce", options.check_once ? 1 : 0); DBWriteContactSettingByte(0, MODULE, "CheckDaily", options.check_daily ? 1 : 0); @@ -649,36 +504,6 @@ void SaveOptions() { DBWriteContactSettingByte(0, MODULE, "SaveZips", (int)options.save_zips); DBWriteContactSettingByte(0, MODULE, "NoUnzip", (int)options.no_unzip); DBWriteContactSettingByte(0, MODULE, "AutoDLLOnly", options.auto_dll_only ? 1 : 0); - - REPLACEVARSDATA dat = {0}; - dat.cbSize = sizeof(dat); - dat.dwFlags = RVF_TCHAR; - - TCHAR* mir_path = (TCHAR*)CallService(MS_UTILS_REPLACEVARS, (WPARAM)_T("%miranda_userdata%"), (LPARAM)&dat); - size_t mp_len = _tcslen(mir_path); - - // remove mir_path from the front of folder names, so that profile can be moved - if(_tcslen(options.backup_folder) > mp_len && _tcsncmp(options.backup_folder, mir_path, mp_len) == 0) { - TCHAR *p = options.backup_folder + mp_len; - DBWriteString(0, MODULE, "BackupFolder", p); - } else { - DBWriteString(0, MODULE, "BackupFolder", options.backup_folder); - } - - if(_tcslen(options.data_folder) > mp_len && _tcsncmp(options.data_folder, mir_path, mp_len) == 0) { - TCHAR *p = options.data_folder + mp_len; - DBWriteString(0, MODULE, "DataFolder", p); - } else { - DBWriteString(0, MODULE, "DataFolder", options.data_folder); - } - - if(_tcslen(options.zip_folder) > mp_len && _tcsncmp(options.zip_folder, mir_path, mp_len) == 0) { - TCHAR *p = options.zip_folder + mp_len; - DBWriteString(0, MODULE, "ZipFolder", p); - } else { - DBWriteString(0, MODULE, "ZipFolder", options.zip_folder); - } - mir_free(mir_path); } diff --git a/updater/resource.h b/updater/resource.h index 35617cc..294c46c 100644 --- a/updater/resource.h +++ b/updater/resource.h @@ -9,7 +9,6 @@ #define IDD_CONFIRMUPDATES 106 #define IDD_PROGRESS 107 #define IDD_CONFIRMCOMPONENTS 108 -#define IDD_OPT2 109 #define IDI_UPDATEANDEXIT 128 #define IDC_BTN_RESTART 1000 #define IDC_CHK_ONSTART 1001 @@ -29,16 +28,10 @@ #define IDC_CHK_STARTOFFLINE 1013 #define IDC_LIST_COMPONENTS 1014 #define IDC_ED_UPDATES 1016 -#define IDC_ED_DATA 1017 -#define IDC_ED_BACKUPS 1018 #define IDC_BTN_BRUPDATES 1019 -#define IDC_BTN_BRDATA 1020 -#define IDC_BTN_BRBACKUPS 1021 #define IDC_CHK_POPUP 1021 #define IDC_CHK_RESTART 1022 -#define IDC_ED_ZIPS 1022 #define IDC_CHK_UPDATEANDEXIT 1023 -#define IDC_BTN_BRZIPS 1023 #define IDC_SLID_VERREQ 1024 #define IDC_ST_VERREQ 1025 #define IDC_CHK_SAVEZIPS 1026 diff --git a/updater/updater.rc b/updater/updater.rc index 8c7df60..6440caa 100644 --- a/updater/updater.rc +++ b/updater/updater.rc @@ -132,22 +132,6 @@ BEGIN LTEXT "Initialising...",IDC_PROGMSG,9,7,171,8 END -IDD_OPT2 DIALOGEX 0, 0, 281, 167 -STYLE DS_SETFONT | DS_FIXEDSYS | DS_CENTER | WS_CHILD -EXSTYLE WS_EX_CONTROLPARENT -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - LTEXT "Data:",IDC_STATIC,14,15,129,8 - LTEXT "Backups:",IDC_STATIC,14,49,129,8 - EDITTEXT IDC_ED_DATA,26,30,185,14,ES_AUTOHSCROLL - EDITTEXT IDC_ED_BACKUPS,26,63,185,14,ES_AUTOHSCROLL - PUSHBUTTON "Browse...",IDC_BTN_BRDATA,217,30,50,14 - PUSHBUTTON "Browse...",IDC_BTN_BRBACKUPS,217,63,50,14 - EDITTEXT IDC_ED_ZIPS,25,104,185,14,ES_AUTOHSCROLL - PUSHBUTTON "Browse...",IDC_BTN_BRZIPS,215,104,50,14 - LTEXT "Saved archives:",IDC_STATIC,14,91,129,8 -END - ///////////////////////////////////////////////////////////////////////////// // @@ -172,14 +156,6 @@ BEGIN TOPMARGIN, 7 BOTTOMMARGIN, 34 END - - IDD_OPT2, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 274 - TOPMARGIN, 7 - BOTTOMMARGIN, 160 - END END #endif // APSTUDIO_INVOKED -- cgit v1.2.3