X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcreaDevManagerLib%2FwxCDMNewProjectDialog.cpp;h=c3066a79be64f2741c28682a0db193f2d8cecca0;hb=35dd4d1ddf73a91d308cc49fc394104169936055;hp=6a33d26280652f931bc58c8cc5c9590ca72cfb6f;hpb=17824854619941a12697fea8524f4218f9a14ef9;p=crea.git

diff --git a/lib/creaDevManagerLib/wxCDMNewProjectDialog.cpp b/lib/creaDevManagerLib/wxCDMNewProjectDialog.cpp
index 6a33d26..c3066a7 100644
--- a/lib/creaDevManagerLib/wxCDMNewProjectDialog.cpp
+++ b/lib/creaDevManagerLib/wxCDMNewProjectDialog.cpp
@@ -2,8 +2,10 @@
 # ---------------------------------------------------------------------
 #
 # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
-#                        pour la Santé)
+#                        pour la Sant�)
 # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
 #
 #  This software is governed by the CeCILL-B license under French law and 
 #  abiding by the rules of distribution of free software. You can  use, 
@@ -20,14 +22,15 @@
 #
 #  The fact that you are presently reading this means that you have had
 #  knowledge of the CeCILL-B license and that you accept its terms.
-# ------------------------------------------------------------------------ */ 
+# ------------------------------------------------------------------------ 
+*/ 
 
 
 /*
  * wxCDMNewProjectDialog.cpp
  *
  *  Created on: 13/11/2012
- *      Author: daniel
+ *      Author: Daniel Felipe Gonzalez Obando
  */
 
 #include "wxCDMNewProjectDialog.h"
@@ -94,10 +97,10 @@ void wxCDMNewProjectDialog::CreateControls()
   wxBoxSizer* v_sizer1 = new wxBoxSizer(wxVERTICAL);
 
 
-  wxStaticText* title = new wxStaticText(this, wxID_ANY, wxString("Create a new project"), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT);//new wxRichTextCtrl(this,wxID_ANY, wxString("Create a new project"), wxDefaultPosition, wxDefaultSize, wxRE_READONLY);
+  wxStaticText* title = new wxStaticText(this, wxID_ANY, wxT("Create a new project"), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT);//new wxRichTextCtrl(this,wxID_ANY, wxString("Create a new project"), wxDefaultPosition, wxDefaultSize, wxRE_READONLY);
   v_sizer1->Add(title, 0, wxALIGN_LEFT | wxALL | wxALIGN_CENTER_VERTICAL, 5);
 
-  wxStaticText* instruction = new wxStaticText(this, wxID_ANY, wxString("Please fill the following details."), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT);
+  wxStaticText* instruction = new wxStaticText(this, wxID_ANY, wxT("Please fill the following details."), wxDefaultPosition, wxDefaultSize, wxALIGN_LEFT);
   v_sizer1->Add(instruction, 0, wxALIGN_LEFT | wxALL | wxALIGN_CENTER_VERTICAL, 5);
 
   wxFlexGridSizer* formItems = new wxFlexGridSizer(4,2,9,15);
@@ -108,8 +111,8 @@ void wxCDMNewProjectDialog::CreateControls()
   wxStaticText *stxtPrjPkg = new wxStaticText(this, -1, wxT("Default Package's Description (HTML)"));
 
   wxBoxSizer* h_sizer1 = new wxBoxSizer(wxHORIZONTAL);
-  wxButton *ddPrjLocBtn = new wxButton(this, ID_BUTTON_CHOOSE, wxString("Choose directory..."));
-  this->projectLocation = new wxStaticText(this, -1, wxString(""));
+  wxButton *ddPrjLocBtn = new wxButton(this, ID_BUTTON_CHOOSE, wxT("Choose directory..."));
+  this->projectLocation = new wxStaticText(this, -1, wxT(""));
   h_sizer1->Add(ddPrjLocBtn,0,wxALIGN_LEFT | wxLEFT | wxALIGN_CENTER_VERTICAL, 5);
   h_sizer1->Add(this->projectLocation,0,wxALIGN_LEFT | wxLEFT | wxALIGN_CENTER_VERTICAL, 5);
   h_sizer1->SetMinSize(wxSize(150, 20));
@@ -133,32 +136,32 @@ void wxCDMNewProjectDialog::CreateControls()
   v_sizer1->Add(formItems, 1, wxEXPAND | wxALL, 15);
 
   wxBoxSizer* h_sizer2 = new wxBoxSizer(wxHORIZONTAL);
-  h_sizer2->Add(new wxButton(this, ID_BUTTON_NEXT, wxString("Create Project")), 0, wxALL | wxALIGN_CENTER_VERTICAL, 5);
-  h_sizer2->Add(new wxButton(this, ID_BUTTON_CANCEL, wxString("Cancel")), 0, wxALL | wxALIGN_CENTER_VERTICAL, 5);
+  h_sizer2->Add(new wxButton(this, ID_BUTTON_NEXT, wxT("Create Project")), 0, wxALL | wxALIGN_CENTER_VERTICAL, 5);
+  h_sizer2->Add(new wxButton(this, ID_BUTTON_CANCEL, wxT("Cancel")), 0, wxALL | wxALIGN_CENTER_VERTICAL, 5);
 
   v_sizer1->Add(h_sizer2, 0, wxALIGN_RIGHT | wxRIGHT | wxBOTTOM | wxALIGN_CENTER_VERTICAL, 30);
 
   SetSizer(v_sizer1);
-  v_sizer1->SetSizeHints(this);
+  //v_sizer1->RecalcSizes();
 }
 
 void wxCDMNewProjectDialog::OnCreateProject(wxCommandEvent& event)
 {
   bool ready = true;
 
-  if(ready && this->projectName->GetValue() == wxString(""))
+  if(ready && this->projectName->GetValue() == wxT(""))
     {
-      wxMessageBox(wxString("The project name cannot be empty"),_T("Error"),wxOK | wxICON_ERROR);
+      wxMessageBox(wxT("The project name cannot be empty"),_T("Error"),wxOK | wxICON_ERROR);
       ready = false;
     }
-  if(ready && this->projectLocation->GetLabel() == wxString(""))
+  if(ready && this->projectLocation->GetLabel() == wxT(""))
     {
-      wxMessageBox(wxString("The project location cannot be empty"),_T("Error"),wxOK | wxICON_ERROR);
+      wxMessageBox(wxT("The project location cannot be empty"),_T("Error"),wxOK | wxICON_ERROR);
       ready = false;
     }
-  if(ready && this->packageAuthor->GetValue() == wxString(""))
+  if(ready && this->packageAuthor->GetValue() == wxT(""))
     {
-      wxMessageBox(wxString("The project's author cannot be empty"),_T("Error"),wxOK | wxICON_ERROR);
+      wxMessageBox(wxT("The project's author cannot be empty"),_T("Error"),wxOK | wxICON_ERROR);
       ready = false;
     }
 
@@ -178,7 +181,7 @@ void wxCDMNewProjectDialog::OnCancel(wxCommandEvent& event)
 
 void wxCDMNewProjectDialog::OnChooseLocation(wxCommandEvent& event)
 {
-  wxDirDialog* dialog = new wxDirDialog(this, "Choose the location of the new project");
+  wxDirDialog* dialog = new wxDirDialog(this, wxT("Choose the location of the new project"));
   dialog->ShowModal();
   this->projectLocation->SetLabel(dialog->GetPath());
   this->Update();