ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-04-24 16:22:03 +05:00
Code Issues Packages Projects Releases Wiki Activity

Avoid code duplication: use LightApp_Name dialog.

Browse Source
This commit is contained in:
jfa 2006-02-20 11:37:38 +00:00
parent 96892bc512
commit 25187cb1d6
4 changed files with 7 additions and 189 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/GEOMToolsGUI/GEOMToolsGUI_1.cxx
View File

@ -33,7 +33,6 @@
#include "GeometryGUI.h"
#include "GEOMToolsGUI_TransparencyDlg.h"
#include "GEOMToolsGUI_NbIsosDlg.h" // Method ISOS adjustement
#include "GEOMToolsGUI_NameDlg.h"
#include "GEOM_Actor.h"
#include "GEOMBase.h"
@ -57,10 +56,12 @@
#include <SUIT_MessageBox.h>
#include <SalomeApp_Application.h>
#include <LightApp_SelectionMgr.h>
#include <SalomeApp_Study.h>
#include <SalomeApp_Module.h>
#include <LightApp_SelectionMgr.h>
#include <LightApp_NameDlg.h>
#include "SALOMEDSClient.hxx"
#include "utilities.h"
@ -195,7 +196,7 @@ void GEOMToolsGUI::OnRename()
if( obj->FindAttribute(anAttr, "AttributeName") ) {
_PTR(AttributeName) aName (anAttr);
QString newName = GEOMToolsGUI_NameDlg::getName( app->desktop(), aName->Value().c_str() );
QString newName = LightApp_NameDlg::getName( app->desktop(), aName->Value().c_str() );
if ( !newName.isEmpty() ) {
aName->SetValue( newName.latin1() ); // rename the SObject
IObject->setName( newName.latin1() );// rename the InteractiveObject

135
src/GEOMToolsGUI/GEOMToolsGUI_NameDlg.cxx
View File

@ -1,135 +0,0 @@
// SALOME GEOMToolsGUI : implementation of desktop and GUI kernel
//
// Copyright (C) 2003 CEA/DEN, EDF R&D
//
//
//
// File : GEOMToolsGUI_NameDlg.cxx
// Author : Vadim SANDLER
// Module : SALOME
// $Header$
#include "GEOMToolsGUI_NameDlg.h"
#include <SUIT_Session.h>
#include <SUIT_Application.h>
#include <SUIT_Desktop.h>
#include <SUIT_Tools.h>
#include <qgroupbox.h>
#include <qlabel.h>
#include <qlineedit.h>
#include <qpushbutton.h>
#include <qlayout.h>
//using namespace std;
/*!
Constructor
*/
GEOMToolsGUI_NameDlg::GEOMToolsGUI_NameDlg( QWidget* parent )
: QDialog( parent ? parent : SUIT_Session::session()->activeApplication()->desktop(),
"GEOMToolsGUI_NameDlg",
true,
WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu )
{
setCaption( tr("TLT_RENAME") );
setSizeGripEnabled( TRUE );
QVBoxLayout* topLayout = new QVBoxLayout( this );
topLayout->setMargin( 11 ); topLayout->setSpacing( 6 );
/***************************************************************/
QGroupBox* GroupC1 = new QGroupBox( this, "GroupC1" );
GroupC1->setColumnLayout(0, Qt::Vertical );
GroupC1->layout()->setMargin( 0 ); GroupC1->layout()->setSpacing( 0 );
QHBoxLayout* GroupC1Layout = new QHBoxLayout( GroupC1->layout() );
GroupC1Layout->setAlignment( Qt::AlignTop );
GroupC1Layout->setMargin( 11 ); GroupC1Layout->setSpacing( 6 );
QLabel* TextLabel = new QLabel( GroupC1, "TextLabel1" );
TextLabel->setText( tr( "NAME_LBL" ) );
GroupC1Layout->addWidget( TextLabel );
myLineEdit = new QLineEdit( GroupC1, "LineEdit1" );
myLineEdit->setMinimumSize( 250, 0 );
GroupC1Layout->addWidget( myLineEdit );
/***************************************************************/
QGroupBox* GroupButtons = new QGroupBox( this, "GroupButtons" );
GroupButtons->setColumnLayout(0, Qt::Vertical );
GroupButtons->layout()->setMargin( 0 ); GroupButtons->layout()->setSpacing( 0 );
QHBoxLayout* GroupButtonsLayout = new QHBoxLayout( GroupButtons->layout() );
GroupButtonsLayout->setAlignment( Qt::AlignTop );
GroupButtonsLayout->setMargin( 11 ); GroupButtonsLayout->setSpacing( 6 );
myButtonOk = new QPushButton( GroupButtons, "buttonOk" );
myButtonOk->setText( tr( "GEOM_BUT_OK" ) );
myButtonOk->setAutoDefault( TRUE );
myButtonOk->setDefault( TRUE );
GroupButtonsLayout->addWidget( myButtonOk );
GroupButtonsLayout->addStretch();
myButtonCancel = new QPushButton( GroupButtons, "buttonCancel" );
myButtonCancel->setText( tr( "GEOM_BUT_CANCEL" ) );
myButtonCancel->setAutoDefault( TRUE );
GroupButtonsLayout->addWidget( myButtonCancel );
/***************************************************************/
topLayout->addWidget( GroupC1 );
topLayout->addWidget( GroupButtons );
// signals and slots connections
connect( myButtonOk, SIGNAL( clicked() ), this, SLOT( accept() ) );
connect( myButtonCancel, SIGNAL( clicked() ), this, SLOT( reject() ) );
/* Move widget on the botton right corner of main widget */
SUIT_Tools::centerWidget( this, parent );
}
/*!
Destructor
*/
GEOMToolsGUI_NameDlg::~GEOMToolsGUI_NameDlg()
{
}
/*!
Sets name
*/
void GEOMToolsGUI_NameDlg::setName( const QString& name )
{
myLineEdit->setText( name );
myLineEdit->end(false);
myLineEdit->home(true);
}
/*!
Returns name entered by user
*/
QString GEOMToolsGUI_NameDlg::name()
{
return myLineEdit->text();
}
void GEOMToolsGUI_NameDlg::accept()
{
if ( name().stripWhiteSpace().isEmpty() )
return;
QDialog::accept();
}
/*!
Creates modal <Rename> dialog and returns name entered [ static ]
*/
QString GEOMToolsGUI_NameDlg::getName( QWidget* parent, const QString& oldName )
{
QString n;
GEOMToolsGUI_NameDlg* dlg = new GEOMToolsGUI_NameDlg( parent );
if ( !oldName.isNull() )
dlg->setName( oldName );
if ( dlg->exec() == QDialog::Accepted )
n = dlg->name();
delete dlg;
return n;
}

46
src/GEOMToolsGUI/GEOMToolsGUI_NameDlg.h
View File

@ -1,46 +0,0 @@
// SALOME GEOMToolsGUI : implementation of desktop and GUI kernel
//
// Copyright (C) 2003 CEA/DEN, EDF R&D
//
//
//
// File : GEOMToolsGUI_NameDlg.h
// Author : Vadim SANDLER
// Module : SALOME
// $Header$
#ifndef GEOMToolsGUI_NAMEDLG_H
#define GEOMToolsGUI_NAMEDLG_H
#include <qdialog.h>
class QLineEdit;
class QPushButton;
//=================================================================================
// class : GEOMToolsGUI_NameDlg
// purpose : Common <Rename> dialog box class
//=================================================================================
class GEOMToolsGUI_NameDlg : public QDialog
{
Q_OBJECT
public:
GEOMToolsGUI_NameDlg( QWidget* parent = 0 );
~GEOMToolsGUI_NameDlg();
void setName( const QString& name );
QString name();
static QString getName( QWidget* parent = 0, const QString& oldName = QString::null );
protected slots:
void accept();
private:
QPushButton* myButtonOk;
QPushButton* myButtonCancel;
QLineEdit* myLineEdit;
};
#endif // GEOMToolsGUI_NAMEDLG_H

8
src/GEOMToolsGUI/Makefile.in
View File

@ -38,17 +38,15 @@ VPATH=.:@srcdir@:@top_srcdir@/idl
LIB = libGEOMToolsGUI.la
# header files
EXPORT_HEADERS=
EXPORT_HEADERS =
LIB_SRC = GEOMToolsGUI.cxx \
GEOMToolsGUI_1.cxx \
GEOMToolsGUI_TransparencyDlg.cxx \
GEOMToolsGUI_NbIsosDlg.cxx \
GEOMToolsGUI_NameDlg.cxx
GEOMToolsGUI_NbIsosDlg.cxx
LIB_MOC = GEOMToolsGUI_TransparencyDlg.h \
GEOMToolsGUI_NbIsosDlg.h \
GEOMToolsGUI_NameDlg.h
GEOMToolsGUI_NbIsosDlg.h
LIB_CLIENT_IDL = SALOMEDS_Attributes.idl \
SALOME_GenericObj.idl \