]> SALOME platform Git repositories - modules/gui.git/commitdiff
Salome HOME
Porting to Qt4
authorvsr <vsr@opencascade.com>
Wed, 16 May 2007 13:27:25 +0000 (13:27 +0000)
committervsr <vsr@opencascade.com>
Wed, 16 May 2007 13:27:25 +0000 (13:27 +0000)
src/STD/Makefile.am
src/STD/STD.pro
src/STD/STD_LoadStudiesDlg.cxx [deleted file]
src/STD/STD_LoadStudiesDlg.h [deleted file]
src/SUIT/Makefile.am

index dbb5d2ccba895573401f25d97dab5bf87cec7f36..48eb22116af9ff401cdde314328897d23128a9c4 100755 (executable)
@@ -25,7 +25,6 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 lib_LTLIBRARIES = libstd.la
 
-#VSR: already migrated to Qt4 files
 salomeinclude_HEADERS=         \
        STD.h                   \
        STD_Application.h       \
@@ -34,11 +33,6 @@ salomeinclude_HEADERS=               \
        STD_SDIDesktop.h        \
        STD_TabDesktop.h
 
-#VSR: not yet migrated to Qt4 files
-#                              \
-       STD_LoadStudiesDlg.h
-
-#VSR: already migrated to Qt4 files
 dist_libstd_la_SOURCES=                \
        STD_Application.cxx     \
        STD_CloseDlg.cxx        \
@@ -46,11 +40,6 @@ dist_libstd_la_SOURCES=              \
        STD_SDIDesktop.cxx      \
        STD_TabDesktop.cxx
 
-#VSR: not yet migrated to Qt4 files
-#                              \
-       STD_LoadStudiesDlg.cxx
-
-#VSR: already migrated to Qt4 files
 MOC_FILES=                             \
        STD_Application_moc.cxx         \
        STD_CloseDlg_moc.cxx            \
@@ -58,10 +47,6 @@ MOC_FILES=                           \
        STD_SDIDesktop_moc.cxx          \
        STD_TabDesktop_moc.cxx
 
-#VSR: not yet migrated to Qt4 files
-#                                      \
-       STD_LoadStudiesDlg_moc.cxx
-
 nodist_libstd_la_SOURCES= $(MOC_FILES)
 
 dist_salomeres_DATA=                   \
index 31b4901f1e3cf85fab8981b39074565b78f51305..96ef4c230a5ea11135d80062e0d8029872730d16 100644 (file)
@@ -19,14 +19,12 @@ HEADERS += STD_CloseDlg.h
 HEADERS += STD_MDIDesktop.h
 HEADERS += STD_SDIDesktop.h
 HEADERS += STD_TabDesktop.h
-#HEADERS += STD_LoadStudiesDlg.h
 
 SOURCES  = STD_Application.cxx
 SOURCES += STD_CloseDlg.cxx
 SOURCES += STD_MDIDesktop.cxx
 SOURCES += STD_SDIDesktop.cxx
 SOURCES += STD_TabDesktop.cxx
-#SOURCES += STD_LoadStudiesDlg.cxx
 
 TRANSLATIONS = resources/STD_images.ts \
                resources/STD_msg_en.ts
diff --git a/src/STD/STD_LoadStudiesDlg.cxx b/src/STD/STD_LoadStudiesDlg.cxx
deleted file mode 100644 (file)
index 5dc4c0d..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-// 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 "STD_LoadStudiesDlg.h"
-
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qlistbox.h>
-#include <qpushbutton.h>
-
-#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
-*/
-
-STD_LoadStudiesDlg::STD_LoadStudiesDlg( QWidget* parent,  bool modal, WFlags fl )
-: QDialog( parent, "STD_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/STD/STD_LoadStudiesDlg.h b/src/STD/STD_LoadStudiesDlg.h
deleted file mode 100644 (file)
index 268b161..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-// 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 <STD.h>
-
-#include <qdialog.h>
-#include <qvariant.h>
-
-class QLabel;
-class QListBox;
-class QPushButton;
-class QVBoxLayout; 
-class QHBoxLayout; 
-class QGridLayout; 
-class QListBoxItem;
-
-/*!\class STD_LoadStudiesDlg
- * \brief Describes a dialog box that gives a list of opened studies.
- * 
- */
-class STD_EXPORT STD_LoadStudiesDlg : public QDialog
-{ 
-   Q_OBJECT
-
-public:
-   STD_LoadStudiesDlg( QWidget* parent = 0, bool modal = FALSE, WFlags fl = 0 );
-   ~STD_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
index 896b02a6f023c959cfc3d35b61e21f036c986687..32ab09def893b59f6643ff697a0af1130a42aa60 100755 (executable)
@@ -25,7 +25,6 @@ include $(top_srcdir)/adm_local/unix/make_common_starter.am
 
 lib_LTLIBRARIES = libsuit.la
 
-#VSR: already migrated to Qt4 files
 salomeinclude_HEADERS=                 \
        SUIT.h                          \
        SUIT_Accel.h                    \
@@ -57,7 +56,6 @@ salomeinclude_HEADERS=                        \
        SUIT_ViewModel.h                \
        SUIT_ViewWindow.h
 
-#VSR: already migrated to Qt4 files
 dist_libsuit_la_SOURCES=               \
        SUIT_Accel.cxx                  \
        SUIT_ActionOperation.cxx        \