From b4f75ff78f32c8d13502f7dc0567e605c94317b0 Mon Sep 17 00:00:00 2001
From: Guillaume Pasero <guillaume.pasero@c-s.fr>
Date: Fri, 5 Jan 2018 11:06:07 +0100
Subject: [PATCH] BUG: Mantis-1494: enhance messages for user, minor UI and
translation fixes
---
.../Visualization/Mapla/src/CMakeLists.txt | 2 +-
.../Mapla/src/mvdMaplaMainWindow.qrc | 2 ++
.../Monteverdi/src/CMakeLists.txt | 2 +-
.../Monteverdi/src/mvdMainWindow.qrc | 2 ++
.../MonteverdiGui/src/mvdQtWidgetView.cxx | 29 ++++++++++------
...otbWrapperQtWidgetSimpleProgressReport.cxx | 2 ++
.../QtWidget/src/otbWrapperQtWidgetView.cxx | 4 +--
Utilities/Data/Icons/forbidden-24x24.png | Bin 0 -> 1290 bytes
i18n/fr_FR.ts | 32 ++++++++++++++++++
9 files changed, 60 insertions(+), 15 deletions(-)
create mode 100644 Utilities/Data/Icons/forbidden-24x24.png
diff --git a/Modules/Visualization/Mapla/src/CMakeLists.txt b/Modules/Visualization/Mapla/src/CMakeLists.txt
index ee5df87066..491e26857b 100644
--- a/Modules/Visualization/Mapla/src/CMakeLists.txt
+++ b/Modules/Visualization/Mapla/src/CMakeLists.txt
@@ -63,7 +63,7 @@ endif()
#############################################################################
qt4_wrap_cpp( OTBMapla_SRC_MOC ${OTBMapla_HEADERS_MOC} )
qt4_wrap_ui( OTBMapla_FORMS_HEADERS ${OTBMapla_FORMS} )
-qt4_add_resources( OTBMapla_RESOURCES_RCC ${OTBMapla_RESOURCES} )
+qt4_add_resources( OTBMapla_RESOURCES_RCC ${OTBMapla_RESOURCES} OPTIONS "-no-compress")
#############################################################################
add_to_qt4_i18n_sources( ${OTBMapla_SRCS} )
diff --git a/Modules/Visualization/Mapla/src/mvdMaplaMainWindow.qrc b/Modules/Visualization/Mapla/src/mvdMaplaMainWindow.qrc
index 83448295fd..8bfc273128 100644
--- a/Modules/Visualization/Mapla/src/mvdMaplaMainWindow.qrc
+++ b/Modules/Visualization/Mapla/src/mvdMaplaMainWindow.qrc
@@ -12,6 +12,8 @@
<file alias="action_ZoomOut_Icon">../../../../Utilities/Data/Icons/action-zoomout_24x24.png</file>
<file alias="action_ZoomFull_Icon">../../../../Utilities/Data/Icons/action-zoomtolayer_24x24.png</file>
<file alias="action_Open_Icon">../../../../Utilities/Data/Icons/document-open_32x32.png</file>
+ <file alias="done">../../../../Utilities/Data/Icons/check_24x24.png</file>
+ <file alias="failed">../../../../Utilities/Data/Icons/forbidden-24x24.png</file>
</qresource>
<qresource prefix="/images">
<file alias="application_icon">../../../../Utilities/Data/Icons/monteverdi-128x128.png</file>
diff --git a/Modules/Visualization/Monteverdi/src/CMakeLists.txt b/Modules/Visualization/Monteverdi/src/CMakeLists.txt
index 6b450c1066..87a9ffe6d3 100644
--- a/Modules/Visualization/Monteverdi/src/CMakeLists.txt
+++ b/Modules/Visualization/Monteverdi/src/CMakeLists.txt
@@ -46,7 +46,7 @@ set( OTBMonteverdi_RESOURCES
#############################################################################
qt4_wrap_cpp( OTBMonteverdi_SRC_MOC ${OTBMonteverdi_HEADERS_MOC} )
qt4_wrap_ui( OTBMonteverdi_FORMS_HEADERS ${OTBMonteverdi_FORMS} )
-qt4_add_resources( OTBMonteverdi_RESOURCES_RCC ${OTBMonteverdi_RESOURCES} )
+qt4_add_resources( OTBMonteverdi_RESOURCES_RCC ${OTBMonteverdi_RESOURCES} OPTIONS "-no-compress")
#############################################################################
add_to_qt4_i18n_sources( ${OTBMonteverdi_SRCS} )
diff --git a/Modules/Visualization/Monteverdi/src/mvdMainWindow.qrc b/Modules/Visualization/Monteverdi/src/mvdMainWindow.qrc
index dfd8f7d286..aa3845538e 100644
--- a/Modules/Visualization/Monteverdi/src/mvdMainWindow.qrc
+++ b/Modules/Visualization/Monteverdi/src/mvdMainWindow.qrc
@@ -22,6 +22,8 @@
<file alias="action_ZoomOut_Icon">../../../../Utilities/Data/Icons/action-zoomout_24x24.png</file>
<file alias="action_ZoomLayer_Icon">../../../../Utilities/Data/Icons/action-zoomtolayer_24x24.png</file>
<file alias="action_Open_Icon">../../../../Utilities/Data/Icons/document-open_32x32.png</file>
+ <file alias="done">../../../../Utilities/Data/Icons/check_24x24.png</file>
+ <file alias="failed">../../../../Utilities/Data/Icons/forbidden-24x24.png</file>
</qresource>
<qresource prefix="/images">
<file alias="application_icon">../../../../Utilities/Data/Icons/monteverdi-128x128.png</file>
diff --git a/Modules/Visualization/MonteverdiGui/src/mvdQtWidgetView.cxx b/Modules/Visualization/MonteverdiGui/src/mvdQtWidgetView.cxx
index 264b33d4bd..3c33015a5b 100644
--- a/Modules/Visualization/MonteverdiGui/src/mvdQtWidgetView.cxx
+++ b/Modules/Visualization/MonteverdiGui/src/mvdQtWidgetView.cxx
@@ -187,20 +187,19 @@ QtWidgetView
// Create a VBoxLayout with the header, the input widgets, and the footer
QVBoxLayout *mainLayout = new QVBoxLayout();
QTabWidget *tab = new QTabWidget();
- tab->addTab(CreateInputWidgets(), "Parameters");
+ tab->addTab(CreateInputWidgets(), tr("Parameters"));
-
//otb::Wrapper::QtWidgetProgressReport* prog = new otb::Wrapper::QtWidgetProgressReport(m_Model);
//prog->SetApplication(m_Application);
//tab->addTab(prog, "Progress");
- tab->addTab(CreateDoc(), "Documentation");
+ tab->addTab(CreateDoc(), tr("Documentation"));
mainLayout->addWidget(tab);
QTextEdit *log = new QTextEdit();
connect( m_Model->GetLogOutput(), SIGNAL(NewContentLog(QString)), log, SLOT(append(QString) ) );
- tab->addTab(log, "Logs");
+ tab->addTab(log, tr("Logs"));
- m_Message = new QLabel("<center><font color=\"#FF0000\">Select parameters</font></center>");
+ m_Message = new QLabel("<center><font color=\"#FF0000\">"+tr("Select parameters")+"</font></center>");
connect(
m_Model,
SIGNAL( SetApplicationReady( bool ) ),
@@ -215,12 +214,16 @@ QtWidgetView
otb::Wrapper::QtWidgetSimpleProgressReport* progressReport =
new otb::Wrapper::QtWidgetSimpleProgressReport(m_Model);
progressReport->SetApplication(m_Application);
+
+ QWidget* footer = CreateFooter();
QHBoxLayout *footLayout = new QHBoxLayout;
footLayout->addWidget(progressReport);
- footLayout->addWidget(CreateFooter());
+ footLayout->addWidget(footer);
mainLayout->addLayout(footLayout);
+ footLayout->setAlignment(footer, Qt::AlignBottom);
+
QGroupBox *mainGroup = new QGroupBox();
mainGroup->setLayout(mainLayout);
@@ -617,7 +620,7 @@ QtWidgetView
emit ExecuteAndWriteOutput();
- m_Message->setText("<center><font color=\"#FF0000\">Running</font></center>");
+ m_Message->setText("<center><font color=\"#FF0000\">"+tr("Running")+"</font></center>");
}
/******************************************************************************/
@@ -627,11 +630,15 @@ QtWidgetView
{
if (status >= 0)
{
- m_Message->setText("<center><font color=\"#00A000\">DONE</font></center>");
+ m_Message->setText("<center>"
+ "<img src=\":/icons/done\" width=\"16\" height=\"16\" />"
+ "<font color=\"#00A000\">"+tr("Done")+"</font></center>");
}
else
{
- m_Message->setText("<center><font color=\"#FF0000\">FAILED !</font></center>");
+ m_Message->setText("<center>"
+ "<img src=\":/icons/failed\" width=\"16\" height=\"16\" />"
+ "<font color=\"#FF0000\">"+tr("Failed")+"</font></center>");
}
}
@@ -641,9 +648,9 @@ QtWidgetView
::UpdateMessageAfterApplicationReady( bool val )
{
if(val == true)
- m_Message->setText("<center><font color=\"#00FF00\">Ready to run</font></center>");
+ m_Message->setText("<center><font color=\"#00A000\">"+tr("Ready to run")+"</font></center>");
else
- m_Message->setText("<center><font color=\"#FF0000\">Select parameters</font></center>");
+ m_Message->setText("<center><font color=\"#FF0000\">"+tr("Select parameters")+"</font></center>");
}
/*******************************************************************************/
diff --git a/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetSimpleProgressReport.cxx b/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetSimpleProgressReport.cxx
index cb595ebe55..c8347b23d9 100644
--- a/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetSimpleProgressReport.cxx
+++ b/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetSimpleProgressReport.cxx
@@ -45,7 +45,9 @@ QtWidgetSimpleProgressReport::QtWidgetSimpleProgressReport(QtWidgetModel * model
m_AddProcessCommand->SetCallbackFunction( this, &QtWidgetSimpleProgressReport::ProcessEvent );
m_Bar = new itk::QtProgressBar(this);
+
m_Label = new QLabel("No process");
+ m_Label->setWordWrap(true);
connect( m_Bar, SIGNAL(SetValueChanged(int)), m_Bar, SLOT(setValue(int)) );
connect( m_Model, SIGNAL(SetProgressReportDone()), m_Bar, SLOT(reset()) );
diff --git a/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetView.cxx b/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetView.cxx
index 9cc7c4af44..39c9d80bd4 100644
--- a/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetView.cxx
+++ b/Modules/Wrappers/QtWidget/src/otbWrapperQtWidgetView.cxx
@@ -97,11 +97,11 @@ void QtWidgetView::UpdateMessageAfterExecution(int status)
{
if (status >= 0)
{
- m_Message->setText("<center><font color=\"#00A000\">DONE</font></center>");
+ m_Message->setText("<center><font color=\"#00A000\">Done</font></center>");
}
else
{
- m_Message->setText("<center><font color=\"#FF0000\">FAILED !</font></center>");
+ m_Message->setText("<center><font color=\"#FF0000\">Failed</font></center>");
}
}
diff --git a/Utilities/Data/Icons/forbidden-24x24.png b/Utilities/Data/Icons/forbidden-24x24.png
new file mode 100644
index 0000000000000000000000000000000000000000..c910740e6d2030667faefeeb7445bf07e61703c8
GIT binary patch
literal 1290
zcmV+l1@-!gP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru;sFE+IR?#az0Lpt1eZxf
zK~zY`?Uie6R8<hi|L5Mj_b%0TTiz`#<<(`|ZDA=W8>qor5rP<r1|OJ)pd=EEMg-&$
zgE3KRY*2!xsL^OOM2%65<q^=Lg$fvB`moBfZIRNIrj^2OySw*sUVflzA#6au_{H;W
z&dizLoS8XifdALOU9T4vT_IQJ<r;N!Z%wZY2Ge&;$~T7VYKn_f`XSfa++HvZTiZJT
z0Q-Z%xzqebi`-JqAVQ9Xln_GnS&X)IMIwh69cw%e05AJ|*c=L7AMlE|0MCZoF%M8{
z9#~#GaoqTOWHg$gDGC4y$jf$22uMvEjP&;(e68U~W$i%1srD9NW4Jvv;ABMwg7x)y
zr=-Ml%k=5TCuL<8vB5!5U5`c?51CRlfeUF!K5L|=dsV?lxilBfMWY=*baw?GYi;ZA
zT(SgH4;)B+gKe3anGY{sTtCL;DrJc{RKvh8@#Omp>b_icMU4W1DYs3?S(ByfPp7#w
zS6@8w)8Wov%h#O_^$)jGt_CbCzkS_Jj#FyI<8VM=#S@sQDi40Mc+vd;P&I8T0N}~y
z<}-o)2R3zHy!cGQwAsz7R#KLiyW#4fuK*k>D;w>itdd$LdN^<FNhbDKoPpcch%700
z)y<!uzonxS@6DL;=Mi~F!_hY)@xiYdV{j>?^3eQwqf-Jb$U-nWIVl8=c6U{VF2&YI
z9jD83C|sQ9WU1<BWxDQO)!K?(g@vg0dI136p8xIf0mp$V<ph)QK<X4Zw476hsBL$w
zZ)!Qa^81s$Ef;>jdw?+{9SR+oy{)wL3jlcP)G2HXhXDZ3oo+uDb?gx39Ey|`DFIT5
zeABUEQW^$;8h;U1H@E(Lc3@ydf;ljm1D)Wm&u7ox0syr$XZ{_V5Mhf_K+61-0Ecrc
zNf~TP(*Phr89oREu(z-K;|rGawn-T*#)(15^B>L(EL_>rf;Wd=F_$vUVhpz6)^MNN
zaKYrf#bgwYkYxb=N&x^_<jz=EoZ+d^Ag2N_(p_p@m3Ml<nzpuX0N|XLSyIB{yft+V
z6s11FIfNA2TO}nc0N~8R1=v~W!wa2flI`(CIVFTTQo^Rx@Om;D*5>6JAI+JwoN?~9
zgn&!a4qg*b?eihYoE}@qBbE?w6IAUi^kq-^ssUU`?DqSywLRP&XZ$`6!W}7LIrii`
zb8_|=3VAh7DTtyr#%#NLhtHS#CGYkZFEbQ;0zl`$i5O!GH=GJ3_6CE9Sr)!Kf1Xt2
z<!v{qvsp?BLI}8&7?qYrFPZiukG8gan({BQmo9~|Zy##>{x?)Yo`9546eZ4qwT7x3
z9-+A$T~%anGU>_EjT4tlGg~19nQk{6!QZWHYF>Rq-}U7d^>0!L*#;m@NC}0IghEIc
zAw&Y0$b?8YR27D*T0+VfE1Q~Ly3u*y2H+up{!n&y;Vh45^GIDUC*-oJLI^ZPfl7dW
z%RcsFELK$;iL^<;0T2UVT@RoENC%JsU<3e+*IlFU9XqaUjA7)0fb>~*q^`HOv4_&W
zAs;4y0RV#l*gu(^L?uKWf+|;apEjf;|LJW11KeLOAZz;f82|tP07*qoM6N<$f=eGq
ABLDyZ
literal 0
HcmV?d00001
diff --git a/i18n/fr_FR.ts b/i18n/fr_FR.ts
index f0568af418..9102d25f18 100644
--- a/i18n/fr_FR.ts
+++ b/i18n/fr_FR.ts
@@ -5110,5 +5110,37 @@ Le(s) résultat(s) vont être importés en tant que jeu de données.</translatio
<source>Following files are being viewed in </source>
<translation>Les fichiers suivants sont en cours de visualisation dans </translation>
</message>
+ <message>
+ <source>Running</source>
+ <translation>En cours</translation>
+ </message>
+ <message>
+ <source>Done</source>
+ <translation>Terminé</translation>
+ </message>
+ <message>
+ <source>Failed</source>
+ <translation>Echec</translation>
+ </message>
+ <message>
+ <source>Ready to run</source>
+ <translation>Prêt à démarrer</translation>
+ </message>
+ <message>
+ <source>Select parameters</source>
+ <translation>Choix des paramètres</translation>
+ </message>
+ <message>
+ <source>Parameters</source>
+ <translation>Paramètres</translation>
+ </message>
+ <message>
+ <source>Documentation</source>
+ <translation>Documentation</translation>
+ </message>
+ <message>
+ <source>Logs</source>
+ <translation>Logs</translation>
+ </message>
</context>
</TS>
--
GitLab