Changeset 259 in PSPA

Timestamp:

Jan 21, 2013, 6:40:27 PM (12 years ago)

Author:

garnier

Message:

refactoring

Location:

Interface_Web/trunk/pspaWT

Files:

• htdocs (moved) (moved from Interface_Web/trunk/pspaWT/documents)
• htdocs/pspa.css (modified) (6 diffs)
• sources/controler/src/nomdElements.cc (modified) (1 diff)
• sources/userInterface/src/GWt_ligneFaisceau.cc (modified) (1 diff)
• sources/userInterface/src/GWt_pspaApplication.cc (modified) (2 diffs)

Interface_Web/trunk/pspaWT/htdocs/pspa.css

@@ -4 +4 @@
 
 body {
-    background: url("../icons/fond.jpg") repeat fixed left top / 100% auto #FFFFFF;
+    background: url("fond.jpg") repeat fixed left top / 100% auto #FFFFFF;
 }
 
@@ -12 +12 @@
 
 .elementLigneFaiseau_line {
-  background-image : url("../icons/line.gif");
+  background-image : url("line.gif");
   background-repeat : repeat-x;
 }
 
 .elementLigneFaiseau_arrow {
-  background-image : url("../icons/arrow.gif");
+  background-image : url("arrow.gif");
   background-repeat : no-repeat;
   float: right;
@@ -23 +23 @@
 
 .saveButton {
-  background-image : url("../icons/save.png");
+  background-image : url("save.png");
   background-repeat : no-repeat;
   background-size : 100% 100%;
@@ -29 +29 @@
 
 .restoreButton {
-  background-image : url("../icons/restore.png");
+  background-image : url("restore.png");
   background-repeat : no-repeat;
   background-size : 100% 100%;
@@ -35 +35 @@
 
 .loadNewButton {
-  background-image : url("../icons/open.png");
+  background-image : url("open.png");
   background-repeat : no-repeat;
   background-size : 100% 100%;
@@ -41 +41 @@
 
 .histoButton {
-  background-image : url("../icons/histo.png");
+  background-image : url("histo.png");
   background-repeat : no-repeat;
   background-size : 100% 100%;

Interface_Web/trunk/pspaWT/sources/controler/src/nomdElements.cc

@@ -47 +47 @@
 {
   switch(eType) {
-  case beam : return string("icons/beam.jpg"); break;
-  case RFgun : return string("icons/rfgun.jpg"); break;
-  case drift : return string("icons/drift.jpg"); break;
-  case cell : return string("icons/cell.jpg"); break;
-  case bend : return string("icons/bend.jpg"); break;
-  case soleno :  return string("icons/lens.jpg"); break;
-  case fit :  return string("icons/fit.jpg"); break;
+  case beam : return string("htdocs/beam.jpg"); break;
+  case RFgun : return string("htdocs/rfgun.jpg"); break;
+  case drift : return string("htdocs/drift.jpg"); break;
+  case cell : return string("htdocs/cell.jpg"); break;
+  case bend : return string("htdocs/bend.jpg"); break;
+  case soleno :  return string("htdocs/lens.jpg"); break;
+  case fit :  return string("htdocs/fit.jpg"); break;
   default : return string("");
   }

Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_ligneFaisceau.cc

@@ -25 +25 @@
   ligneFaisceauLayout_ = new WHBoxLayout();
   //  decorationStyle().setBackgroundColor (WColor(245,245,245)); 
-  decorationStyle().setBackgroundImage (WApplication::appRoot()+"/icons/background.png");
+  decorationStyle().setBackgroundImage (WApplication::appRoot()+"/htdocs/background.png");
   setLayout(ligneFaisceauLayout_);
 

Interface_Web/trunk/pspaWT/sources/userInterface/src/GWt_pspaApplication.cc

@@ -55 +55 @@
   // include the styleSheet
   WContainerWidget *widroot = root();
-  useStyleSheet ("include/pspa.css");
+  useStyleSheet ("htdocs/pspa.css");
   dtmanage_ = new dataManager();
 
@@ -108 +108 @@
   WContainerWidget * layoutContainer = new WContainerWidget();
   layoutContainer->setLayout(toolbarLayout);
-  layoutContainer->decorationStyle().setBackgroundImage ("/icons/fond_toolbar.png");
+  layoutContainer->decorationStyle().setBackgroundImage ("/htdocs/fond_toolbar.png");
   layout->addWidget(layoutContainer, 1, 0, 1, 2);
   layout->addWidget(createPalette(), 2, 0, 4, 1);