Salome HOME
projects
/
modules
/
gui.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bos #23995 Porting to Qt 5.12: move locale settings from spin boxes to global level...
[modules/gui.git]
/
src
/
Qtx
/
QtxSplash.h
diff --git
a/src/Qtx/QtxSplash.h
b/src/Qtx/QtxSplash.h
index 76da7f83e59dc3a0de12cb2800efcc63d9af41e0..4a4ecedd766236e9e9ea3142522bc9480a3ee7ee 100644
(file)
--- a/
src/Qtx/QtxSplash.h
+++ b/
src/Qtx/QtxSplash.h
@@
-1,4
+1,4
@@
-// Copyright (C) 2007-20
16
CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-20
21
CEA/DEN, EDF R&D, OPEN CASCADE
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
//
// Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@
-64,6
+64,10
@@
public:
static void setStatus( const QString&, const int = -1 );
static void setError( const QString&, const QString& = QString(), const int = -1 );
static void setStatus( const QString&, const int = -1 );
static void setError( const QString&, const QString& = QString(), const int = -1 );
+ void setSize( const QSize& );
+ void setSize( int, int );
+ QSize fixedSize() const;
+
void setPixmap( const QPixmap& );
QPixmap pixmap() const;
void setPixmap( const QPixmap& );
QPixmap pixmap() const;
@@
-152,7
+156,8
@@
private:
private:
static QtxSplash* mySplash;
private:
static QtxSplash* mySplash;
-
+
+ QSize mySize; //!< splash size
QPixmap myPixmap; //!< splash pixmap
QString myInfo; //!< constant info
QString myMessage; //!< current status message
QPixmap myPixmap; //!< splash pixmap
QString myInfo; //!< constant info
QString myMessage; //!< current status message