From: abd Date: Tue, 7 Oct 2008 12:18:13 +0000 (+0000) Subject: Temporary fix for Win32 because used old version of PyQt and sip X-Git-Tag: RELIQUAT_4x_25102008~3 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=3f3353be8e814f1632832ef7095ebc80ed85db00;p=modules%2Fgui.git Temporary fix for Win32 because used old version of PyQt and sip --- diff --git a/src/SALOME_PYQT/SalomePyQt/Makefile.am b/src/SALOME_PYQT/SalomePyQt/Makefile.am index 24604a9ae..f2a7093e1 100644 --- a/src/SALOME_PYQT/SalomePyQt/Makefile.am +++ b/src/SALOME_PYQT/SalomePyQt/Makefile.am @@ -59,7 +59,7 @@ MOC_H = sipSalomePyQtProxySalomePyQt.h endif endif -EXTRA_DIST+= SalomePyQt.sip SalomePyQt_v4.sip +EXTRA_DIST+= SalomePyQt.sip SalomePyQt_v4.sip SalomePyQt_v4_win32.sip # Libraries targets MOC_FILES= SalomePyQt_moc.cxx diff --git a/src/SALOME_PYQT/SalomePyQt/SalomePyQt_v4_win32.sip b/src/SALOME_PYQT/SalomePyQt/SalomePyQt_v4_win32.sip new file mode 100755 index 000000000..75c3131ef --- /dev/null +++ b/src/SALOME_PYQT/SalomePyQt/SalomePyQt_v4_win32.sip @@ -0,0 +1,209 @@ +//============================================================================= +// File : SalomePyQt_v4.sip +// Created : 25/04/05 +// Author : Vadim SANDLER +// Project : SALOME +// Copyright : 2003-2005 CEA/DEN, EDF R&D +// $Header : $ +//============================================================================= + +%Module SalomePyQt + +%Import qtmod.sip + +//%ExportedHeaderCode +//#include +//%End + +class SALOME_Selection : QObject +{ +%TypeHeaderCode +#include +%End + +public: + void Clear() /ReleaseGIL/ ; + void ClearIObjects() /ReleaseGIL/ ; + void ClearFilters() /ReleaseGIL/ ; + +private: + SALOME_Selection( QObject* /TransferThis/ ); + +signals: + void currentSelectionChanged(); +}; + +//%ExportedHeaderCode + +enum MenuName { + File = 1, + View = 2, + Edit = 3, + Preferences = 4, + Tools = 5, + Window = 6, + Help = 7 +}; + +enum WindowType { + WT_ObjectBrowser, + WT_PyConsole, + WT_LogWindow, + WT_User +}; + +enum PrefType { + PT_Space, + PT_Bool, + PT_Color, + PT_String, + PT_Selector, + PT_DblSpin, + PT_IntSpin, + PT_Double, + PT_Integer, + PT_GroupBox, + PT_Font, + PT_DirList, + PT_File, + PT_User +}; + +enum Orientation { + Horizontal = 0, + Vertical = 1 +}; + +enum Action { + MoveWidget = 0, + LeaveWidget = 1, + SplitAt = 2 +}; + +//%End + +class QtxAction : QAction +{ +%TypeHeaderCode +#include +%End +private: + QtxAction(const QtxAction &); +}; + +class SalomePyQt +{ +%TypeHeaderCode +#include +%End + +public: + static QWidget* getDesktop() /ReleaseGIL/ ; + static QWidget* getMainFrame() /ReleaseGIL/ ; + static QMenuBar* getMainMenuBar() /ReleaseGIL/ ; + static QPopupMenu* getPopupMenu( const MenuName ) /ReleaseGIL/ ; + static SALOME_Selection* getSelection() /Factory,ReleaseGIL/ ; + static int getStudyId() /ReleaseGIL/ ; + static void putInfo( const QString&, const int = 0 ) /ReleaseGIL/ ; + static const QString getActiveComponent() /ReleaseGIL/ ; + static void updateObjBrowser( const int = 0, bool = true ) /ReleaseGIL/ ; + + static QString getFileName ( QWidget*, const QString&, const QStringList&, const QString&, bool ) /ReleaseGIL/ ; + static QStringList getOpenFileNames ( QWidget*, const QString&, const QStringList&, const QString& ) /ReleaseGIL/ ; + static QString getExistingDirectory( QWidget*, const QString&, const QString& ) /ReleaseGIL/ ; + + static void helpContext( const QString&, const QString& ) /ReleaseGIL/ ; + + static bool dumpView( const QString& ) /ReleaseGIL/ ; + + static int defaultMenuGroup() /ReleaseGIL/ ; + + static int createTool( const QString& ) /ReleaseGIL/ ; + static int createTool( const int, const int, const int = -1 ) /ReleaseGIL/ ; + static int createTool( const int, const QString&, const int = -1 ) /ReleaseGIL/ ; + static int createTool( QAction*, const int, const int = -1, const int = -1 ) /ReleaseGIL/ ; + static int createTool( QAction*, const QString&, const int = -1, const int = -1 ) /ReleaseGIL/ ; + + static int createMenu( const QString&, const int, + const int = -1, const int = -1, const int = -1 ) /ReleaseGIL/ ; + static int createMenu( const QString&, const QString&, + const int = -1, const int = -1, const int = -1 ) /ReleaseGIL/ ; + static int createMenu( const int, const int, + const int = -1, const int = -1 ) /ReleaseGIL/ ; + static int createMenu( const int, const QString&, + const int = -1, const int = -1 ) /ReleaseGIL/ ; + static int createMenu( QAction*, const int, const int = -1, + const int = -1, const int = -1 ) /ReleaseGIL/ ; + static int createMenu( QAction*, const QString&, const int = -1, + const int = -1, const int = -1 ) /ReleaseGIL/ ; + static QAction* createSeparator() /ReleaseGIL/ ; + + static QAction* createAction( const int, const QString&, + const QString& = QString::null, const QString& = QString::null, + const QString& = QString::null, const int = 0, const bool = false ) /ReleaseGIL/ ; + + static QActionGroup* createActionGroup(const int, const bool = true) /ReleaseGIL/ ; + + static QAction* action( const int ) /ReleaseGIL/ ; + static int actionId( const QAction* ) /ReleaseGIL/ ; + + static bool clearMenu( const int = 0, const int = 0, + const bool = true ) /ReleaseGIL/ ; + + static void addSetting ( const QString&, const QString&, const double ) /ReleaseGIL/ ; + static void addSetting ( const QString&, const QString&, const int /Constrained/ ) /ReleaseGIL/ ; + static void addSetting ( const QString&, const QString&, const bool, const int ) /ReleaseGIL/ ; + static void addSetting ( const QString&, const QString&, const QString& ) /ReleaseGIL/ ; + static void addSetting ( const QString&, const QString&, const QColor& ) /ReleaseGIL/ ; + static int integerSetting( const QString&, const QString&, const int = 0 ) /ReleaseGIL/ ; + static double doubleSetting ( const QString&, const QString&, const double = 0 ) /ReleaseGIL/ ; + static bool boolSetting ( const QString&, const QString&, const bool = false ) /ReleaseGIL/ ; + static QString stringSetting ( const QString&, const QString&, const QString& = QString("") ) /ReleaseGIL/ ; + static QColor colorSetting ( const QString&, const QString&, const QColor& = QColor() ) /ReleaseGIL/ ; + static void removeSetting ( const QString&, const QString& ) /ReleaseGIL/ ; + static bool hasSetting ( const QString&, const QString& ) /ReleaseGIL/ ; + +// obsolete + static void addStringSetting( const QString&, const QString&, bool = true ) /ReleaseGIL/ ; + static void addIntSetting ( const QString&, const int, bool = true ) /ReleaseGIL/ ; + static void addDoubleSetting( const QString&, const double, bool = true ) /ReleaseGIL/ ; + static void addBoolSetting ( const QString&, const bool, bool = true ) /ReleaseGIL/ ; + static void removeSettings ( const QString& ) /ReleaseGIL/ ; + static QString getSetting ( const QString& ) /ReleaseGIL/ ; + + static int addGlobalPreference( const QString& ) /ReleaseGIL/ ; + static int addPreference( const QString& ) /ReleaseGIL/ ; + static int addPreference( const QString&, + const int, const int = -1, + const QString& = QString::null, + const QString& = QString::null ) /ReleaseGIL/ ; + static QVariant preferenceProperty( const int, const QString& ) /ReleaseGIL/ ; + static void setPreferenceProperty( const int, + const QString&, + const QVariant& ) /ReleaseGIL/ ; + static void addPreferenceProperty( const int, + const QString&, + const int, + const QVariant& ) /ReleaseGIL/ ; + + static void message( const QString&, bool = true ) /ReleaseGIL/ ; + static void clearMessages() /ReleaseGIL/ ; + + static QValueList getViews() /ReleaseGIL/ ; + static int getActiveView() /ReleaseGIL/ ; + static QString getViewType( const int ) /ReleaseGIL/ ; + static bool setViewTitle( const int, const QString& ) /ReleaseGIL/ ; + static QString getViewTitle( const int ) /ReleaseGIL/ ; + static QValueList findViews( const QString& ) /ReleaseGIL/ ; + static bool activateView( const int ) /ReleaseGIL/ ; + static int createView( const QString& ) /ReleaseGIL/ ; + static bool closeView( const int ) /ReleaseGIL/ ; + static int cloneView( const int ) /ReleaseGIL/ ; + static bool isViewVisible( const int id ) /ReleaseGIL/ ; + + static bool groupAllViews() /ReleaseGIL/ ; + static bool splitView( const int, Orientation, Action ) /ReleaseGIL/ ; + static bool moveView( const int, const int, const bool ) /ReleaseGIL/ ; + static QValueList neighbourViews( const int ) /ReleaseGIL/ ; +}; +