ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-01-13 18:20:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

rnc: slight GUI and translation modifications

Browse Source
This commit is contained in:
gdd 2011-04-20 09:43:47 +00:00
parent 7de39bacb2
commit 84e6fdc3cb
7 changed files with 161 additions and 149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/EntityGUI/EntityGUI_1Sel1Spin1Check_QTD.ui
View File

@ -108,7 +108,7 @@
</item>
</layout>
</item>
<item row="2" column="0">
<item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="checkBox">
<property name="text">
<string>CheckBox</string>

120
src/EntityGUI/EntityGUI_2Sel1Check_QTD.ui
View File

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>438</width>
<height>121</height>
<width>366</width>
<height>119</height>
</rect>
</property>
<property name="windowTitle">
@ -25,47 +25,7 @@
<property name="title">
<string>Values</string>
</property>
<layout class="QGridLayout" columnstretch="0,0,1,0">
<property name="margin">
<number>9</number>
</property>
<property name="spacing">
<number>6</number>
</property>
<item row="1" column="3">
<layout class="QHBoxLayout">
<property name="spacing">
<number>6</number>
</property>
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="QPushButton" name="buttonUndo">
<property name="text">
<string>Undo</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="buttonRedo">
<property name="text">
<string>Redo</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="0" column="2">
<widget class="QLineEdit" name="LineEdit1">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<layout class="QGridLayout" name="gridLayout" columnstretch="0,0,1,0">
<item row="0" column="0">
<widget class="QLabel" name="TextLabel1">
<property name="sizePolicy">
@ -95,6 +55,16 @@
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QLineEdit" name="LineEdit1">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="0" column="3">
<widget class="QPushButton" name="buttonApply">
<property name="text">
@ -102,16 +72,6 @@
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QLineEdit" name="LineEdit2"/>
</item>
<item row="1" column="1">
<widget class="QPushButton" name="PushButton2">
<property name="text">
<string/>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="TextLabel2">
<property name="text">
@ -119,19 +79,57 @@
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QCheckBox" name="checkBox">
<item row="1" column="1">
<widget class="QPushButton" name="PushButton2">
<property name="text">
<string>CheckBox</string>
<string/>
</property>
</widget>
</item>
<item row="2" column="2" colspan="2">
<widget class="QLabel" name="label">
<property name="text">
<string>TextLabel</string>
<item row="1" column="2">
<widget class="QLineEdit" name="LineEdit2"/>
</item>
<item row="1" column="3">
<layout class="QHBoxLayout">
<property name="spacing">
<number>6</number>
</property>
</widget>
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="QPushButton" name="buttonUndo">
<property name="text">
<string>Undo</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="buttonRedo">
<property name="text">
<string>Redo</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="2" column="0" colspan="4">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QCheckBox" name="checkBox">
<property name="text">
<string>CheckBox</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>

6
src/EntityGUI/EntityGUI_3Spin1Check_QTD.ui
View File

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>496</width>
<height>148</height>
<width>270</width>
<height>149</height>
</rect>
</property>
<property name="windowTitle">
@ -120,7 +120,7 @@
</property>
</widget>
</item>
<item row="3" column="0">
<item row="3" column="0" colspan="2">
<widget class="QCheckBox" name="checkBox">
<property name="text">
<string>CheckBox</string>

140
src/EntityGUI/EntityGUI_4Spin1Check_QTD.ui
View File

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>456</width>
<height>181</height>
<width>384</width>
<height>189</height>
</rect>
</property>
<property name="windowTitle">
@ -25,25 +25,52 @@
<property name="title">
<string>Values</string>
</property>
<layout class="QGridLayout" columnstretch="0,1,0">
<property name="margin">
<number>9</number>
</property>
<property name="spacing">
<number>6</number>
</property>
<item row="2" column="1">
<widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DZ"/>
</item>
<item row="3" column="1">
<widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DS"/>
</item>
<item row="1" column="1">
<widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DY"/>
<layout class="QGridLayout" name="gridLayout" columnstretch="0,1,0">
<item row="0" column="0">
<widget class="QLabel" name="TextLabel1">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>TL1</string>
</property>
<property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX"/>
</item>
<item row="0" column="2">
<widget class="QPushButton" name="buttonApply">
<property name="text">
<string>Create</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="TextLabel2">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>TL2</string>
</property>
<property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DY"/>
</item>
<item row="1" column="2">
<layout class="QGridLayout">
<property name="margin">
@ -68,15 +95,8 @@
</item>
</layout>
</item>
<item row="0" column="2">
<widget class="QPushButton" name="buttonApply">
<property name="text">
<string>Create</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="TextLabel1">
<item row="2" column="0">
<widget class="QLabel" name="TextLabel3">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
@ -84,13 +104,16 @@
</sizepolicy>
</property>
<property name="text">
<string>TL1</string>
<string>TL3</string>
</property>
<property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DZ"/>
</item>
<item row="3" column="0">
<widget class="QLabel" name="TextLabel4">
<property name="sizePolicy">
@ -107,51 +130,26 @@
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="TextLabel2">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>TL2</string>
</property>
<property name="wordWrap">
<bool>false</bool>
</property>
</widget>
<item row="3" column="1">
<widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DS"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="TextLabel3">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>TL3</string>
</property>
<property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QCheckBox" name="checkBox">
<property name="text">
<string>CheckBox</string>
</property>
</widget>
</item>
<item row="5" column="1" colspan="2">
<widget class="QLabel" name="label">
<property name="text">
<string>TextLabel</string>
</property>
</widget>
<item row="4" column="0" colspan="3">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QCheckBox" name="checkBox">
<property name="text">
<string>CheckBox</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>TextLabel</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>

24
src/EntityGUI/EntityGUI_SketcherDlg.cxx
View File

@ -462,6 +462,7 @@ void EntityGUI_SketcherDlg::TypeClicked( int constructorId )
{
myConstructorId = constructorId;
if ( myConstructorId == 0 ) { // SEGMENT
GroupPt2->RB_Point1->setChecked( true );
GroupPt2->setEnabled( false );
GroupD2->setEnabled( true );
MainWidget->RB_Dest1->setEnabled( true );
@ -470,6 +471,7 @@ void EntityGUI_SketcherDlg::TypeClicked( int constructorId )
}
else if ( myConstructorId == 1 ) { // ARC
GroupPt2->setEnabled( true );
GroupD2->RB_Dir21->setChecked( true );
GroupD2->setEnabled( false );
MainWidget->RB_Dest1->setEnabled( true );
MainWidget->RB_Dest1->setChecked( true );
@ -518,9 +520,16 @@ void EntityGUI_SketcherDlg::PointClicked( int constructorId )
{
MESSAGE("PointClicked")
myConstructorPntId = constructorId;
GroupPt2->RB_Point1->setChecked( true );
GroupPt->RB_Point3->setEnabled( true );
Point2Clicked( 1 );
int buttonId = GroupPt2->ButtonGroup->checkedId();
MESSAGE("checkedId ="<< buttonId)
if (buttonId >= 0){ // = If a button is checked
Point2Clicked(buttonId);
}
else{
GroupPt2->RB_Point1->setChecked( true );
Point2Clicked( 1 );
}
}
//=================================================================================
@ -706,8 +715,15 @@ void EntityGUI_SketcherDlg::Point2Clicked( int constructorId )
void EntityGUI_SketcherDlg::Dir1Clicked( int constructorId )
{
myConstructorDirId = constructorId;
GroupD2->RB_Dir21->setChecked( true );
Dir2Clicked( 2 );
int dirButtonId = GroupD2->ButtonGroup->checkedId();
MESSAGE("checkedId ="<< dirButtonId)
if (dirButtonId >= 0){ // = If a button is checked
Dir2Clicked(dirButtonId);
}
else{
GroupD2->RB_Dir21->setChecked( true );
Dir2Clicked( 2 );
}
}

8
src/GEOMGUI/GEOM_msg_en.ts
View File

@ -1547,19 +1547,19 @@ Please, select face, shell or solid and try again</translation>
</message>
<message>
<source>GEOM_SKETCHER_CENTER_X</source>
<translation>Center X coord. :</translation>
<translation>X Center :</translation>
</message>
<message>
<source>GEOM_SKETCHER_CENTER_Y</source>
<translation>Center Y coord. :</translation>
<translation>Y Center :</translation>
</message>
<message>
<source>GEOM_SKETCHER_CENTER_DX</source>
<translation>Center DX coord. :</translation>
<translation>DX Center :</translation>
</message>
<message>
<source>GEOM_SKETCHER_CENTER_DY</source>
<translation>Center DY coord. :</translation>
<translation>DY Center :</translation>
</message>
<message>
<source>GEOM_SKETCHER_DEST</source>

8
src/GEOMGUI/GEOM_msg_fr.ts
View File

@ -1547,19 +1547,19 @@ Choisissez une face, une coque ou un solide et essayez de nouveau</translation>
</message>
<message>
<source>GEOM_SKETCHER_CENTER_X</source>
<translation>Centre coord. X :</translation>
<translation>X Centre :</translation>
</message>
<message>
<source>GEOM_SKETCHER_CENTER_Y</source>
<translation>Centre coord. Y :</translation>
<translation>Y Centre :</translation>
</message>
<message>
<source>GEOM_SKETCHER_CENTER_DX</source>
<translation>Centre coord. DX :</translation>
<translation>DX Centre :</translation>
</message>
<message>
<source>GEOM_SKETCHER_CENTER_DY</source>
<translation>Centre coord. DY :</translation>
<translation>DY Centre :</translation>
</message>
<message>
<source>GEOM_SKETCHER_DEST</source>