From: vsr Date: Tue, 10 Jul 2007 11:43:11 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: qt4_porting_delivery_220807~108 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=7622e52a438eb7f2117eb339f4a1bd657767b90d;p=modules%2Fgui.git *** empty log message *** --- diff --git a/GUI_version.h.in b/GUI_version.h.in index 9a5df78eb..ca6285403 100644 --- a/GUI_version.h.in +++ b/GUI_version.h.in @@ -17,9 +17,9 @@ // // See http://www.salome-platform.org/ // -// File : GUI_version.h -// Author : Vadim SANDLER -// Module : SALOME +// File : GUI_version.h +// Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com) +// #if !defined(__GUI_VERSION_H__) #define __GUI_VERSION_H__ diff --git a/src/GLViewer/GLViewer_ViewFrame.cxx b/src/GLViewer/GLViewer_ViewFrame.cxx index 24e7f0e99..d871fa313 100644 --- a/src/GLViewer/GLViewer_ViewFrame.cxx +++ b/src/GLViewer/GLViewer_ViewFrame.cxx @@ -27,6 +27,8 @@ #include "GLViewer_Viewer.h" #include "GLViewer_ViewPort2d.h" +#include + #include #include #include @@ -39,7 +41,6 @@ #include #include #include -#include #include #include #include @@ -73,9 +74,8 @@ myVP( 0 ) setBackgroundColor( Qt::white ); layout->addWidget( vp ); - myToolBar = new QToolBar(this); - //myToolBar->setCloseMode(QDockWindow::Undocked); - myToolBar->setWindowTitle(tr("LBL_TOOLBAR_LABEL")); + myToolBar = new QtxToolBar( true, tr("LBL_TOOLBAR_LABEL"), this ); + createActions(); createToolBar(); } @@ -164,10 +164,12 @@ void GLViewer_ViewFrame::createToolBar() aScaleBtn->AddAction(myActionsMap[FitRectId]); aScaleBtn->AddAction(myActionsMap[FitSelectId]); aScaleBtn->AddAction(myActionsMap[ZoomId]); + myToolBar->addWidget( aScaleBtn ); SUIT_ToolButton* aPanBtn = new SUIT_ToolButton(myToolBar); aPanBtn->AddAction(myActionsMap[PanId]); aPanBtn->AddAction(myActionsMap[GlobalPanId]); + myToolBar->addWidget( aPanBtn ); myToolBar->addAction( myActionsMap[ResetId] ); } diff --git a/src/LogWindow/LogWindow.cxx b/src/LogWindow/LogWindow.cxx index fb6ef862d..77cfb6aeb 100755 --- a/src/LogWindow/LogWindow.cxx +++ b/src/LogWindow/LogWindow.cxx @@ -19,9 +19,9 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File : LogWindow.cxx -// Author : Vadim SANDLER, Open CASCADE S.A. (vadim.sandler@opencascade.com) -// Module : SALOME +// File : LogWindow.cxx +// Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com) +// #include "LogWindow.h" diff --git a/src/LogWindow/LogWindow.h b/src/LogWindow/LogWindow.h index b1816f8c8..326425bd7 100755 --- a/src/LogWindow/LogWindow.h +++ b/src/LogWindow/LogWindow.h @@ -19,9 +19,9 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File : LogWindow.h -// Author : Vadim SANDLER, Open CASCADE S.A. (vadim.sandler@opencascade.com) -// Module : SALOME +// File : LogWindow.h +// Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com) +// #ifndef LOGWINDOW_H #define LOGWINDOW_H diff --git a/src/OCCViewer/OCCViewer_ViewPort.cxx b/src/OCCViewer/OCCViewer_ViewPort.cxx index 510e9b575..fb1dda253 100755 --- a/src/OCCViewer/OCCViewer_ViewPort.cxx +++ b/src/OCCViewer/OCCViewer_ViewPort.cxx @@ -207,6 +207,8 @@ void OCCViewer_ViewPort::initialize() setBackgroundRole( QPalette::NoRole );//NoBackground ); // set focus policy to threat QContextMenuEvent from keyboard setFocusPolicy( Qt::StrongFocus ); + setAttribute( Qt::WA_PaintOnScreen ); + setAttribute( Qt::WA_NoSystemBackground ); } /*! diff --git a/src/OCCViewer/OCCViewer_ViewWindow.cxx b/src/OCCViewer/OCCViewer_ViewWindow.cxx index 8757574d2..ae7bb38b0 100755 --- a/src/OCCViewer/OCCViewer_ViewWindow.cxx +++ b/src/OCCViewer/OCCViewer_ViewWindow.cxx @@ -35,10 +35,11 @@ #include "SUIT_ResourceMgr.h" #include "SUIT_MessageBox.h" +#include + #include #include #include -#include #include #include @@ -219,9 +220,7 @@ void OCCViewer_ViewWindow::initLayout() setTransformRequested ( NOTHING ); setTransformInProcess ( false ); - myToolBar = new QToolBar(this); - //myToolBar->setCloseMode(QDockWindow::Undocked); // toolbar has "Close" (X) button only if it's undocked, but there is no such functionality in Qt4 - myToolBar->setWindowTitle(tr("LBL_TOOLBAR_LABEL")); + myToolBar = new QtxToolBar( true, tr("LBL_TOOLBAR_LABEL"), this ); createActions(); createToolBar(); @@ -984,10 +983,12 @@ void OCCViewer_ViewWindow::createToolBar() aScaleBtn->AddAction(myActionsMap[FitAllId]); aScaleBtn->AddAction(myActionsMap[FitRectId]); aScaleBtn->AddAction(myActionsMap[ZoomId]); + myToolBar->addWidget( aScaleBtn ); SUIT_ToolButton* aPanningBtn = new SUIT_ToolButton(myToolBar, "pan"); aPanningBtn->AddAction(myActionsMap[PanId]); aPanningBtn->AddAction(myActionsMap[GlobalPanId]); + myToolBar->addWidget( aPanningBtn ); myToolBar->addAction( myActionsMap[ChangeRotationPointId] ); @@ -1000,12 +1001,14 @@ void OCCViewer_ViewWindow::createToolBar() aViewsBtn->AddAction(myActionsMap[BottomId]); aViewsBtn->AddAction(myActionsMap[LeftId]); aViewsBtn->AddAction(myActionsMap[RightId]); + myToolBar->addWidget( aViewsBtn ); myToolBar->addAction( myActionsMap[ResetId] ); SUIT_ToolButton* aMemBtn = new SUIT_ToolButton(myToolBar, "view"); aMemBtn->AddAction(myActionsMap[MemId]); aMemBtn->AddAction(myActionsMap[RestoreId]); + myToolBar->addWidget( aMemBtn ); myToolBar->addSeparator(); myToolBar->addAction( myActionsMap[CloneId] ); diff --git a/src/Plot2d/Plot2d_FitDataDlg.cxx b/src/Plot2d/Plot2d_FitDataDlg.cxx index f5141e1a7..5f5cf1850 100755 --- a/src/Plot2d/Plot2d_FitDataDlg.cxx +++ b/src/Plot2d/Plot2d_FitDataDlg.cxx @@ -16,10 +16,9 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File : Plot2d_FitDataDlg.cxx -// Author : Vadim SANDLER -// Module : SALOME -// $Header$ +// File : Plot2d_FitDataDlg.cxx +// Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com) +// #include "Plot2d_FitDataDlg.h" #include diff --git a/src/Plot2d/Plot2d_SetupCurveDlg.cxx b/src/Plot2d/Plot2d_SetupCurveDlg.cxx index 4bd211758..a94e6429f 100644 --- a/src/Plot2d/Plot2d_SetupCurveDlg.cxx +++ b/src/Plot2d/Plot2d_SetupCurveDlg.cxx @@ -16,12 +16,9 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// SALOME Plot2d : implementation of desktop and GUI kernel +// File : Plot2d_SetupCurveDlg.cxx +// Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com) // -// File : Plot2d_SetupCurveDlg.cxx -// Author : Vadim SANDLER -// Module : SALOME -// $Header$ #include "Plot2d_SetupCurveDlg.h" #include "SUIT_Tools.h" diff --git a/src/Plot2d/Plot2d_SetupCurveDlg.h b/src/Plot2d/Plot2d_SetupCurveDlg.h index 84d530aa6..982a7aff8 100644 --- a/src/Plot2d/Plot2d_SetupCurveDlg.h +++ b/src/Plot2d/Plot2d_SetupCurveDlg.h @@ -16,11 +16,9 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// SALOME Plot2d : implementation of desktop and GUI kernel +// File : Plot2d_SetupCurveDlg.h +// Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com) // -// File : Plot2d_SetupCurveDlg.h -// Author : Vadim SANDLER -// Module : SALOME #ifndef Plot2d_SetupCurveDlg_H #define Plot2d_SetupCurveDlg_H diff --git a/src/Plot2d/Plot2d_SetupViewDlg.cxx b/src/Plot2d/Plot2d_SetupViewDlg.cxx index e89eaffc7..d72f75b44 100755 --- a/src/Plot2d/Plot2d_SetupViewDlg.cxx +++ b/src/Plot2d/Plot2d_SetupViewDlg.cxx @@ -16,10 +16,9 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File : Plot2d_SetupViewDlg.cxx -// Author : Vadim SANDLER -// Module : SALOME -// $Header$ +// File : Plot2d_SetupViewDlg.cxx +// Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com) +// #include "Plot2d_SetupViewDlg.h" diff --git a/src/PyConsole/PyConsole.h b/src/PyConsole/PyConsole.h index c99a5864f..d27c40c0f 100644 --- a/src/PyConsole/PyConsole.h +++ b/src/PyConsole/PyConsole.h @@ -16,9 +16,9 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File : PyConsole.h -// Author : Vadim SANDLER -// Module : SALOME +// File : PyConsole.h +// Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com) +// #if !defined ( PYCONSOLE_H ) #define PYCONSOLE_H diff --git a/src/PyConsole/PyConsole_Console.cxx b/src/PyConsole/PyConsole_Console.cxx index 4334b24e9..07cdfb544 100644 --- a/src/PyConsole/PyConsole_Console.cxx +++ b/src/PyConsole/PyConsole_Console.cxx @@ -16,9 +16,9 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File : PyConsole_Console.cxx -// Author : Vadim SANDLER -// Module : SALOME +// File : PyConsole_Console.cxx +// Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com) +// /*! \class PyConsole_Console diff --git a/src/PyConsole/PyConsole_Console.h b/src/PyConsole/PyConsole_Console.h index 32448c38c..17e1c73b6 100644 --- a/src/PyConsole/PyConsole_Console.h +++ b/src/PyConsole/PyConsole_Console.h @@ -16,9 +16,9 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File : PyConsole_Console.h -// Author : Vadim SANDLER, Open CASCADE S.A. (vadim.sandler@opencascade.com) -// Module : SALOME +// File : PyConsole_Console.h +// Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com) +// #ifndef PYCONSOLE_CONSOLE_H #define PYCONSOLE_CONSOLE_H diff --git a/src/PyConsole/PyConsole_Editor.cxx b/src/PyConsole/PyConsole_Editor.cxx index 98c0425a6..29db60017 100644 --- a/src/PyConsole/PyConsole_Editor.cxx +++ b/src/PyConsole/PyConsole_Editor.cxx @@ -19,9 +19,9 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File : PyConsole_Editor.cxx -// Author : Vadim SANDLER -// Module : SALOME +// File : PyConsole_Editor.cxx +// Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com) +// /*! \class PyConsole_Editor diff --git a/src/PyConsole/PyConsole_Editor.h b/src/PyConsole/PyConsole_Editor.h index 0e4c17028..222708c6e 100644 --- a/src/PyConsole/PyConsole_Editor.h +++ b/src/PyConsole/PyConsole_Editor.h @@ -19,9 +19,9 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File : PyConsole_Editor.h -// Author : Vadim SANDLER -// Module : SALOME +// File : PyConsole_Editor.h +// Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com) +// #ifndef PYCONSOLE_EDITOR_H #define PYCONSOLE_EDITOR_H diff --git a/src/Qtx/QtxColorScale.h b/src/Qtx/QtxColorScale.h index ae9e985f2..453aeefe6 100755 --- a/src/Qtx/QtxColorScale.h +++ b/src/Qtx/QtxColorScale.h @@ -59,12 +59,12 @@ public: } DumpMode; //! Color scale flags (bitwise). typedef enum { - AtBorder = 0x001, - Reverse = 0x002, - Integer = 0x004, - WrapTitle = 0x008, - PreciseFormat = 0x010, - Transparent = 0x020 + AtBorder = 0x001, //!< diplay values at colors boundaries + Reverse = 0x002, //!< display color scale in reverse order + Integer = 0x004, //!< round numbers to integer values + WrapTitle = 0x008, //!< wrap title to several lines + PreciseFormat = 0x010, //!< autodetect decimal point precision for color scale values + Transparent = 0x020 //!< transparent background (not implemented yet!) } Flags; public: diff --git a/src/Qtx/QtxMap.h b/src/Qtx/QtxMap.h index 403fc3284..98dec2975 100644 --- a/src/Qtx/QtxMap.h +++ b/src/Qtx/QtxMap.h @@ -16,8 +16,9 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: QtxMap.h -// Author: Vadim SANDLER +// File : QtxMap.h +// Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com) +// #ifndef QTXMAP_H #define QTXMAP_H diff --git a/src/Qtx/QtxPagePrefMgr.cxx b/src/Qtx/QtxPagePrefMgr.cxx index 710de7df0..1863ed489 100644 --- a/src/Qtx/QtxPagePrefMgr.cxx +++ b/src/Qtx/QtxPagePrefMgr.cxx @@ -756,8 +756,16 @@ void QtxPagePrefListItem::setSelected( const int id ) /*! \class QtxPagePrefToolBoxItem + \brief GUI implementation of the tool box container preference item. */ +/*! + \brief Constructor. + \param title preference item title + \param parent parent preference item + \param sect resource file section associated with the preference item + \param param resource file parameter associated with the preference item +*/ QtxPagePrefToolBoxItem::QtxPagePrefToolBoxItem( const QString& title, QtxPreferenceItem* parent, const QString& sect, const QString& param ) : QtxPagePrefItem( title, parent, sect, param ) @@ -765,15 +773,24 @@ QtxPagePrefToolBoxItem::QtxPagePrefToolBoxItem( const QString& title, QtxPrefere setWidget( myToolBox = new QToolBox( 0 ) ); } +/*! + \brief Destructor. +*/ QtxPagePrefToolBoxItem::~QtxPagePrefToolBoxItem() { } +/*! + \brief Update widget contents. +*/ void QtxPagePrefToolBoxItem::updateContents() { updateToolBox(); } +/*! + \brief Update tool box widget. +*/ void QtxPagePrefToolBoxItem::updateToolBox() { QList items; @@ -1130,6 +1147,11 @@ void QtxPagePrefFrameItem::setOrientation( const Qt::Orientation o ) myBox->setOrientation( o ); } +/*! + \brief Check if the frame widget stretching is enabled. + \return \c true if the widget is stretchable + \sa setStretch() +*/ bool QtxPagePrefFrameItem::stretch() const { QSpacerItem* s = 0; @@ -1140,6 +1162,11 @@ bool QtxPagePrefFrameItem::stretch() const return s ? s->expandingDirections() & Qt::Vertical : false; } +/*! + \brief Enable/disable frame widget stretching. + \param on new stretchable state + \sa stretch() +*/ void QtxPagePrefFrameItem::setStretch( const bool on ) { QSpacerItem* s = 0; @@ -2984,8 +3011,8 @@ void QtxPagePrefPathItem::setOptionValue( const QString& name, const QVariant& v } /*! - \class QtxPagePrefPathListItem - \brief GUI implementation of resources directory list item. + \class QtxPagePrefPathListItem + \brief GUI implementation of the resources files/directories list item. */ /*! @@ -3111,10 +3138,20 @@ void QtxPagePrefPathListItem::setOptionValue( const QString& name, const QVarian \brief GUI implementation of resources date/time item. */ +/*! + \brief Constructor. + + Creates an item to enter date and time. + + \param title preference item title + \param parent parent preference item + \param sect resource file section associated with the preference item + \param param resource file parameter associated with the preference item +*/ QtxPagePrefDateTimeItem::QtxPagePrefDateTimeItem( const QString& title, QtxPreferenceItem* parent, const QString& sect, const QString& param ) : QtxPageNamedPrefItem( title, parent, sect, param ), -myType( DateTime ) + myType( DateTime ) { setControl( myDateTime = new QDateTimeEdit() ); myDateTime->setCalendarPopup( true ); @@ -3122,10 +3159,22 @@ myType( DateTime ) updateDateTime(); } +/*! + \brief Constructor. + + Creates preference item for editing of the date and/or time value: + the type is specified by parameter \a type. + + \param type preference item input type (QtxPagePrefDateTimeItem::InputType) + \param title preference item title + \param parent parent preference item + \param sect resource file section associated with the preference item + \param param resource file parameter associated with the preference item +*/ QtxPagePrefDateTimeItem::QtxPagePrefDateTimeItem( const int type, const QString& title, QtxPreferenceItem* parent, const QString& sect, const QString& param ) : QtxPageNamedPrefItem( title, parent, sect, param ), -myType( type ) + myType( type ) { setControl( myDateTime = new QDateTimeEdit() ); myDateTime->setCalendarPopup( true ); @@ -3133,15 +3182,28 @@ myType( type ) updateDateTime(); } +/*! + \brief Destructor. +*/ QtxPagePrefDateTimeItem::~QtxPagePrefDateTimeItem() { } +/*! + \brief Get date/time box preference item input type. + \return preference item input type (QtxPagePrefDateTimeItem::InputType) + \sa setInputType() +*/ int QtxPagePrefDateTimeItem::inputType() const { return myType; } +/*! + \brief Set date/time box preference item input type. + \param type new preference item input type (QtxPagePrefDateTimeItem::InputType) + \sa inputType() +*/ void QtxPagePrefDateTimeItem::setInputType( const int type ) { if ( myType == type ) @@ -3151,36 +3213,69 @@ void QtxPagePrefDateTimeItem::setInputType( const int type ) updateDateTime(); } +/*! + \brief Check if the popup calendar menu is enabled. + \return \c true if calendar popup menu is enabled +*/ bool QtxPagePrefDateTimeItem::calendar() const { return myDateTime->calendarPopup(); } +/*! + \brief Enable/disable popup calendar menu. + \param on new flag state +*/ void QtxPagePrefDateTimeItem::setCalendar( const bool on ) { myDateTime->setCalendarPopup( on ); } +/*! + \brief Get maximum date value. + \return maximum date value + \sa setMaximumDate(), minimumDate(), maximumTime(), minimumTime() +*/ QDate QtxPagePrefDateTimeItem::maximumDate() const { return myDateTime->maximumDate(); } +/*! + \brief Get maximum time value. + \return maximum time value + \sa setMaximumTime(), minimumTime(), maximumDate(), minimumDate() +*/ QTime QtxPagePrefDateTimeItem::maximumTime() const { return myDateTime->maximumTime(); } +/*! + \brief Get minimum date value. + \return minimum date value + \sa setMinimumDate(), maximumDate(), maximumTime(), minimumTime() +*/ QDate QtxPagePrefDateTimeItem::minimumDate() const { return myDateTime->minimumDate(); } +/*! + \brief Get minimum time value. + \return maximum time value + \sa setMinimumTime(), maximumTime(), maximumDate(), minimumDate() +*/ QTime QtxPagePrefDateTimeItem::minimumTime() const { return myDateTime->minimumTime(); } +/*! + \brief Set maximum date value. + \param d new maximum date value + \sa maximumDate(), minimumDate(), maximumTime(), minimumTime() +*/ void QtxPagePrefDateTimeItem::setMaximumDate( const QDate& d ) { if ( d.isValid() ) @@ -3189,6 +3284,11 @@ void QtxPagePrefDateTimeItem::setMaximumDate( const QDate& d ) myDateTime->clearMaximumDate(); } +/*! + \brief Set maximum time value. + \param t new maximum time value + \sa maximumTime(), minimumTime(), maximumDate(), minimumDate() +*/ void QtxPagePrefDateTimeItem::setMaximumTime( const QTime& t ) { if ( t.isValid() ) @@ -3197,6 +3297,11 @@ void QtxPagePrefDateTimeItem::setMaximumTime( const QTime& t ) myDateTime->clearMaximumTime(); } +/*! + \brief Set minimum date value. + \param d new minimum date value + \sa minimumDate(), maximumDate(), maximumTime(), minimumTime() +*/ void QtxPagePrefDateTimeItem::setMinimumDate( const QDate& d ) { if ( d.isValid() ) @@ -3205,6 +3310,11 @@ void QtxPagePrefDateTimeItem::setMinimumDate( const QDate& d ) myDateTime->clearMinimumDate(); } +/*! + \brief Set minimum time value. + \param t new minimum time value + \sa minimumTime(), maximumTime(), maximumDate(), minimumDate() +*/ void QtxPagePrefDateTimeItem::setMinimumTime( const QTime& t ) { if ( t.isValid() ) @@ -3213,6 +3323,10 @@ void QtxPagePrefDateTimeItem::setMinimumTime( const QTime& t ) myDateTime->clearMinimumTime(); } +/*! + \brief Store preference item to the resource manager. + \sa retrieve() +*/ void QtxPagePrefDateTimeItem::store() { QString str; @@ -3232,6 +3346,10 @@ void QtxPagePrefDateTimeItem::store() setString( str ); } +/*! + \brief Retrieve preference item from the resource manager. + \sa store() +*/ void QtxPagePrefDateTimeItem::retrieve() { QString str = getString(); @@ -3249,6 +3367,12 @@ void QtxPagePrefDateTimeItem::retrieve() } } +/*! + \brief Get preference item option value. + \param name option name + \return property value or null QVariant if option is not set + \sa setOptionValue() +*/ QVariant QtxPagePrefDateTimeItem::optionValue( const QString& name ) const { if ( name == "input_type" || name == "type" ) @@ -3265,6 +3389,12 @@ QVariant QtxPagePrefDateTimeItem::optionValue( const QString& name ) const return QtxPageNamedPrefItem::optionValue( name ); } +/*! + \brief Set preference item option value. + \param name option name + \param val new property value + \sa optionValue() +*/ void QtxPagePrefDateTimeItem::setOptionValue( const QString& name, const QVariant& val ) { if ( name == "input_type" || name == "type" ) @@ -3296,6 +3426,9 @@ void QtxPagePrefDateTimeItem::setOptionValue( const QString& name, const QVarian QtxPageNamedPrefItem::setOptionValue( name, val ); } +/*! + \brief Update date/time widget. +*/ void QtxPagePrefDateTimeItem::updateDateTime() { QString dispFmt; diff --git a/src/Qtx/QtxSplash.cxx b/src/Qtx/QtxSplash.cxx index f99e36b2a..6ea0510f9 100644 --- a/src/Qtx/QtxSplash.cxx +++ b/src/Qtx/QtxSplash.cxx @@ -16,8 +16,9 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: QtxSplash.cxx -// Author: Vadim SANDLER +// File : QtxSplash.cxx +// Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com) +// #include "QtxSplash.h" diff --git a/src/Qtx/QtxSplash.h b/src/Qtx/QtxSplash.h index bd952119b..a786205f0 100644 --- a/src/Qtx/QtxSplash.h +++ b/src/Qtx/QtxSplash.h @@ -16,8 +16,9 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File: QtxSplash.h -// Author: Vadim SANDLER +// File : QtxSplash.h +// Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com) +// #ifndef QTXSPLASH_H #define QTXSPLASH_H diff --git a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.cxx b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.cxx index 7e4791a49..02e8e8519 100644 --- a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.cxx +++ b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.cxx @@ -17,7 +17,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : SalomePyQt.cxx -// Author : Vadim SANDLER, Open CASCADE SAS, vadim.sandler@opencascade.com +// Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com) // #include // this include must be first!!! diff --git a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.h b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.h index c6c2fd679..cef6a1a88 100644 --- a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.h +++ b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.h @@ -17,7 +17,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : SalomePyQt.h -// Author : Vadim SANDLER, Open CASCADE SAS, vadim.sandler@opencascade.com +// Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com) // #ifndef SALOME_PYQT_H diff --git a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip index 5ef7ac3a3..ddc290a9f 100644 --- a/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip +++ b/src/SALOME_PYQT/SalomePyQt/SalomePyQt.sip @@ -1,11 +1,24 @@ -//============================================================================= -// File : SalomePyQt.sip -// Created : 25/04/05 -// Author : Vadim SANDLER -// Project : SALOME -// Copyright : 2003-2005 CEA/DEN, EDF R&D -// $Header : $ -//============================================================================= +// 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 +// +// File : SalomePyQt.sip +// Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com) +// %Module SalomePyQt diff --git a/src/SALOME_SWIG/SALOMEGUI_Swig.cxx b/src/SALOME_SWIG/SALOMEGUI_Swig.cxx index a6f44c2c2..3c533fee2 100644 --- a/src/SALOME_SWIG/SALOMEGUI_Swig.cxx +++ b/src/SALOME_SWIG/SALOMEGUI_Swig.cxx @@ -19,8 +19,8 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File : SALOMEGUI_Swig.cxx -// Author : Vadim SANDLER +// File : SALOMEGUI_Swig.cxx +// Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com) // #include "SALOMEGUI_Swig.hxx" diff --git a/src/SALOME_SWIG/SALOMEGUI_Swig.hxx b/src/SALOME_SWIG/SALOMEGUI_Swig.hxx index 76211c33f..483300f38 100644 --- a/src/SALOME_SWIG/SALOMEGUI_Swig.hxx +++ b/src/SALOME_SWIG/SALOMEGUI_Swig.hxx @@ -19,8 +19,8 @@ // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// File : SALOMEGUI_Swig.hxx -// Author : Vadim SANDLER +// File : SALOMEGUI_Swig.hxx +// Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com) // #ifndef SALOMEGUI_SWIG_HXX diff --git a/src/SALOME_SWIG/test_big_table.py b/src/SALOME_SWIG/test_big_table.py index 78fa2e347..126a549ec 100755 --- a/src/SALOME_SWIG/test_big_table.py +++ b/src/SALOME_SWIG/test_big_table.py @@ -16,10 +16,9 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# File : test_big_table.py -# Author : Vadim SANDLER -# Module : SALOME -# $Header$ +# File : test_big_table.py +# Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com) +# import salome import math diff --git a/src/SALOME_SWIG/test_many_objects.py b/src/SALOME_SWIG/test_many_objects.py index 98de03f1e..df486b271 100755 --- a/src/SALOME_SWIG/test_many_objects.py +++ b/src/SALOME_SWIG/test_many_objects.py @@ -16,10 +16,9 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# File : visu_many_objects.py -# Author : Vadim SANDLER -# Module : SALOME -# $Header$ +# File : visu_many_objects.py +# Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com) +# import salome import SALOMEDS diff --git a/src/SALOME_SWIG/test_table.py b/src/SALOME_SWIG/test_table.py index 0727594ce..740029932 100755 --- a/src/SALOME_SWIG/test_table.py +++ b/src/SALOME_SWIG/test_table.py @@ -16,10 +16,9 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -# File : test_table.py -# Author : Vadim SANDLER -# Module : SALOME -# $Header$ +# File : test_table.py +# Author : Vadim SANDLER, Open CASCADE S.A.S. (vadim.sandler@opencascade.com) +# import salome import math diff --git a/src/STD/STD_Application.cxx b/src/STD/STD_Application.cxx index 35b80fc39..f0561eb6f 100755 --- a/src/STD/STD_Application.cxx +++ b/src/STD/STD_Application.cxx @@ -350,40 +350,6 @@ bool STD_Application::onOpenDoc( const QString& aName ) return res; } -/*! \retval true, if document was loaded successful, else false.*/ -bool STD_Application::onLoadDoc( const QString& aName ) -{ - bool res = true; - if ( !activeStudy() ) - { - // if no study - load in current desktop - res = useStudy( aName ); - } - else - { - // if study exists - load in new desktop. Check: is the same file is loaded? - SUIT_Session* aSession = SUIT_Session::session(); - QList aAppList = aSession->applications(); - bool isAlreadyOpen = false; - SUIT_Application* aApp = 0; - for ( QList::iterator it = aAppList.begin(); it != aAppList.end() && !isAlreadyOpen; ++it ) - { - aApp = *it; - if ( aApp->activeStudy()->studyName() == aName ) - isAlreadyOpen = true; - } - if ( !isAlreadyOpen ) - { - aApp = startApplication( 0, 0 ); - if ( aApp ) - res = aApp->useStudy( aName ); - } - else - aApp->desktop()->activateWindow(); - } - return res; -} - /*!Virtual function. Not implemented here.*/ void STD_Application::beforeCloseDoc( SUIT_Study* ) { diff --git a/src/STD/STD_Application.h b/src/STD/STD_Application.h index 3ff6d57bc..9ea5b736d 100755 --- a/src/STD/STD_Application.h +++ b/src/STD/STD_Application.h @@ -115,8 +115,6 @@ public slots: virtual void onOpenDoc(); virtual bool onOpenDoc( const QString& ); - virtual bool onLoadDoc( const QString& ); - virtual void onExit(); virtual void onCopy(); diff --git a/src/SUIT/SUIT_Application.cxx b/src/SUIT/SUIT_Application.cxx index a5e545230..f07565b4e 100755 --- a/src/SUIT/SUIT_Application.cxx +++ b/src/SUIT/SUIT_Application.cxx @@ -126,15 +126,6 @@ bool SUIT_Application::useFile( const QString& theFileName ) return status; } -/*! - Opens other study into active Study. If Study is empty - creates it. - \param theName - name of study -*/ -bool SUIT_Application::useStudy( const QString& /*theName*/ ) -{ - return false; -} - /*! Creates new empty Study if active Study = 0 */ diff --git a/src/SUIT/SUIT_Application.h b/src/SUIT/SUIT_Application.h index 710d3b2d5..dd84cd031 100755 --- a/src/SUIT/SUIT_Application.h +++ b/src/SUIT/SUIT_Application.h @@ -84,9 +84,6 @@ public: //! Opens document into active Study. If Study is empty - creates it. virtual bool useFile( const QString& theFileName); - //! Loads document into active Study. If Study is empty - creates it. - virtual bool useStudy( const QString& theName); - //! Creates new empty Study if active Study = 0 virtual void createEmptyStudy();