Changeset 246 in PSPA

Timestamp:

Jan 19, 2013, 3:37:31 PM (12 years ago)

Author:

garnier

Message:

Ajout d'icones pour la toolbar et d'un fond sur le programme

Location:

Interface_Web/trunk/pspaWT

Files:

• History (modified) (1 diff)
• icons/fond_toolbar.png (added)
• icons/histo.png (added)
• icons/open.png (added)
• icons/patienter.gif (added)
• icons/restore.png (added)
• icons/save.png (added)
• include/pspa.css (modified) (1 diff)
• src/GWt_dropZoneLigneFaiseau.cc (modified) (2 diffs)
• src/GWt_pspaApplication.cc (modified) (2 diffs)

Interface_Web/trunk/pspaWT/History

@@ -5 +5 @@
      PSPA - Plateforme de simulation en physique des accélérateurs
      =========================================================
+
+19 Janvier 2012  Laurent Garnier
+- Ajout d'icones pour la toolbar et d'un fond sur le programme
 
 18 Janvier 2012  Laurent Garnier

Interface_Web/trunk/pspaWT/include/pspa.css

@@ -5 +5 @@
     background: url("../icons/fond.jpg") repeat fixed left top / 100% auto #FFFFFF;
 }
+
+toolbar {
+    background: url("../icons/fond_toolbar.png") repeat fixed left top / 100% 100% #FFFFFF;
+}
+
+#Wt-btn {
+   background-repeat: no;
+}

Interface_Web/trunk/pspaWT/src/GWt_dropZoneLigneFaiseau.cc

@@ -11 +11 @@
 #include <Wt/WHBoxLayout>
 #include <Wt/WGridLayout>
+#include <Wt/WLength>
+#include <Wt/WVBoxLayout>
+
 
 GWt_dropZoneLigneFaiseau::GWt_dropZoneLigneFaiseau(PspaApplication* ps,bool linkImageOk, bool showInsertMessage)
@@ -33 +36 @@
   decorationStyle().setBorder (WBorder (WBorder::Dotted));
 
-    /*  WContainerWidget* insertMessage_ = new WContainerWidget();
-  WGridLayout *textGridLayout = new WGridLayout();
-
-  WText* insertMessageText = new WText("Drag elements here",insertMessage_);
-
-  insertMessageText->decorationStyle().setBorder (WBorder (WBorder::Dashed));
-  decorationStyle().setBorder (WBorder (WBorder::Dotted));
-
-  textGridLayout->addWidget(new WText("z "),0,0);
-  textGridLayout->addWidget(insertMessageText,1,0);
-  textGridLayout->addWidget(new WText(" z"),2,0);
-  insertMessage_->setLayout(textGridLayout);
-
-  insertMessage_->setContentAlignment(  Wt::AlignCenter |Wt::AlignMiddle );     
-  textGridLayout->setRowStretch(0, 10);
-  textGridLayout->setRowStretch(2, 10);
-  insertMessage_->resize(WLength::Auto, 600);
-
-*/
     WText* insertMessage_ = new WText("Drag elements here");
-    setContentAlignment(        Wt::AlignCenter |Wt::AlignMiddle );
-    addWidget(insertMessage_);
+
+    WVBoxLayout* fit = new WVBoxLayout();
+    fit->addWidget(insertMessage_,1,Wt::AlignCenter |Wt::AlignMiddle);
+    setLayout(fit);
+
   if (linkImageOk) {
     linkImage_ = new WImage("icons/link.jpg");

Interface_Web/trunk/pspaWT/src/GWt_pspaApplication.cc

@@ -64 +64 @@
 
   WHBoxLayout *toolbarLayout = new WHBoxLayout();
-  WPushButton* boutonSauve = new WPushButton(" sauvegarder la config");
-  WPushButton* boutonRestaure = new WPushButton(" restaurer la config");
-  WPushButton* boutonLoadNew = new WPushButton(" upload config");
-  WPushButton* boutongraphicalAnalysis = new WPushButton("analyse graphique");
-  boutonSauve->setMinimumSize(30,30);
-  boutonRestaure->setMinimumSize(30,30);
-  //  boutonLoadNew->setMinimumSize(30,30);
+    
+  WPushButton* boutonSauve = new WPushButton();
+  WPushButton* boutonRestaure = new WPushButton();
+  WPushButton* boutonLoadNew = new WPushButton();
+  WPushButton* boutongraphicalAnalysis = new WPushButton();
+
+  boutonSauve->decorationStyle().setBackgroundImage (WApplication::appRoot()+"../icons/save.png");
+//  boutonSauve->setIcon ("../icons/save.png");
+  boutonRestaure->decorationStyle().setBackgroundImage (WApplication::appRoot()+"../icons/restore.png");
+  boutonLoadNew->decorationStyle().setBackgroundImage (WApplication::appRoot()+"../icons/open.png");
+  boutongraphicalAnalysis->decorationStyle().setBackgroundImage (WApplication::appRoot()+"../icons/histo.png");
+
+  boutonSauve->setToolTip ("sauvegarder la config");
+  boutonRestaure->setToolTip (" restaurer la config");
+  boutonLoadNew->setToolTip ("upload config");
+  boutongraphicalAnalysis->setToolTip ("analyse graphique");
+
+  boutonSauve->setMaximumSize(38,38);
+  boutonSauve->setMinimumSize(38,38);
+  boutonRestaure->setMaximumSize(38,38);
+  boutonRestaure->setMinimumSize(38,38);
+  boutonLoadNew->setMaximumSize(38,38);
+  boutonLoadNew->setMinimumSize(38,38);
+  boutongraphicalAnalysis->setMaximumSize(38,38);
+  boutongraphicalAnalysis->setMinimumSize(38,38);
   
   boutonSauve->clicked().connect(this, &PspaApplication::sauver);
@@ -81 +99 @@
 
 
-  toolbarLayout->addWidget(boutonSauve , 1);
-  toolbarLayout->addWidget(boutonRestaure , 1);
-  toolbarLayout->addWidget(boutonLoadNew , 1);
-  toolbarLayout->addWidget(boutongraphicalAnalysis , 1);
-
-  layout->addLayout(toolbarLayout, 1, 0, 1, 2);
+  toolbarLayout->addWidget(boutonSauve , 0,Wt::AlignMiddle);
+  toolbarLayout->addWidget(boutonRestaure , 0,Wt::AlignMiddle);
+  toolbarLayout->addWidget(boutonLoadNew , 0,Wt::AlignMiddle);
+  toolbarLayout->addWidget(boutongraphicalAnalysis , 0,Wt::AlignMiddle);
+  toolbarLayout->addWidget(new WText("") , 1,Wt::AlignMiddle);
+
+  WContainerWidget * layoutContainer = new WContainerWidget();
+  layoutContainer->setLayout(toolbarLayout);
+  layoutContainer->decorationStyle().setBackgroundImage (WApplication::appRoot()+"../icons/fond_toolbar.png");
+  layout->addWidget(layoutContainer, 1, 0, 1, 2);
   layout->addWidget(createPalette(), 2, 0, 4, 1);