From eadb37661531b59bf98dd976e29c5c5dba682bb7 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 22 Apr 2013 14:04:41 +0200 Subject: [PATCH] Feature #1711 CreaDevManager application implementation Fix: fixed main frame for windows display Fix: Now opening Visual Studio 2010 --- lib/creaDevManagerLib/modelCDMProject.cpp | 10 +++----- .../wxCDMMainDescriptionPanel.cpp | 25 ++++++++++--------- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/lib/creaDevManagerLib/modelCDMProject.cpp b/lib/creaDevManagerLib/modelCDMProject.cpp index 08cafc7..c394633 100644 --- a/lib/creaDevManagerLib/modelCDMProject.cpp +++ b/lib/creaDevManagerLib/modelCDMProject.cpp @@ -747,15 +747,13 @@ bool modelCDMProject::Build(std::string*& result, const std::string& line) //TODO: adjust for windows and mac #ifdef _WIN32 // ------ Windows - //\\..\\IDE\\VCExpress.exe \"" + this->buildPath + CDMUtilities::SLASH + this->nameProject + ".sln\" -// std::string command = "\"" + std::string(getenv("VS90COMNTOOLS")) + "..\\IDE\\VCExpress.exe\" \"" + this->buildPath + CDMUtilities::SLASH + this->nameProject + ".sln\" &"; - std::string command = "\"\"%VS90COMNTOOLS%..\\IDE\\VCExpress.exe\" \"" + this->buildPath + CDMUtilities::SLASH + this->nameProject + ".sln\" &\""; - command = "start cmd.exe /k " + command + " &"; - if(0 == system(command.c_str())) + std::string command = "start \"\" \"" + this->buildPath + CDMUtilities::SLASH + this->nameProject + ".sln\""; + //wxMessageBox(crea::std2wx(command), wxT("Project Compilation - Check!")); + if(0 == system(command.c_str())) return true; else { - result = new std::string("An error has happened running: \"" + command + "\". Please make sure to have visual c++ express installed and to have the VS90COMNTOOLS environment variable set."); + result = new std::string("An error has happened running: \"" + command + "\". Please make sure to have visual c++ installed."); return false; } #elif __APPLE__ diff --git a/lib/creaDevManagerLib/wxCDMMainDescriptionPanel.cpp b/lib/creaDevManagerLib/wxCDMMainDescriptionPanel.cpp index 71d4508..dbe66c1 100644 --- a/lib/creaDevManagerLib/wxCDMMainDescriptionPanel.cpp +++ b/lib/creaDevManagerLib/wxCDMMainDescriptionPanel.cpp @@ -102,27 +102,28 @@ void wxCDMMainDescriptionPanel::CreateControls() sizer->Add(headerSizer, 0, wxALIGN_CENTER | wxUP, 10); //Actions - wxStaticBoxSizer* actionsBox = new wxStaticBoxSizer(wxVERTICAL, this, wxT("&Actions")); + wxStaticBoxSizer* actionsBox = new wxStaticBoxSizer(wxHORIZONTAL, this, wxT("&Actions")); actionsBox->GetStaticBox()->SetToolTip(wxT("Create a new crea project or open an existing one selection any of the available actions.")); - wxPanel* actionsPanel = new wxPanel(this); - wxBoxSizer* actionsPanelSizer = new wxBoxSizer(wxHORIZONTAL); + //wxPanel* actionsPanel = new wxPanel(this); + //wxBoxSizer* actionsPanelSizer = new wxBoxSizer(wxHORIZONTAL); - wxButton* newProjectbt = new wxButton(actionsPanel, ID_BUTTON_NEWPROJECT, _T("New Project")); + wxButton* newProjectbt = new wxButton(this, ID_BUTTON_NEWPROJECT, _T("New Project")); newProjectbt->SetToolTip(wxT("Create a new crea project.")); - actionsPanelSizer->Add(newProjectbt, 0, wxRIGHT | wxLEFT, 20); - wxButton* openProjectbt = new wxButton(actionsPanel, ID_BUTTON_OPENPROJECT, _T("Open Project (source/binaries)")); + actionsBox->Add(newProjectbt, 0, wxALL, 20); + wxButton* openProjectbt = new wxButton(this, ID_BUTTON_OPENPROJECT, _T("Open Project (source/binaries)")); openProjectbt->SetToolTip(wxT("Open an existing crea project from its binaries or its sources.")); - actionsPanelSizer->Add(openProjectbt, 0, wxRIGHT | wxLEFT, 20); + actionsBox->Add(openProjectbt, 0, wxALL, 20); - actionsPanel->SetSizer(actionsPanelSizer); - actionsPanelSizer->Fit(actionsPanel); - actionsBox->Add(actionsPanel, 0, wxALIGN_CENTER | wxALL, 10); - sizer -> Add(actionsBox, 0, wxEXPAND | wxALL, 20); + //actionsPanel->SetSizer(actionsPanelSizer); + //actionsPanelSizer->Fit(actionsPanel); + + //actionsBox->Add(actionsPanel, 0,wxEXPAND | wxALIGN_CENTER | wxALL, 10); + sizer -> Add(actionsBox, 0, wxALIGN_CENTER | wxALL, 20); //Asign sizer sizer->SetSizeHints(this); SetSizer(sizer); - + sizer->Fit(this); if(((wxCDMMainFrame*)this->GetParent())->isHelp()) { wxDialog* helpDialog = new wxCDMMainHelpDialog(this->GetParent(), this, wxID_ANY); -- 2.47.1