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

rnc: slight improvements of widgets behaviour and added some missing translations

Browse Source
This commit is contained in:
gdd 2011-03-29 12:39:50 +00:00
parent 8598f0fe49
commit 01bec554f7
9 changed files with 279 additions and 276 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/EntityGUI/EntityGUI_1Sel1Spin1Check_QTD.ui
View File

@ -25,7 +25,7 @@
<property name="title">
<string>Values</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<layout class="QGridLayout" name="gridLayout" columnstretch="0,0,1,0">
<item row="0" column="0">
<widget class="QLabel" name="TextLabel1">
<property name="sizePolicy">

23
src/EntityGUI/EntityGUI_1Sel_QTD.ui
View File

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>EntityGUI_1Sel_QTD</class>
<widget class="QWidget" name="EntityGUI_1Sel_QTD">
@ -6,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>402</width>
<height>88</height>
<height>92</height>
</rect>
</property>
<property name="windowTitle">
@ -24,7 +25,7 @@
<property name="title">
<string>Values</string>
</property>
<layout class="QGridLayout" >
<layout class="QGridLayout" rowstretch="0,0" columnstretch="0,0,1,0">
<property name="margin">
<number>9</number>
</property>
@ -33,12 +34,12 @@
</property>
<item row="1" column="3">
<layout class="QHBoxLayout">
<property name="margin" >
<number>0</number>
</property>
<property name="spacing">
<number>6</number>
</property>
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="QPushButton" name="buttonUndo">
<property name="text">
@ -58,9 +59,7 @@
<item row="0" column="2">
<widget class="QLineEdit" name="LineEdit1">
<property name="sizePolicy">
<sizepolicy>
<hsizetype>3</hsizetype>
<vsizetype>0</vsizetype>
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@ -70,9 +69,7 @@
<item row="0" column="0">
<widget class="QLabel" name="TextLabel1">
<property name="sizePolicy">
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@ -88,9 +85,7 @@
<item row="0" column="1">
<widget class="QPushButton" name="PushButton1">
<property name="sizePolicy">
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>

11
src/EntityGUI/EntityGUI_1Spin_QTD.ui
View File

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>EntityGUI_1Spin_QTD</class>
<widget class="QWidget" name="EntityGUI_1Spin_QTD">
@ -5,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>268</width>
<height>88</height>
<width>270</width>
<height>92</height>
</rect>
</property>
<property name="windowTitle">
@ -24,7 +25,7 @@
<property name="title">
<string>Values</string>
</property>
<layout class="QGridLayout" >
<layout class="QGridLayout" columnstretch="0,1,0">
<property name="margin">
<number>9</number>
</property>
@ -68,9 +69,7 @@
<item row="0" column="0">
<widget class="QLabel" name="TextLabel1">
<property name="sizePolicy">
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>

2
src/EntityGUI/EntityGUI_2Sel1Check_QTD.ui
View File

@ -25,7 +25,7 @@
<property name="title">
<string>Values</string>
</property>
<layout class="QGridLayout">
<layout class="QGridLayout" columnstretch="0,0,1,0">
<property name="margin">
<number>9</number>
</property>

15
src/EntityGUI/EntityGUI_2Spin_QTD.ui
View File

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>EntityGUI_2Spin_QTD</class>
<widget class="QWidget" name="EntityGUI_2Spin_QTD">
@ -5,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>264</width>
<height>88</height>
<width>276</width>
<height>92</height>
</rect>
</property>
<property name="windowTitle">
@ -24,7 +25,7 @@
<property name="title">
<string>Values</string>
</property>
<layout class="QGridLayout" >
<layout class="QGridLayout" columnstretch="0,1,0">
<property name="margin">
<number>9</number>
</property>
@ -40,9 +41,7 @@
<item row="1" column="0">
<widget class="QLabel" name="TextLabel2">
<property name="sizePolicy">
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@ -58,9 +57,7 @@
<item row="0" column="0">
<widget class="QLabel" name="TextLabel1">
<property name="sizePolicy">
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>

15
src/EntityGUI/EntityGUI_3Spin1Check_QTD.ui
View File

@ -25,7 +25,7 @@
<property name="title">
<string>Values</string>
</property>
<layout class="QGridLayout">
<layout class="QGridLayout" rowstretch="0,0,0,0,0" columnstretch="0,1,0">
<property name="margin">
<number>9</number>
</property>
@ -127,6 +127,19 @@
</property>
</widget>
</item>
<item row="4" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>

2
src/EntityGUI/EntityGUI_4Spin1Check_QTD.ui
View File

@ -25,7 +25,7 @@
<property name="title">
<string>Values</string>
</property>
<layout class="QGridLayout">
<layout class="QGridLayout" columnstretch="0,1,0">
<property name="margin">
<number>9</number>
</property>

23
src/EntityGUI/EntityGUI_4Spin_QTD.ui
View File

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>EntityGUI_4Spin_QTD</class>
<widget class="QWidget" name="EntityGUI_4Spin_QTD">
@ -5,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>264</width>
<height>140</height>
<width>270</width>
<height>144</height>
</rect>
</property>
<property name="windowTitle">
@ -24,7 +25,7 @@
<property name="title">
<string>Values</string>
</property>
<layout class="QGridLayout" >
<layout class="QGridLayout" columnstretch="1,0,0">
<property name="margin">
<number>9</number>
</property>
@ -77,9 +78,7 @@
<item row="0" column="0">
<widget class="QLabel" name="TextLabel1">
<property name="sizePolicy">
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@ -95,9 +94,7 @@
<item row="3" column="0">
<widget class="QLabel" name="TextLabel4">
<property name="sizePolicy">
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@ -113,9 +110,7 @@
<item row="1" column="0">
<widget class="QLabel" name="TextLabel2">
<property name="sizePolicy">
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
@ -131,9 +126,7 @@
<item row="2" column="0">
<widget class="QLabel" name="TextLabel3">
<property name="sizePolicy">
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>

12
src/EntityGUI/EntityGUI_SketcherDlg.cxx
View File

@ -122,6 +122,7 @@ EntityGUI_SketcherDlg::EntityGUI_SketcherDlg( GeometryGUI* GUI, QWidget* parent,
topLayout->addWidget(GroupBox1);
topLayout->addWidget( MainWidget );
topLayout->setStretch( 1, 1);
GroupPt = new EntityGUI_Point( MainWidget->DestCnt );
@ -231,6 +232,7 @@ EntityGUI_SketcherDlg::EntityGUI_SketcherDlg( GeometryGUI* GUI, QWidget* parent,
SkeletonCntlayout->addWidget( Group2Spin, 0, 0 );
SkeletonCntlayout->addWidget( Group3Spin, 0, 0 );
SkeletonCntlayout->addWidget( Group4Spin, 0, 0 );
//SkeletonCntlayout->setStretch( 0, 1);
/***************************************************************/
QButtonGroup* ButtonGroup = new QButtonGroup( this );
@ -505,6 +507,7 @@ void EntityGUI_SketcherDlg::DestClicked( int constructorId )
Group4Spin->checkBox->hide();
Dir1Clicked( 2 ); // Angle
}
resize( minimumSizeHint() );
}
//=================================================================================
@ -513,6 +516,7 @@ void EntityGUI_SketcherDlg::DestClicked( int constructorId )
//=================================================================================
void EntityGUI_SketcherDlg::PointClicked( int constructorId )
{
MESSAGE("PointClicked")
myConstructorPntId = constructorId;
GroupPt2->RB_Point1->setChecked( true );
GroupPt->RB_Point3->setEnabled( true );
@ -525,6 +529,7 @@ void EntityGUI_SketcherDlg::PointClicked( int constructorId )
//=================================================================================
void EntityGUI_SketcherDlg::Point2Clicked( int constructorId )
{
MESSAGE("Point2Clicked")
InitClick();
// Get setting of step value from file configuration
@ -687,6 +692,7 @@ void EntityGUI_SketcherDlg::Point2Clicked( int constructorId )
}
}
resize( minimumSizeHint() );
connect( myGeometryGUI->getApp()->selectionMgr(),
SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
@ -890,7 +896,7 @@ void EntityGUI_SketcherDlg::Dir2Clicked( int constructorId )
}
}
}
resize( minimumSizeHint() );
GEOMBase_Helper::displayPreview( true, false, true, true, myLineWidth );
}
@ -1969,13 +1975,13 @@ bool EntityGUI_SketcherDlg::execute( ObjectList& objects )
if ( mySketchType == PT_ABS_CENTER ||
mySketchType == PT_REL_CENTER ){
Group4Spin->label->show();
Group4Spin->label->setText(QString(aProfile2.ErrMsg().c_str()));
Group4Spin->label->setText( tr( aProfile2.ErrMsg().c_str() ) );
}
else
Group4Spin->label->hide();
if ( mySketchType == PT_SEL_CENTER ){
Group2Sel->label->show();
Group2Sel->label->setText(QString(aProfile2.ErrMsg().c_str()));
Group2Sel->label->setText( tr( aProfile2.ErrMsg().c_str() ) );
}
else
Group2Sel->label->hide();