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@15668 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca 2007-10-04 14:46:14 +00:00
parent 8be2a6c27b
commit 03c2ec6d22
2 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
setup/Setup.cpp
View File

@ -45,7 +45,7 @@ void CampoFrame::OnErase(wxEraseEvent& e)
wxRect rect2 = rect; rect2.SetTop(rect.GetBottom() / 2); wxRect rect2 = rect; rect2.SetTop(rect.GetBottom() / 2);
dc.GradientFillLinear(rect2, c1, c2, wxDOWN); dc.GradientFillLinear(rect2, c1, c2, wxDOWN);
const int nHeight = rect.GetHeight()/8; const int nHeight = rect.GetHeight()/10;
wxFont* pFont = wxTheFontList->FindOrCreateFont(nHeight, wxFONTFAMILY_SWISS, wxFONTSTYLE_ITALIC, wxFont* pFont = wxTheFontList->FindOrCreateFont(nHeight, wxFONTFAMILY_SWISS, wxFONTSTYLE_ITALIC,
wxFONTWEIGHT_BOLD); wxFONTWEIGHT_BOLD);
dc.SetFont(*pFont); dc.SetFont(*pFont);

32
setup/wizard.cpp
View File

@ -1234,6 +1234,9 @@ bool CampoWizardPage9::TransferDataToWindow()
wxFileName fnFileToCheck(strUVNCDir, "winvnc"); wxFileName fnFileToCheck(strUVNCDir, "winvnc");
fnFileToCheck.SetExt("exe"); fnFileToCheck.SetExt("exe");
if (fnFileToCheck.FileExists()) if (fnFileToCheck.FileExists())
bChkTeleass = false;
/* if (fnFileToCheck.FileExists())
{ {
//controlla pure la versione...non si sa mai che ce ne sia una nuova! //controlla pure la versione...non si sa mai che ce ne sia una nuova!
//intanto controlla la data di creazione di quello su harddisk... //intanto controlla la data di creazione di quello su harddisk...
@ -1241,22 +1244,23 @@ bool CampoWizardPage9::TransferDataToWindow()
fnFileToCheck.GetTimes(NULL, NULL, &dtCreateInstalled); fnFileToCheck.GetTimes(NULL, NULL, &dtCreateInstalled);
//..poi controlla la data del programma di installazione sul cd... //..poi controlla la data del programma di installazione sul cd...
wxString strPathCD("../../teleassistenza/UltraVNC-101-Setup.exe"); const wxString strPathCD = GetApp()->GetSourceDir("teleassistenza");
wxDir dirDirCD(strPathCD);
if (dirDirCD.Exists(strPathCD))
{
wxFileName fnFileOnCD(strPathCD, "winvnc.exe");
if (fnFileOnCD.FileExists())
{
wxDateTime dtCreateCD;
fnFileOnCD.GetTimes(NULL, NULL, &dtCreateCD);
//se quello su CD e' piu' nuovo propone di installare la teleassistenza wxFileName fnFileOnCD(strPathCD, "UltraVNC-101-Setup.exe");
if (dtCreateInstalled >= dtCreateCD) if (fnFileOnCD.FileExists())
bChkTeleass = false; {
} wxDateTime dtCreateCD;
fnFileOnCD.GetTimes(NULL, NULL, &dtCreateCD);
//se quello su CD e' piu' nuovo propone di installare la teleassistenza
if (dtCreateInstalled >= dtCreateCD)
bChkTeleass = false;
} }
} else
{
bChkTeleass = false;
}
}*/
} }
Set(902, bChkTeleass); Set(902, bChkTeleass);