Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make same planes cannot be used twice in partition tool
[modules/shaper.git]
/
src
/
XGUI
/
XGUI_ErrorDialog.cpp
diff --git
a/src/XGUI/XGUI_ErrorDialog.cpp
b/src/XGUI/XGUI_ErrorDialog.cpp
index c3608f606bc060cb83bb0b2c011264d871dd7d18..d389e3b3f73d6a04ae35581c56f058acd5fe8ad2 100644
(file)
--- a/
src/XGUI/XGUI_ErrorDialog.cpp
+++ b/
src/XGUI/XGUI_ErrorDialog.cpp
@@
-1,3
+1,5
@@
+// Copyright (C) 2014-20xx CEA/DEN, EDF R&D -->
+
/*
* XGUI_ErrorDialog.cpp
*
/*
* XGUI_ErrorDialog.cpp
*
@@
-6,6
+8,8
@@
*/
#include <XGUI_ErrorDialog.h>
*/
#include <XGUI_ErrorDialog.h>
+#include <ModuleBase_Tools.h>
+
#include <QDialogButtonBox>
#include <QHBoxLayout>
#include <QLabel>
#include <QDialogButtonBox>
#include <QHBoxLayout>
#include <QLabel>
@@
-20,10
+24,10
@@
XGUI_ErrorDialog::XGUI_ErrorDialog(QWidget* parent)
myErrorLog = new QTextEdit(this);
myErrorLog->setReadOnly(true);
aDlgLay->addWidget(myErrorLog);
myErrorLog = new QTextEdit(this);
myErrorLog->setReadOnly(true);
aDlgLay->addWidget(myErrorLog);
- QDialogButtonBox* aButtonBox =
-
new QDialogButtonBox(QDialogButtonBox::Close, Qt::Horizontal,
this);
+ QDialogButtonBox* aButtonBox =
new QDialogButtonBox(QDialogButtonBox::Close, Qt::Horizontal,
+
this);
aDlgLay->addWidget(aButtonBox);
aDlgLay->addWidget(aButtonBox);
- aDlgLay->setContentsMargins(2,
2,2,
2);
+ aDlgLay->setContentsMargins(2,
2, 2,
2);
aDlgLay->setSpacing(2);
setLayout(aDlgLay);
resize(420, 240);
aDlgLay->setSpacing(2);
setLayout(aDlgLay);
resize(420, 240);
@@
-56,10
+60,10
@@
void XGUI_ErrorDialog::addError(const QString& theError)
{
myErrors.append(theError);
refresh();
{
myErrors.append(theError);
refresh();
- if(!isVisible()) {
+ if
(!isVisible()) {
show();
raise();
show();
raise();
-
activateWindow(
);
+
ModuleBase_Tools::activateWindow(this, "XGUI_ErrorDialog::addError"
);
}
}
}
}