Changeset 174 in PSPA

Timestamp:

Dec 12, 2012, 12:03:54 PM (12 years ago)

Author:

garnier

Message:

ajout de fileselecteur, manque quelques petits details

Location:

Interface_Web/trunk/pspaWT

Files:

• include/GWt_dialog.h (modified) (2 diffs)
• include/GWt_pspaApplication.h (modified) (2 diffs)
• src/GWt_LigneFaisceau.cc (modified) (1 diff)
• src/GWt_dialog.cc (modified) (2 diffs)
• src/GWt_pspaApplication.cc (modified) (3 diffs)

Interface_Web/trunk/pspaWT/include/GWt_dialog.h

@@ -4 +4 @@
 #include <Wt/WDialog>
 #include <Wt/WString>
+#include <Wt/WContainerWidget>
 
 using namespace Wt;
@@ -22 +23 @@
   enum  iconType { Warning, Error, Info, Wait, NoIcon }; 
 
+  /** Add a dialog with the given container inside
+      @param titre: A title displayed on the window title bar
+      @param message: The message inside this dialog
+      @param container: a valid WContainer
+  */
+  GWt_dialog(WString titre, WContainerWidget* container, bool modal=false);
+
+  /** Add a full dialog window configure with title, message, iconType and button
+      @param titre: A title displayed on the window title bar
+      @param message: The message inside this dialog
+      @param icon: IconType, could be Warning, Error, Info, Wait or NoIcon
+      @param modal: true for a blocking dialog, false for a non-blocking dialog
+      @param okButton: true if you want a "ok" button at the end
+  */
   GWt_dialog(WString titre, std::string message, iconType icon=NoIcon, bool modal=false, bool okButton=false);
 };

Interface_Web/trunk/pspaWT/include/GWt_pspaApplication.h

@@ -46 +46 @@
  WContainerWidget* contenuSections_;
  list<GWt_sectionToExecute*> selectedSections_;
+ WFileUpload* uploadFileSelectorWidget;
 
  WText*   createTitle(const WString&);
@@ -59 +60 @@
  void restaurer();
  void chargerConfig();
+ void openFileSelector();
  void dessiner();
 

Interface_Web/trunk/pspaWT/src/GWt_LigneFaisceau.cc

@@ -126 +126 @@
 
   message_= new GWt_dialog("Question","Are you sure you want to delete the selected item?",GWt_dialog::Warning,true,true);
-  message_->setClosable(true);
 
   WSignalMapper<GWt_abstractElement *> *MyMap = new WSignalMapper<GWt_abstractElement *>(this);

Interface_Web/trunk/pspaWT/src/GWt_dialog.cc

@@ -7 +7 @@
 #include <Wt/WCssDecorationStyle>
 #include "GWt_dialog.h"
+
+GWt_dialog::GWt_dialog(
+ WString titre,
+ WContainerWidget* wc,
+ bool modal
+):
+  WDialog(titre)
+{
+
+  // change the title bar style
+  titleBar()->decorationStyle().setBackgroundColor (WColor(70,180,220)); 
+  
+  WContainerWidget* widgt = new WContainerWidget(contents());
+  widgt->addWidget(wc);
+  
+  setClosable(true);
+  setModal (modal); 
+}
+
+
 
 GWt_dialog::GWt_dialog(
@@ -82 +102 @@
  widgt->setLayout(hLayout);
 
+ setClosable(true);
  setModal (modal);
 }

Interface_Web/trunk/pspaWT/src/GWt_pspaApplication.cc

@@ -63 +63 @@
   //  boutonLoadNew->setMinimumSize(30,30);
   
-  //  uploadWidget = new WFileUpload(w);
-  WContainerWidget *result = new WContainerWidget();
-  WFileUpload *const uploadWidget = new WFileUpload(result);
-  uploadWidget->setFileTextSize(40);
-  
   // Upload when the button is clicked.
-  boutonLoadNew->clicked().connect(uploadWidget, &WFileUpload::upload);
-  //  boutonLoadNew->clicked().connect(boutonLoadNew, &Wt::WPushButton::disable);
-
-  // Upload automatically when the user entered a file.
-  uploadWidget->changed().connect(uploadWidget, &WFileUpload::upload);
-  //  uploadWidget->changed().connect(boutonLoadNew, &Wt::WPushButton::disable);
-
   // React to a succesfull upload.
-  uploadWidget->uploaded().connect(this, &PspaApplication::chargerConfig);
-  
-  // React to a fileupload problem.
-  //  upload->fileTooLarge().connect(this, &MyWidget::fileTooLarge);
-
+  boutonLoadNew->clicked().connect(this, &PspaApplication::openFileSelector);
 
 
@@ -88 +72 @@
   toolbarLayout->addWidget(boutonRestaure , 1);
   toolbarLayout->addWidget(boutonLoadNew , 1);
-  toolbarLayout->addWidget(result , 1);
   boutonSauve->clicked().connect(this, &PspaApplication::sauver);
   boutonRestaure->clicked().connect(this, &PspaApplication::restaurer);
@@ -476 +459 @@
 }
 
+
+void PspaApplication::openFileSelector()
+{
+
+  WContainerWidget *result = new WContainerWidget();
+  uploadFileSelectorWidget = new WFileUpload(result);
+  uploadFileSelectorWidget->setFileTextSize(40);
+  
+  // Upload automatically when the user entered a file.
+  uploadFileSelectorWidget->changed().connect(uploadFileSelectorWidget, &WFileUpload::upload);
+  //  uploadFileSelectorWidget->changed().connect(boutonLoadNew, &Wt::WPushButton::disable);
+  
+  // React to a succesfull upload.
+  uploadFileSelectorWidget->uploaded().connect(this, &PspaApplication::chargerConfig);
+  
+  // React to a fileupload problem.
+  //...  upload->fileTooLarge().connect(this, &MyWidget::fileTooLarge);
+  
+  
+  GWt_dialog* fileSelectorDialog = new GWt_dialog("Load a file",result,false);
+  
+  fileSelectorDialog->exec();
+}
+
+
 void PspaApplication::chargerConfig()
 {
-//   std::string filename = uploadWidget->spoolFileName();
-//   addConsoleMessage(string("chargement de la configuration...:"+filename));
-}
+  GWt_dialog*  message= new GWt_dialog("Info","The file has been correctly upload to" + uploadFileSelectorWidget->spoolFileName(),GWt_dialog::Warning,false,true);
+  
+  message->show();
+}
+
 
 void PspaApplication::faireDessin()