Changeset 147 in PSPA for Interface_Web/trunk

Timestamp:

Dec 6, 2012, 4:43:31 PM (12 years ago)

Author:

garnier

Message:

amelioration du dialog

Location:

Interface_Web/trunk/pspaWT

Files:

• include/GWt_dialog.h (modified) (1 diff)
• src/GWt_dialog.cc (modified) (1 diff)
• src/GWt_pspaApplication.cc (modified) (6 diffs)

Interface_Web/trunk/pspaWT/include/GWt_dialog.h

@@ -12 +12 @@
  public :
 
-  GWt_dialog(WString titre, std::string message, bool modal=false, bool patienter=false, bool ok=false);
- 
+  enum  iconType { Warning, Error, Info, Wait, NoIcon }; 
+
+  GWt_dialog(WString titre, std::string message, iconType icon=NoIcon, bool modal=false, bool ok=false);
 };
 #endif

Interface_Web/trunk/pspaWT/src/GWt_dialog.cc

@@ -3 +3 @@
 #include <Wt/WText>
 #include <Wt/WBreak>
+#include <Wt/WHBoxLayout>
 #include <Wt/WPushButton>
 #include "GWt_dialog.h"
 
-GWt_dialog::GWt_dialog(WString titre, std::string message, bool modal, bool patienter,bool ok):
+GWt_dialog::GWt_dialog(
+ WString titre,
+ std::string message,
+ iconType icon,
+ bool modal,
+ bool ok
+):
   WDialog(titre)
 {
 
-  // changement des "\n" par des <br>
-  size_t pos = message.find("\n", 0);
+  WContainerWidget* widgt = new WContainerWidget(contents());
+  WHBoxLayout* hLayout = new WHBoxLayout();
+  
+  WImage* tImg = new WImage("icons/error.png");
+  switch (icon) {
+  case Warning:
+    tImg->setImageLink ("icons/warning.png");
+    tImg->setMaximumSize (70,70);
+    hLayout->addWidget(tImg);
+    break;
+  case Error:
+    tImg->setImageLink ("icons/error.png");
+    tImg->setMaximumSize (70,70);
+    hLayout->addWidget(tImg);
+    break;
+  case Info:
+    tImg->setImageLink ("icons/info.png");
+    tImg->setMaximumSize (70,70);
+    hLayout->addWidget(tImg);
+    break;
+  case Wait:
+    tImg->setImageLink ("icons/patienter.gif");
+    tImg->setMaximumSize (70,70);
+    hLayout->addWidget(tImg);
+    break;
+  case NoIcon:
+    break;
+  default:
+    break;
+  }
 
-  while(pos != std::string::npos) {
-    new Wt::WText(message.substr(0,pos),contents());
-    message = message.substr(pos+1);
-    pos = message.find("\n");
-    new Wt::WBreak(contents());
-  }
-  new Wt::WText(message,contents());
+ WContainerWidget* right = new WContainerWidget();
+ WVBoxLayout* vLayout = new WVBoxLayout();
+ 
+ // changement des "\n" par des <br>
+ size_t pos = message.find("\n", 0);
+ 
+ while(pos != std::string::npos) {
+   vLayout->addWidget(new Wt::WText(message.substr(0,pos),widgt));
+   message = message.substr(pos+1);
+   pos = message.find("\n");
+   vLayout->addWidget(new Wt::WBreak());
+ }
+ vLayout->addWidget(new Wt::WText(message));
+ 
+ 
+ if (ok) {
+   vLayout->addWidget(new Wt::WBreak);
+   
+   Wt::WPushButton *ok = new Wt::WPushButton("Ok");
+   vLayout->addWidget(ok);
+   
+   // this event will accept() the Dialog
+   ok->clicked().connect(this, &Wt::WDialog::accept); 
+ }
+ 
+ right->setLayout(vLayout);
+ hLayout->addWidget(right);
 
-  if (patienter) {
-    new WImage("icons/patienter.gif",contents());
-  }
-  if (ok) {
-    new Wt::WBreak(contents());
-    
-    Wt::WPushButton *ok = new Wt::WPushButton("Ok", contents());
-    
-    // this event will accept() the Dialog
-    ok->clicked().connect(this, &Wt::WDialog::accept); 
-  }
-  setModal (modal);
+ widgt->setLayout(hLayout);
+
+ setModal (modal);
 }
 

Interface_Web/trunk/pspaWT/src/GWt_pspaApplication.cc

@@ -318 +318 @@
         {
           addConsoleMessage(" bad section definition !  \n ");
-          GWt_dialog warningDialog("PSPA : Vérification des sections", " bad section definition !", true,false,true);
+          GWt_dialog warningDialog("PSPA : Vérification des sections", " bad section definition !", GWt_dialog::Error,true,true);
           warningDialog.exec();
           return;
@@ -332 +332 @@
         {
           addConsoleMessage(" bad section definition !  \n ");
-          GWt_dialog warningDialog("PSPA : Vérification des sections", " bad section definition !", true,false,true);
+          GWt_dialog warningDialog("PSPA : Vérification des sections", " bad section definition !", GWt_dialog::Error, true,true);
           warningDialog.exec();
           return;
@@ -343 +343 @@
 
   if (!areDataCoherent()) {
-    GWt_dialog warningDialog("PSPA : Vérification des sections", " données incohérentes !", true,false,true);
+    GWt_dialog warningDialog("PSPA : Vérification des sections", " données incohérentes !", GWt_dialog::Error,true,true);
     warningDialog.exec();
   }
@@ -375 +375 @@
       caMarche = false; 
       addConsoleMessage(diagnostic.c_str());
-      GWt_dialog calculDialog("PSPA : Erreur lors de check execute", diagnostic, true,false,true);
+      GWt_dialog calculDialog("PSPA : Erreur lors de check execute", diagnostic , GWt_dialog::Error,true,true);
       calculDialog.exec();
     }
@@ -396 +396 @@
   static_cast<GWt_globalParameters*>(globalParam_)->updateGlobals();
 
-  GWt_dialog calculDialog("Calcul en cours", "Veuillez patienter...", false,true);
+  GWt_dialog calculDialog("Calcul en cours", "Veuillez patienter...", GWt_dialog::Error, true,false);
   calculDialog.show();
 
@@ -403 +403 @@
   string resultat;
   if ( !dtmanage_->executeAll(resultat)) {
-    GWt_dialog warningDialog("PSPA : Echec", " echec lors de l'exécution !", true,false,true);
+    GWt_dialog warningDialog("PSPA : Echec", " echec lors de l'exécution !", GWt_dialog::Error, true,true);
     warningDialog.exec();
   }