diff --git a/src/CurveCreator/CurveCreator_NewSectionDlg.cxx b/src/CurveCreator/CurveCreator_NewSectionDlg.cxx
index 526dfb717..f5f602a3c 100644
--- a/src/CurveCreator/CurveCreator_NewSectionDlg.cxx
+++ b/src/CurveCreator/CurveCreator_NewSectionDlg.cxx
@@ -46,12 +46,12 @@ CurveCreator_NewSectionDlg::CurveCreator_NewSectionDlg( QWidget *parent, bool en
QFrame* aCoordFrame = new QFrame( aFrame );
QGridLayout* aCoordLayout = new QGridLayout( aCoordFrame );
- QLabel* aLbl = new QLabel(tr("NAME"), this);
+ QLabel* aLbl = new QLabel(tr("SECTION_NAME"), this);
myName = new QLineEdit(this);
aCoordLayout->addWidget(aLbl, 0, 0);
aCoordLayout->addWidget(myName, 0 , 1);
- aLbl = new QLabel(tr("LINE_TYPE"));
+ aLbl = new QLabel(tr("SECTION_LINE_TYPE"));
myLineType = new QComboBox(this);
SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr();
@@ -60,13 +60,13 @@ CurveCreator_NewSectionDlg::CurveCreator_NewSectionDlg( QWidget *parent, bool en
// QPixmap aPolylinePixmap = QPixmap(tr(":images/ICON_POLYLINE"));
// QPixmap aSplinePixmap = QPixmap(tr(":images/ICON_SPLINE"));
- myLineType->addItem(aPolylinePixmap, tr("POLYLINE_TYPE"));
- myLineType->addItem(aSplinePixmap, tr("SPLINE_TYPE"));
+ myLineType->addItem(aPolylinePixmap, tr("SECTION_POLYLINE_TYPE"));
+ myLineType->addItem(aSplinePixmap, tr("SECTION_SPLINE_TYPE"));
myLineType->setCurrentIndex(0);
aCoordLayout->addWidget(aLbl, 1, 0);
aCoordLayout->addWidget(myLineType, 1 , 1);
- aLbl = new QLabel(tr("LINE_CLOSED"));
+ aLbl = new QLabel(tr("SECTION_LINE_CLOSED"));
myIsClosed = new QCheckBox(this);
aCoordLayout->addWidget(aLbl, 2, 0);
aCoordLayout->addWidget(myIsClosed, 2, 1);
@@ -78,8 +78,8 @@ CurveCreator_NewSectionDlg::CurveCreator_NewSectionDlg( QWidget *parent, bool en
myBtnFrame = new QFrame( aFrame );
QHBoxLayout* aBtnsLayout = new QHBoxLayout( myBtnFrame );
- myAddBtn = new QPushButton( tr( "ADD_BTN" ), myBtnFrame );
- myCancelBtn = new QPushButton( tr( "CANCEL" ), myBtnFrame );
+ myAddBtn = new QPushButton( tr( "SECTION_ADD_BTN" ), myBtnFrame );
+ myCancelBtn = new QPushButton( tr( "SECTION_CANCEL_BTN" ), myBtnFrame );
connect( myAddBtn, SIGNAL( clicked() ), this, SIGNAL( addSection() ) );
connect( myCancelBtn, SIGNAL( clicked() ), this, SIGNAL( cancelSection() ) );
@@ -113,12 +113,12 @@ void CurveCreator_NewSectionDlg::setEditMode( bool isEdit )
{
myIsEdit = isEdit;
if( myIsEdit ){
- myAddBtn->setText(tr("OK"));
+ myAddBtn->setText(tr("SECTION_OK_BTN"));
myAddBtn->disconnect( SIGNAL( clicked() ) );
connect( myAddBtn, SIGNAL( clicked() ), this, SIGNAL( modifySection() ) );
}
else{
- myAddBtn->setText(tr("ADD_BTN"));
+ myAddBtn->setText(tr("SECTION_ADD_BTN"));
myAddBtn->disconnect( SIGNAL( clicked() ) );
connect( myAddBtn, SIGNAL( clicked() ), this, SIGNAL( addSection() ) );
}
diff --git a/src/CurveCreator/CurveCreator_TableView.cxx b/src/CurveCreator/CurveCreator_TableView.cxx
index b7567ab57..b40760511 100644
--- a/src/CurveCreator/CurveCreator_TableView.cxx
+++ b/src/CurveCreator/CurveCreator_TableView.cxx
@@ -104,10 +104,10 @@ CurveCreator_TableView::CurveCreator_TableView( CurveCreator_ICurve* theCurve,
setColumnWidth( 0, SECTION_NAME_COLUMN_WIDTH );
setColumnWidth( 1, POINT_INDEX_COLUMN_WIDTH );
QStringList aLabels;
- QString aCoord1 = theCoordTitles.size() > 0 ? theCoordTitles[0] : tr( "X" ); // tr( "X_POSITION_LBL" )
- QString aCoord2 = theCoordTitles.size() > 1 ? theCoordTitles[1] : tr( "Y" ); // tr( "Y_POSITION_LBL" )
+ QString aCoord1 = theCoordTitles.size() > 0 ? theCoordTitles[0] : tr( "TABLE_X" ); // tr( "X_POSITION_LBL" )
+ QString aCoord2 = theCoordTitles.size() > 1 ? theCoordTitles[1] : tr( "TABLE_Y" ); // tr( "Y_POSITION_LBL" )
//aLabels << tr( "SECTION_LABEL" ) << tr( "IDENTIFIER_LABEL" ) << aCoord1 << aCoord2;
- aLabels << tr( "Section" ) << "Index" << aCoord1 << aCoord2;
+ aLabels << tr( "TABLE_SECTION" ) << tr("TABLE_INDEX") << aCoord1 << aCoord2;
setHorizontalHeaderLabels( aLabels );
}
diff --git a/src/CurveCreator/CurveCreator_Widget.cxx b/src/CurveCreator/CurveCreator_Widget.cxx
index be3e19233..eeb5f799b 100644
--- a/src/CurveCreator/CurveCreator_Widget.cxx
+++ b/src/CurveCreator/CurveCreator_Widget.cxx
@@ -93,7 +93,7 @@ CurveCreator_Widget::CurveCreator_Widget(QWidget* parent,
connect( myNewSectionEditor, SIGNAL(modifySection()), this, SLOT(onModifySection()) );
connect( myNewSectionEditor, SIGNAL(cancelSection()), this, SLOT(onCancelSection()) );
- QGroupBox* aSectionGroup = new QGroupBox(tr("Sections"),this);
+ QGroupBox* aSectionGroup = new QGroupBox(tr("SECTION_GROUP_TITLE"),this);
mySectionView = new CurveCreator_TreeView(myCurve, aSectionGroup);
mySectionView->setSelectionMode( QTreeView::ExtendedSelection );
@@ -105,7 +105,7 @@ CurveCreator_Widget::CurveCreator_Widget(QWidget* parent,
connect( myLocalPointView, SIGNAL( cellChanged( int, int ) ),
this, SLOT( onCellChanged( int, int ) ) );
- QToolBar* aTB = new QToolBar(tr("TOOL_BAR_TLT"), aSectionGroup);
+ QToolBar* aTB = new QToolBar(tr("SECTION_GROUP_TITLE"), aSectionGroup);
// QToolButton* anUndoBtn = new QToolButton(aTB);
SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr();
@@ -174,12 +174,12 @@ CurveCreator_Widget::CurveCreator_Widget(QWidget* parent,
connect(anAct, SIGNAL(triggered()), this, SLOT(onUncloseSections()) );
anAct = createAction( SET_SECTIONS_POLYLINE_ID, tr("SET_SECTIONS_POLYLINE"),
- aPolylinePixmap, tr("SET_POLYLINE_TLT"),
+ aPolylinePixmap, tr("SET_SECTIONS_POLYLINE_TLT"),
QKeySequence(Qt::ControlModifier|Qt::Key_E) );
connect(anAct, SIGNAL(triggered()), this, SLOT(onSetPolyline()) );
anAct = createAction( SET_SECTIONS_SPLINE_ID, tr("SET_SECTIONS_SPLINE"), aSplinePixmap,
- tr("SET_SPLINE_TLT"), QKeySequence(Qt::ControlModifier|Qt::Key_R) );
+ tr("SET_SECTIONS_SPLINE_TLT"), QKeySequence(Qt::ControlModifier|Qt::Key_R) );
connect(anAct, SIGNAL(triggered()), this, SLOT(onSetSpline()) );
anAct = createAction( REMOVE_ID, tr("REMOVE"), aRemovePixmap, tr("REMOVE_TLT"),
diff --git a/src/CurveCreator/CurveCreator_Widget.h b/src/CurveCreator/CurveCreator_Widget.h
index 31b4db039..76c705415 100644
--- a/src/CurveCreator/CurveCreator_Widget.h
+++ b/src/CurveCreator/CurveCreator_Widget.h
@@ -45,7 +45,6 @@ class QAction;
class QPixmap;
class CurveCreator_TableView;
class CurveCreator_TreeView;
-class CurveCreator_NewPointDlg;
class CurveCreator_NewSectionDlg;
class CURVECREATOR_EXPORT CurveCreator_Widget : public QWidget
diff --git a/src/GEOMGUI/GEOM_msg_en.ts b/src/GEOMGUI/GEOM_msg_en.ts
index 261ae1522..4e3b36a6c 100644
--- a/src/GEOMGUI/GEOM_msg_en.ts
+++ b/src/GEOMGUI/GEOM_msg_en.ts
@@ -5153,6 +5153,22 @@ Ignoring units will cause model scaling (as dimensions are supposed to be specif
CC_PNT_ITEM_X_Y_Z
X=%1, Y=%2, Z=%3
+
+ TABLE_SECTION
+ Section
+
+
+ TABLE_INDEX
+ Index
+
+
+ TABLE_X
+ X
+
+
+ TABLE_Y
+ Y
+
BasicGUI_CurveDlg
@@ -5394,74 +5410,39 @@ Ignoring units will cause model scaling (as dimensions are supposed to be specif
Face 2 V
-
- CurveCreator_NewPointDlg
-
- ADD_NEW_POINT
- Add new points
-
-
- X_COORD
- X
-
-
- Y_COORD
- Y
-
-
- Z_COORD
- Z
-
-
- ADD_BTN
- Add
-
-
- ADD_CONTINUE_BTN
- Add and continue
-
-
- ADD_NEW_POINT_TO_%1
- Add new point to %1
-
-
- SET_POINT_COORDINATES
- Set point coordinates
-
-
CurveCreator_NewSectionDlg
- NAME
+ SECTION_NAME
Name
- LINE_TYPE
+ SECTION_LINE_TYPE
Type
- POLYLINE_TYPE
+ SECTION_POLYLINE_TYPE
Polyline
- SPLINE_TYPE
+ SECTION_SPLINE_TYPE
Spline
- LINE_CLOSED
+ SECTION_LINE_CLOSED
Closed
- OK
- Ok
-
-
- ADD_BTN
+ SECTION_ADD_BTN
Add
- ADD_CONTINUE_BTN
- Add and continue
+ SECTION_OK_BTN
+ Ok
+
+
+ SECTION_CANCEL_BTN
+ Cancel
ADD_NEW_SECTION
@@ -5486,11 +5467,7 @@ Ignoring units will cause model scaling (as dimensions are supposed to be specif
CurveCreator_Widget
- CURVE_NAME_TLT
- Name
-
-
- SECTION_GROUP_TLT
+ SECTION_GROUP_TITLE
Sections
@@ -5517,22 +5494,6 @@ Ignoring units will cause model scaling (as dimensions are supposed to be specif
NEW_SECTION_TLT
Insert new section
-
- INSERT_SECTION_BEFORE
- Insert section before
-
-
- INSERT_SECTION_BEFORE_TLT
- Insert section before
-
-
- INSERT_SECTION_AFTER
- Insert section after
-
-
- INSERT_SECTION_AFTER_TLT
- Insert section after
-
ADDITION_MODE
Addition mode
@@ -5557,18 +5518,6 @@ Ignoring units will cause model scaling (as dimensions are supposed to be specif
DETECTION_MODE_TLT
Detection mode
-
- INSERT_POINT_BEFORE
- Insert point before
-
-
- INSERT_POINT_BEFORE_TLT
- Insert point before
-
-
- INSERT_POINT_AFTER
- Insert point after
-
CLOSE_SECTIONS
Set closed
@@ -5617,22 +5566,6 @@ Ignoring units will cause model scaling (as dimensions are supposed to be specif
JOIN_TLT
Join selected sections
-
- STEP_UP
- Move up
-
-
- STEP_UP_TLT
- Move selected objects up
-
-
- STEP_DOWN
- Move down
-
-
- STEP_DOWN_TLT
- Move selected objects down
-
CLEAR_ALL
Clear all