Changeset 399 in PSPA for Interface_Web/branches/12_03_12-managerComboBox/pspaWT/sources/userInterface/src/GWt_sectionToExecute.cc

Timestamp:

Mar 27, 2013, 5:14:47 PM (11 years ago)

Author:

garnier

Message:

Mise en place des comboBox et changement de l'aspect visuel

File:

• Interface_Web/branches/12_03_12-managerComboBox/pspaWT/sources/userInterface/src/GWt_sectionToExecute.cc (modified) (7 diffs)

Interface_Web/branches/12_03_12-managerComboBox/pspaWT/sources/userInterface/src/GWt_sectionToExecute.cc

@@ -2 +2 @@
 #include <Wt/WVBoxLayout>
 #include <Wt/WHBoxLayout>
+#include <Wt/WGridLayout>
 #include <Wt/WContainerWidget>
 #include <Wt/WImage>
@@ -15 +16 @@
 softwarePanel(sPanel)
 {
-    Wt::WHBoxLayout* mainContainerLayout = new Wt::WHBoxLayout();
+    Wt::WGridLayout* mainContainerLayout = new Wt::WGridLayout();
     mainContainerLayout->setContentsMargins(0,0,0,0);
 
@@ -26 +27 @@
     labelAndComboInsideContainerLayout->setContentsMargins(0,0,0,0);
     
-    labelAndComboInsideContainerLayout->addWidget(new Wt::WText(" from : "));
+    labelAndComboInsideContainerLayout->addWidget(new Wt::WText("from&nbsp;:&nbsp;"));
     labelAndComboInsideContainerLayout->addWidget(first);
-    labelAndComboInsideContainerLayout->addWidget(new Wt::WText(" to : "));
+    labelAndComboInsideContainerLayout->addWidget(new Wt::WText("to&nbsp;:&nbsp;"));
     labelAndComboInsideContainerLayout->addWidget(last);
     labelAndComboInsideContainerLayout->addWidget(soft);
@@ -39 +40 @@
     labelAndComboContainer->setLayout(labelAndComboContainerLayout);
     
-    // add label and Combo containers
-    mainContainerLayout->addWidget(labelAndComboContainer);
-
             
     // add errors and warning layout
@@ -48 +46 @@
 
     Wt::WContainerWidget* warningsAndErrorsContainer = new Wt::WContainerWidget();
-    Wt::WVBoxLayout* vLayoutContainer = new Wt::WVBoxLayout();
-
-    vLayoutContainer->addWidget(warningsContainer_);
-    vLayoutContainer->addWidget(errorsContainer_);
-    vLayoutContainer->addStretch (100);
+    Wt::WVBoxLayout* vWarningsAndErrorsLayoutContainer = new Wt::WVBoxLayout();
     
     Wt::WHBoxLayout* hLayoutContainerWarnings = new Wt::WHBoxLayout();
@@ -58 +52 @@
 
     
-    // fill containers
-    Wt::WImage* imgWarning = new WImage ("/htdocs/warning.png");
-    Wt::WImage* imgError = new WImage ("/htdocs/error.png");
-
-    // resize images
-    imgWarning->resize(20,20);
-    imgError->resize(20,20);
-    
-    warningsLabel_ = new Wt::WLabel("");
-    errorsLabel_ = new Wt::WLabel("");
-
-    hLayoutContainerWarnings->addWidget(imgWarning);
+    warningsLabel_ = new Wt::WText("",XHTMLText);
+    errorsLabel_ = new Wt::WText("",XHTMLText);
     hLayoutContainerWarnings->addWidget(warningsLabel_);
-    hLayoutContainerErrors->addWidget(imgError);
     hLayoutContainerErrors->addWidget(errorsLabel_);
 
@@ -82 +65 @@
     errorsContainer_->setLayout(hLayoutContainerErrors);
     
-    warningsAndErrorsContainer->setLayout(vLayoutContainer);
+    vWarningsAndErrorsLayoutContainer->addWidget(errorsContainer_);
+    vWarningsAndErrorsLayoutContainer->addWidget(warningsContainer_);
+    vWarningsAndErrorsLayoutContainer->addStretch (100);
 
+    warningsAndErrorsContainer->setLayout(vWarningsAndErrorsLayoutContainer);
+
+    // add label and Combo containers
+    mainContainerLayout->addWidget(labelAndComboContainer,0,0);
     // add warnings and errors containers
-//    mainContainerLayout->addWidget(warningsAndErrorsContainer);
+    mainContainerLayout->addWidget(warningsAndErrorsContainer,1,0);
 
-    this->setLayout(mainContainerLayout);
-    
+    // manage margins
+    vWarningsAndErrorsLayoutContainer->setContentsMargins(20,0,0,0);
+    hLayoutContainerWarnings->setContentsMargins(0,0,0,0);
+    hLayoutContainerErrors->setContentsMargins(0,0,0,0);
+
+    setLayout(mainContainerLayout);
+    warningsContainer_->setStyleClass("warningsContainer");
+    errorsContainer_->setStyleClass("errorsContainer");
+
     
     firstElement->activated().connect(softwarePanel,&GWt_softwarePanel::updateSections);