From 25187cb1d6e6754d8cf4369bb1f209ce91b8cb46 Mon Sep 17 00:00:00 2001 From: jfa Date: Mon, 20 Feb 2006 11:37:38 +0000 Subject: [PATCH] Avoid code duplication: use LightApp_Name dialog. --- src/GEOMToolsGUI/GEOMToolsGUI_1.cxx | 7 +- src/GEOMToolsGUI/GEOMToolsGUI_NameDlg.cxx | 135 ---------------------- src/GEOMToolsGUI/GEOMToolsGUI_NameDlg.h | 46 -------- src/GEOMToolsGUI/Makefile.in | 8 +- 4 files changed, 7 insertions(+), 189 deletions(-) delete mode 100644 src/GEOMToolsGUI/GEOMToolsGUI_NameDlg.cxx delete mode 100644 src/GEOMToolsGUI/GEOMToolsGUI_NameDlg.h diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx index 1d1c12a38..41a4f3a32 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx +++ b/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx @@ -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 #include -#include #include #include +#include +#include + #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 diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_NameDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_NameDlg.cxx deleted file mode 100644 index b4876de4c..000000000 --- a/src/GEOMToolsGUI/GEOMToolsGUI_NameDlg.cxx +++ /dev/null @@ -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 -#include -#include -#include - -#include -#include -#include -#include -#include - -//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 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; -} diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_NameDlg.h b/src/GEOMToolsGUI/GEOMToolsGUI_NameDlg.h deleted file mode 100644 index e9071d6f4..000000000 --- a/src/GEOMToolsGUI/GEOMToolsGUI_NameDlg.h +++ /dev/null @@ -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 - -class QLineEdit; -class QPushButton; - -//================================================================================= -// class : GEOMToolsGUI_NameDlg -// purpose : Common 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 diff --git a/src/GEOMToolsGUI/Makefile.in b/src/GEOMToolsGUI/Makefile.in index 1dac4b1ab..58752719f 100644 --- a/src/GEOMToolsGUI/Makefile.in +++ b/src/GEOMToolsGUI/Makefile.in @@ -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 \ -- 2.39.2