From 2301d2d0253d9f4fe7b0d60311abbb27539f9d09 Mon Sep 17 00:00:00 2001 From: vsr Date: Wed, 16 May 2007 13:51:56 +0000 Subject: [PATCH] Porting to Qt4 --- src/Qtx/Makefile.am | 6 +- src/Qtx/Qtx.pro | 4 +- src/Qtx/QtxMRUAction.h | 1 - src/SalomeApp/Makefile.am | 5 +- src/SalomeApp/SalomeApp_Application.cxx | 4 +- src/SalomeApp/SalomeApp_LoadStudiesDlg.cxx | 84 ++++++++++++++++++++++ src/SalomeApp/SalomeApp_LoadStudiesDlg.h | 69 ++++++++++++++++++ 7 files changed, 164 insertions(+), 9 deletions(-) create mode 100644 src/SalomeApp/SalomeApp_LoadStudiesDlg.cxx create mode 100644 src/SalomeApp/SalomeApp_LoadStudiesDlg.h diff --git a/src/Qtx/Makefile.am b/src/Qtx/Makefile.am index 4ea4b66da..17027f074 100755 --- a/src/Qtx/Makefile.am +++ b/src/Qtx/Makefile.am @@ -39,6 +39,7 @@ salomeinclude_HEADERS= \ QtxDockWidget.h \ QtxMainWindow.h \ QtxMap.h \ + QtxMRUAction.h \ QtxResourceMgr.h \ QtxToolBar.h \ QtxWorkstack.h @@ -56,7 +57,6 @@ salomeinclude_HEADERS= \ QtxListResourceEdit.h \ QtxListView.h \ QtxLogoMgr.h \ - QtxMRUAction.h \ QtxMenuButton.h \ QtxOperations.h \ QtxParser.h \ @@ -88,6 +88,7 @@ dist_libqtx_la_SOURCES= \ QtxDockAction.cxx \ QtxDockWidget.cxx \ QtxMainWindow.cxx \ + QtxMRUAction.cxx \ QtxResourceMgr.cxx \ QtxToolBar.cxx \ QtxWorkstack.cxx @@ -105,7 +106,6 @@ dist_libqtx_la_SOURCES= \ QtxListResourceEdit.cxx \ QtxListView.cxx \ QtxLogoMgr.cxx \ - QtxMRUAction.cxx \ QtxMenuButton.cxx \ QtxOperations.cxx \ QtxParser.cxx \ @@ -132,6 +132,7 @@ MOC_FILES= \ QtxDockAction_moc.cxx \ QtxDockWidget_moc.cxx \ QtxMainWindow_moc.cxx \ + QtxMRUAction_moc.cxx \ QtxToolBar_moc.cxx \ QtxWorkstack_moc.cxx @@ -147,7 +148,6 @@ MOC_FILES= \ QtxListResourceEdit_moc.cxx \ QtxListView_moc.cxx \ QtxLogoMgr_moc.cxx \ - QtxMRUAction_moc.cxx \ QtxMenuButton_moc.cxx \ QtxPathDialog_moc.cxx \ QtxPopupMenu_moc.cxx \ diff --git a/src/Qtx/Qtx.pro b/src/Qtx/Qtx.pro index 173f57909..445db0ebb 100644 --- a/src/Qtx/Qtx.pro +++ b/src/Qtx/Qtx.pro @@ -23,6 +23,7 @@ HEADERS += QtxDockAction.h HEADERS += QtxDockWidget.h HEADERS += QtxMainWindow.h HEADERS += QtxMap.h +HEADERS += QtxMRUAction.h HEADERS += QtxResourceMgr.h HEADERS += QtxToolBar.h HEADERS += QtxWorkstack.h @@ -37,7 +38,6 @@ HEADERS += QtxWorkstack.h #HEADERS += QtxListResourceEdit.h #HEADERS += QtxListView.h #HEADERS += QtxLogoMgr.h -#HEADERS += QtxMRUAction.h #HEADERS += QtxMenuButton.h #HEADERS += QtxOperations.h #HEADERS += QtxParser.h @@ -63,6 +63,7 @@ SOURCES += QtxDialog.cxx SOURCES += QtxDockAction.cxx SOURCES += QtxDockWidget.cxx SOURCES += QtxMainWindow.cxx +SOURCES += QtxMRUAction.cxx SOURCES += QtxResourceMgr.cxx SOURCES += QtxToolBar.cxx SOURCES += QtxWorkstack.cxx @@ -77,7 +78,6 @@ SOURCES += QtxWorkstack.cxx #SOURCES += QtxListResourceEdit.cxx #SOURCES += QtxListView.cxx #SOURCES += QtxLogoMgr.cxx -#SOURCES += QtxMRUAction.cxx #SOURCES += QtxMenuButton.cxx #SOURCES += QtxOperations.cxx #SOURCES += QtxParser.cxx diff --git a/src/Qtx/QtxMRUAction.h b/src/Qtx/QtxMRUAction.h index db19c903b..913d7f552 100755 --- a/src/Qtx/QtxMRUAction.h +++ b/src/Qtx/QtxMRUAction.h @@ -24,7 +24,6 @@ #include "QtxAction.h" -#include #include class QtxResourceMgr; diff --git a/src/SalomeApp/Makefile.am b/src/SalomeApp/Makefile.am index 7fe6176f6..f8a49cf22 100755 --- a/src/SalomeApp/Makefile.am +++ b/src/SalomeApp/Makefile.am @@ -36,6 +36,7 @@ salomeinclude_HEADERS= \ SalomeApp_Application.h \ SalomeApp_DataModel.h \ SalomeApp_DataObject.h \ + SalomeApp_LoadStudiesDlg.h \ SalomeApp_Module.h \ SalomeApp_Study.h \ SalomeApp_ExceptionHandler.h \ @@ -53,6 +54,7 @@ dist_libSalomeApp_la_SOURCES= \ SalomeApp_Application.cxx \ SalomeApp_DataModel.cxx \ SalomeApp_DataObject.cxx \ + SalomeApp_LoadStudiesDlg.cxx \ SalomeApp_Study.cxx \ SalomeApp_ExceptionHandler.cxx \ SalomeApp_EventFilter.cxx \ @@ -70,6 +72,7 @@ MOC_FILES= \ SalomeApp_Application_moc.cxx \ SalomeApp_DataModel_moc.cxx \ SalomeApp_Module_moc.cxx \ + SalomeApp_LoadStudiesDlg_moc.cxx \ SalomeApp_Study_moc.cxx \ SalomeApp_StudyPropertiesDlg_moc.cxx \ SalomeApp_ListView_moc.cxx \ @@ -102,4 +105,4 @@ libSalomeApp_la_LIBADD= $(KERNEL_LDFLAGS) -lOpUtil -lSALOMELocalTrace -lSalomeDS ../PythonConsole/libPythonConsole.la ../LogWindow/libLogWindow.la \ ../LightApp/libLightApp.la ../TOOLSGUI/libToolsGUI.la $(CAS_KERNEL) -EXTRA_DIST+=SalomeApp_PyInterp.h \ No newline at end of file +EXTRA_DIST+=SalomeApp_PyInterp.h diff --git a/src/SalomeApp/SalomeApp_Application.cxx b/src/SalomeApp/SalomeApp_Application.cxx index 643aab333..4b6ba17cd 100644 --- a/src/SalomeApp/SalomeApp_Application.cxx +++ b/src/SalomeApp/SalomeApp_Application.cxx @@ -39,7 +39,7 @@ #include "LightApp_SelectionMgr.h" #include "LightApp_NameDlg.h" -#include "STD_LoadStudiesDlg.h" +#include "SalomeApp_LoadStudiesDlg.h" #include #include @@ -382,7 +382,7 @@ void SalomeApp_Application::onLoadDoc() { QString name, studyname, ext; - STD_LoadStudiesDlg aDlg( desktop(), TRUE); + SalomeApp_LoadStudiesDlg aDlg( desktop(), TRUE); std::vector List = studyMgr()->GetOpenStudies(); diff --git a/src/SalomeApp/SalomeApp_LoadStudiesDlg.cxx b/src/SalomeApp/SalomeApp_LoadStudiesDlg.cxx new file mode 100644 index 000000000..1cf810ea0 --- /dev/null +++ b/src/SalomeApp/SalomeApp_LoadStudiesDlg.cxx @@ -0,0 +1,84 @@ +// Copyright (C) 2005 OPEN CASCADE, CEA/DEN, EDF R&D, PRINCIPIA 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 +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// 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 +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// +#include "SalomeApp_LoadStudiesDlg.h" + +#include +#include +#include +#include + +#define SPACING_SIZE 6 +#define MARGIN_SIZE 11 +#define MIN_LISTBOX_WIDTH 150 +#define MIN_LISTBOX_HEIGHT 100 + +/*! +* \brief creates a Load study dialog box +* \param parent a parent widget +* \param modal bool argument, if true the dialog box is a modal dialog box +* \param f style flags +*/ + +SalomeApp_LoadStudiesDlg::SalomeApp_LoadStudiesDlg( QWidget* parent, bool modal, WFlags fl ) +: QDialog( parent, "SalomeApp_LoadStudiesDlg", modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu ) +{ + resize( 321, 181 ); + setCaption( tr("DLG_LOAD_STUDY_CAPTION") ); + setSizeGripEnabled( TRUE ); + + QGridLayout* aTopLayout = new QGridLayout(this); + aTopLayout->setMargin(MARGIN_SIZE); + aTopLayout->setSpacing(SPACING_SIZE); + + TextLabel1 = new QLabel( this, "TextLabel1" ); + TextLabel1->setGeometry( QRect( 11, 12, 297, 16 ) ); + TextLabel1->setText( tr( "MEN_STUDIES_CHOICE" ) ); + + QHBoxLayout* aBtnLayout = new QHBoxLayout; + aBtnLayout->setSpacing( SPACING_SIZE ); + aBtnLayout->setMargin( 0 ); + + buttonOk = new QPushButton( this, "buttonOk" ); + buttonOk->setText( tr( "BUT_OK" ) ); + buttonOk->setAutoDefault( true ); + buttonOk->setDefault( true ); + + buttonCancel = new QPushButton( this, "buttonCancel" ); + buttonCancel->setText( tr( "BUT_CANCEL" ) ); + buttonCancel->setAutoDefault( true ); + + aBtnLayout->addWidget( buttonOk ); + aBtnLayout->addItem( new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum ) ); + aBtnLayout->addWidget( buttonCancel ); + + ListComponent = new QListBox( this, "ListComponent" ); + ListComponent->setVScrollBarMode(QListBox::AlwaysOn); + ListComponent->setMinimumSize(MIN_LISTBOX_WIDTH, MIN_LISTBOX_HEIGHT); + ListComponent->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding)); + ListComponent->setSelectionMode(QListBox::Single); + + aTopLayout->addWidget(TextLabel1, 0, 0); + aTopLayout->addWidget(ListComponent, 1, 0); + aTopLayout->addLayout(aBtnLayout, 2, 0); + + // signals and slots connections + connect( buttonOk, SIGNAL( clicked() ), this, SLOT( accept() ) ); + connect( buttonCancel, SIGNAL( clicked() ), this, SLOT( reject() ) ); +} + diff --git a/src/SalomeApp/SalomeApp_LoadStudiesDlg.h b/src/SalomeApp/SalomeApp_LoadStudiesDlg.h new file mode 100644 index 000000000..0fe64394d --- /dev/null +++ b/src/SalomeApp/SalomeApp_LoadStudiesDlg.h @@ -0,0 +1,69 @@ +// Copyright (C) 2005 OPEN CASCADE, CEA/DEN, EDF R&D, PRINCIPIA 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 +// version 2.1 of the License. +// +// This library is distributed in the hope that it will be useful +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// 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 +// +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +// +#ifndef STD_LOADSTUDIESDLG_H +#define STD_LOADSTUDIESDLG_H + +#include + +#include +#include + +class QLabel; +class QListBox; +class QPushButton; +class QVBoxLayout; +class QHBoxLayout; +class QGridLayout; +class QListBoxItem; + +/*!\class SalomeApp_LoadStudiesDlg + * \brief Describes a dialog box that gives a list of opened studies. + * + */ +class STD_EXPORT SalomeApp_LoadStudiesDlg : public QDialog +{ + Q_OBJECT + +public: + SalomeApp_LoadStudiesDlg( QWidget* parent = 0, bool modal = FALSE, WFlags fl = 0 ); + ~SalomeApp_LoadStudiesDlg() {} + + /*!\var TextLabel1 + * \brief stores a dialog text label + */ + QLabel* TextLabel1; + + /*!\var buttonOk + * \brief stores a dialog button OK + */ + QPushButton* buttonOk; + + /*!\var buttonCancel + * \brief stores a dialog button Cancel + */ + QPushButton* buttonCancel; + + /*!\var ListComponent + * \brief stores a dialog list compoent + */ + QListBox* ListComponent; + +}; + +#endif // STD_LOADSTUDIESDLG_H -- 2.39.2