diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-07-26 08:15:03 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-07-26 08:15:03 +0000 |
| commit | 0157c90b31e8d41e02b3ca6ae919ba643ced2d61 (patch) | |
| tree | 50c0840c289fee49df571026c4d64ba788d6d847 /desktop | |
| parent | 616e4e29dbfe803fbac4e6d9249e1c769a177b20 (diff) | |
INTEGRATION: CWS c06v2_SRC680 (1.10.20); FILE MERGED
2006/05/26 11:29:22 kso 1.10.20.2: #135985#, #135986# - handling of special cases.
Issue number:
Submitted by:
Reviewed by:
2006/05/18 13:08:54 cd 1.10.20.1: #135985# Support full screen splash screen with adaptable pos/size of progress
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/splash/splash.hxx | 39 |
1 files changed, 31 insertions, 8 deletions
diff --git a/desktop/source/splash/splash.hxx b/desktop/source/splash/splash.hxx index a19acecaf5fb..dae53c238ceb 100644 --- a/desktop/source/splash/splash.hxx +++ b/desktop/source/splash/splash.hxx @@ -4,9 +4,9 @@ * * $RCSfile: splash.hxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: rt $ $Date: 2006-05-02 17:13:44 $ + * last change: $Author: rt $ $Date: 2006-07-26 09:15:03 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -66,6 +66,9 @@ #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <osl/mutex.hxx> #include <vcl/virdev.hxx> +#ifndef _RTL_BOOTSTRAP_HXX_ +#include <rtl/bootstrap.hxx> +#endif using namespace ::rtl; @@ -80,6 +83,15 @@ class SplashScreen , public IntroWindow { private: + struct FullScreenProgressRatioValue + { + double _fXRelPos; + double _fYRelPos; + double _fRelWidth; + double _fRelHeight; + }; + enum BitmapMode { BM_FULLSCREEN, BM_DEFAULT }; + // don't allow anybody but ourselves to create instances of this class SplashScreen(const SplashScreen&); SplashScreen(void); @@ -92,6 +104,10 @@ private: void loadConfig(); void initBitmap(); void updateStatus(); + bool findScreenBitmap( Bitmap& aBitmap ); + bool findAppBitmap( Bitmap& aBitmap ); + bool findBitmap( const rtl::OUString aBmpFileName, Bitmap& aBitmap ); + void determineProgressRatioValues( rtl::Bootstrap& rIniFile, double& rXRelPos, double& rYRelPos, double& rRelWidth, double& rRelHeight ); static SplashScreen *_pINSTANCE; @@ -103,14 +119,21 @@ private: Color _cProgressFrameColor; Color _cProgressBarColor; OUString _sExecutePath; - - sal_Int32 _iMax; - sal_Int32 _iProgress; - sal_Bool _bPaintBitmap; - sal_Bool _bPaintProgress; - sal_Bool _bVisible; + OUString _sAppName; + std::vector< FullScreenProgressRatioValue > _sFullScreenProgressRatioValues; + + sal_Int32 _iMax; + sal_Int32 _iProgress; + BitmapMode _eBitmapMode; + sal_Bool _bPaintBitmap; + sal_Bool _bPaintProgress; + sal_Bool _bVisible; + sal_Bool _bFullScreenSplash; + sal_Bool _bProgressEnd; long _height, _width, _tlx, _tly, _barwidth; long _barheight, _barspace; + double _fXPos, _fYPos; + double _fWidth, _fHeight; const long _xoffset, _yoffset; public: |