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 a496a82d7c416e31d2e9832ebab8dd8b45edd65f..3ece51e833d035ddf097191de5307063ea39eb46 100644
(file)
--- a/
src/HYDROGUI/HYDROGUI_InputPanel.cxx
+++ b/
src/HYDROGUI/HYDROGUI_InputPanel.cxx
@@
-1,8
+1,4
@@
-// Copyright (C) 2007-2015 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
@@
-20,18
+16,24
@@
// 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 <QDir>
HYDROGUI_InputPanel::HYDROGUI_InputPanel( HYDROGUI_Module* theModule, const QString& theTitle, bool doInitLayout )
#include <QLayout>
#include <QPushButton>
#include <QDir>
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 );
myModule( theModule )
{
setFloating( false );
@@
-57,17
+59,20
@@
HYDROGUI_InputPanel::HYDROGUI_InputPanel( HYDROGUI_Module* theModule, const QStr
aBtnsLayout->setMargin( 5 );
aBtnsLayout->setSpacing( 5 );
aBtnsLayout->setMargin( 5 );
aBtnsLayout->setSpacing( 5 );
- myCancel = new QPushButton( tr( "C
ANCEL
" ), myBtnFrame );
+ myCancel = new QPushButton( tr( "C
LOSE
" ), myBtnFrame );
myHelp = new QPushButton( tr( "HELP" ), myBtnFrame );
if ( doInitLayout ) {
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 );
+ 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( myCancel, SIGNAL( clicked() ), this, SLOT( onCancel() ) );
connect( myApply, SIGNAL( clicked() ), this, SLOT( onApply() ) );
}
connect( myCancel, SIGNAL( clicked() ), this, SLOT( onCancel() ) );
@@
-85,12
+90,18
@@
HYDROGUI_Module* HYDROGUI_InputPanel::module() const
bool HYDROGUI_InputPanel::isApplyEnabled() const
{
bool HYDROGUI_InputPanel::isApplyEnabled() const
{
-
return myApply->isEnabled();
+ return myApply->isEnabled();
}
void HYDROGUI_InputPanel::setApplyEnabled( bool on )
{
}
void HYDROGUI_InputPanel::setApplyEnabled( bool on )
{
- myApply->setEnabled( on );
+ myApplyAndClose->setEnabled( on );
+ myApply->setEnabled( on );
+}
+
+void HYDROGUI_InputPanel::onApplyAndClose()
+{
+ emit panelApplyAndClose();
}
void HYDROGUI_InputPanel::onApply()
}
void HYDROGUI_InputPanel::onApply()