root/campo-sirio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Patch level :

Browse Source 
Files correlati     :
Ricompilazione Demo : [ ]
Commento            :


git-svn-id: svn://10.65.10.50/trunk@15567 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca 2007-08-21 08:59:43 +00:00
parent 3feeb4ce9f
commit 292588de07
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
setup/Setup.cpp
View File

@ -2053,7 +2053,7 @@ bool CampoSetup::CreateAutostartMode(const int iSrvAutostartMode, const wxString
//link nella cartella esecuzione automatica //link nella cartella esecuzione automatica
case 1: case 1:
{ {
CreateIcon(CSIDL_COMMON_STARTUP, strPath); CreateIcon(CSIDL_COMMON_STARTUP, strExe);
} }
break; break;
default: default:
@ -2068,9 +2068,9 @@ bool CampoSetup::CreateIcon(unsigned int csidl, const wxFileName& strExeFile) co
{ {
//csidl = CSIDL_COMMON_DESKTOPDIRECTORY = desktop //csidl = CSIDL_COMMON_DESKTOPDIRECTORY = desktop
//csidl = CSIDL_COMMON_STARTUP = all users esecuzione automatica //csidl = CSIDL_COMMON_STARTUP = all users esecuzione automatica
wxString szDesktopPath = GetFolderPath(csidl); wxString strDesktopPath = GetFolderPath(csidl);
if (!szDesktopPath.IsEmpty()) if (!strDesktopPath.IsEmpty())
{ {
CoInitialize(NULL); CoInitialize(NULL);
@ -2092,7 +2092,12 @@ bool CampoSetup::CreateIcon(unsigned int csidl, const wxFileName& strExeFile) co
if (SUCCEEDED(hres)) if (SUCCEEDED(hres))
{ {
wxFileName strLnk(szDesktopPath, wxT("Campo.lnk")); wxFileName strLnk;
if (csidl == CSIDL_COMMON_STARTUP)
strLnk.Assign(strDesktopPath, wxT("Lurch.lnk"));
else
strLnk.Assign(strDesktopPath, wxT("Campo.lnk"));
// Save the link by calling IPersistFile::Save. // Save the link by calling IPersistFile::Save.
wxString stringa = strLnk.GetFullPath(); wxString stringa = strLnk.GetFullPath();
wchar_t buff[_MAX_PATH]; wchar_t buff[_MAX_PATH];
@ -2120,10 +2125,14 @@ void CampoSetup::OnTimer(wxTimerEvent& WXUNUSED(e))
const wxString& strDest = pWizard->GetPrgLocPath(); const wxString& strDest = pWizard->GetPrgLocPath();
const wxFileName strExe(strDest, wxT("ba0.exe")); const wxFileName strExe(strDest, wxT("ba0.exe"));
//creazione dell'icona sul desktop
const bool bDesktopShortcut = pWizard->GetDesktopShortcut(); const bool bDesktopShortcut = pWizard->GetDesktopShortcut();
if (bDesktopShortcut) if (bDesktopShortcut)
CreateIcon(CSIDL_COMMON_DESKTOPDIRECTORY, strExe); CreateIcon(CSIDL_COMMON_DESKTOPDIRECTORY, strExe);
//copia del contenuto della cartella campo nella cartella di destinazione
//solo se installa campo server //solo se installa campo server
const unsigned int uInstallationType = pWizard->GetInstallationType(); const unsigned int uInstallationType = pWizard->GetInstallationType();
//se sta installando campo in postazione server e deve installare un gestore di servizi //se sta installando campo in postazione server e deve installare un gestore di servizi