Minor improvement of Inertia dialog box look-n-feel.

diff --git a/src/GEOMGUI/GEOM_msg_en.ts b/src/GEOMGUI/GEOM_msg_en.ts
index 754afda3d6174beed6288015700b39d082182d3d..79079b8c81a60273b67b401531b11714c068d09c 100644 (file)
--- a/src/GEOMGUI/GEOM_msg_en.ts
+++ b/src/GEOMGUI/GEOM_msg_en.ts
@@ -908,14 +908,6 @@ Please, select face, shell or solid and try again</translation>
         <source>GEOM_INERTIA_CONSTR</source>
         <translation>Matrix And Moments Of Inertia</translation>
     </message>
-    <message>
-        <source>GEOM_INERTIA_I</source>
-        <translation>%1:1 :</translation>
-    </message>
-    <message>
-        <source>GEOM_INERTIA_IXYZ</source>
-        <translation>IX &amp; IY &amp; IZ :</translation>
-    </message>
     <message>
         <source>GEOM_INERTIA_TITLE</source>
         <translation>Calculs Of Inertia</translation>

diff --git a/src/GEOMGUI/GEOM_msg_fr.ts b/src/GEOMGUI/GEOM_msg_fr.ts
index 07c02e244f0447bf8b36bd807ce435336f2c6d88..7bb28365f6bc1f7b20c3b4416fdfbe8024f40e4b 100644 (file)
--- a/src/GEOMGUI/GEOM_msg_fr.ts
+++ b/src/GEOMGUI/GEOM_msg_fr.ts
@@ -920,14 +920,6 @@ Choisissez une face, une coque ou un solide et essayez de nouveau</translation>
         <source>GEOM_INERTIA_CONSTR</source>
         <translation>Matrice et moment d&apos;inertie</translation>
     </message>
-    <message>
-        <source>GEOM_INERTIA_I</source>
-        <translation>%1:1 :</translation>
-    </message>
-    <message>
-        <source>GEOM_INERTIA_IXYZ</source>
-        <translation>IX &amp; IY &amp; IZ :</translation>
-    </message>
     <message>
         <source>GEOM_INERTIA_TITLE</source>
         <translation>Calcul de l&apos;inertie</translation>

diff --git a/src/GEOMGUI/GEOM_msg_ja.ts b/src/GEOMGUI/GEOM_msg_ja.ts
index 8d7cd8e2df49428bd40eb2fea3a1e5d1ac19f0be..8ee7476d70b46e967325b103cc7f780a372ca50c 100644 (file)
--- a/src/GEOMGUI/GEOM_msg_ja.ts
+++ b/src/GEOMGUI/GEOM_msg_ja.ts
@@ -899,14 +899,6 @@
       <source>GEOM_INERTIA_CONSTR</source>
       <translation>行列とモーメント</translation>
     </message>
-    <message>
-      <source>GEOM_INERTIA_I</source>
-      <translation>%1:1。</translation>
-    </message>
-    <message>
-      <source>GEOM_INERTIA_IXYZ</source>
-      <translation>IX &amp; IY &amp; IZ :</translation>
-    </message>
     <message>
       <source>GEOM_INERTIA_TITLE</source>
       <translation>慣性の計算</translation>

diff --git a/src/MeasureGUI/MeasureGUI_1Sel12LineEdit_QTD.ui b/src/MeasureGUI/MeasureGUI_1Sel12LineEdit_QTD.ui
index 30b225aad0e852363691d84463e6d52a243571e7..2f0e56b0ee26a2df20d99769442e17074bfe7788 100644 (file)
--- a/src/MeasureGUI/MeasureGUI_1Sel12LineEdit_QTD.ui
+++ b/src/MeasureGUI/MeasureGUI_1Sel12LineEdit_QTD.ui
@@ -1,63 +1,48 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>MeasureGUI_1Sel12LineEdit_QTD</class>
- <widget class="QWidget" name="MeasureGUI_1Sel12LineEdit_QTD" >
-  <property name="geometry" >
+ <widget class="QWidget" name="MeasureGUI_1Sel12LineEdit_QTD">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>196</width>
-    <height>162</height>
+    <width>501</width>
+    <height>171</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string/>
   </property>
-  <layout class="QGridLayout" >
-   <property name="leftMargin" >
-    <number>0</number>
-   </property>
-   <property name="topMargin" >
-    <number>0</number>
-   </property>
-   <property name="rightMargin" >
-    <number>0</number>
-   </property>
-   <property name="bottomMargin" >
-    <number>0</number>
-   </property>
-   <property name="horizontalSpacing" >
-    <number>6</number>
-   </property>
-   <property name="verticalSpacing" >
-    <number>6</number>
-   </property>
-   <item row="0" column="0" >
-    <widget class="QGroupBox" name="GroupBox1" >
-     <property name="title" >
+  <layout class="QGridLayout" name="gridLayout_2">
+   <item row="0" column="0">
+    <widget class="QGroupBox" name="GroupBox1">
+     <property name="title">
       <string/>
      </property>
-     <layout class="QGridLayout" >
-      <property name="leftMargin" >
-       <number>9</number>
-      </property>
-      <property name="topMargin" >
-       <number>9</number>
-      </property>
-      <property name="rightMargin" >
-       <number>9</number>
-      </property>
-      <property name="bottomMargin" >
-       <number>9</number>
-      </property>
-      <property name="horizontalSpacing" >
-       <number>6</number>
-      </property>
-      <property name="verticalSpacing" >
-       <number>6</number>
-      </property>
-      <item row="0" column="2" >
-       <widget class="QLineEdit" name="LineEdit1" >
-        <property name="minimumSize" >
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="0">
+       <widget class="QLabel" name="TextLabel1">
+        <property name="text">
+         <string>TL1</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QPushButton" name="PushButton1">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2" colspan="5">
+       <widget class="QLineEdit" name="LineEdit1">
+        <property name="minimumSize">
          <size>
           <width>300</width>
           <height>0</height>
@@ -65,109 +50,207 @@
         </property>
        </widget>
       </item>
-      <item row="1" column="0" colspan="3" >
-       <layout class="QGridLayout" >
-        <property name="leftMargin" >
-         <number>0</number>
-        </property>
-        <property name="topMargin" >
-         <number>0</number>
-        </property>
-        <property name="rightMargin" >
-         <number>0</number>
-        </property>
-        <property name="bottomMargin" >
-         <number>0</number>
-        </property>
-        <property name="horizontalSpacing" >
-         <number>6</number>
-        </property>
-        <property name="verticalSpacing" >
-         <number>6</number>
-        </property>
-        <item row="2" column="2" >
-         <widget class="QLineEdit" name="LineEdit32" />
-        </item>
-        <item row="1" column="2" >
-         <widget class="QLineEdit" name="LineEdit22" />
-        </item>
-        <item row="0" column="0" >
-         <widget class="QLabel" name="TextLabel2" >
-          <property name="text" >
-           <string>TL2</string>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="1" >
-         <widget class="QLineEdit" name="LineEdit11" />
-        </item>
-        <item row="2" column="0" >
-         <widget class="QLabel" name="TextLabel4" >
-          <property name="text" >
-           <string>TL4</string>
-          </property>
-         </widget>
-        </item>
-        <item row="1" column="1" >
-         <widget class="QLineEdit" name="LineEdit21" />
-        </item>
-        <item row="1" column="3" >
-         <widget class="QLineEdit" name="LineEdit23" />
-        </item>
-        <item row="2" column="1" >
-         <widget class="QLineEdit" name="LineEdit31" />
-        </item>
-        <item row="3" column="1" >
-         <widget class="QLineEdit" name="LineEdit41" />
-        </item>
-        <item row="3" column="3" >
-         <widget class="QLineEdit" name="LineEdit43" />
-        </item>
-        <item row="0" column="3" >
-         <widget class="QLineEdit" name="LineEdit13" />
-        </item>
-        <item row="3" column="0" >
-         <widget class="QLabel" name="TextLabel5" >
-          <property name="text" >
-           <string>TL5</string>
-          </property>
-         </widget>
-        </item>
-        <item row="3" column="2" >
-         <widget class="QLineEdit" name="LineEdit42" />
-        </item>
-        <item row="0" column="2" >
-         <widget class="QLineEdit" name="LineEdit12" />
-        </item>
-        <item row="2" column="3" >
-         <widget class="QLineEdit" name="LineEdit33" />
-        </item>
-        <item row="1" column="0" >
-         <widget class="QLabel" name="TextLabel3" >
-          <property name="text" >
-           <string>TL3</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-      <item row="0" column="0" >
-       <widget class="QLabel" name="TextLabel1" >
-        <property name="text" >
-         <string>TL1</string>
+      <item row="1" column="1">
+       <widget class="QLabel" name="TextLabel2_1">
+        <property name="text">
+         <string>TL2_1</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="1" >
-       <widget class="QPushButton" name="PushButton1" >
-        <property name="sizePolicy" >
-         <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
+      <item row="1" column="2">
+       <widget class="QLineEdit" name="LineEdit11">
+        <property name="minimumSize">
+         <size>
+          <width>100</width>
+          <height>0</height>
+         </size>
         </property>
-        <property name="text" >
-         <string/>
+       </widget>
+      </item>
+      <item row="1" column="3">
+       <widget class="QLabel" name="TextLabel2_2">
+        <property name="text">
+         <string>TL2_2</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="4">
+       <widget class="QLineEdit" name="LineEdit12">
+        <property name="minimumSize">
+         <size>
+          <width>100</width>
+          <height>0</height>
+         </size>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="5">
+       <widget class="QLabel" name="TextLabel2_3">
+        <property name="text">
+         <string>TL2_3</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="6">
+       <widget class="QLineEdit" name="LineEdit13">
+        <property name="minimumSize">
+         <size>
+          <width>100</width>
+          <height>0</height>
+         </size>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="QLabel" name="TextLabel3_1">
+        <property name="text">
+         <string>TL3_1</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="2">
+       <widget class="QLineEdit" name="LineEdit21">
+        <property name="minimumSize">
+         <size>
+          <width>100</width>
+          <height>0</height>
+         </size>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="3">
+       <widget class="QLabel" name="TextLabel3_2">
+        <property name="text">
+         <string>TL3_2</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="4">
+       <widget class="QLineEdit" name="LineEdit22">
+        <property name="minimumSize">
+         <size>
+          <width>100</width>
+          <height>0</height>
+         </size>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="5">
+       <widget class="QLabel" name="TextLabel3_3">
+        <property name="text">
+         <string>TL3_3</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="6">
+       <widget class="QLineEdit" name="LineEdit23">
+        <property name="minimumSize">
+         <size>
+          <width>100</width>
+          <height>0</height>
+         </size>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1">
+       <widget class="QLabel" name="TextLabel4_1">
+        <property name="text">
+         <string>TL4_1</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="2">
+       <widget class="QLineEdit" name="LineEdit31">
+        <property name="minimumSize">
+         <size>
+          <width>100</width>
+          <height>0</height>
+         </size>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="3">
+       <widget class="QLabel" name="TextLabel4_2">
+        <property name="text">
+         <string>TL4_2</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="4">
+       <widget class="QLineEdit" name="LineEdit32">
+        <property name="minimumSize">
+         <size>
+          <width>100</width>
+          <height>0</height>
+         </size>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="5">
+       <widget class="QLabel" name="TextLabel4_3">
+        <property name="text">
+         <string>TL4_3</string>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="6">
+       <widget class="QLineEdit" name="LineEdit33">
+        <property name="minimumSize">
+         <size>
+          <width>100</width>
+          <height>0</height>
+         </size>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="1">
+       <widget class="QLabel" name="TextLabel5_1">
+        <property name="text">
+         <string>TL5_1</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="2">
+       <widget class="QLineEdit" name="LineEdit41">
+        <property name="minimumSize">
+         <size>
+          <width>100</width>
+          <height>0</height>
+         </size>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="3">
+       <widget class="QLabel" name="TextLabel5_2">
+        <property name="text">
+         <string>TL5_2</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="4">
+       <widget class="QLineEdit" name="LineEdit42">
+        <property name="minimumSize">
+         <size>
+          <width>100</width>
+          <height>0</height>
+         </size>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="5">
+       <widget class="QLabel" name="TextLabel5_3">
+        <property name="text">
+         <string>TL5_3</string>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="6">
+       <widget class="QLineEdit" name="LineEdit43">
+        <property name="minimumSize">
+         <size>
+          <width>100</width>
+          <height>0</height>
+         </size>
         </property>
        </widget>
       </item>

diff --git a/src/MeasureGUI/MeasureGUI_InertiaDlg.cxx b/src/MeasureGUI/MeasureGUI_InertiaDlg.cxx
index 3a17446b40338fc6b9ee3a891e66ee8fb6e5451a..3a011a5fee16a6ea8e4f2bd6f9544891130b74c8 100644 (file)
--- a/src/MeasureGUI/MeasureGUI_InertiaDlg.cxx
+++ b/src/MeasureGUI/MeasureGUI_InertiaDlg.cxx
@@ -62,10 +62,18 @@ MeasureGUI_InertiaDlg::MeasureGUI_InertiaDlg( GeometryGUI* GUI, QWidget* parent
   myGrp = new MeasureGUI_1Sel12LineEdit( centralWidget() );
   myGrp->GroupBox1->setTitle( tr( "GEOM_MATRIX" ) );
   myGrp->TextLabel1->setText( tr( "GEOM_OBJECT" ) );
-  myGrp->TextLabel2->setText( tr( "GEOM_INERTIA_I" ).arg( "1" ) );
-  myGrp->TextLabel3->setText( tr( "GEOM_INERTIA_I" ).arg( "2" ) );
-  myGrp->TextLabel4->setText( tr( "GEOM_INERTIA_I" ).arg( "3" ) );
-  myGrp->TextLabel5->setText( tr( "GEOM_INERTIA_IXYZ" ) );
+  myGrp->TextLabel2_1->setText( "1:1" );
+  myGrp->TextLabel2_2->setText( "1:2" );
+  myGrp->TextLabel2_3->setText( "1:3" );
+  myGrp->TextLabel3_1->setText( "2:1" );
+  myGrp->TextLabel3_2->setText( "2:2" );
+  myGrp->TextLabel3_3->setText( "2:3" );
+  myGrp->TextLabel4_1->setText( "3:1" );
+  myGrp->TextLabel4_2->setText( "3:2" );
+  myGrp->TextLabel4_3->setText( "3:3" );
+  myGrp->TextLabel5_1->setText( "IX" );
+  myGrp->TextLabel5_2->setText( "IY" );
+  myGrp->TextLabel5_3->setText( "IZ" );
   myGrp->LineEdit11->setReadOnly( true );
   myGrp->LineEdit12->setReadOnly( true );
   myGrp->LineEdit13->setReadOnly( true );