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
Issue #3052: Conflicting constraint after trim ellipse
[modules/shaper.git]
/
src
/
ModuleBase
/
ModuleBase_Dialog.cpp
diff --git
a/src/ModuleBase/ModuleBase_Dialog.cpp
b/src/ModuleBase/ModuleBase_Dialog.cpp
index d07bebf0f05b072850f6829abbe28fe320eb17c8..046c8abb55ee9674f57b598bf407df3f54f28037 100644
(file)
--- a/
src/ModuleBase/ModuleBase_Dialog.cpp
+++ b/
src/ModuleBase/ModuleBase_Dialog.cpp
@@
-1,4
+1,4
@@
-// Copyright (C) 2014-201
7
CEA/DEN, EDF R&D
+// Copyright (C) 2014-201
9
CEA/DEN, EDF R&D
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@
-12,10
+12,9
@@
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA
//
//
-// See http://www.salome-platform.org/ or
-// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#include "ModuleBase_Dialog.h"
//
#include "ModuleBase_Dialog.h"
@@
-24,6
+23,7
@@
#include "ModuleBase_IPropertyPanel.h"
#include "ModuleBase_PageWidget.h"
#include "ModuleBase_ModelDialogWidget.h"
#include "ModuleBase_IPropertyPanel.h"
#include "ModuleBase_PageWidget.h"
#include "ModuleBase_ModelDialogWidget.h"
+#include "ModuleBase_Tools.h"
#include <ModelAPI_Session.h>
#include <ModelAPI_Events.h>
#include <ModelAPI_Session.h>
#include <ModelAPI_Events.h>
@@
-47,9
+47,10
@@
ModuleBase_Dialog::ModuleBase_Dialog(ModuleBase_IWorkshop* theParent, const QStr
myActiveWidget(0)
{
ModuleBase_WidgetFactory aFactory(myDescription, myWorkshop);
myActiveWidget(0)
{
ModuleBase_WidgetFactory aFactory(myDescription, myWorkshop);
- std::string aTitle = aFactory.widgetAPI()->getProperty(FEATURE_TEXT);
+ QString aTitle = ModuleBase_Tools::translate("ModuleBase_Dialog",
+ aFactory.widgetAPI()->getProperty(FEATURE_TEXT));
- setWindowTitle(aTitle
.c_str()
);
+ setWindowTitle(aTitle);
SessionPtr aMgr = ModelAPI_Session::get();
std::shared_ptr<ModelAPI_Document> aDoc = aMgr->activeDocument();
SessionPtr aMgr = ModelAPI_Session::get();
std::shared_ptr<ModelAPI_Document> aDoc = aMgr->activeDocument();
@@
-75,7
+76,7
@@
ModuleBase_Dialog::ModuleBase_Dialog(ModuleBase_IWorkshop* theParent, const QStr
aFrame->setFrameStyle(QFrame::WinPanel | QFrame::Raised);
aLayout->addWidget(aFrame);
aFrame->setFrameStyle(QFrame::WinPanel | QFrame::Raised);
aLayout->addWidget(aFrame);
- Q
VBoxLayout* aBtnLayout = new QV
BoxLayout(aFrame);
+ Q
HBoxLayout* aBtnLayout = new QH
BoxLayout(aFrame);
ModuleBase_Tools::adjustMargins(aBtnLayout);
myButtonsBox = new QDialogButtonBox(
ModuleBase_Tools::adjustMargins(aBtnLayout);
myButtonsBox = new QDialogButtonBox(