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@15715 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca 2007-10-16 16:06:54 +00:00
parent 146bd2fb93
commit 4e348ab514
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
setup/Setup.cpp
View File

@ -806,7 +806,20 @@ void CampoSetup::NormalSetup()
if (bDesktopShortcut) if (bDesktopShortcut)
{ {
const wxFileName strExe(strPrgLocPath, wxT("ba0.exe")); const wxFileName strExe(strPrgLocPath, wxT("ba0.exe"));
CreateIcon(CSIDL_COMMON_DESKTOPDIRECTORY, strExe, "Campo"); wxString strLnk;
switch (uInstallationType)
{
case 1:
strLnk = "Campo (Server)";
break;
case 2:
strLnk = "Campo (Client)";
break;
default:
strLnk = "Campo";
break;
}
CreateIcon(CSIDL_COMMON_DESKTOPDIRECTORY, strExe, strLnk);
} }

16
setup/wizard.cpp
View File

@ -357,13 +357,13 @@ CampoWizardPage3::CampoWizardPage3(wxWizard* parent) : CampoWizardPage(parent)
asGroups.Add(strGroup); asGroups.Add(strGroup);
} }
int prechecked = -1; int prechecked = -1;
for (unsigned int i = 0; i < asGroups.GetCount(); i++) for (int i = 0; i < (int)asGroups.GetCount(); i++)
{ {
CampoIniFile iniCampoStp("C:\\campo.stp", asGroups[i]); CampoIniFile iniCampoStp("C:\\campo.stp", asGroups[i]);
wxString strPath = iniCampoStp.Get(strProgram); wxString strPath = iniCampoStp.Get(strProgram);
//sono installazioni valide quelle che presentano la coppia di files campo.ini e campo.aut (senza.. //sono installazioni valide quelle che passano il vaglio della CheckPrgdir, metodo che testa l'integrita'..
//..questi 2 soggetti il programma non parte) //..di una cartella programmi di campo
if (CheckPrgDir(strPath)) if (CheckPrgDir(strPath))
{ {
//controlla il tipo di installazione rilevata (Standalone,Server,Client) //controlla il tipo di installazione rilevata (Standalone,Server,Client)
@ -391,7 +391,15 @@ CampoWizardPage3::CampoWizardPage3(wxWizard* parent) : CampoWizardPage(parent)
if (nType == 1 || nType == 2) if (nType == 1 || nType == 2)
prechecked = i; prechecked = i;
} }
} //if(wxFileName::... } //if(CheckPrgDir(strPath)...
else //se una installazione su campo.stp non e' buona cancella la voce da campo.stp stesso..
//..per non fare casini in futuro
{
wxString strGroup = "/";
strGroup += asGroups[i];
iniCampoStp.DeleteGroup(strGroup);
}
} //for(unsigned int i=0... } //for(unsigned int i=0...
wxString strTitle, strBody; wxString strTitle, strBody;