You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by af...@apache.org on 2013/07/11 13:07:45 UTC
svn commit: r1502186 - in /openoffice/trunk/main:
default_images/introabout/intro.png desktop/source/splash/splash.cxx
desktop/source/splash/splash.hxx instsetoo_native/util/openoffice.lst
scp2/source/ooo/common_brand.scp
Author: af
Date: Thu Jul 11 11:07:44 2013
New Revision: 1502186
URL: http://svn.apache.org/r1502186
Log:
122620: Tweeked the splash screen a little.
Modified:
openoffice/trunk/main/default_images/introabout/intro.png
openoffice/trunk/main/desktop/source/splash/splash.cxx
openoffice/trunk/main/desktop/source/splash/splash.hxx
openoffice/trunk/main/instsetoo_native/util/openoffice.lst
openoffice/trunk/main/scp2/source/ooo/common_brand.scp
Modified: openoffice/trunk/main/default_images/introabout/intro.png
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/default_images/introabout/intro.png?rev=1502186&r1=1502185&r2=1502186&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/trunk/main/desktop/source/splash/splash.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/desktop/source/splash/splash.cxx?rev=1502186&r1=1502185&r2=1502186&view=diff
==============================================================================
--- openoffice/trunk/main/desktop/source/splash/splash.cxx (original)
+++ openoffice/trunk/main/desktop/source/splash/splash.cxx Thu Jul 11 11:07:44 2013
@@ -55,6 +55,7 @@ SplashScreen::SplashScreen(const Referen
: IntroWindow()
, _vdev(*((IntroWindow*)this))
, _cProgressFrameColor(sal::static_int_cast< ColorData >(NOT_LOADED))
+ , _bShowProgressFrame(true)
, _cProgressBarColor(sal::static_int_cast< ColorData >(NOT_LOADED))
, _bNativeProgress(true)
, _iMax(100)
@@ -303,6 +304,8 @@ void SplashScreen::loadConfig()
OUString( RTL_CONSTASCII_USTRINGPARAM( "FullScreenSplash" ) ) );
OUString sNativeProgress = implReadBootstrapKey(
OUString( RTL_CONSTASCII_USTRINGPARAM( "NativeProgress" ) ) );
+ OUString sShowProgressFrame = implReadBootstrapKey(
+ OUString( RTL_CONSTASCII_USTRINGPARAM( "ShowProgressFrame" ) ) );
// Determine full screen splash mode
@@ -334,6 +337,11 @@ void SplashScreen::loadConfig()
}
}
+ if (sShowProgressFrame.getLength() > 0)
+ {
+ _bShowProgressFrame = sShowProgressFrame.toBoolean();
+ }
+
if ( sProgressBarColor.getLength() )
{
sal_uInt8 nRed = 0;
@@ -658,18 +666,40 @@ void SplashScreen::Paint( const Rectangl
if (_bPaintBitmap)
_vdev.DrawBitmapEx( Point(), _aIntroBmp );
- if (_bPaintProgress) {
+ if (_bPaintProgress)
+ {
// draw progress...
- long length = (_iProgress * _barwidth / _iMax) - (2 * _barspace);
- if (length < 0) length = 0;
-
- // border
- _vdev.SetFillColor();
- _vdev.SetLineColor( _cProgressFrameColor );
- _vdev.DrawRect(Rectangle(_tlx, _tly, _tlx+_barwidth, _tly+_barheight));
- _vdev.SetFillColor( _cProgressBarColor );
- _vdev.SetLineColor();
- _vdev.DrawRect(Rectangle(_tlx+_barspace, _tly+_barspace, _tlx+_barspace+length, _tly+_barheight-_barspace));
+ long length = (_iProgress * _barwidth / _iMax);
+ if (_bShowProgressFrame)
+ length -= (2 * _barspace);
+ if (length < 0)
+ length = 0;
+
+ if (_bShowProgressFrame)
+ {
+ // border
+ _vdev.SetFillColor();
+ _vdev.SetLineColor( _cProgressFrameColor );
+ _vdev.DrawRect(Rectangle(_tlx, _tly, _tlx+_barwidth, _tly+_barheight));
+ _vdev.SetFillColor( _cProgressBarColor );
+ _vdev.SetLineColor();
+ _vdev.DrawRect(Rectangle(_tlx+_barspace, _tly+_barspace, _tlx+_barspace+length, _tly+_barheight-_barspace));
+ _vdev.DrawText( Rectangle(_tlx, _tly+_barheight+5, _tlx+_barwidth, _tly+_barheight+5+20), _sProgressText, TEXT_DRAW_CENTER );
+ }
+ else
+ {
+ // Show flat progress bar without frame.
+
+ // border
+ _vdev.SetFillColor( _cProgressFrameColor );
+ _vdev.SetLineColor();
+ _vdev.DrawRect(Rectangle(_tlx, _tly, _tlx+_barwidth, _tly+_barheight));
+
+ _vdev.SetFillColor( _cProgressBarColor );
+ _vdev.SetLineColor();
+ _vdev.DrawRect(Rectangle(_tlx, _tly, _tlx+length, _tly+_barheight));
+ }
+
_vdev.DrawText( Rectangle(_tlx, _tly+_barheight+5, _tlx+_barwidth, _tly+_barheight+5+20), _sProgressText, TEXT_DRAW_CENTER );
}
Size aSize = GetOutputSizePixel();
Modified: openoffice/trunk/main/desktop/source/splash/splash.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/desktop/source/splash/splash.hxx?rev=1502186&r1=1502185&r2=1502186&view=diff
==============================================================================
--- openoffice/trunk/main/desktop/source/splash/splash.hxx (original)
+++ openoffice/trunk/main/desktop/source/splash/splash.hxx Thu Jul 11 11:07:44 2013
@@ -84,6 +84,7 @@ private:
VirtualDevice _vdev;
BitmapEx _aIntroBmp;
Color _cProgressFrameColor;
+ bool _bShowProgressFrame;
Color _cProgressBarColor;
bool _bNativeProgress;
OUString _sAppName;
Modified: openoffice/trunk/main/instsetoo_native/util/openoffice.lst
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/instsetoo_native/util/openoffice.lst?rev=1502186&r1=1502185&r2=1502186&view=diff
==============================================================================
--- openoffice/trunk/main/instsetoo_native/util/openoffice.lst (original)
+++ openoffice/trunk/main/instsetoo_native/util/openoffice.lst Thu Jul 11 11:07:44 2013
@@ -20,10 +20,11 @@ Globals
LIBRARYVERSION 10.0.0
POOLPRODUCT 1
PROGRESSBARCOLOR 14,133,205
- PROGRESSSIZE 320,7
- PROGRESSPOSITION 185,206
+ PROGRESSSIZE 432,4
+ PROGRESSPOSITION 60,180
PROGRESSFRAMECOLOR 207,208,211
- NATIVEPROGRESS true
+ SHOWPROGRESSFRAME false
+ NATIVEPROGRESS false
REGISTRYLAYERNAME Layers
SERVICEPACK 1
UPDATE_DATABASE 1
Modified: openoffice/trunk/main/scp2/source/ooo/common_brand.scp
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/ooo/common_brand.scp?rev=1502186&r1=1502185&r2=1502186&view=diff
==============================================================================
--- openoffice/trunk/main/scp2/source/ooo/common_brand.scp (original)
+++ openoffice/trunk/main/scp2/source/ooo/common_brand.scp Thu Jul 11 11:07:44 2013
@@ -848,6 +848,15 @@ ProfileItem gid_Brand_Profileitem_Soffic
Value = "${PROGRESSFRAMECOLOR}";
End
+ProfileItem gid_Brand_Profileitem_Soffice_ShowProgressFrame_So
+ ProfileID = gid_Brand_Profile_Soffice_Ini;
+ ModuleID = gid_Module_Root_Brand;
+ Section = "Bootstrap";
+ Order = 5;
+ Key = "ShowProgressFrame";
+ Value = "${SHOWPROGRESSFRAME}";
+End
+
ProfileItem gid_Brand_Profileitem_Soffice_NativeProgress_So
ProfileID = gid_Brand_Profile_Soffice_Ini;
ModuleID = gid_Module_Root_Brand;