Author: arielch
Date: Fri May 25 10:20:50 2012
New Revision: 1342560
URL: http://svn.apache.org/viewvc?rev=1342560&view=rev
Log:
i112141 - Fix how Throbber control handles image URLs
Also redefine spinner images so that can be zipped and found by the
current implementation.
Modified:
incubator/ooo/trunk/main/toolkit/source/awt/animatedimagespeer.cxx
incubator/ooo/trunk/main/vcl/AllLangResTarget_vcl.mk
incubator/ooo/trunk/main/vcl/inc/svids.hrc
incubator/ooo/trunk/main/vcl/source/control/throbber.cxx
incubator/ooo/trunk/main/vcl/source/src/throbber.src
Modified: incubator/ooo/trunk/main/toolkit/source/awt/animatedimagespeer.cxx
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/toolkit/source/awt/animatedimagespeer.cxx?rev=1342560&r1=1342559&r2=1342560&view=diff
==============================================================================
--- incubator/ooo/trunk/main/toolkit/source/awt/animatedimagespeer.cxx
(original)
+++ incubator/ooo/trunk/main/toolkit/source/awt/animatedimagespeer.cxx Fri May
25 10:20:50 2012
@@ -111,28 +111,7 @@ namespace toolkit
//==================================================================================================================
namespace
{
-
//--------------------------------------------------------------------------------------------------------------
- ::rtl::OUString lcl_getHighContrastURL( ::rtl::OUString const&
i_imageURL )
- {
- INetURLObject aURL( i_imageURL );
- if ( aURL.GetProtocol() != INET_PROT_PRIV_SOFFICE )
- {
- OSL_VERIFY( aURL.insertName( ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "hicontrast" ) ), false, 0 ) );
- return aURL.GetMainURL( INetURLObject::NO_DECODE );
- }
- // the private: scheme is not considered to be hierarchical by
INetURLObject, so manually insert the
- // segment
- const sal_Int32 separatorPos = i_imageURL.indexOf( '/' );
- ENSURE_OR_RETURN( separatorPos != -1, "lcl_getHighContrastURL:
unsipported URL scheme - cannot automatically determine HC version!",
i_imageURL );
-
- ::rtl::OUStringBuffer composer;
- composer.append( i_imageURL.copy( 0, separatorPos ) );
- composer.appendAscii( "/hicontrast" );
- composer.append( i_imageURL.copy( separatorPos ) );
- return composer.makeStringAndClear();
- }
-
-
//--------------------------------------------------------------------------------------------------------------
+
//--------------------------------------------------------------------------------------------------------------
bool lcl_ensureImage_throw( Reference< XGraphicProvider > const&
i_graphicProvider, const bool i_isHighContrast, const CachedImage&
i_cachedImage )
{
if ( !i_cachedImage.xGraphic.is() )
@@ -141,8 +120,22 @@ namespace toolkit
if ( i_isHighContrast )
{
// try (to find) the high-contrast version of the graphic
first
- aMediaProperties.put( "URL", lcl_getHighContrastURL(
i_cachedImage.sImageURL ) );
- i_cachedImage.xGraphic.set(
i_graphicProvider->queryGraphic( aMediaProperties.getPropertyValues() ),
UNO_QUERY );
+ INetURLObject aURL( i_cachedImage.sImageURL );
+ if ( aURL.GetProtocol() != INET_PROT_PRIV_SOFFICE )
+ {
+ rtl::OUString sURL( i_cachedImage.sImageURL );
+ const sal_Int32 separatorPos = sURL.lastIndexOf( '/' );
+ if ( separatorPos != -1 )
+ {
+ ::rtl::OUStringBuffer composer;
+ composer.append( sURL.copy( 0, separatorPos ) );
+ composer.appendAscii( RTL_CONSTASCII_STRINGPARAM(
"/hicontrast" ) );
+ composer.append( sURL.copy( separatorPos ) );
+
+ aMediaProperties.put( "URL",
composer.makeStringAndClear() );
+ i_cachedImage.xGraphic.set(
i_graphicProvider->queryGraphic( aMediaProperties.getPropertyValues() ),
UNO_QUERY );
+ }
+ }
}
if ( !i_cachedImage.xGraphic.is() )
{
Modified: incubator/ooo/trunk/main/vcl/AllLangResTarget_vcl.mk
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/AllLangResTarget_vcl.mk?rev=1342560&r1=1342559&r2=1342560&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/AllLangResTarget_vcl.mk (original)
+++ incubator/ooo/trunk/main/vcl/AllLangResTarget_vcl.mk Fri May 25 10:20:50
2012
@@ -43,6 +43,7 @@ $(eval $(call gb_SrsTarget_add_files,vcl
vcl/source/src/menu.src \
vcl/source/src/print.src \
vcl/source/src/stdtext.src \
+ vcl/source/src/throbber.src \
vcl/source/src/units.src \
))
Modified: incubator/ooo/trunk/main/vcl/inc/svids.hrc
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/inc/svids.hrc?rev=1342560&r1=1342559&r2=1342560&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/inc/svids.hrc (original)
+++ incubator/ooo/trunk/main/vcl/inc/svids.hrc Fri May 25 10:20:50 2012
@@ -251,6 +251,9 @@
#define SV_ICON_ID_MACRO 17
#define SV_ICON_ID_PRINTERADMIN 501
+#define SV_RESID_BITMAP_THROBBER_START 3000
+#define SV_RESID_BITMAP_THROBBER_END 3060
+
#define HID_PRINTDLG HID_VCL_START
#endif // _SV_SVIDS_HRC
Modified: incubator/ooo/trunk/main/vcl/source/control/throbber.cxx
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/source/control/throbber.cxx?rev=1342560&r1=1342559&r2=1342560&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/source/control/throbber.cxx (original)
+++ incubator/ooo/trunk/main/vcl/source/control/throbber.cxx Fri May 25
10:20:50 2012
@@ -88,28 +88,6 @@ Throbber::~Throbber()
//----------------------------------------------------------------------------------------------------------------------
namespace
{
-
//..................................................................................................................
- ::rtl::OUString lcl_getHighContrastURL( ::rtl::OUString const& i_imageURL )
- {
- INetURLObject aURL( i_imageURL );
- if ( aURL.GetProtocol() != INET_PROT_PRIV_SOFFICE )
- {
- OSL_VERIFY( aURL.insertName( ::rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM( "hicontrast" ) ), false, 0 ) );
- return aURL.GetMainURL( INetURLObject::NO_DECODE );
- }
- // the private: scheme is not considered to be hierarchical by
INetURLObject, so manually insert the
- // segment
- const sal_Int32 separatorPos = i_imageURL.indexOf( '/' );
- ENSURE_OR_RETURN( separatorPos != -1, "lcl_getHighContrastURL:
unsipported URL scheme - cannot automatically determine HC version!",
i_imageURL );
-
- ::rtl::OUStringBuffer composer;
- composer.append( i_imageURL.copy( 0, separatorPos ) );
- composer.appendAscii( "/hicontrast" );
- composer.append( i_imageURL.copy( separatorPos ) );
- return composer.makeStringAndClear();
- }
-
-
//..................................................................................................................
::std::vector< Image > lcl_loadImageSet( const Throbber::ImageSet
i_imageSet, const bool i_isHiContrast )
{
::std::vector< Image > aImages;
@@ -130,8 +108,21 @@ namespace
Reference< XGraphic > xGraphic;
if ( i_isHiContrast )
{
- aMediaProperties.put( "URL", lcl_getHighContrastURL( *imageURL
) );
- xGraphic.set( xGraphicProvider->queryGraphic(
aMediaProperties.getPropertyValues() ), UNO_QUERY );
+ INetURLObject aURL( *imageURL );
+ if ( aURL.GetProtocol() != INET_PROT_PRIV_SOFFICE )
+ {
+ const sal_Int32 separatorPos = imageURL->lastIndexOf( '/'
);
+ if ( separatorPos != -1 )
+ {
+ ::rtl::OUStringBuffer composer;
+ composer.append( imageURL->copy( 0, separatorPos ) );
+ composer.appendAscii( RTL_CONSTASCII_STRINGPARAM(
"/hicontrast" ) );
+ composer.append( imageURL->copy( separatorPos ) );
+
+ aMediaProperties.put( "URL",
composer.makeStringAndClear() );
+ xGraphic.set( xGraphicProvider->queryGraphic(
aMediaProperties.getPropertyValues() ), UNO_QUERY );
+ }
+ }
}
if ( !xGraphic.is() )
{
@@ -279,7 +270,7 @@ void Throbber::setImageList( const Seque
for ( size_t i=0; i<nImageCounts[index]; ++i )
{
::rtl::OUStringBuffer aURL;
- aURL.appendAscii( "private:graphicrepository/shared/spinner-" );
+ aURL.appendAscii( "private:graphicrepository/vcl/res/spinner-" );
aURL.appendAscii( pResolutions[index] );
aURL.appendAscii( "-" );
if ( i < 9 )
Modified: incubator/ooo/trunk/main/vcl/source/src/throbber.src
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/vcl/source/src/throbber.src?rev=1342560&r1=1342559&r2=1342560&view=diff
==============================================================================
--- incubator/ooo/trunk/main/vcl/source/src/throbber.src (original)
+++ incubator/ooo/trunk/main/vcl/source/src/throbber.src Fri May 25 10:20:50
2012
@@ -19,93 +19,335 @@
*
*************************************************************/
+#define _SV_THROBBER_SRC
+#include <svids.hrc>
+
+#define THROBBER_16 SV_RESID_BITMAP_THROBBER_START
+#define THROBBER_16_HC THROBBER_16 + 6
+#define THROBBER_32 THROBBER_16_HC + 6
+#define THROBBER_32_HC THROBBER_32 + 12
+#define THROBBER_64 THROBBER_32_HC + 12
+#define THROBBER_64_HC THROBBER_64 + 12
// TODO: we need a mechanism to add images to images.zip, *without*
// referring them in resource files. The below resources are never loaded
// at runtime, instead, the images in images.zip are accessed via
// private:graphicrepository/* URLs.
-Resource 1000
+
+Bitmap (THROBBER_16 + 1)
+{
+ file = "spinner-16-01.png";
+};
+
+Bitmap (THROBBER_16 + 2)
+{
+ file = "spinner-16-02.png";
+};
+
+Bitmap (THROBBER_16 + 3)
+{
+ file = "spinner-16-03.png";
+};
+
+Bitmap (THROBBER_16 + 4)
+{
+ file = "spinner-16-04.png";
+};
+
+Bitmap (THROBBER_16 + 5)
+{
+ file = "spinner-16-05.png";
+};
+
+Bitmap (THROBBER_16 + 6)
+{
+ file = "spinner-16-06.png";
+};
+
+
+
+
+Bitmap (THROBBER_16_HC + 1)
+{
+ file = "spinner-16-01_h.png";
+};
+
+Bitmap (THROBBER_16_HC + 2)
+{
+ file = "spinner-16-02_h.png";
+};
+
+Bitmap (THROBBER_16_HC + 3)
+{
+ file = "spinner-16-03_h.png";
+};
+
+Bitmap (THROBBER_16_HC + 4)
+{
+ file = "spinner-16-04_h.png";
+};
+
+Bitmap (THROBBER_16_HC + 5)
+{
+ file = "spinner-16-05_h.png";
+};
+
+Bitmap (THROBBER_16_HC + 6)
+{
+ file = "spinner-16-06_h.png";
+};
+
+
+
+
+Bitmap (THROBBER_32 + 1)
+{
+ file = "spinner-32-01.png";
+};
+
+Bitmap (THROBBER_32 + 2)
+{
+ file = "spinner-32-02.png";
+};
+
+Bitmap (THROBBER_32 + 3)
+{
+ file = "spinner-32-03.png";
+};
+
+Bitmap (THROBBER_32 + 4)
+{
+ file = "spinner-32-04.png";
+};
+
+Bitmap (THROBBER_32 + 5)
+{
+ file = "spinner-32-05.png";
+};
+
+Bitmap (THROBBER_32 + 6)
+{
+ file = "spinner-32-06.png";
+};
+
+Bitmap (THROBBER_32 + 7)
+{
+ file = "spinner-32-07.png";
+};
+
+Bitmap (THROBBER_32 + 8)
+{
+ file = "spinner-32-08.png";
+};
+
+Bitmap (THROBBER_32 + 9)
+{
+ file = "spinner-32-09.png";
+};
+
+Bitmap (THROBBER_32 + 10)
+{
+ file = "spinner-32-10.png";
+};
+
+Bitmap (THROBBER_32 + 11)
+{
+ file = "spinner-32-11.png";
+};
+
+Bitmap (THROBBER_32 + 12)
+{
+ file = "spinner-32-12.png";
+};
+
+
+
+
+Bitmap (THROBBER_32_HC + 1)
+{
+ file = "spinner-32-01_h.png";
+};
+
+Bitmap (THROBBER_32_HC + 2)
+{
+ file = "spinner-32-02_h.png";
+};
+
+Bitmap (THROBBER_32_HC + 3)
+{
+ file = "spinner-32-03_h.png";
+};
+
+Bitmap (THROBBER_32_HC + 4)
+{
+ file = "spinner-32-04_h.png";
+};
+
+Bitmap (THROBBER_32_HC + 5)
+{
+ file = "spinner-32-05_h.png";
+};
+
+Bitmap (THROBBER_32_HC + 6)
{
- Image 1 { ImageBitmap = Bitmap{ file = "shared/spinner-16-01.png"; }; };
- Image 2 { ImageBitmap = Bitmap{ file = "shared/spinner-16-02.png"; }; };
- Image 3 { ImageBitmap = Bitmap{ file = "shared/spinner-16-03.png"; }; };
- Image 4 { ImageBitmap = Bitmap{ file = "shared/spinner-16-04.png"; }; };
- Image 5 { ImageBitmap = Bitmap{ file = "shared/spinner-16-05.png"; }; };
- Image 6 { ImageBitmap = Bitmap{ file = "shared/spinner-16-06.png"; }; };
-};
-
-Resource 1001
-{
- Image 1 { ImageBitmap = Bitmap{ file =
"hicontrast/shared/spinner-16-01.png"; }; };
- Image 2 { ImageBitmap = Bitmap{ file =
"hicontrast/shared/spinner-16-02.png"; }; };
- Image 3 { ImageBitmap = Bitmap{ file =
"hicontrast/shared/spinner-16-03.png"; }; };
- Image 4 { ImageBitmap = Bitmap{ file =
"hicontrast/shared/spinner-16-04.png"; }; };
- Image 5 { ImageBitmap = Bitmap{ file =
"hicontrast/shared/spinner-16-05.png"; }; };
- Image 6 { ImageBitmap = Bitmap{ file =
"hicontrast/shared/spinner-16-06.png"; }; };
-};
-
-Resource 1002
-{
- Image 1 { ImageBitmap = Bitmap{ file = "shared/spinner-32-01.png"; }; };
- Image 2 { ImageBitmap = Bitmap{ file = "shared/spinner-32-02.png"; }; };
- Image 3 { ImageBitmap = Bitmap{ file = "shared/spinner-32-03.png"; }; };
- Image 4 { ImageBitmap = Bitmap{ file = "shared/spinner-32-04.png"; }; };
- Image 5 { ImageBitmap = Bitmap{ file = "shared/spinner-32-05.png"; }; };
- Image 6 { ImageBitmap = Bitmap{ file = "shared/spinner-32-06.png"; }; };
- Image 7 { ImageBitmap = Bitmap{ file = "shared/spinner-32-07.png"; }; };
- Image 8 { ImageBitmap = Bitmap{ file = "shared/spinner-32-08.png"; }; };
- Image 9 { ImageBitmap = Bitmap{ file = "shared/spinner-32-09.png"; }; };
- Image 10 { ImageBitmap = Bitmap{ file = "shared/spinner-32-10.png"; }; };
- Image 11 { ImageBitmap = Bitmap{ file = "shared/spinner-32-11.png"; }; };
- Image 12 { ImageBitmap = Bitmap{ file = "shared/spinner-32-12.png"; }; };
-};
-
-Resource 1003
-{
- Image 1 { ImageBitmap = Bitmap{ file =
"hicontrast/shared/spinner-32-01.png"; }; };
- Image 2 { ImageBitmap = Bitmap{ file =
"hicontrast/shared/spinner-32-02.png"; }; };
- Image 3 { ImageBitmap = Bitmap{ file =
"hicontrast/shared/spinner-32-03.png"; }; };
- Image 4 { ImageBitmap = Bitmap{ file =
"hicontrast/shared/spinner-32-04.png"; }; };
- Image 5 { ImageBitmap = Bitmap{ file =
"hicontrast/shared/spinner-32-05.png"; }; };
- Image 6 { ImageBitmap = Bitmap{ file =
"hicontrast/shared/spinner-32-06.png"; }; };
- Image 7 { ImageBitmap = Bitmap{ file =
"hicontrast/shared/spinner-32-07.png"; }; };
- Image 8 { ImageBitmap = Bitmap{ file =
"hicontrast/shared/spinner-32-08.png"; }; };
- Image 9 { ImageBitmap = Bitmap{ file =
"hicontrast/shared/spinner-32-09.png"; }; };
- Image 10 { ImageBitmap = Bitmap{ file =
"hicontrast/shared/spinner-32-10.png"; }; };
- Image 11 { ImageBitmap = Bitmap{ file =
"hicontrast/shared/spinner-32-11.png"; }; };
- Image 12 { ImageBitmap = Bitmap{ file =
"hicontrast/shared/spinner-32-12.png"; }; };
-};
-
-Resource 1004
-{
- Image 1 { ImageBitmap = Bitmap{ file = "shared/spinner-64-01.png"; }; };
- Image 2 { ImageBitmap = Bitmap{ file = "shared/spinner-64-02.png"; }; };
- Image 3 { ImageBitmap = Bitmap{ file = "shared/spinner-64-03.png"; }; };
- Image 4 { ImageBitmap = Bitmap{ file = "shared/spinner-64-04.png"; }; };
- Image 5 { ImageBitmap = Bitmap{ file = "shared/spinner-64-05.png"; }; };
- Image 6 { ImageBitmap = Bitmap{ file = "shared/spinner-64-06.png"; }; };
- Image 7 { ImageBitmap = Bitmap{ file = "shared/spinner-64-07.png"; }; };
- Image 8 { ImageBitmap = Bitmap{ file = "shared/spinner-64-08.png"; }; };
- Image 9 { ImageBitmap = Bitmap{ file = "shared/spinner-64-09.png"; }; };
- Image 10 { ImageBitmap = Bitmap{ file = "shared/spinner-64-10.png"; }; };
- Image 11 { ImageBitmap = Bitmap{ file = "shared/spinner-64-11.png"; }; };
- Image 12 { ImageBitmap = Bitmap{ file = "shared/spinner-64-12.png"; }; };
-};
-
-Resource 1005
-{
- Image 1 { ImageBitmap = Bitmap{ file =
"hicontrast/shared/spinner-64-01.png"; }; };
- Image 2 { ImageBitmap = Bitmap{ file =
"hicontrast/shared/spinner-64-02.png"; }; };
- Image 3 { ImageBitmap = Bitmap{ file =
"hicontrast/shared/spinner-64-03.png"; }; };
- Image 4 { ImageBitmap = Bitmap{ file =
"hicontrast/shared/spinner-64-04.png"; }; };
- Image 5 { ImageBitmap = Bitmap{ file =
"hicontrast/shared/spinner-64-05.png"; }; };
- Image 6 { ImageBitmap = Bitmap{ file =
"hicontrast/shared/spinner-64-06.png"; }; };
- Image 7 { ImageBitmap = Bitmap{ file =
"hicontrast/shared/spinner-64-07.png"; }; };
- Image 8 { ImageBitmap = Bitmap{ file =
"hicontrast/shared/spinner-64-08.png"; }; };
- Image 9 { ImageBitmap = Bitmap{ file =
"hicontrast/shared/spinner-64-09.png"; }; };
- Image 10 { ImageBitmap = Bitmap{ file =
"hicontrast/shared/spinner-64-10.png"; }; };
- Image 11 { ImageBitmap = Bitmap{ file =
"hicontrast/shared/spinner-64-11.png"; }; };
- Image 12 { ImageBitmap = Bitmap{ file =
"hicontrast/shared/spinner-64-12.png"; }; };
+ file = "spinner-32-06_h.png";
};
+
+Bitmap (THROBBER_32_HC + 7)
+{
+ file = "spinner-32-07_h.png";
+};
+
+Bitmap (THROBBER_32_HC + 8)
+{
+ file = "spinner-32-08_h.png";
+};
+
+Bitmap (THROBBER_32_HC + 9)
+{
+ file = "spinner-32-09_h.png";
+};
+
+Bitmap (THROBBER_32_HC + 10)
+{
+ file = "spinner-32-10_h.png";
+};
+
+Bitmap (THROBBER_32_HC + 11)
+{
+ file = "spinner-32-11_h.png";
+};
+
+Bitmap (THROBBER_32_HC + 12)
+{
+ file = "spinner-32-12_h.png";
+};
+
+
+
+Bitmap (THROBBER_64 + 1)
+{
+ file = "spinner-64-01.png";
+};
+
+Bitmap (THROBBER_64 + 2)
+{
+ file = "spinner-64-02.png";
+};
+
+Bitmap (THROBBER_64 + 3)
+{
+ file = "spinner-64-03.png";
+};
+
+Bitmap (THROBBER_64 + 4)
+{
+ file = "spinner-64-04.png";
+};
+
+Bitmap (THROBBER_64 + 5)
+{
+ file = "spinner-64-05.png";
+};
+
+Bitmap (THROBBER_64 + 6)
+{
+ file = "spinner-64-06.png";
+};
+
+Bitmap (THROBBER_64 + 7)
+{
+ file = "spinner-64-07.png";
+};
+
+Bitmap (THROBBER_64 + 8)
+{
+ file = "spinner-64-08.png";
+};
+
+Bitmap (THROBBER_64 + 9)
+{
+ file = "spinner-64-09.png";
+};
+
+Bitmap (THROBBER_64 + 10)
+{
+ file = "spinner-64-10.png";
+};
+
+Bitmap (THROBBER_64 + 11)
+{
+ file = "spinner-64-11.png";
+};
+
+Bitmap (THROBBER_64 + 12)
+{
+ file = "spinner-64-12.png";
+};
+
+
+
+
+Bitmap (THROBBER_64_HC + 1)
+{
+ file = "spinner-64-01_h.png";
+};
+
+Bitmap (THROBBER_64_HC + 2)
+{
+ file = "spinner-64-02_h.png";
+};
+
+Bitmap (THROBBER_64_HC + 3)
+{
+ file = "spinner-64-03_h.png";
+};
+
+Bitmap (THROBBER_64_HC + 4)
+{
+ file = "spinner-64-04_h.png";
+};
+
+Bitmap (THROBBER_64_HC + 5)
+{
+ file = "spinner-64-05_h.png";
+};
+
+Bitmap (THROBBER_64_HC + 6)
+{
+ file = "spinner-64-06_h.png";
+};
+
+Bitmap (THROBBER_64_HC + 7)
+{
+ file = "spinner-64-07_h.png";
+};
+
+Bitmap (THROBBER_64_HC + 8)
+{
+ file = "spinner-64-08_h.png";
+};
+
+Bitmap (THROBBER_64_HC + 9)
+{
+ file = "spinner-64-09_h.png";
+};
+
+Bitmap (THROBBER_64_HC + 10)
+{
+ file = "spinner-64-10_h.png";
+};
+
+Bitmap (THROBBER_64_HC + 11)
+{
+ file = "spinner-64-11_h.png";
+};
+
+Bitmap (THROBBER_64_HC + 12)
+{
+ file = "spinner-64-12_h.png";
+};
+
+
