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

Patch level :4.0 setup

Browse Source 
Files correlati     :
Ricompilazione Demo : [ ]
Commento            :modalita' di esecuzione server


git-svn-id: svn://10.65.10.50/trunk@15551 c028cbd2-c16b-5b4b-a496-9718f37d4682
This commit is contained in:
luca 2007-08-08 14:26:35 +00:00
parent 30e2be72e4
commit cb12dee318
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
setup/Setup.cpp
View File

@ -201,7 +201,7 @@ bool CreateIcon(unsigned int csidl, const wxFileName& strExeFile)
return true; return true;
} }
bool CreateLerchService() bool CreateAutostartMode(const int iSrvAutostartMode)
{ {
return true; return true;
} }
@ -245,7 +245,7 @@ class CampoWizard : public wxWizard
bool _bInstUseDict; //installa/usa server diction bool _bInstUseDict; //installa/usa server diction
wxString _strSrvDict; //server diction wxString _strSrvDict; //server diction
unsigned int _uSrvAutostartMode; //tipologia di esecuzione dei server unsigned int _iSrvAutostartMode; //tipologia di esecuzione dei server
bool _bDesktopShortcut; //crea il link sul desktop bool _bDesktopShortcut; //crea il link sul desktop
protected: protected:
@ -286,7 +286,7 @@ public:
void SetSrvDict(const wxString& strSrvDict); void SetSrvDict(const wxString& strSrvDict);
const wxString& GetSrvDict() const; const wxString& GetSrvDict() const;
void SetSrvAutostartMode(const int uSrvAutostartMode); void SetSrvAutostartMode(const int iSrvAutostartMode);
const int GetSrvAutostartMode() const; const int GetSrvAutostartMode() const;
void SetDesktopShortcut(const bool bDesktopShortcut); void SetDesktopShortcut(const bool bDesktopShortcut);
@ -1562,7 +1562,7 @@ class CampoWizardPage10 : public CampoWizardPage
wxString _strDataPath; wxString _strDataPath;
wxString _strSrvAuth; wxString _strSrvAuth;
wxString _strSrvDict; wxString _strSrvDict;
unsigned int _uSrvAutostartMode; unsigned int _iSrvAutostartMode;
bool _bInstDemoData; bool _bInstDemoData;
bool _bDesktopShortcut; bool _bDesktopShortcut;
@ -1586,7 +1586,7 @@ bool CampoWizardPage10::TransferDataToWindow()
_strDataPath = cw.GetDataPath(); _strDataPath = cw.GetDataPath();
_strSrvAuth = cw.GetSrvAuth(); _strSrvAuth = cw.GetSrvAuth();
_strSrvDict = cw.GetSrvDict(); _strSrvDict = cw.GetSrvDict();
_uSrvAutostartMode = cw.GetSrvAutostartMode(); _iSrvAutostartMode = cw.GetSrvAutostartMode();
break; break;
case 2: //client case 2: //client
_strInstallType = "Client"; _strInstallType = "Client";
@ -1655,10 +1655,10 @@ bool CampoWizardPage10::TransferDataToWindow()
strBody += wxT(Bold(_strSrvDict) + "</p>"); strBody += wxT(Bold(_strSrvDict) + "</p>");
} }
//...e loro modalita' di lancio (solo installazione server!) //...e loro modalita' di lancio (solo installazione server!)
if (_uInstallType == 1 && _uSrvAutostartMode >= 0) if (_uInstallType == 1 && _iSrvAutostartMode >= 0)
{ {
strBody += wxT("<p>Modalita' di esecuzione dei programmi di gestione: "); strBody += wxT("<p>Modalita' di esecuzione dei programmi di gestione: ");
if (_uSrvAutostartMode == 0) if (_iSrvAutostartMode == 0)
strBody += wxT(Bold("Come servizi") + "</p>"); strBody += wxT(Bold("Come servizi") + "</p>");
else else
strBody += wxT(Bold("Nel menu esecuzione automatica") + "</p>"); strBody += wxT(Bold("Nel menu esecuzione automatica") + "</p>");
@ -1844,14 +1844,14 @@ const wxString& CampoWizard::GetSrvDict() const
return _strSrvDict; return _strSrvDict;
} }
void CampoWizard::SetSrvAutostartMode(const int uSrvAutostartMode) void CampoWizard::SetSrvAutostartMode(const int iSrvAutostartMode)
{ {
_uSrvAutostartMode = uSrvAutostartMode; _iSrvAutostartMode = iSrvAutostartMode;
} }
const int CampoWizard::GetSrvAutostartMode() const const int CampoWizard::GetSrvAutostartMode() const
{ {
return _uSrvAutostartMode; return _iSrvAutostartMode;
} }
void CampoWizard::SetInstDemoData(const bool bInstDemoData) void CampoWizard::SetInstDemoData(const bool bInstDemoData)
@ -2017,7 +2017,8 @@ void CampoSetup::OnTimer(wxTimerEvent& WXUNUSED(e))
const bool bInstallLerch = pWizard->GetInstUseAuth() | pWizard->GetInstUseDict(); const bool bInstallLerch = pWizard->GetInstUseAuth() | pWizard->GetInstUseDict();
if (bInstallLerch) if (bInstallLerch)
{ {
CreateLerchService(); const int iSrvAutostartMode = pWizard->GetSrvAutostartMode();
CreateAutostartMode(iSrvAutostartMode);
} }
} }