[St-m-svn] SF.net SVN: st-m: [601] trunk
Brought to you by:
cnx_glenn
From: <cnx...@us...> - 2007-06-09 14:35:25
|
Revision: 601 http://svn.sourceforge.net/st-m/?rev=601&view=rev Author: cnx_glenn Date: 2007-06-09 07:35:22 -0700 (Sat, 09 Jun 2007) Log Message: ----------- Use {commonappdata} folder rather then install location to start boot order files Modified Paths: -------------- trunk/setup/st-m_Install.iss trunk/setup/st-m_Install_ANSI.iss trunk/src/BtOrderDlg.cpp trunk/src/BtOrderDlg.h trunk/src/rsrc.rc Modified: trunk/setup/st-m_Install.iss =================================================================== --- trunk/setup/st-m_Install.iss 2007-06-08 18:25:02 UTC (rev 600) +++ trunk/setup/st-m_Install.iss 2007-06-09 14:35:22 UTC (rev 601) @@ -137,7 +137,7 @@ Source: "..\translations\release\LangZhs.dll"; DestDir: "{app}"; DestName: "Language.dll"; Components: language\chs [Dirs] -Name: "{app}\batch" +Name: "{commonappdata}\Startup Manager\batch" [Registry] Root: HKLM; Subkey: "Software\Startup Manager"; Flags: uninsdeletekeyifempty; Check: not IsWin64 @@ -177,8 +177,9 @@ [UninstallDelete] Type: files; Name: "{app}\log.log" Type: files; Name: "{app}\Language.dll" -Type: dirifempty; Name: "{app}\batch" -Type: dirifempty; Name: "{app}" +Type: filesandordirs; Name: "{app}" +Type: dirifempty; Name: "{commonappdata}\Startup Manager\batch" +Type: dirifempty; Name: "{commonappdata}\Startup Manager" [Code] var Modified: trunk/setup/st-m_Install_ANSI.iss =================================================================== --- trunk/setup/st-m_Install_ANSI.iss 2007-06-08 18:25:02 UTC (rev 600) +++ trunk/setup/st-m_Install_ANSI.iss 2007-06-09 14:35:22 UTC (rev 601) @@ -61,7 +61,7 @@ Source: "..\help\st-m.chm"; DestDir: "{app}"; [Dirs] -Name: "{app}\batch" +Name: "{commonappdata}\Startup Manager\batch" [Registry] Root: HKLM; Subkey: "Software\Startup Manager"; Flags: uninsdeletekeyifempty; Check: not IsWin64 @@ -100,8 +100,9 @@ [UninstallDelete] Type: files; Name: "{app}\log.log" -Type: dirifempty; Name: "{app}\batch" -Type: dirifempty; Name: "{app}" +Type: filesandordirs; Name: "{app}" +Type: dirifempty; Name: "{commonappdata}\Startup Manager\batch" +Type: dirifempty; Name: "{commonappdata}\Startup Manager" [Code] procedure URLLabelOnClick(Sender: TObject); Modified: trunk/src/BtOrderDlg.cpp =================================================================== --- trunk/src/BtOrderDlg.cpp 2007-06-08 18:25:02 UTC (rev 600) +++ trunk/src/BtOrderDlg.cpp 2007-06-09 14:35:22 UTC (rev 601) @@ -169,7 +169,7 @@ m_bIsWinNT = false; } -tstring BtOrderDlg::OnBrowse(HWND hWndParent, LPTSTR types) +tstring BtOrderDlg::OnBrowse(HWND hWndParent, LPTSTR types, tstring folder) { TCHAR *szFileName = new TCHAR[MAX_PATH + 1]; szFileName[0] = 0; @@ -182,6 +182,9 @@ ofn.lpstrFile = szFileName; ofn.nMaxFile = MAX_PATH; ofn.Flags = OFN_EXPLORER | OFN_FILEMUSTEXIST | OFN_HIDEREADONLY; + + if(folder.length() > 0) + ofn.lpstrInitialDir = const_cast<TCHAR*>(folder.c_str()); tstring retVal; if(GetOpenFileName(&ofn)) @@ -249,14 +252,17 @@ if(name.length() > 0) { - TCHAR tmp[MAX_PATH+1]; - ::GetModuleFileName(GetModuleHandle(NULL), tmp, MAX_PATH*sizeof(TCHAR)); - File file; - file.SetPath(tmp); - m_Path = file.GetDir(); - m_Path += _T("batch\\"); + IMalloc *gpMalloc; + SHGetMalloc(&gpMalloc); + + TCHAR tmp[MAX_PATH]; + SHGetSpecialFolderPath(GetHwnd(), tmp, CSIDL_COMMON_APPDATA, NULL); + m_Path = tmp; + m_Path += _T("\\Startup Manager\\batch\\"); m_Path += name; + gpMalloc->Release(); + ::EnableWindow(::GetDlgItem(GetHwnd(), IDOK), true); ::EnableWindow(::GetDlgItem(GetHwnd(), IDADD), true); ::EnableWindow(::GetDlgItem(GetHwnd(), IDC_CHWAIT), true); @@ -272,7 +278,17 @@ void BtOrderDlg::OnOpen() { - m_Path = OnBrowse(GetHwnd(), _T("Batch File\0*.bat\0")); + IMalloc *gpMalloc; + SHGetMalloc(&gpMalloc); + + TCHAR tmp[MAX_PATH]; + SHGetSpecialFolderPath(GetHwnd(), tmp, CSIDL_COMMON_APPDATA, NULL); + m_Path = tmp; + m_Path += _T("\\Startup Manager\\batch\\"); + + gpMalloc->Release(); + + m_Path = OnBrowse(GetHwnd(), _T("Batch File\0*.bat\0"), m_Path); if(m_Path.length() > 0) { m_bBrowsed = true; Modified: trunk/src/BtOrderDlg.h =================================================================== --- trunk/src/BtOrderDlg.h 2007-06-08 18:25:02 UTC (rev 600) +++ trunk/src/BtOrderDlg.h 2007-06-09 14:35:22 UTC (rev 601) @@ -35,7 +35,7 @@ virtual ~BtOrderDlg() {} private: - static tstring OnBrowse(HWND hWndParent, LPTSTR typeString); + static tstring OnBrowse(HWND hWndParent, LPTSTR typeString, tstring folder = _T("")); void ReadBatchFile(); void OnNew(); void OnOpen(); Modified: trunk/src/rsrc.rc =================================================================== --- trunk/src/rsrc.rc 2007-06-08 18:25:02 UTC (rev 600) +++ trunk/src/rsrc.rc 2007-06-09 14:35:22 UTC (rev 601) @@ -203,7 +203,7 @@ BEGIN CONTROL "Here", IDC_HOMEPAGE, "Static", SS_LEFT | SS_NOTIFY, 80, 55, 15, 10 CONTROL "Project License", IDC_LICENSE, "Static", SS_LEFT | SS_NOTIFY, 135, 55, 50, 10 - LTEXT "Startup Manager (version 2.3) is an application to manage the programs that automatically startup.", IDW_STATIC, 15, 30, 170, 20 + LTEXT "Startup Manager (version 2.3.1) is an application to manage the programs that automatically startup.", IDW_STATIC, 15, 30, 170, 20 LTEXT "Project homepage:", IDW_STATIC, 15, 55, 65, 14 LTEXT "Copyright \xA9 2004-2007, Glenn Van Loon", IDW_STATIC, 15, 70, 135, 14 LTEXT "Glenn Van Loon", IDW_STATIC, 17, 95, 70, 10 @@ -315,7 +315,7 @@ STRINGTABLE DISCARDABLE BEGIN - IDW_MAIN "Startup Manager 2.3" + IDW_MAIN "Startup Manager 2.3.1" END //toolbar button tooltips @@ -450,8 +450,8 @@ END 1 VERSIONINFO -FILEVERSION 2,3,0,2811 -PRODUCTVERSION 2,3,0,2811 +FILEVERSION 2,3,1,2812 +PRODUCTVERSION 2,3,1,2812 FILETYPE VFT_APP BEGIN BLOCK "StringFileInfo" @@ -460,13 +460,13 @@ BEGIN VALUE "Comments", "This is a program to manage the programs that boot on windows startup.\0" VALUE "CompanyName", "\0" - VALUE "FileVersion", "2.3.0.2811" + VALUE "FileVersion", "2.3.1.2812" VALUE "FileDescription", "Manage WinStartup\0" VALUE "InternalName", "Startup Manager\0" VALUE "LegalCopyright", "Copyright \xA9 2004-2007, Glenn Van Loon\0" VALUE "OriginalFilename", "Startup Manager.EXE\0" VALUE "ProductName", "Startup Manager 2.3\0" - VALUE "ProductVersion", "2.3.0\0" + VALUE "ProductVersion", "2.3.1\0" VALUE "Website", "http://st-m.sf.net/\nhttp://sf.net/projects/st-m/\0" VALUE "License", "GNU General Public License\0" END This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |