Salome HOME
projects
/
modules
/
hydro.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refs #727, #736: fix for the first bug and for the second part (Bug2) of the last...
[modules/hydro.git]
/
src
/
HYDROGUI
/
HYDROGUI_InputPanel.cxx
diff --git
a/src/HYDROGUI/HYDROGUI_InputPanel.cxx
b/src/HYDROGUI/HYDROGUI_InputPanel.cxx
index 23a9c06e756b29500bc2c3a13b384cce7b696f28..3ece51e833d035ddf097191de5307063ea39eb46 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_InputPanel.cxx
+++ b/
src/HYDROGUI/HYDROGUI_InputPanel.cxx
@@
-1,12
+1,8
@@
-// Copyright (C) 2007-2013 CEA/DEN, EDF R&D, OPEN CASCADE
-//
-// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
-//
+// Copyright (C) 2014-2015 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
// License as published by the Free Software Foundation; either
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License
, or (at your option) any later version
.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-20,56
+16,67
@@
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
-#include "HYDROGUI_InputPanel.h"
-#include "HYDROGUI_Module.h"
-
-#include <CAM_Application.h>
-#include <SUIT_Desktop.h>
+#include <HYDROGUI_InputPanel.h>
+#ifndef LIGHT_MODE
+ #include <HYDROGUI_Module.h>
+ #include <CAM_Application.h>
+ #include <SUIT_Desktop.h>
+#endif
+#include <QFrame>
#include <QLayout>
#include <QPushButton>
#include <QLayout>
#include <QPushButton>
+#include <QDir>
HYDROGUI_InputPanel::HYDROGUI_InputPanel( HYDROGUI_Module* theModule, const QString& theTitle, bool doInitLayout )
HYDROGUI_InputPanel::HYDROGUI_InputPanel( HYDROGUI_Module* theModule, const QString& theTitle, bool doInitLayout )
+#ifdef LIGHT_MODE
+: QDockWidget( 0 ),
+#else
: QDockWidget( theModule->application()->desktop() ),
: QDockWidget( theModule->application()->desktop() ),
+#endif
myModule( theModule )
{
setFloating( false );
setWindowTitle( theTitle );
setAllowedAreas( Qt::RightDockWidgetArea );
myModule( theModule )
{
setFloating( false );
setWindowTitle( theTitle );
setAllowedAreas( Qt::RightDockWidgetArea );
- if ( doInitLayout ) {
- QFrame* aFrame = new QFrame( this );
- setWidget( aFrame );
- QVBoxLayout* aLayout = new QVBoxLayout( aFrame );
+ QFrame* aFrame = new QFrame( this );
+ setWidget( aFrame );
+ QVBoxLayout* aLayout = new QVBoxLayout( aFrame );
+
+ myMainFrame = new QFrame( aFrame );
+ QBoxLayout* aMainLayout = new QVBoxLayout( myMainFrame );
+ aMainLayout->setMargin( 0 );
+ aMainLayout->setSpacing( 5 );
- myMainFrame = new QFrame( aFrame );
- QBoxLayout* aMainLayout = new QVBoxLayout( myMainFrame );
- aMainLayout->setMargin( 0 );
- aMainLayout->setSpacing( 5 );
-
- aLayout->addWidget( myMainFrame, 1 );
+ aLayout->addWidget( myMainFrame, 1 );
+
+ myBtnFrame = new QFrame( aFrame );
+ aLayout->addWidget( myBtnFrame, 0 );
- myBtnFrame = new QFrame( aFrame );
- aLayout->addWidget( myBtnFrame, 0 );
+ QHBoxLayout* aBtnsLayout = new QHBoxLayout( myBtnFrame );
+ aBtnsLayout->setMargin( 5 );
+ aBtnsLayout->setSpacing( 5 );
- QHBoxLayout* aBtnsLayout = new QHBoxLayout( myBtnFrame );
- aBtnsLayout->setMargin( 5 );
- aBtnsLayout->setSpacing( 5 );
+ myCancel = new QPushButton( tr( "CLOSE" ), myBtnFrame );
+ myHelp = new QPushButton( tr( "HELP" ), myBtnFrame );
+ if ( doInitLayout ) {
+ myApplyAndClose = new QPushButton( tr( "APPLY_AND_CLOSE" ), myBtnFrame );
myApply = new QPushButton( tr( "APPLY" ), myBtnFrame );
myApply = new QPushButton( tr( "APPLY" ), myBtnFrame );
- myCancel = new QPushButton( tr( "CANCEL" ), myBtnFrame );
- myHelp = new QPushButton( tr( "HELP" ), myBtnFrame );
+ aBtnsLayout->addWidget( myApplyAndClose, 0 );
aBtnsLayout->addWidget( myApply, 0 );
aBtnsLayout->addWidget( myCancel, 0 );
aBtnsLayout->addStretch( 1 );
aBtnsLayout->addWidget( myHelp, 0 );
aBtnsLayout->addWidget( myApply, 0 );
aBtnsLayout->addWidget( myCancel, 0 );
aBtnsLayout->addStretch( 1 );
aBtnsLayout->addWidget( myHelp, 0 );
+ connect( myApplyAndClose, SIGNAL( clicked() ), this, SLOT( onApplyAndClose() ) );
connect( myApply, SIGNAL( clicked() ), this, SLOT( onApply() ) );
connect( myApply, SIGNAL( clicked() ), this, SLOT( onApply() ) );
- connect( myCancel, SIGNAL( clicked() ), this, SLOT( onCancel() ) );
- connect( myHelp, SIGNAL( clicked() ), this, SLOT( onHelp() ) );
}
}
+ connect( myCancel, SIGNAL( clicked() ), this, SLOT( onCancel() ) );
+ connect( myHelp, SIGNAL( clicked() ), this, SLOT( onHelp() ) );
}
HYDROGUI_InputPanel::~HYDROGUI_InputPanel()
}
HYDROGUI_InputPanel::~HYDROGUI_InputPanel()
@@
-81,6
+88,22
@@
HYDROGUI_Module* HYDROGUI_InputPanel::module() const
return myModule;
}
return myModule;
}
+bool HYDROGUI_InputPanel::isApplyEnabled() const
+{
+ return myApply->isEnabled();
+}
+
+void HYDROGUI_InputPanel::setApplyEnabled( bool on )
+{
+ myApplyAndClose->setEnabled( on );
+ myApply->setEnabled( on );
+}
+
+void HYDROGUI_InputPanel::onApplyAndClose()
+{
+ emit panelApplyAndClose();
+}
+
void HYDROGUI_InputPanel::onApply()
{
emit panelApply();
void HYDROGUI_InputPanel::onApply()
{
emit panelApply();
@@
-93,6
+116,7
@@
void HYDROGUI_InputPanel::onCancel()
void HYDROGUI_InputPanel::onHelp()
{
void HYDROGUI_InputPanel::onHelp()
{
+ emit panelHelp();
}
void HYDROGUI_InputPanel::closeEvent ( QCloseEvent * event )
}
void HYDROGUI_InputPanel::closeEvent ( QCloseEvent * event )
@@
-122,3
+146,8
@@
QFrame* HYDROGUI_InputPanel::mainFrame() const
{
return myMainFrame;
}
{
return myMainFrame;
}
+
+QFrame* HYDROGUI_InputPanel::buttonFrame() const
+{
+ return myBtnFrame;
+}