From 3688267d8b4f06b4c2a3d381b0dfdd7425c07b75 Mon Sep 17 00:00:00 2001 From: stv Date: Mon, 27 Jun 2005 11:24:56 +0000 Subject: [PATCH] Prefernces and properties. --- src/SalomeApp/SalomeApp_ListView.cxx | 310 +++++++++--------- src/SalomeApp/SalomeApp_ListView.h | 5 +- src/SalomeApp/SalomeApp_PreferencesDlg.cxx | 2 +- .../SalomeApp_StudyPropertiesDlg.cxx | 11 +- src/SalomeApp/resources/SalomeApp_msg_en.po | 12 +- 5 files changed, 171 insertions(+), 169 deletions(-) diff --git a/src/SalomeApp/SalomeApp_ListView.cxx b/src/SalomeApp/SalomeApp_ListView.cxx index 438edd02c..988ac450d 100644 --- a/src/SalomeApp/SalomeApp_ListView.cxx +++ b/src/SalomeApp/SalomeApp_ListView.cxx @@ -1,4 +1,4 @@ -// SALOME SalomeApp +// SALOME SalomeApp // // Copyright (C) 2005 CEA/DEN, EDF R&D // @@ -36,7 +36,7 @@ using namespace std; // Purpose : static function - used for resizing editing widget //================================================================ void computeEditGeometry(SalomeApp_ListViewItem* theItem, - SalomeApp_EntityEdit* theWidget) + SalomeApp_EntityEdit* theWidget) { if (!theItem) return; @@ -44,7 +44,7 @@ void computeEditGeometry(SalomeApp_ListViewItem* theItem, int anEditColumn = theItem->getEditedColumn(); if (anEditColumn < 0) return; - + int aX = 0, aY = 0, aW = 0, aH = 0; QRect aRect = aListView->itemRect(theItem); @@ -65,8 +65,8 @@ void computeEditGeometry(SalomeApp_ListViewItem* theItem, // Function : SalomeApp_ListView::SalomeApp_ListView // Purpose : constructor //================================================================ -SalomeApp_ListView::SalomeApp_ListView(QWidget *parent) : -QListView(parent) +SalomeApp_ListView::SalomeApp_ListView( QWidget* parent ) +: QtxListView( parent ) { myMouseEnabled = true; myEditingEnabled = false; @@ -82,9 +82,9 @@ QListView(parent) viewport()->installEventFilter(this); - connect(this, SIGNAL(selectionChanged()), + connect(this, SIGNAL(selectionChanged()), this, SLOT(onSelectionChanged())); - connect(header(), SIGNAL(sizeChange(int, int, int)), + connect(header(), SIGNAL(sizeChange(int, int, int)), this, SLOT(onHeaderSizeChange(int, int, int))); } @@ -92,7 +92,7 @@ QListView(parent) // Function : SalomeApp_ListView::~SalomeApp_ListView // Purpose : destructor //================================================================ -SalomeApp_ListView::~SalomeApp_ListView() +SalomeApp_ListView::~SalomeApp_ListView() { if (myEdit) { delete myEdit; @@ -105,7 +105,7 @@ SalomeApp_ListView::~SalomeApp_ListView() // Function : SalomeApp_ListView::updateViewer // Purpose : updates all data viewer //================================================================ -void SalomeApp_ListView::updateViewer() +void SalomeApp_ListView::updateViewer() { // temporary disconnecting selection changed SIGNAL blockSignals(true); @@ -122,7 +122,7 @@ void SalomeApp_ListView::updateViewer() // Function : SalomeApp_ListView::updateSelected // Purpose : updates currently selected item(s) //================================================================ -void SalomeApp_ListView::updateSelected() +void SalomeApp_ListView::updateSelected() { // temporary disconnecting selection changed SIGNAL blockSignals(true); @@ -148,7 +148,7 @@ QString SalomeApp_ListView::popupClientType() const // Function : SalomeApp_ListView::contextMenuPopup // Purpose : fills popup menu with items //================================================================ -void SalomeApp_ListView::contextMenuPopup( QPopupMenu* aPopup ) +void SalomeApp_ListView::contextMenuPopup( QPopupMenu* aPopup ) { if (aPopup) { // add items here... @@ -159,7 +159,7 @@ void SalomeApp_ListView::contextMenuPopup( QPopupMenu* aPopup ) // Function : SalomeApp_ListView::clear // Purpose : clears view //================================================================ -void SalomeApp_ListView::clear() +void SalomeApp_ListView::clear() { if (myEdit) { delete myEdit; @@ -173,7 +173,7 @@ void SalomeApp_ListView::clear() // Function : SalomeApp_ListView::isMouseEnabled // Purpose : returms true if mouse events are enabled //================================================================ -bool SalomeApp_ListView::isMouseEnabled() +bool SalomeApp_ListView::isMouseEnabled() { return myMouseEnabled; } @@ -182,7 +182,7 @@ bool SalomeApp_ListView::isMouseEnabled() // Function : SalomeApp_ListView::enableMouse // Purpose : enabled/disables mouse events (excluding MouseMove) //================================================================ -void SalomeApp_ListView::enableMouse(bool enable) +void SalomeApp_ListView::enableMouse(bool enable) { myMouseEnabled = enable; } @@ -191,7 +191,7 @@ void SalomeApp_ListView::enableMouse(bool enable) // Function : SalomeApp_ListView::eventFilter // Purpose : event filter //================================================================ -bool SalomeApp_ListView::eventFilter(QObject* object, QEvent* event) +bool SalomeApp_ListView::eventFilter(QObject* object, QEvent* event) { if (object == viewport() && (event->type() == QEvent::MouseButtonPress || @@ -207,7 +207,7 @@ bool SalomeApp_ListView::eventFilter(QObject* object, QEvent* event) // Function : SalomeApp_ListView::enableEditing // Purpose : setting editing of items availbale/not available //================================================================ -void SalomeApp_ListView::enableEditing(bool theFlag) +void SalomeApp_ListView::enableEditing(bool theFlag) { myEditingEnabled = theFlag; if (!myEditingEnabled) { @@ -223,7 +223,7 @@ void SalomeApp_ListView::enableEditing(bool theFlag) // Function : SalomeApp_ListView::isEnableEditing // Purpose : says if editing is enabled //================================================================ -bool SalomeApp_ListView::isEnableEditing() +bool SalomeApp_ListView::isEnableEditing() { return myEditingEnabled; } @@ -232,7 +232,7 @@ bool SalomeApp_ListView::isEnableEditing() // Function : SalomeApp_ListView::accept // Purpose : calls finishEditing(true)... //================================================================ -void SalomeApp_ListView::accept() +void SalomeApp_ListView::accept() { finishEditing(true); } @@ -241,7 +241,7 @@ void SalomeApp_ListView::accept() // Function : QAD_ListView::onSelectionChanged // Purpose : slot, called when selection changed in List Viewer //================================================================ -void SalomeApp_ListView::onSelectionChanged() +void SalomeApp_ListView::onSelectionChanged() { if (myEdit) { finishEditing(true); @@ -252,7 +252,7 @@ void SalomeApp_ListView::onSelectionChanged() updateContents(); } myEditedItem = 0; - } + } // editing is allowed in Single Selection Mode only if (selectionMode() != Single || !isEnableEditing()) return; @@ -275,7 +275,7 @@ void SalomeApp_ListView::onSelectionChanged() // Function : SalomeApp_ListView::resizeEvent // Purpose : called when Data Viewer is resized //================================================================ -void SalomeApp_ListView::resizeEvent( QResizeEvent * e) +void SalomeApp_ListView::resizeEvent( QResizeEvent * e) { QListView::resizeEvent(e); int aW = columnWidth(columns()-1); @@ -289,7 +289,7 @@ void SalomeApp_ListView::resizeEvent( QResizeEvent * e) // Function : SalomeApp_ListView::onHeaderSizeChange // Purpose : slot, called when columns sizes are changed //================================================================ -void SalomeApp_ListView::onHeaderSizeChange(int, int, int) +void SalomeApp_ListView::onHeaderSizeChange(int, int, int) { int aW = columnWidth(columns()-1); int aX = header()->sectionPos(columns()-1); @@ -301,7 +301,7 @@ void SalomeApp_ListView::onHeaderSizeChange(int, int, int) // Function : SalomeApp_ListView::viewportPaintEvent // Purpose : handler for paint event //================================================================ -void SalomeApp_ListView::viewportPaintEvent(QPaintEvent* e) +void SalomeApp_ListView::viewportPaintEvent(QPaintEvent* e) { QListView::viewportPaintEvent(e); if (myEditedItem && myEdit) { @@ -313,16 +313,16 @@ void SalomeApp_ListView::viewportPaintEvent(QPaintEvent* e) // Function : SalomeApp_ListView::onEditOk // Purpose : called when user finishes in editing of item //================================================================ -void SalomeApp_ListView::onEditOk() +void SalomeApp_ListView::onEditOk() { finishEditing(true); } - + //================================================================ // Function : SalomeApp_ListView::onEditCancel // Purpose : called when user cancels item editing //================================================================ -void SalomeApp_ListView::onEditCancel() +void SalomeApp_ListView::onEditCancel() { finishEditing(false); } @@ -331,7 +331,7 @@ void SalomeApp_ListView::onEditCancel() // Function : SalomeApp_ListView::finishEditing // Purpose : finishes editing of entity //================================================================ -UpdateType SalomeApp_ListView::finishEditing(bool ok) +UpdateType SalomeApp_ListView::finishEditing(bool ok) { UpdateType aNeedsUpdate = utCancel; if (myEditedItem && myEdit) @@ -361,7 +361,7 @@ UpdateType SalomeApp_ListView::finishEditing(bool ok) SalomeApp_ListViewItem* aParent = (SalomeApp_ListViewItem*)(myEditedItem->parent()); if (aParent) aParent->updateAllLevels(); - else + else myEditedItem->updateAllLevels(); } break; @@ -397,10 +397,10 @@ UpdateType SalomeApp_ListView::finishEditing(bool ok) // Purpose : gets current tooltip for list view // returns valid rect in success //================================================================ -QRect SalomeApp_ListView::tip(QPoint aPos, - QString& aText, - QRect& dspRect, - QFont& dspFnt) const +QRect SalomeApp_ListView::tip(QPoint aPos, + QString& aText, + QRect& dspRect, + QFont& dspFnt) const { QRect result( -1, -1, -1, -1 ); SalomeApp_ListViewItem* aItem = (SalomeApp_ListViewItem*)itemAt( aPos ); @@ -410,7 +410,7 @@ QRect SalomeApp_ListView::tip(QPoint aPos, QRect aTextRect = aItem->textRect(i); if ( !aItem->text(i).isEmpty() && ( aItemRect.width() > header()->sectionSize(i) || - aTextRect.left() < 0 || + aTextRect.left() < 0 || aTextRect.top() < 0 || aTextRect.right() > viewport()->width() || aTextRect.bottom() > viewport()->height() ) ) { @@ -419,7 +419,7 @@ QRect SalomeApp_ListView::tip(QPoint aPos, dspRect = aItem->tipRect(); dspFnt = font(); if (dspRect.isValid()) { - result = QRect(QPoint(0, aItemRect.top()), + result = QRect(QPoint(0, aItemRect.top()), QSize(viewport()->width(), aItemRect.height())); } } @@ -437,7 +437,7 @@ QRect SalomeApp_ListView::tip(QPoint aPos, // Purpose : constructor //================================================================ SalomeApp_ListViewItem::SalomeApp_ListViewItem(SalomeApp_ListView* parent) : -QListViewItem( parent ) +QListViewItem( parent ) { init(); } @@ -446,9 +446,9 @@ QListViewItem( parent ) // Function : SalomeApp_ListViewItem::SalomeApp_ListViewItem // Purpose : constructor //================================================================ -SalomeApp_ListViewItem::SalomeApp_ListViewItem(SalomeApp_ListView* parent, +SalomeApp_ListViewItem::SalomeApp_ListViewItem(SalomeApp_ListView* parent, SalomeApp_ListViewItem* after) : -QListViewItem( parent, after ) +QListViewItem( parent, after ) { init(); } @@ -457,10 +457,10 @@ QListViewItem( parent, after ) // Function : SalomeApp_ListViewItem::SalomeApp_ListViewItem // Purpose : constructor //================================================================ -SalomeApp_ListViewItem::SalomeApp_ListViewItem(SalomeApp_ListView* parent, +SalomeApp_ListViewItem::SalomeApp_ListViewItem(SalomeApp_ListView* parent, const QString& theName, const bool theEditable) : -QListViewItem(parent, theName) +QListViewItem(parent, theName) { init(); setEditable(theEditable); @@ -470,11 +470,11 @@ QListViewItem(parent, theName) // Function : SalomeApp_ListViewItem::SalomeApp_ListViewItem // Purpose : constructor //================================================================ -SalomeApp_ListViewItem::SalomeApp_ListViewItem(SalomeApp_ListView* parent, +SalomeApp_ListViewItem::SalomeApp_ListViewItem(SalomeApp_ListView* parent, const QString& theName, const QString& theValue, const bool theEditable) : -QListViewItem(parent, theName, theValue) +QListViewItem(parent, theName, theValue) { init(); setEditable(theEditable); @@ -484,7 +484,7 @@ QListViewItem(parent, theName, theValue) // Function : SalomeApp_ListViewItem::SalomeApp_ListViewItem // Purpose : constructor //================================================================ -SalomeApp_ListViewItem::SalomeApp_ListViewItem(SalomeApp_ListViewItem* parent, +SalomeApp_ListViewItem::SalomeApp_ListViewItem(SalomeApp_ListViewItem* parent, const QString& theName, const bool theEditable) : QListViewItem(parent, theName) @@ -497,8 +497,8 @@ QListViewItem(parent, theName) // Function : SalomeApp_ListViewItem::SalomeApp_ListViewItem // Purpose : constructor //================================================================ -SalomeApp_ListViewItem::SalomeApp_ListViewItem(SalomeApp_ListViewItem* parent, - SalomeApp_ListViewItem* after, +SalomeApp_ListViewItem::SalomeApp_ListViewItem(SalomeApp_ListViewItem* parent, + SalomeApp_ListViewItem* after, const QString& theName, const bool theEditable) : QListViewItem(parent, after, theName) @@ -511,8 +511,8 @@ QListViewItem(parent, after, theName) // Function : SalomeApp_ListViewItem::SalomeApp_ListViewItem // Purpose : constructor //================================================================ -SalomeApp_ListViewItem::SalomeApp_ListViewItem(SalomeApp_ListView* parent, - SalomeApp_ListViewItem* after, +SalomeApp_ListViewItem::SalomeApp_ListViewItem(SalomeApp_ListView* parent, + SalomeApp_ListViewItem* after, const QString& theName, const bool theEditable) : QListViewItem(parent, after, theName) @@ -526,7 +526,7 @@ QListViewItem(parent, after, theName) // Function : SalomeApp_ListViewItem::SalomeApp_ListViewItem // Purpose : constructor //================================================================ -SalomeApp_ListViewItem::SalomeApp_ListViewItem(SalomeApp_ListViewItem* parent, +SalomeApp_ListViewItem::SalomeApp_ListViewItem(SalomeApp_ListViewItem* parent, const QString& theName, const QString& theValue, const bool theEditable) : @@ -541,8 +541,8 @@ QListViewItem(parent, theName, theValue) // Function : SalomeApp_ListViewItem::SalomeApp_ListViewItem // Purpose : constructor //================================================================ -SalomeApp_ListViewItem::SalomeApp_ListViewItem(SalomeApp_ListViewItem* parent, - SalomeApp_ListViewItem* after, +SalomeApp_ListViewItem::SalomeApp_ListViewItem(SalomeApp_ListViewItem* parent, + SalomeApp_ListViewItem* after, const QString& theName, const QString& theValue, const bool theEditable) : @@ -556,8 +556,8 @@ QListViewItem(parent, after, theName, theValue) // Function : SalomeApp_ListViewItem::SalomeApp_ListViewItem // Purpose : constructor //================================================================ -SalomeApp_ListViewItem::SalomeApp_ListViewItem(SalomeApp_ListView* parent, - SalomeApp_ListViewItem* after, +SalomeApp_ListViewItem::SalomeApp_ListViewItem(SalomeApp_ListView* parent, + SalomeApp_ListViewItem* after, const QString& theName, const QString& theValue, const bool theEditable) : @@ -571,7 +571,7 @@ QListViewItem(parent, after, theName, theValue) // Function : SalomeApp_ListViewItem::~SalomeApp_ListViewItem // Purpose : destructor //================================================================ -SalomeApp_ListViewItem::~SalomeApp_ListViewItem() +SalomeApp_ListViewItem::~SalomeApp_ListViewItem() { } @@ -579,7 +579,7 @@ SalomeApp_ListViewItem::~SalomeApp_ListViewItem() // Function : SalomeApp_ListViewItem::init // Purpose : initialization //================================================================ -void SalomeApp_ListViewItem::init() +void SalomeApp_ListViewItem::init() { myEditable = false; myAccepted = true; @@ -593,7 +593,7 @@ void SalomeApp_ListViewItem::init() // Function : SalomeApp_ListViewItem::getName // Purpose : as default returns text in the first column //================================================================ -QString SalomeApp_ListViewItem::getName() const +QString SalomeApp_ListViewItem::getName() const { return ( listView()->columns() > 0 ) ? text(0) : QString(""); } @@ -602,7 +602,7 @@ QString SalomeApp_ListViewItem::getName() const // Function : SalomeApp_ListViewItem::setName // Purpose : as default sets text in the first column //================================================================ -UpdateType SalomeApp_ListViewItem::setName(const QString& theName) +UpdateType SalomeApp_ListViewItem::setName(const QString& theName) { UpdateType aNeedsUpdate = utCancel; if (listView()->columns() > 0) { @@ -616,7 +616,7 @@ UpdateType SalomeApp_ListViewItem::setName(const QString& theName) // Function : SalomeApp_ListViewItem::getValue // Purpose : as default returns text in the second column //================================================================ -QString SalomeApp_ListViewItem::getValue() const +QString SalomeApp_ListViewItem::getValue() const { return ( listView()->columns() > 1 ) ? text(1) : QString(""); } @@ -625,7 +625,7 @@ QString SalomeApp_ListViewItem::getValue() const // Function : SalomeApp_ListViewItem::setValue // Purpose : as default sets text in the second column //================================================================ -UpdateType SalomeApp_ListViewItem::setValue(const QString& theValue) +UpdateType SalomeApp_ListViewItem::setValue(const QString& theValue) { UpdateType aNeedsUpdate = utCancel; if (listView()->columns() > 1) { @@ -639,7 +639,7 @@ UpdateType SalomeApp_ListViewItem::setValue(const QString& theValue) // Function : SalomeApp_ListViewItem::fullName // Purpose : returns full path to the entity from the root //================================================================ -QString SalomeApp_ListViewItem::fullName() +QString SalomeApp_ListViewItem::fullName() { QString aFullName = getName(); SalomeApp_ListViewItem* aParent = (SalomeApp_ListViewItem*)parent(); @@ -654,7 +654,7 @@ QString SalomeApp_ListViewItem::fullName() // Function : SalomeApp_ListViewItem::openAllLevels // Purpose : expands all entities beginning from this level //================================================================ -void SalomeApp_ListViewItem::openAllLevels() +void SalomeApp_ListViewItem::openAllLevels() { setOpen(true); SalomeApp_ListViewItem* aChild = (SalomeApp_ListViewItem*)firstChild(); @@ -668,7 +668,7 @@ void SalomeApp_ListViewItem::openAllLevels() // Function : SalomeApp_ListViewItem::updateAllLevels // Purpose : update all entites beginning from this level //================================================================ -void SalomeApp_ListViewItem::updateAllLevels() +void SalomeApp_ListViewItem::updateAllLevels() { SalomeApp_ListViewItem* aChild = (SalomeApp_ListViewItem*)firstChild(); while( aChild ) { @@ -681,7 +681,7 @@ void SalomeApp_ListViewItem::updateAllLevels() // Function : SalomeApp_EditBox::isEditable // Purpose : return true if entity is editable //================================================================ -bool SalomeApp_ListViewItem::isEditable() const +bool SalomeApp_ListViewItem::isEditable() const { return myEditable; } @@ -690,7 +690,7 @@ bool SalomeApp_ListViewItem::isEditable() const // Function : SalomeApp_ListViewItem::setEditable // Purpose : sets editable flag fo the entity //================================================================ -void SalomeApp_ListViewItem::setEditable(bool theEditable) +void SalomeApp_ListViewItem::setEditable(bool theEditable) { myEditable = theEditable; } @@ -699,7 +699,7 @@ void SalomeApp_ListViewItem::setEditable(bool theEditable) // Function : SalomeApp_ListViewItem::isAccepted // Purpose : returns true if entitiy is accepted after editing //================================================================ -bool SalomeApp_ListViewItem::isAccepted() const +bool SalomeApp_ListViewItem::isAccepted() const { return myAccepted; } @@ -708,27 +708,27 @@ bool SalomeApp_ListViewItem::isAccepted() const // Function : SalomeApp_ListViewItem::setAccepted // Purpose : set entitiy accepted or not after editing //================================================================ -void SalomeApp_ListViewItem::setAccepted(bool theAccepted) +void SalomeApp_ListViewItem::setAccepted(bool theAccepted) { myAccepted = theAccepted; } //================================================================ // Function : SalomeApp_ListViewItem::getEditingType -// Purpose : returns type of edit control (0 - edit box, 1 - combo box, +// Purpose : returns type of edit control (0 - edit box, 1 - combo box, // 2 - editable combo box), default is edit box //================================================================ -int SalomeApp_ListViewItem::getEditingType() +int SalomeApp_ListViewItem::getEditingType() { return myEditingType; } //================================================================ // Function : SalomeApp_ListViewItem::setEditingType -// Purpose : sets type of edit control (0 - edit box, 1 - combo box, +// Purpose : sets type of edit control (0 - edit box, 1 - combo box, // 2 - editable combo box), negative value means none //================================================================ -void SalomeApp_ListViewItem::setEditingType(const int type) +void SalomeApp_ListViewItem::setEditingType(const int type) { myEditingType = type; } @@ -738,7 +738,7 @@ void SalomeApp_ListViewItem::setEditingType(const int type) // Purpose : returns edited column, default is last column // negative value means there are no editable columns //================================================================ -int SalomeApp_ListViewItem::getEditedColumn() +int SalomeApp_ListViewItem::getEditedColumn() { return listView()->columns()-1; } @@ -748,7 +748,7 @@ int SalomeApp_ListViewItem::getEditedColumn() // Purpose : returns type of edited value (string, int, double) // default is string //================================================================ -int SalomeApp_ListViewItem::getValueType() +int SalomeApp_ListViewItem::getValueType() { return myValueType; } @@ -757,7 +757,7 @@ int SalomeApp_ListViewItem::getValueType() // Function : SalomeApp_ListViewItem::setValueType // Purpose : sets type of edited value //================================================================ -void SalomeApp_ListViewItem::setValueType(const int valueType) +void SalomeApp_ListViewItem::setValueType(const int valueType) { myValueType = valueType; } @@ -766,7 +766,7 @@ void SalomeApp_ListViewItem::setValueType(const int valueType) // Function : SalomeApp_ListViewItem::getUserType // Purpose : sets type of edited value //================================================================ -int SalomeApp_ListViewItem::getUserType() +int SalomeApp_ListViewItem::getUserType() { return myUserType; } @@ -775,7 +775,7 @@ int SalomeApp_ListViewItem::getUserType() // Function : SalomeApp_ListViewItem::setUserType // Purpose : sets type of edited value //================================================================ -void SalomeApp_ListViewItem::setUserType(const int userType) +void SalomeApp_ListViewItem::setUserType(const int userType) { myUserType = userType; } @@ -785,7 +785,7 @@ void SalomeApp_ListViewItem::setUserType(const int userType) // Purpose : returns buttons for editing widget (Apply (V), Cancel (X)) // default is both buttons //================================================================ -int SalomeApp_ListViewItem::getButtons() +int SalomeApp_ListViewItem::getButtons() { return myButtons; } @@ -794,7 +794,7 @@ int SalomeApp_ListViewItem::getButtons() // Function : SalomeApp_ListViewItem::getButtons // Purpose : sets buttons for editing widget (Apply (V), Cancel (X)) //================================================================ -void SalomeApp_ListViewItem::setButtons(const int buttons) +void SalomeApp_ListViewItem::setButtons(const int buttons) { myButtons = buttons; } @@ -803,7 +803,7 @@ void SalomeApp_ListViewItem::setButtons(const int buttons) // Function : SalomeApp_ListViewItem::startEditing // Purpose : creates control for editing and fills it with values //================================================================ -SalomeApp_EntityEdit* SalomeApp_ListViewItem::startEditing() +SalomeApp_EntityEdit* SalomeApp_ListViewItem::startEditing() { SalomeApp_EntityEdit* aWidget = 0; QListView* aListView = listView(); @@ -816,9 +816,9 @@ SalomeApp_EntityEdit* SalomeApp_ListViewItem::startEditing() int anEditColumn = getEditedColumn(); if (anEditColumn < 0 || anEditType < 0) return 0; - aWidget = new SalomeApp_EntityEdit(aListView->viewport(), - anEditType, - aValueType, + aWidget = new SalomeApp_EntityEdit(aListView->viewport(), + anEditType, + aValueType, aButtons & SalomeApp_EntityEdit::btApply, aButtons & SalomeApp_EntityEdit::btCancel); computeEditGeometry(this, aWidget); @@ -832,7 +832,7 @@ SalomeApp_EntityEdit* SalomeApp_ListViewItem::startEditing() // Function : SalomeApp_ListViewItem::fillWidgetWithValues // Purpose : fills widget with initial values (list or single value) //================================================================ -void SalomeApp_ListViewItem::fillWidgetWithValues(SalomeApp_EntityEdit* theWidget) +void SalomeApp_ListViewItem::fillWidgetWithValues(SalomeApp_EntityEdit* theWidget) { int anEditColumn = getEditedColumn(); if (theWidget && anEditColumn >= 0 && !text(anEditColumn).isEmpty()) @@ -843,7 +843,7 @@ void SalomeApp_ListViewItem::fillWidgetWithValues(SalomeApp_EntityEdit* theWidge // Function : SalomeApp_ListViewItem::finishEditing // Purpose : finishes editing of entity //================================================================ -UpdateType SalomeApp_ListViewItem::finishEditing(SalomeApp_EntityEdit* theWidget) +UpdateType SalomeApp_ListViewItem::finishEditing(SalomeApp_EntityEdit* theWidget) { UpdateType aNeedsUpdate = utCancel; try { @@ -856,10 +856,10 @@ UpdateType SalomeApp_ListViewItem::finishEditing(SalomeApp_EntityEdit* theWidget case 1: aNeedsUpdate = setValue(theWidget->getText()); break; - default: + default: break; } - } + } } catch (...) { MESSAGE( "System error has been caught - SalomeApp_ListViewItem::finishEditing" ) @@ -871,7 +871,7 @@ UpdateType SalomeApp_ListViewItem::finishEditing(SalomeApp_EntityEdit* theWidget // Function : SalomeApp_ListViewItem::tipRect // Purpose : calculates rectangle which should contain item's tip //================================================================ -QRect SalomeApp_ListViewItem::tipRect() +QRect SalomeApp_ListViewItem::tipRect() { QRect aRect = QRect(-1, -1, -1, -1); QRect aItemRect = listView()->itemRect(this); @@ -884,9 +884,9 @@ QRect SalomeApp_ListViewItem::tipRect() QFont aFont(listView()->font()); QFontMetrics fm(aFont); int iw = fm.width(aTip); - aRect = QRect(QPoint(aRect0.x() < 0 ? 0 : aRect0.x(), - aRect0.y()), - QSize (iw, + aRect = QRect(QPoint(aRect0.x() < 0 ? 0 : aRect0.x(), + aRect0.y()), + QSize (iw, aRect0.height())); } return aRect; @@ -896,7 +896,7 @@ QRect SalomeApp_ListViewItem::tipRect() // Function : SalomeApp_ListViewItem::tipText // Purpose : returns text for tooltip //================================================================ -QString SalomeApp_ListViewItem::tipText() +QString SalomeApp_ListViewItem::tipText() { QString aText = getName(); if (!getValue().isEmpty()) @@ -913,21 +913,21 @@ QRect SalomeApp_ListViewItem::textRect(const int column) const QRect aItemRect = listView()->itemRect( this ); if ( !aItemRect.isValid() ) return aItemRect; - + QFont aFont(listView()->font()); QFontMetrics fm(aFont); - - int decorWidth = ( listView()->rootIsDecorated() ) ? + + int decorWidth = ( listView()->rootIsDecorated() ) ? ( listView()->treeStepSize() * (depth() + 1) ) : ( listView()->treeStepSize() * depth() ); - int pixmapWidth = ( pixmap(column) ) ? - pixmap(column)->width() + listView()->itemMargin() * 2 : + int pixmapWidth = ( pixmap(column) ) ? + pixmap(column)->width() + listView()->itemMargin() * 2 : listView()->itemMargin(); int prevWidth = 0; for (int i = 0; i < column; i++) prevWidth += listView()->header()->sectionSize(i); int ix = prevWidth + - pixmapWidth + + pixmapWidth + ((column == 0) ? decorWidth : 0); int iy = aItemRect.y(); int iw = fm.width(text(column)); @@ -951,24 +951,24 @@ QRect SalomeApp_ListViewItem::itemRect(const int column) const QRect aItemRect = listView()->itemRect( this ); if ( !aItemRect.isValid() ) return aItemRect; - + QFont aFont(listView()->font()); QFontMetrics fm(aFont); - - int decorWidth = ( listView()->rootIsDecorated() ) ? + + int decorWidth = ( listView()->rootIsDecorated() ) ? ( listView()->treeStepSize() * (depth() + 1) ) : ( listView()->treeStepSize() * depth() ); - int pixmapWidth = ( pixmap(column) ) ? - pixmap(column)->width() + listView()->itemMargin() * 2 : + int pixmapWidth = ( pixmap(column) ) ? + pixmap(column)->width() + listView()->itemMargin() * 2 : 0; int prevWidth = 0; for (int i = 0; i < column; i++) prevWidth += listView()->header()->sectionSize(i); int ix = prevWidth; int iy = aItemRect.y(); - int iw = pixmapWidth + - listView()->itemMargin() * 2 + - ((column == 0) ? decorWidth : 0) + + int iw = pixmapWidth + + listView()->itemMargin() * 2 + + ((column == 0) ? decorWidth : 0) + fm.width(text(column)); int ih = aItemRect.height(); ix -= listView()->contentsX(); @@ -986,7 +986,7 @@ QRect SalomeApp_ListViewItem::itemRect(const int column) const // Purpose : constructor //================================================================ SalomeApp_EditBox::SalomeApp_EditBox(QWidget* parent) : -QLineEdit(parent) +QLineEdit(parent) { } @@ -994,7 +994,7 @@ QLineEdit(parent) // Function : SalomeApp_EditBox::keyPressEvent // Purpose : event filter for key pressing //================================================================ -void SalomeApp_EditBox::keyPressEvent( QKeyEvent *e ) +void SalomeApp_EditBox::keyPressEvent( QKeyEvent *e ) { if ( e->key() == Key_Escape ) emit escapePressed(); @@ -1012,7 +1012,7 @@ void SalomeApp_EditBox::keyPressEvent( QKeyEvent *e ) // Purpose : constructor //================================================================ SalomeApp_ComboBox::SalomeApp_ComboBox(bool rw, QWidget* parent, const char* name) : -QComboBox(rw, parent, name) +QComboBox(rw, parent, name) { } @@ -1020,9 +1020,9 @@ QComboBox(rw, parent, name) // Function : SalomeApp_ComboBox::findItem // Purpose : searches item in list and returns its index //================================================================ -int SalomeApp_ComboBox::findItem(const QString& theText) +int SalomeApp_ComboBox::findItem(const QString& theText) { - for (int i = 0; i < count(); i++) + for (int i = 0; i < count(); i++) if (text(i) == theText) return i; return -1; @@ -1033,7 +1033,7 @@ int SalomeApp_ComboBox::findItem(const QString& theText) // Purpose : adds item in combo box //================================================================ void SalomeApp_ComboBox::insertItem(const QString& theValue, - int theIndex) + int theIndex) { if (duplicatesEnabled() || findItem(theValue) < 0) QComboBox::insertItem(theValue, theIndex); @@ -1043,7 +1043,7 @@ void SalomeApp_ComboBox::insertItem(const QString& theValue, // Function : SalomeApp_ComboBox::insertList // Purpose : adds list of items in combo box //================================================================ -void SalomeApp_ComboBox::insertList(const QStringList& theList) +void SalomeApp_ComboBox::insertList(const QStringList& theList) { for (unsigned i = 0; i < theList.count(); i++) insertItem(theList[i]); @@ -1053,7 +1053,7 @@ void SalomeApp_ComboBox::insertList(const QStringList& theList) // Function : SalomeApp_ComboBox::insertItem // Purpose : adds item in combo box //================================================================ -void SalomeApp_ComboBox::insertItem(const int theValue) +void SalomeApp_ComboBox::insertItem(const int theValue) { int aNum; bool bOk; @@ -1073,7 +1073,7 @@ void SalomeApp_ComboBox::insertItem(const int theValue) // Function : SalomeApp_ComboBox::insertList // Purpose : adds list of items in combo box //================================================================ -void SalomeApp_ComboBox::insertList(const TColStd_ListOfInteger& theList) +void SalomeApp_ComboBox::insertList(const TColStd_ListOfInteger& theList) { for (TColStd_ListIteratorOfListOfInteger aIter(theList); aIter.More(); aIter.Next()) insertItem(aIter.Value()); @@ -1083,7 +1083,7 @@ void SalomeApp_ComboBox::insertList(const TColStd_ListOfInteger& theList) // Function : SalomeApp_ComboBox::insertItem // Purpose : adds item in combo box //================================================================ -void SalomeApp_ComboBox::insertItem(const double theValue) +void SalomeApp_ComboBox::insertItem(const double theValue) { double aNum; bool bOk; @@ -1103,7 +1103,7 @@ void SalomeApp_ComboBox::insertItem(const double theValue) // Function : SalomeApp_ComboBox::insertList // Purpose : adds list of items in combo box //================================================================ -void SalomeApp_ComboBox::insertList(const TColStd_ListOfReal& theList) +void SalomeApp_ComboBox::insertList(const TColStd_ListOfReal& theList) { for (TColStd_ListIteratorOfListOfReal aIter(theList); aIter.More(); aIter.Next()) insertItem(aIter.Value()); @@ -1122,16 +1122,16 @@ void SalomeApp_ComboBox::insertList(const TColStd_ListOfReal& theList) // Function : SalomeApp_EntityEdit::SalomeApp_EntityEdit // Purpose : constructor //================================================================ -SalomeApp_EntityEdit::SalomeApp_EntityEdit(QWidget* parent, +SalomeApp_EntityEdit::SalomeApp_EntityEdit(QWidget* parent, int controlType, int valueType, - bool butApply, + bool butApply, bool butCancel) : QWidget(parent), myEdit(0), myCombo(0), myApplyBtn(0), -myCancelBtn(0) +myCancelBtn(0) { SalomeApp_Application* app = dynamic_cast( SUIT_Session::session()->activeApplication() ); SUIT_ResourceMgr* mgr = app ? app->resourceMgr() : NULL; @@ -1140,8 +1140,8 @@ myCancelBtn(0) aTopLayout->setAlignment( Qt::AlignTop ); aTopLayout->setSpacing( 0 ); aTopLayout->setMargin( 1 ); - if (controlType != etLineEdit && - controlType != etComboBox && + if (controlType != etLineEdit && + controlType != etComboBox && controlType != etComboEdit) controlType = etLineEdit; if (controlType == etComboBox || controlType == etComboEdit) { @@ -1170,8 +1170,8 @@ myCancelBtn(0) connect(myEdit, SIGNAL(returnPressed()), this, SLOT(onApply())); connect(myEdit, SIGNAL(escapePressed()), this, SLOT(onCancel())); } - if (valueType != vtString && - valueType != vtInteger && + if (valueType != vtString && + valueType != vtInteger && valueType != vtDouble) valueType = vtString; if (valueType == vtInteger) @@ -1181,7 +1181,7 @@ myCancelBtn(0) if (butApply) { // Apply button (V) myApplyBtn = new QToolButton(this); - + QPixmap anIcon; if( mgr ) anIcon = mgr->loadPixmap( "STD", tr( "ICON_APPLY" ), false ); @@ -1214,7 +1214,7 @@ myCancelBtn(0) // Function : SalomeApp_EntityEdit::~SalomeApp_EntityEdit // Purpose : destructor //================================================================ -SalomeApp_EntityEdit::~SalomeApp_EntityEdit() +SalomeApp_EntityEdit::~SalomeApp_EntityEdit() { } @@ -1222,7 +1222,7 @@ SalomeApp_EntityEdit::~SalomeApp_EntityEdit() // Function : SalomeApp_EntityEdit::clear // Purpose : clears edit/combo box //================================================================ -void SalomeApp_EntityEdit::clear() +void SalomeApp_EntityEdit::clear() { if (myEdit) myEdit->clear(); @@ -1234,7 +1234,7 @@ void SalomeApp_EntityEdit::clear() // Function : SalomeApp_EntityEdit::getText // Purpose : returns current text in edit box or combo box //================================================================ -QString SalomeApp_EntityEdit::getText() +QString SalomeApp_EntityEdit::getText() { if (myEdit) return myEdit->text(); @@ -1248,7 +1248,7 @@ QString SalomeApp_EntityEdit::getText() // Function : SalomeApp_EntityEdit::setText // Purpose : sets text //================================================================ -void SalomeApp_EntityEdit::setText(const QString& theText) +void SalomeApp_EntityEdit::setText(const QString& theText) { myString = theText; if (myEdit) @@ -1264,12 +1264,12 @@ void SalomeApp_EntityEdit::setText(const QString& theText) //================================================================ // Function : SalomeApp_EntityEdit::insertItem -// Purpose : adds item in combo box, +// Purpose : adds item in combo box, // sets it current if theSetCurrent is true //================================================================ -void SalomeApp_EntityEdit::insertItem(const QString& theValue, +void SalomeApp_EntityEdit::insertItem(const QString& theValue, bool theSetCurrent, - int theOrder) + int theOrder) { if (myCombo) { int aIndexAt = -1; @@ -1277,8 +1277,8 @@ void SalomeApp_EntityEdit::insertItem(const QString& theValue, aIndexAt = 0; else if (theOrder == atBeforeCurrent && myCombo->count() > 0) aIndexAt = myCombo->currentItem(); - else if (theOrder == atAfterCurrent && - myCombo->count() > 0 && + else if (theOrder == atAfterCurrent && + myCombo->count() > 0 && myCombo->currentItem() < myCombo->count()-1) aIndexAt = myCombo->currentItem() + 1; myCombo->insertItem(theValue, aIndexAt); @@ -1289,11 +1289,11 @@ void SalomeApp_EntityEdit::insertItem(const QString& theValue, //================================================================ // Function : SalomeApp_EntityEdit::insertList -// Purpose : adds items in combo box, +// Purpose : adds items in combo box, // sets item theCurrent as current //================================================================ -void SalomeApp_EntityEdit::insertList(const QStringList& theList, - const int theCurrent) +void SalomeApp_EntityEdit::insertList(const QStringList& theList, + const int theCurrent) { if (myCombo) myCombo->insertList(theList); @@ -1303,11 +1303,11 @@ void SalomeApp_EntityEdit::insertList(const QStringList& theList, //================================================================ // Function : SalomeApp_EntityEdit::insertItem -// Purpose : adds item in combo box, +// Purpose : adds item in combo box, // sets it current if theSetCurrent is true //================================================================ -void SalomeApp_EntityEdit::insertItem(const int theValue, - bool theSetCurrent) +void SalomeApp_EntityEdit::insertItem(const int theValue, + bool theSetCurrent) { if (myCombo) { myCombo->insertItem(theValue); @@ -1318,11 +1318,11 @@ void SalomeApp_EntityEdit::insertItem(const int theValue, //================================================================ // Function : SalomeApp_EntityEdit::insertList -// Purpose : adds items in combo box, +// Purpose : adds items in combo box, // sets item theCurrent as current //================================================================ -void SalomeApp_EntityEdit::insertList(const TColStd_ListOfInteger& theList, - const int theCurrent) +void SalomeApp_EntityEdit::insertList(const TColStd_ListOfInteger& theList, + const int theCurrent) { if (myCombo) myCombo->insertList(theList); @@ -1338,11 +1338,11 @@ void SalomeApp_EntityEdit::insertList(const TColStd_ListOfInteger& theList, //================================================================ // Function : SalomeApp_EntityEdit::insertItem -// Purpose : adds item in combo box, +// Purpose : adds item in combo box, // sets it current if theSetCurrent is true //================================================================ -void SalomeApp_EntityEdit::insertItem(const double theValue, - bool theSetCurrent) +void SalomeApp_EntityEdit::insertItem(const double theValue, + bool theSetCurrent) { if (myCombo) { myCombo->insertItem(theValue); @@ -1353,15 +1353,15 @@ void SalomeApp_EntityEdit::insertItem(const double theValue, //================================================================ // Function : SalomeApp_EntityEdit::insertList -// Purpose : adds items in combo box, +// Purpose : adds items in combo box, // sets item theCurrent as current //================================================================ -void SalomeApp_EntityEdit::insertList(const TColStd_ListOfReal& theList, - const int theCurrent) +void SalomeApp_EntityEdit::insertList(const TColStd_ListOfReal& theList, + const int theCurrent) { if (myCombo) myCombo->insertList(theList); - + TColStd_ListIteratorOfListOfReal aIter(theList); for (unsigned i = 0; aIter.More(); aIter.Next(), i++) { if (theCurrent == i) { @@ -1375,7 +1375,7 @@ void SalomeApp_EntityEdit::insertList(const TColStd_ListOfReal& theList, // Function : SalomeApp_EntityEdit::getControl // Purpose : gets actual widget //================================================================ -QWidget* SalomeApp_EntityEdit::getControl() +QWidget* SalomeApp_EntityEdit::getControl() { if (myEdit) return myEdit; @@ -1389,7 +1389,7 @@ QWidget* SalomeApp_EntityEdit::getControl() // Function : SalomeApp_EntityEdit::setFocus // Purpose : redirect focus to corresponding widget //================================================================ -void SalomeApp_EntityEdit::setFocus() +void SalomeApp_EntityEdit::setFocus() { if (myEdit) { myEdit->setFocus(); @@ -1405,7 +1405,7 @@ void SalomeApp_EntityEdit::setFocus() // Function : SalomeApp_EntityEdit::setValidator // Purpose : sets validator for the control //================================================================ -void SalomeApp_EntityEdit::setValidator(const QValidator* theValidator) +void SalomeApp_EntityEdit::setValidator(const QValidator* theValidator) { if (myEdit) myEdit->setValidator(theValidator); @@ -1417,7 +1417,7 @@ void SalomeApp_EntityEdit::setValidator(const QValidator* theValidator) // Function : SalomeApp_EntityEdit::keyPressEvent // Purpose : event filter for KeyPress event //================================================================ -void SalomeApp_EntityEdit::keyPressEvent( QKeyEvent * e) +void SalomeApp_EntityEdit::keyPressEvent( QKeyEvent * e) { if ( (e->key() == Key_Enter || e->key() == Key_Return ) ) @@ -1430,7 +1430,7 @@ void SalomeApp_EntityEdit::keyPressEvent( QKeyEvent * e) // Function : SalomeApp_EntityEdit::onComboActivated // Purpose : called when item activated in combo box //================================================================ -void SalomeApp_EntityEdit::onComboActivated(const QString& theText) +void SalomeApp_EntityEdit::onComboActivated(const QString& theText) { onTextChanged(theText); } @@ -1439,7 +1439,7 @@ void SalomeApp_EntityEdit::onComboActivated(const QString& theText) // Function : SalomeApp_EntityEdit::onTextChanged // Purpose : slot, called when text changed in line edit //================================================================ -void SalomeApp_EntityEdit::onTextChanged(const QString& theText) +void SalomeApp_EntityEdit::onTextChanged(const QString& theText) { if (myApplyBtn) myApplyBtn->setEnabled(!(theText == myString)); @@ -1451,7 +1451,7 @@ void SalomeApp_EntityEdit::onTextChanged(const QString& theText) // Function : SalomeApp_EntityEdit::onCancel // Purpose : slot, called when user presses Cancel button //================================================================ -void SalomeApp_EntityEdit::onCancel() +void SalomeApp_EntityEdit::onCancel() { setText(myString); if (myApplyBtn) @@ -1465,7 +1465,7 @@ void SalomeApp_EntityEdit::onCancel() // Function : SalomeApp_EntityEdit::onApply // Purpose : slot, called when user presses Apply button //================================================================ -void SalomeApp_EntityEdit::onApply() +void SalomeApp_EntityEdit::onApply() { myString = getText(); if (myApplyBtn) @@ -1479,7 +1479,7 @@ void SalomeApp_EntityEdit::onApply() // Function : SalomeApp_EntityEdit::showButtons // Purpose : shows/hides buttons //================================================================ -void SalomeApp_EntityEdit::showButtons(bool show) +void SalomeApp_EntityEdit::showButtons(bool show) { if (myApplyBtn) show ? myApplyBtn->show() : myApplyBtn->hide(); diff --git a/src/SalomeApp/SalomeApp_ListView.h b/src/SalomeApp/SalomeApp_ListView.h index 89c7cbcb5..e7b7552cf 100644 --- a/src/SalomeApp/SalomeApp_ListView.h +++ b/src/SalomeApp/SalomeApp_ListView.h @@ -12,7 +12,8 @@ #ifndef SALOMEAPP_LISTVIEW_H #define SALOMEAPP_LISTVIEW_H -#include +#include + #include #include #include @@ -47,7 +48,7 @@ class SalomeApp_EntityEdit; // Class : SalomeApp_ListView // Description : parent class for Data Viewer and Properties Viewer //================================================================ -class SalomeApp_ListView : public QListView , public SUIT_PopupClient { +class SalomeApp_ListView : public QtxListView , public SUIT_PopupClient { Q_OBJECT diff --git a/src/SalomeApp/SalomeApp_PreferencesDlg.cxx b/src/SalomeApp/SalomeApp_PreferencesDlg.cxx index 374c451ff..8f7d5d5e7 100755 --- a/src/SalomeApp/SalomeApp_PreferencesDlg.cxx +++ b/src/SalomeApp/SalomeApp_PreferencesDlg.cxx @@ -9,7 +9,7 @@ #include SalomeApp_PreferencesDlg::SalomeApp_PreferencesDlg( SalomeApp_Preferences* prefs, QWidget* parent ) -: QtxDialog( parent, 0, true, false, Standard | Apply ), +: QtxDialog( parent, 0, true, false, OK | Cancel | Apply ), myPrefs( prefs ) { setCaption( tr( "CAPTION" ) ); diff --git a/src/SalomeApp/SalomeApp_StudyPropertiesDlg.cxx b/src/SalomeApp/SalomeApp_StudyPropertiesDlg.cxx index 1613459d5..616af1f86 100644 --- a/src/SalomeApp/SalomeApp_StudyPropertiesDlg.cxx +++ b/src/SalomeApp/SalomeApp_StudyPropertiesDlg.cxx @@ -63,8 +63,8 @@ public: } case SalomeApp_StudyPropertiesDlg::prpLockedId: { - list << SalomeApp_StudyPropertiesDlg::tr("PRP_NO") << SalomeApp_StudyPropertiesDlg::tr("PRP_YES"); - theWidget->insertList(list, getValue() == SalomeApp_StudyPropertiesDlg::tr("PRP_NO") ? 0 : 1); + list << SalomeApp_StudyPropertiesDlg::tr( "PRP_NO" ) << SalomeApp_StudyPropertiesDlg::tr( "PRP_YES" ); + theWidget->insertList(list, getValue() == SalomeApp_StudyPropertiesDlg::tr( "PRP_NO" ) ? 0 : 1 ); break; } case SalomeApp_StudyPropertiesDlg::prpModificationsId: @@ -190,15 +190,16 @@ void SalomeApp_StudyPropertiesDlg::initData() // Locked or not item = new SalomeApp_PropItem(myPropList, item, tr("PRP_LOCKED")+":", true, prpLockedId); item->setEditingType( SalomeApp_EntityEdit::etComboBox); - if (hasData) (propAttr->IsLocked()) ? item->setValue(tr("PRP_YES")) : item->setValue(tr("PRP_NO")); + if ( hasData ) + item->setValue( tr( propAttr->IsLocked() ? "PRP_YES" : "PRP_NO" ) ); // Saved or not item = new SalomeApp_PropItem(myPropList, item, tr("PRP_MODIFIED")+":", false, prpSavedId); if (hasData) { if (propAttr->IsModified()) - item->setValue(tr("PRP_YES")); + item->setValue( tr( "PRP_YES" ) ); else - item->setValue(tr("PRP_NO")); + item->setValue( tr( "PRP_NO" ) ); } // Modifications list diff --git a/src/SalomeApp/resources/SalomeApp_msg_en.po b/src/SalomeApp/resources/SalomeApp_msg_en.po index d0fd32d20..17aee442a 100644 --- a/src/SalomeApp/resources/SalomeApp_msg_en.po +++ b/src/SalomeApp/resources/SalomeApp_msg_en.po @@ -236,12 +236,6 @@ msgstr "from scratch" msgid "SalomeApp_StudyPropertiesDlg::PRP_MODE_FROM_COPYFROM" msgstr "copy from" -msgid "SalomeApp_StudyPropertiesDlg::PRP_NO" -msgstr "No" - -msgid "SalomeApp_StudyPropertiesDlg::PRP_YES" -msgstr "Yes" - msgid "SalomeApp_StudyPropertiesDlg::TLT_STUDY_PROPERTIES" msgstr "Study Properties" @@ -263,6 +257,12 @@ msgstr "Modified" msgid "SalomeApp_StudyPropertiesDlg::PRP_MODIFICATIONS" msgstr "Modifications" +msgid "SalomeApp_StudyPropertiesDlg::PRP_YES" +msgstr "Yes" + +msgid "SalomeApp_StudyPropertiesDlg::PRP_NO" +msgstr "No" + //======================================================================================= msgid "SalomeApp_Application::PUBLISH_IN_STUDY" -- 2.39.2