IPAL9283,9286,9295,9296,9297; some icons restored

diff --git a/src/VISUGUI/VISU_images.po b/src/VISUGUI/VISU_images.po
index 5f17da4b0d5ee7dd488b586009fc039f1dcddb7b..c8de4c3cfe5fbbf7effe8c125d546a8170718488 100644 (file)
--- a/src/VISUGUI/VISU_images.po
+++ b/src/VISUGUI/VISU_images.po
@@ -57,20 +57,33 @@ msgstr "Visu_cutlines.png"
 msgid "ICON_STREAM_LINES"
 msgstr "Visu_streamlines.png"
 
-msgid "ICON_ERASE"
-msgstr "Visu_eraseall.png"
-
 msgid "ICON_PLOT2D"
 msgstr "Visu_plot2d.png"
 
+# Representation menu
+
+msgid "ICON_POINTS"
+msgstr "Visu_points.png"
+
 msgid "ICON_WIREFRAME"
 msgstr "Visu_wireframe.png"
 
 msgid "ICON_SURFACE"
 msgstr "Visu_surface.png"
 
-msgid "ICON_POINTS"
-msgstr "Visu_points.png"
+msgid "ICON_ERASE_ALL"
+msgstr "Visu_eraseall.png"
+
+msgid "ICON_GLOBAL_SELECTION"
+msgstr "Visu_selectall.png"
+
+msgid "ICON_PARTIAL_SELECTION"
+msgstr "Visu_selectonly.png"
+
+msgid "ICON_SCALING"
+msgstr "Visu_scaling.png"
+
+#
 
 msgid "ICON_TIMEANIMATION"
 msgstr "Visu_anim.png"

diff --git a/src/VISUGUI/VISU_msg_en.po b/src/VISUGUI/VISU_msg_en.po
index 6fd7accbbea446412769f5ad35fca3fd01274f65..e68d110d4a2978130246c76a82c391bc2b796cae 100644 (file)
--- a/src/VISUGUI/VISU_msg_en.po
+++ b/src/VISUGUI/VISU_msg_en.po
@@ -10,7 +10,7 @@ msgid "BUT_OK"
 msgstr "OK"
 
 msgid "WRN_VISU"
-msgstr "VISU Warning"
+msgstr "Post-Pro Warning"
 
 msgid "INF_DONE"
 msgstr " done"
@@ -438,6 +438,12 @@ msgstr ""
 msgid "VisuGUI_DeformedShapeDlg::DLG_TITLE"
 msgstr "Deformed Shape"
 
+msgid "VisuGUI_DeformedShapeDlg::DEFORMED_SHAPE_TAB"
+msgstr "Deformed Shape"
+
+msgid "VisuGUI_DeformedShapeDlg::SCALAR_BAR_TAB"
+msgstr "Scalar Bar"
+
 msgid "VisuGUI_DeformedShapeDlg::MAGNITUDE_COLORING"
 msgstr "Magnitude coloring"
 

diff --git a/src/VISUGUI/VisuGUI.cxx b/src/VISUGUI/VisuGUI.cxx
index ae8fb4cb3ef2b05a8e67a751c437f35854f51907..f4824a13b00de70e02e690bd69d9ff0f317951c0 100644 (file)
--- a/src/VISUGUI/VisuGUI.cxx
+++ b/src/VISUGUI/VisuGUI.cxx
@@ -475,7 +475,7 @@ void VisuGUI::CreateMesh (const Handle(SALOME_InteractiveObject)& theIO)
     pPresent = dynamic_cast<VISU::Mesh_i*>(VISU::GetServant(aMesh).in());
   if (pPresent == NULL) {
     SUIT_MessageBox::warn1 (GetDesktop(this),
-                            tr("VISU_WARNING"),
+                            tr("WRN_VISU"),
                            tr("ERR_CANT_BUILD_PRESENTATION"),
                            tr("BUT_OK"));
     return;
@@ -498,7 +498,7 @@ void VisuGUI::CreateMesh (const Handle(SALOME_InteractiveObject)& theIO)
     } catch (std::runtime_error& exc) {
       INFOS(exc.what());
       SUIT_MessageBox::warn1 (GetDesktop(this),
-                              tr("VISU_WARNING"),
+                              tr("WRN_VISU"),
                               tr("ERR_CANT_CREATE_ACTOR") + " " + tr(exc.what()),
                               tr("BUT_OK"));
     }
@@ -1121,8 +1121,8 @@ OnChangeLines()
   VisuGUI_CursorDlg* CursorDlg =
     new VisuGUI_CursorDlg (GetDesktop(this), tr("DLG_LINEWIDTH_TITLE"), TRUE);
 
-  CursorDlg->Comment1->setText("DLG_LINEWIDTH_CMT1");
-  CursorDlg->Comment2->setText("DLG_LINEWIDTH_CMT2");
+  CursorDlg->Comment1->setText(tr("DLG_LINEWIDTH_CMT1"));
+  CursorDlg->Comment2->setText(tr("DLG_LINEWIDTH_CMT2"));
   CursorDlg->SpinBox1->setMinValue(1);
   CursorDlg->SpinBox1->setMaxValue(10);
 
@@ -2055,25 +2055,25 @@ createActions()
   createAction( VISU_ANIMATION, tr("MEN_ANIMATION"), QIconSet(aPixmap), tr("MEN_ANIMATION"), "", 0, aParent, false,
                this, SLOT(OnTimeAnimation()));
 
-  aPixmap = aResourceMgr->loadPixmap("VISU",tr("ICON_ERASE"));
+  aPixmap = aResourceMgr->loadPixmap("VISU",tr("ICON_ERASE_ALL"));
   createAction( VISU_ERASE_ALL, tr("MEN_ERASE_ALL"), QIconSet(aPixmap),
                 tr("MEN_ERASE_ALL"), "", 0, aParent, false,
                this, SLOT(OnEraseAll()));
 
-  //aPixmap = aResourceMgr->loadPixmap("VISU",tr(""));
-  createAction( VISU_GLOBAL_SELECTION, tr("MEN_GLOBAL_SELECTION"), QIconSet(),
+  aPixmap = aResourceMgr->loadPixmap("VISU",tr("ICON_GLOBAL_SELECTION"));
+  createAction( VISU_GLOBAL_SELECTION, tr("MEN_GLOBAL_SELECTION"), QIconSet(aPixmap),
                 tr("MEN_GLOBAL_SELECTION"), "", 0, aParent, false,
                //this, SLOT(OnEraseAll()));
                this);
 
-  //aPixmap = aResourceMgr->loadPixmap("VISU",tr(""));
-  createAction( VISU_PARTIAL_SELECTION, tr("MEN_PARTIAL_SELECTION"), QIconSet(),
+  aPixmap = aResourceMgr->loadPixmap("VISU",tr("ICON_PARTIAL_SELECTION"));
+  createAction( VISU_PARTIAL_SELECTION, tr("MEN_PARTIAL_SELECTION"), QIconSet(aPixmap),
                 tr("MEN_PARTIAL_SELECTION"), "", 0, aParent, false,
                //this, SLOT(OnEraseAll()));
                this);
 
-  //aPixmap = aResourceMgr->loadPixmap("VISU",tr(""));
-  createAction( VISU_SCALING, tr("MEN_SCALING"), QIconSet(),
+  aPixmap = aResourceMgr->loadPixmap("VISU",tr("ICON_SCALING"));
+  createAction( VISU_SCALING, tr("MEN_SCALING"), QIconSet(aPixmap),
                 tr("MEN_SCALING"), "", 0, aParent, false,
                this, SLOT(OnScaling()));
 }

diff --git a/src/VISUGUI/VisuGUI_DeformedShapeDlg.cxx b/src/VISUGUI/VisuGUI_DeformedShapeDlg.cxx
index ef788af72d646edd0d530a464488d66e76b84a89..b77f13710f04894c48be89244a150c2a17171ada 100644 (file)
--- a/src/VISUGUI/VisuGUI_DeformedShapeDlg.cxx
+++ b/src/VISUGUI/VisuGUI_DeformedShapeDlg.cxx
@@ -72,11 +72,11 @@ VisuGUI_DeformedShapeDlg::VisuGUI_DeformedShapeDlg(QWidget* parent)
   TopGroupLayout->addMultiCellWidget(UseMagn, 1, 1, 0, 1);
   //if (!enableUM)
   //  UseMagn->hide();
-  aTabBox->addTab(aBox, "DeformedShape");
+  aTabBox->addTab(aBox, tr("DEFORMED_SHAPE_TAB"));
   
   myScalarPane = new VisuGUI_ScalarBarPane(this, false);
   myScalarPane->setMargin( 5 );
-  aTabBox->addTab(myScalarPane, "ScalarBar");
+  aTabBox->addTab(myScalarPane, tr("SCALAR_BAR_TAB"));
 
 
   QGroupBox* GroupButtons = new QGroupBox( this, "GroupButtons" );

diff --git a/src/VISUGUI/VisuGUI_ScalarBarDlg.cxx b/src/VISUGUI/VisuGUI_ScalarBarDlg.cxx
index ef346bf2479332280547656f2d6ad2d6000e1521..b4a413e0f1b6c68828091719370d13884e9c7af8 100644 (file)
--- a/src/VISUGUI/VisuGUI_ScalarBarDlg.cxx
+++ b/src/VISUGUI/VisuGUI_ScalarBarDlg.cxx
@@ -906,6 +906,8 @@ VisuGUI_TextPrefDlg::VisuGUI_TextPrefDlg(QWidget* parent) :
   aFontsLst.append("Times");
 
   myTitColor = new QToolButton(aTitleGrp);
+  myTitColor->setUsesTextLabel(true);
+  myTitColor->setTextLabel("  ");
   connect( myTitColor, SIGNAL(clicked()), this, SLOT(setTitleColor()) );
   aTitleLayout->addWidget(myTitColor, 1, 0);
 
@@ -932,6 +934,8 @@ VisuGUI_TextPrefDlg::VisuGUI_TextPrefDlg(QWidget* parent) :
   aLabelLayout->setMargin( 3 );
 
   myLblColor = new QToolButton(aLabelsGrp);
+  myLblColor->setUsesTextLabel(true);
+  myLblColor->setTextLabel("  ");
   connect( myLblColor, SIGNAL(clicked()), this, SLOT(setLabelColor()) );
   aLabelLayout->addWidget(myLblColor, 0, 0);