All text boxes were displayed in dialog for choosing a template.

git-svn-id: svn://localhost@133 8062f311-0dae-4547-b526-b8ab9ac864a5
This commit is contained in:
Florian
2010-06-02 18:06:59 +00:00
parent f0df03e009
commit 3407e73a6d
5 changed files with 24 additions and 11251 deletions

View File

@@ -361,22 +361,25 @@ void ChoixTemplateEvent::OnTemplateTreeSelectionChanged( wxTreeEvent& event )
//Update control for each parameter
for (unsigned int i = 0;i<templatesList[j].parameters.size();++i)
{
descriptionsTxt[i]->Show(true);
parametersEdit[i]->Show(true);
descriptionsTxt[i]->SetLabel(templatesList[j].parameters[i]);
{
if ( templatesList[j].parameters[i] != "" )
{
descriptionsTxt[i]->Show(true);
parametersEdit[i]->Show(true);
descriptionsTxt[i]->SetLabel(templatesList[j].parameters[i]);
}
}
Layout();
Fit();
}
string ChoixTemplateEvent::ConvertParam( string Parametre, string ToReplace, string ReplaceBy )
string ChoixTemplateEvent::ConvertParam( string parameter, const string & toReplace, const string & replaceBy )
{
if ( Parametre.find( ToReplace ) != string::npos )
Parametre.replace( Parametre.find( ToReplace ), ToReplace.length(), ReplaceBy );
if ( parameter.find( toReplace ) != string::npos )
parameter.replace( parameter.find( toReplace ), toReplace.length(), replaceBy );
return Parametre;
return parameter;
}
void ChoixTemplateEvent::OnAideBtClick(wxCommandEvent& event)

View File

@@ -103,7 +103,7 @@ class ChoixTemplateEvent: public wxDialog
//*)
wxTreeItemId item;
string ConvertParam(string Parametre, string ToReplace, string ReplaceBy);
string ConvertParam( string parameter, const string & toReplace, const string & replaceBy );
void ProcessEvents(vector < BaseEventSPtr > & events );
DECLARE_EVENT_TABLE()

File diff suppressed because it is too large Load Diff

View File

@@ -161,7 +161,7 @@
<Cursor position="248" topLine="0" />
</File>
<File name="EditorScene.cpp" open="0" top="0" tabpos="4">
<Cursor position="32655" topLine="665" />
<Cursor position="28605" topLine="512" />
</File>
<File name="EditorScene.h" open="0" top="0" tabpos="8">
<Cursor position="3114" topLine="105" />
@@ -178,8 +178,8 @@
<File name="Extensions.h" open="0" top="0" tabpos="2">
<Cursor position="1971" topLine="58" />
</File>
<File name="Fusion.cpp" open="0" top="0" tabpos="1">
<Cursor position="6580" topLine="178" />
<File name="Fusion.cpp" open="1" top="0" tabpos="1">
<Cursor position="6230" topLine="99" />
</File>
<File name="Fusion.h" open="0" top="0" tabpos="0">
<Cursor position="441" topLine="3" />

View File

@@ -4,10 +4,10 @@
namespace AutoVersion{
//Date Version Types
static const char DATE[] = "30";
static const char MONTH[] = "05";
static const char DATE[] = "02";
static const char MONTH[] = "06";
static const char YEAR[] = "2010";
static const char UBUNTU_VERSION_STYLE[] = "10.05";
static const char UBUNTU_VERSION_STYLE[] = "10.06";
//Software Status
static const char STATUS[] = "Release";
@@ -16,14 +16,14 @@ namespace AutoVersion{
//Standard Version Type
static const long MAJOR = 1;
static const long MINOR = 3;
static const long BUILD = 9663;
static const long REVISION = 48679;
static const long BUILD = 9664;
static const long REVISION = 48687;
//Miscellaneous Version Types
static const long BUILDS_COUNT = 21733;
#define RC_FILEVERSION 1,3,9663,48679
#define RC_FILEVERSION_STRING "1, 3, 9663, 48679\0"
static const char FULLVERSION_STRING[] = "1.3.9663.48679";
static const long BUILDS_COUNT = 21744;
#define RC_FILEVERSION 1,3,9664,48687
#define RC_FILEVERSION_STRING "1, 3, 9664, 48687\0"
static const char FULLVERSION_STRING[] = "1.3.9664.48687";
//These values are to keep track of your versioning state, don't modify them.
static const long BUILD_HISTORY = 0;