Localization fixing

This commit is contained in:
skv 2014-09-29 16:44:26 +04:00
parent 1e018830bb
commit d73471def8
5 changed files with 45 additions and 113 deletions

View File

@ -46,12 +46,12 @@ CurveCreator_NewSectionDlg::CurveCreator_NewSectionDlg( QWidget *parent, bool en
QFrame* aCoordFrame = new QFrame( aFrame ); QFrame* aCoordFrame = new QFrame( aFrame );
QGridLayout* aCoordLayout = new QGridLayout( aCoordFrame ); QGridLayout* aCoordLayout = new QGridLayout( aCoordFrame );
QLabel* aLbl = new QLabel(tr("NAME"), this); QLabel* aLbl = new QLabel(tr("SECTION_NAME"), this);
myName = new QLineEdit(this); myName = new QLineEdit(this);
aCoordLayout->addWidget(aLbl, 0, 0); aCoordLayout->addWidget(aLbl, 0, 0);
aCoordLayout->addWidget(myName, 0 , 1); aCoordLayout->addWidget(myName, 0 , 1);
aLbl = new QLabel(tr("LINE_TYPE")); aLbl = new QLabel(tr("SECTION_LINE_TYPE"));
myLineType = new QComboBox(this); myLineType = new QComboBox(this);
SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr(); 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 aPolylinePixmap = QPixmap(tr(":images/ICON_POLYLINE"));
// QPixmap aSplinePixmap = QPixmap(tr(":images/ICON_SPLINE")); // QPixmap aSplinePixmap = QPixmap(tr(":images/ICON_SPLINE"));
myLineType->addItem(aPolylinePixmap, tr("POLYLINE_TYPE")); myLineType->addItem(aPolylinePixmap, tr("SECTION_POLYLINE_TYPE"));
myLineType->addItem(aSplinePixmap, tr("SPLINE_TYPE")); myLineType->addItem(aSplinePixmap, tr("SECTION_SPLINE_TYPE"));
myLineType->setCurrentIndex(0); myLineType->setCurrentIndex(0);
aCoordLayout->addWidget(aLbl, 1, 0); aCoordLayout->addWidget(aLbl, 1, 0);
aCoordLayout->addWidget(myLineType, 1 , 1); aCoordLayout->addWidget(myLineType, 1 , 1);
aLbl = new QLabel(tr("LINE_CLOSED")); aLbl = new QLabel(tr("SECTION_LINE_CLOSED"));
myIsClosed = new QCheckBox(this); myIsClosed = new QCheckBox(this);
aCoordLayout->addWidget(aLbl, 2, 0); aCoordLayout->addWidget(aLbl, 2, 0);
aCoordLayout->addWidget(myIsClosed, 2, 1); aCoordLayout->addWidget(myIsClosed, 2, 1);
@ -78,8 +78,8 @@ CurveCreator_NewSectionDlg::CurveCreator_NewSectionDlg( QWidget *parent, bool en
myBtnFrame = new QFrame( aFrame ); myBtnFrame = new QFrame( aFrame );
QHBoxLayout* aBtnsLayout = new QHBoxLayout( myBtnFrame ); QHBoxLayout* aBtnsLayout = new QHBoxLayout( myBtnFrame );
myAddBtn = new QPushButton( tr( "ADD_BTN" ), myBtnFrame ); myAddBtn = new QPushButton( tr( "SECTION_ADD_BTN" ), myBtnFrame );
myCancelBtn = new QPushButton( tr( "CANCEL" ), myBtnFrame ); myCancelBtn = new QPushButton( tr( "SECTION_CANCEL_BTN" ), myBtnFrame );
connect( myAddBtn, SIGNAL( clicked() ), this, SIGNAL( addSection() ) ); connect( myAddBtn, SIGNAL( clicked() ), this, SIGNAL( addSection() ) );
connect( myCancelBtn, SIGNAL( clicked() ), this, SIGNAL( cancelSection() ) ); connect( myCancelBtn, SIGNAL( clicked() ), this, SIGNAL( cancelSection() ) );
@ -113,12 +113,12 @@ void CurveCreator_NewSectionDlg::setEditMode( bool isEdit )
{ {
myIsEdit = isEdit; myIsEdit = isEdit;
if( myIsEdit ){ if( myIsEdit ){
myAddBtn->setText(tr("OK")); myAddBtn->setText(tr("SECTION_OK_BTN"));
myAddBtn->disconnect( SIGNAL( clicked() ) ); myAddBtn->disconnect( SIGNAL( clicked() ) );
connect( myAddBtn, SIGNAL( clicked() ), this, SIGNAL( modifySection() ) ); connect( myAddBtn, SIGNAL( clicked() ), this, SIGNAL( modifySection() ) );
} }
else{ else{
myAddBtn->setText(tr("ADD_BTN")); myAddBtn->setText(tr("SECTION_ADD_BTN"));
myAddBtn->disconnect( SIGNAL( clicked() ) ); myAddBtn->disconnect( SIGNAL( clicked() ) );
connect( myAddBtn, SIGNAL( clicked() ), this, SIGNAL( addSection() ) ); connect( myAddBtn, SIGNAL( clicked() ), this, SIGNAL( addSection() ) );
} }

View File

@ -104,10 +104,10 @@ CurveCreator_TableView::CurveCreator_TableView( CurveCreator_ICurve* theCurve,
setColumnWidth( 0, SECTION_NAME_COLUMN_WIDTH ); setColumnWidth( 0, SECTION_NAME_COLUMN_WIDTH );
setColumnWidth( 1, POINT_INDEX_COLUMN_WIDTH ); setColumnWidth( 1, POINT_INDEX_COLUMN_WIDTH );
QStringList aLabels; QStringList aLabels;
QString aCoord1 = theCoordTitles.size() > 0 ? theCoordTitles[0] : tr( "X" ); // tr( "X_POSITION_LBL" ) QString aCoord1 = theCoordTitles.size() > 0 ? theCoordTitles[0] : tr( "TABLE_X" ); // tr( "X_POSITION_LBL" )
QString aCoord2 = theCoordTitles.size() > 1 ? theCoordTitles[1] : tr( "Y" ); // tr( "Y_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_LABEL" ) << tr( "IDENTIFIER_LABEL" ) << aCoord1 << aCoord2;
aLabels << tr( "Section" ) << "Index" << aCoord1 << aCoord2; aLabels << tr( "TABLE_SECTION" ) << tr("TABLE_INDEX") << aCoord1 << aCoord2;
setHorizontalHeaderLabels( aLabels ); setHorizontalHeaderLabels( aLabels );
} }

View File

@ -93,7 +93,7 @@ CurveCreator_Widget::CurveCreator_Widget(QWidget* parent,
connect( myNewSectionEditor, SIGNAL(modifySection()), this, SLOT(onModifySection()) ); connect( myNewSectionEditor, SIGNAL(modifySection()), this, SLOT(onModifySection()) );
connect( myNewSectionEditor, SIGNAL(cancelSection()), this, SLOT(onCancelSection()) ); 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 = new CurveCreator_TreeView(myCurve, aSectionGroup);
mySectionView->setSelectionMode( QTreeView::ExtendedSelection ); mySectionView->setSelectionMode( QTreeView::ExtendedSelection );
@ -105,7 +105,7 @@ CurveCreator_Widget::CurveCreator_Widget(QWidget* parent,
connect( myLocalPointView, SIGNAL( cellChanged( int, int ) ), connect( myLocalPointView, SIGNAL( cellChanged( int, int ) ),
this, SLOT( onCellChanged( 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); // QToolButton* anUndoBtn = new QToolButton(aTB);
SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr(); SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr();
@ -174,12 +174,12 @@ CurveCreator_Widget::CurveCreator_Widget(QWidget* parent,
connect(anAct, SIGNAL(triggered()), this, SLOT(onUncloseSections()) ); connect(anAct, SIGNAL(triggered()), this, SLOT(onUncloseSections()) );
anAct = createAction( SET_SECTIONS_POLYLINE_ID, tr("SET_SECTIONS_POLYLINE"), 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) ); QKeySequence(Qt::ControlModifier|Qt::Key_E) );
connect(anAct, SIGNAL(triggered()), this, SLOT(onSetPolyline()) ); connect(anAct, SIGNAL(triggered()), this, SLOT(onSetPolyline()) );
anAct = createAction( SET_SECTIONS_SPLINE_ID, tr("SET_SECTIONS_SPLINE"), aSplinePixmap, 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()) ); connect(anAct, SIGNAL(triggered()), this, SLOT(onSetSpline()) );
anAct = createAction( REMOVE_ID, tr("REMOVE"), aRemovePixmap, tr("REMOVE_TLT"), anAct = createAction( REMOVE_ID, tr("REMOVE"), aRemovePixmap, tr("REMOVE_TLT"),

View File

@ -45,7 +45,6 @@ class QAction;
class QPixmap; class QPixmap;
class CurveCreator_TableView; class CurveCreator_TableView;
class CurveCreator_TreeView; class CurveCreator_TreeView;
class CurveCreator_NewPointDlg;
class CurveCreator_NewSectionDlg; class CurveCreator_NewSectionDlg;
class CURVECREATOR_EXPORT CurveCreator_Widget : public QWidget class CURVECREATOR_EXPORT CurveCreator_Widget : public QWidget

View File

@ -5153,6 +5153,22 @@ Ignoring units will cause model scaling (as dimensions are supposed to be specif
<source>CC_PNT_ITEM_X_Y_Z</source> <source>CC_PNT_ITEM_X_Y_Z</source>
<translation>X=%1, Y=%2, Z=%3</translation> <translation>X=%1, Y=%2, Z=%3</translation>
</message> </message>
<message>
<source>TABLE_SECTION</source>
<translation>Section</translation>
</message>
<message>
<source>TABLE_INDEX</source>
<translation>Index</translation>
</message>
<message>
<source>TABLE_X</source>
<translation>X</translation>
</message>
<message>
<source>TABLE_Y</source>
<translation>Y</translation>
</message>
</context> </context>
<context> <context>
<name>BasicGUI_CurveDlg</name> <name>BasicGUI_CurveDlg</name>
@ -5394,74 +5410,39 @@ Ignoring units will cause model scaling (as dimensions are supposed to be specif
<translation>Face 2 V</translation> <translation>Face 2 V</translation>
</message> </message>
</context> </context>
<context>
<name>CurveCreator_NewPointDlg</name>
<message>
<source>ADD_NEW_POINT</source>
<translation>Add new points</translation>
</message>
<message>
<source>X_COORD</source>
<translation>X</translation>
</message>
<message>
<source>Y_COORD</source>
<translation>Y</translation>
</message>
<message>
<source>Z_COORD</source>
<translation>Z</translation>
</message>
<message>
<source>ADD_BTN</source>
<translation>Add</translation>
</message>
<message>
<source>ADD_CONTINUE_BTN</source>
<translation>Add and continue</translation>
</message>
<message>
<source>ADD_NEW_POINT_TO_%1</source>
<translation>Add new point to %1</translation>
</message>
<message>
<source>SET_POINT_COORDINATES</source>
<translation>Set point coordinates</translation>
</message>
</context>
<context> <context>
<name>CurveCreator_NewSectionDlg</name> <name>CurveCreator_NewSectionDlg</name>
<message> <message>
<source>NAME</source> <source>SECTION_NAME</source>
<translation>Name</translation> <translation>Name</translation>
</message> </message>
<message> <message>
<source>LINE_TYPE</source> <source>SECTION_LINE_TYPE</source>
<translation>Type</translation> <translation>Type</translation>
</message> </message>
<message> <message>
<source>POLYLINE_TYPE</source> <source>SECTION_POLYLINE_TYPE</source>
<translation>Polyline</translation> <translation>Polyline</translation>
</message> </message>
<message> <message>
<source>SPLINE_TYPE</source> <source>SECTION_SPLINE_TYPE</source>
<translation>Spline</translation> <translation>Spline</translation>
</message> </message>
<message> <message>
<source>LINE_CLOSED</source> <source>SECTION_LINE_CLOSED</source>
<translation>Closed</translation> <translation>Closed</translation>
</message> </message>
<message> <message>
<source>OK</source> <source>SECTION_ADD_BTN</source>
<translation>Ok</translation>
</message>
<message>
<source>ADD_BTN</source>
<translation>Add</translation> <translation>Add</translation>
</message> </message>
<message> <message>
<source>ADD_CONTINUE_BTN</source> <source>SECTION_OK_BTN</source>
<translation>Add and continue</translation> <translation>Ok</translation>
</message>
<message>
<source>SECTION_CANCEL_BTN</source>
<translation>Cancel</translation>
</message> </message>
<message> <message>
<source>ADD_NEW_SECTION</source> <source>ADD_NEW_SECTION</source>
@ -5486,11 +5467,7 @@ Ignoring units will cause model scaling (as dimensions are supposed to be specif
<context> <context>
<name>CurveCreator_Widget</name> <name>CurveCreator_Widget</name>
<message> <message>
<source>CURVE_NAME_TLT</source> <source>SECTION_GROUP_TITLE</source>
<translation>Name</translation>
</message>
<message>
<source>SECTION_GROUP_TLT</source>
<translation>Sections</translation> <translation>Sections</translation>
</message> </message>
<message> <message>
@ -5517,22 +5494,6 @@ Ignoring units will cause model scaling (as dimensions are supposed to be specif
<source>NEW_SECTION_TLT</source> <source>NEW_SECTION_TLT</source>
<translation>Insert new section</translation> <translation>Insert new section</translation>
</message> </message>
<message>
<source>INSERT_SECTION_BEFORE</source>
<translation>Insert section before</translation>
</message>
<message>
<source>INSERT_SECTION_BEFORE_TLT</source>
<translation>Insert section before</translation>
</message>
<message>
<source>INSERT_SECTION_AFTER</source>
<translation>Insert section after</translation>
</message>
<message>
<source>INSERT_SECTION_AFTER_TLT</source>
<translation>Insert section after</translation>
</message>
<message> <message>
<source>ADDITION_MODE</source> <source>ADDITION_MODE</source>
<translation>Addition mode</translation> <translation>Addition mode</translation>
@ -5557,18 +5518,6 @@ Ignoring units will cause model scaling (as dimensions are supposed to be specif
<source>DETECTION_MODE_TLT</source> <source>DETECTION_MODE_TLT</source>
<translation>Detection mode</translation> <translation>Detection mode</translation>
</message> </message>
<message>
<source>INSERT_POINT_BEFORE</source>
<translation>Insert point before</translation>
</message>
<message>
<source>INSERT_POINT_BEFORE_TLT</source>
<translation>Insert point before</translation>
</message>
<message>
<source>INSERT_POINT_AFTER</source>
<translation>Insert point after</translation>
</message>
<message> <message>
<source>CLOSE_SECTIONS</source> <source>CLOSE_SECTIONS</source>
<translation>Set closed</translation> <translation>Set closed</translation>
@ -5617,22 +5566,6 @@ Ignoring units will cause model scaling (as dimensions are supposed to be specif
<source>JOIN_TLT</source> <source>JOIN_TLT</source>
<translation>Join selected sections</translation> <translation>Join selected sections</translation>
</message> </message>
<message>
<source>STEP_UP</source>
<translation>Move up</translation>
</message>
<message>
<source>STEP_UP_TLT</source>
<translation>Move selected objects up</translation>
</message>
<message>
<source>STEP_DOWN</source>
<translation>Move down</translation>
</message>
<message>
<source>STEP_DOWN_TLT</source>
<translation>Move selected objects down</translation>
</message>
<message> <message>
<source>CLEAR_ALL</source> <source>CLEAR_ALL</source>
<translation>Clear all</translation> <translation>Clear all</translation>