diff --git a/icon-themes/galaxy/vcl/res/spinner-16-01.png b/icon-themes/galaxy/vcl/res/spinner-16-01.png new file mode 100644 index 000000000000..16134fc7ef14 Binary files /dev/null and b/icon-themes/galaxy/vcl/res/spinner-16-01.png differ diff --git a/icon-themes/galaxy/vcl/res/spinner-16-02.png b/icon-themes/galaxy/vcl/res/spinner-16-02.png new file mode 100644 index 000000000000..b78f934d92ee Binary files /dev/null and b/icon-themes/galaxy/vcl/res/spinner-16-02.png differ diff --git a/icon-themes/galaxy/vcl/res/spinner-16-03.png b/icon-themes/galaxy/vcl/res/spinner-16-03.png new file mode 100644 index 000000000000..c17dfdc03d1b Binary files /dev/null and b/icon-themes/galaxy/vcl/res/spinner-16-03.png differ diff --git a/icon-themes/galaxy/vcl/res/spinner-16-04.png b/icon-themes/galaxy/vcl/res/spinner-16-04.png new file mode 100644 index 000000000000..c0c6a004afa5 Binary files /dev/null and b/icon-themes/galaxy/vcl/res/spinner-16-04.png differ diff --git a/icon-themes/galaxy/vcl/res/spinner-16-05.png b/icon-themes/galaxy/vcl/res/spinner-16-05.png new file mode 100644 index 000000000000..ebc7e3565f39 Binary files /dev/null and b/icon-themes/galaxy/vcl/res/spinner-16-05.png differ diff --git a/icon-themes/galaxy/vcl/res/spinner-16-06.png b/icon-themes/galaxy/vcl/res/spinner-16-06.png new file mode 100644 index 000000000000..3a2b29da9d78 Binary files /dev/null and b/icon-themes/galaxy/vcl/res/spinner-16-06.png differ diff --git a/icon-themes/galaxy/vcl/res/spinner-32-01.png b/icon-themes/galaxy/vcl/res/spinner-32-01.png new file mode 100644 index 000000000000..2c6b6937f8b2 Binary files /dev/null and b/icon-themes/galaxy/vcl/res/spinner-32-01.png differ diff --git a/icon-themes/galaxy/vcl/res/spinner-32-02.png b/icon-themes/galaxy/vcl/res/spinner-32-02.png new file mode 100644 index 000000000000..4662ddf54924 Binary files /dev/null and b/icon-themes/galaxy/vcl/res/spinner-32-02.png differ diff --git a/icon-themes/galaxy/vcl/res/spinner-32-03.png b/icon-themes/galaxy/vcl/res/spinner-32-03.png new file mode 100644 index 000000000000..8c1a0be53da5 Binary files /dev/null and b/icon-themes/galaxy/vcl/res/spinner-32-03.png differ diff --git a/icon-themes/galaxy/vcl/res/spinner-32-04.png b/icon-themes/galaxy/vcl/res/spinner-32-04.png new file mode 100644 index 000000000000..ba323f36244d Binary files /dev/null and b/icon-themes/galaxy/vcl/res/spinner-32-04.png differ diff --git a/icon-themes/galaxy/vcl/res/spinner-32-05.png b/icon-themes/galaxy/vcl/res/spinner-32-05.png new file mode 100644 index 000000000000..f733dd17266c Binary files /dev/null and b/icon-themes/galaxy/vcl/res/spinner-32-05.png differ diff --git a/icon-themes/galaxy/vcl/res/spinner-32-06.png b/icon-themes/galaxy/vcl/res/spinner-32-06.png new file mode 100644 index 000000000000..bbaebc36f565 Binary files /dev/null and b/icon-themes/galaxy/vcl/res/spinner-32-06.png differ diff --git a/icon-themes/galaxy/vcl/res/spinner-32-07.png b/icon-themes/galaxy/vcl/res/spinner-32-07.png new file mode 100644 index 000000000000..d005cb55b4eb Binary files /dev/null and b/icon-themes/galaxy/vcl/res/spinner-32-07.png differ diff --git a/icon-themes/galaxy/vcl/res/spinner-32-08.png b/icon-themes/galaxy/vcl/res/spinner-32-08.png new file mode 100644 index 000000000000..bda1e7192809 Binary files /dev/null and b/icon-themes/galaxy/vcl/res/spinner-32-08.png differ diff --git a/icon-themes/galaxy/vcl/res/spinner-32-09.png b/icon-themes/galaxy/vcl/res/spinner-32-09.png new file mode 100644 index 000000000000..3e688421d95e Binary files /dev/null and b/icon-themes/galaxy/vcl/res/spinner-32-09.png differ diff --git a/icon-themes/galaxy/vcl/res/spinner-32-10.png b/icon-themes/galaxy/vcl/res/spinner-32-10.png new file mode 100644 index 000000000000..d43e8866e10e Binary files /dev/null and b/icon-themes/galaxy/vcl/res/spinner-32-10.png differ diff --git a/icon-themes/galaxy/vcl/res/spinner-32-11.png b/icon-themes/galaxy/vcl/res/spinner-32-11.png new file mode 100644 index 000000000000..d67c895a2c7d Binary files /dev/null and b/icon-themes/galaxy/vcl/res/spinner-32-11.png differ diff --git a/icon-themes/galaxy/vcl/res/spinner-32-12.png b/icon-themes/galaxy/vcl/res/spinner-32-12.png new file mode 100644 index 000000000000..9c3c4a849c6f Binary files /dev/null and b/icon-themes/galaxy/vcl/res/spinner-32-12.png differ diff --git a/icon-themes/galaxy/vcl/res/spinner-64-01.png b/icon-themes/galaxy/vcl/res/spinner-64-01.png new file mode 100644 index 000000000000..01afa46aac51 Binary files /dev/null and b/icon-themes/galaxy/vcl/res/spinner-64-01.png differ diff --git a/icon-themes/galaxy/vcl/res/spinner-64-02.png b/icon-themes/galaxy/vcl/res/spinner-64-02.png new file mode 100644 index 000000000000..16a19c20652b Binary files /dev/null and b/icon-themes/galaxy/vcl/res/spinner-64-02.png differ diff --git a/icon-themes/galaxy/vcl/res/spinner-64-03.png b/icon-themes/galaxy/vcl/res/spinner-64-03.png new file mode 100644 index 000000000000..af37f8f9f42a Binary files /dev/null and b/icon-themes/galaxy/vcl/res/spinner-64-03.png differ diff --git a/icon-themes/galaxy/vcl/res/spinner-64-04.png b/icon-themes/galaxy/vcl/res/spinner-64-04.png new file mode 100644 index 000000000000..02c14e6e8a4f Binary files /dev/null and b/icon-themes/galaxy/vcl/res/spinner-64-04.png differ diff --git a/icon-themes/galaxy/vcl/res/spinner-64-05.png b/icon-themes/galaxy/vcl/res/spinner-64-05.png new file mode 100644 index 000000000000..97f975b09c0a Binary files /dev/null and b/icon-themes/galaxy/vcl/res/spinner-64-05.png differ diff --git a/icon-themes/galaxy/vcl/res/spinner-64-06.png b/icon-themes/galaxy/vcl/res/spinner-64-06.png new file mode 100644 index 000000000000..c8e7944ed3eb Binary files /dev/null and b/icon-themes/galaxy/vcl/res/spinner-64-06.png differ diff --git a/icon-themes/galaxy/vcl/res/spinner-64-07.png b/icon-themes/galaxy/vcl/res/spinner-64-07.png new file mode 100644 index 000000000000..c598e476366b Binary files /dev/null and b/icon-themes/galaxy/vcl/res/spinner-64-07.png differ diff --git a/icon-themes/galaxy/vcl/res/spinner-64-08.png b/icon-themes/galaxy/vcl/res/spinner-64-08.png new file mode 100644 index 000000000000..73d54f2abcbd Binary files /dev/null and b/icon-themes/galaxy/vcl/res/spinner-64-08.png differ diff --git a/icon-themes/galaxy/vcl/res/spinner-64-09.png b/icon-themes/galaxy/vcl/res/spinner-64-09.png new file mode 100644 index 000000000000..fafd367f0df3 Binary files /dev/null and b/icon-themes/galaxy/vcl/res/spinner-64-09.png differ diff --git a/icon-themes/galaxy/vcl/res/spinner-64-10.png b/icon-themes/galaxy/vcl/res/spinner-64-10.png new file mode 100644 index 000000000000..225598a28aec Binary files /dev/null and b/icon-themes/galaxy/vcl/res/spinner-64-10.png differ diff --git a/icon-themes/galaxy/vcl/res/spinner-64-11.png b/icon-themes/galaxy/vcl/res/spinner-64-11.png new file mode 100644 index 000000000000..193b7b8e01ce Binary files /dev/null and b/icon-themes/galaxy/vcl/res/spinner-64-11.png differ diff --git a/icon-themes/galaxy/vcl/res/spinner-64-12.png b/icon-themes/galaxy/vcl/res/spinner-64-12.png new file mode 100644 index 000000000000..6ca28736271d Binary files /dev/null and b/icon-themes/galaxy/vcl/res/spinner-64-12.png differ diff --git a/icon-themes/hicontrast/vcl/res/spinner-16-01.png b/icon-themes/hicontrast/vcl/res/spinner-16-01.png new file mode 100644 index 000000000000..5018887da569 Binary files /dev/null and b/icon-themes/hicontrast/vcl/res/spinner-16-01.png differ diff --git a/icon-themes/hicontrast/vcl/res/spinner-16-02.png b/icon-themes/hicontrast/vcl/res/spinner-16-02.png new file mode 100644 index 000000000000..082ec90f079b Binary files /dev/null and b/icon-themes/hicontrast/vcl/res/spinner-16-02.png differ diff --git a/icon-themes/hicontrast/vcl/res/spinner-16-03.png b/icon-themes/hicontrast/vcl/res/spinner-16-03.png new file mode 100644 index 000000000000..db6de0599497 Binary files /dev/null and b/icon-themes/hicontrast/vcl/res/spinner-16-03.png differ diff --git a/icon-themes/hicontrast/vcl/res/spinner-16-04.png b/icon-themes/hicontrast/vcl/res/spinner-16-04.png new file mode 100644 index 000000000000..df295bc33c0d Binary files /dev/null and b/icon-themes/hicontrast/vcl/res/spinner-16-04.png differ diff --git a/icon-themes/hicontrast/vcl/res/spinner-16-05.png b/icon-themes/hicontrast/vcl/res/spinner-16-05.png new file mode 100644 index 000000000000..25f74e693995 Binary files /dev/null and b/icon-themes/hicontrast/vcl/res/spinner-16-05.png differ diff --git a/icon-themes/hicontrast/vcl/res/spinner-16-06.png b/icon-themes/hicontrast/vcl/res/spinner-16-06.png new file mode 100644 index 000000000000..6a4daa3771f9 Binary files /dev/null and b/icon-themes/hicontrast/vcl/res/spinner-16-06.png differ diff --git a/icon-themes/hicontrast/vcl/res/spinner-32-01.png b/icon-themes/hicontrast/vcl/res/spinner-32-01.png new file mode 100644 index 000000000000..c3596c19f276 Binary files /dev/null and b/icon-themes/hicontrast/vcl/res/spinner-32-01.png differ diff --git a/icon-themes/hicontrast/vcl/res/spinner-32-02.png b/icon-themes/hicontrast/vcl/res/spinner-32-02.png new file mode 100644 index 000000000000..e2ca6b965d23 Binary files /dev/null and b/icon-themes/hicontrast/vcl/res/spinner-32-02.png differ diff --git a/icon-themes/hicontrast/vcl/res/spinner-32-03.png b/icon-themes/hicontrast/vcl/res/spinner-32-03.png new file mode 100644 index 000000000000..6609d3a6d300 Binary files /dev/null and b/icon-themes/hicontrast/vcl/res/spinner-32-03.png differ diff --git a/icon-themes/hicontrast/vcl/res/spinner-32-04.png b/icon-themes/hicontrast/vcl/res/spinner-32-04.png new file mode 100644 index 000000000000..e70a393be204 Binary files /dev/null and b/icon-themes/hicontrast/vcl/res/spinner-32-04.png differ diff --git a/icon-themes/hicontrast/vcl/res/spinner-32-05.png b/icon-themes/hicontrast/vcl/res/spinner-32-05.png new file mode 100644 index 000000000000..63eb3e10375c Binary files /dev/null and b/icon-themes/hicontrast/vcl/res/spinner-32-05.png differ diff --git a/icon-themes/hicontrast/vcl/res/spinner-32-06.png b/icon-themes/hicontrast/vcl/res/spinner-32-06.png new file mode 100644 index 000000000000..c072e397cc00 Binary files /dev/null and b/icon-themes/hicontrast/vcl/res/spinner-32-06.png differ diff --git a/icon-themes/hicontrast/vcl/res/spinner-32-07.png b/icon-themes/hicontrast/vcl/res/spinner-32-07.png new file mode 100644 index 000000000000..801ea3b36f9e Binary files /dev/null and b/icon-themes/hicontrast/vcl/res/spinner-32-07.png differ diff --git a/icon-themes/hicontrast/vcl/res/spinner-32-08.png b/icon-themes/hicontrast/vcl/res/spinner-32-08.png new file mode 100644 index 000000000000..60635b1e47e1 Binary files /dev/null and b/icon-themes/hicontrast/vcl/res/spinner-32-08.png differ diff --git a/icon-themes/hicontrast/vcl/res/spinner-32-09.png b/icon-themes/hicontrast/vcl/res/spinner-32-09.png new file mode 100644 index 000000000000..0a4513daa636 Binary files /dev/null and b/icon-themes/hicontrast/vcl/res/spinner-32-09.png differ diff --git a/icon-themes/hicontrast/vcl/res/spinner-32-10.png b/icon-themes/hicontrast/vcl/res/spinner-32-10.png new file mode 100644 index 000000000000..06fbd02faf7f Binary files /dev/null and b/icon-themes/hicontrast/vcl/res/spinner-32-10.png differ diff --git a/icon-themes/hicontrast/vcl/res/spinner-32-11.png b/icon-themes/hicontrast/vcl/res/spinner-32-11.png new file mode 100644 index 000000000000..89e14cd33786 Binary files /dev/null and b/icon-themes/hicontrast/vcl/res/spinner-32-11.png differ diff --git a/icon-themes/hicontrast/vcl/res/spinner-32-12.png b/icon-themes/hicontrast/vcl/res/spinner-32-12.png new file mode 100644 index 000000000000..2ced9380408e Binary files /dev/null and b/icon-themes/hicontrast/vcl/res/spinner-32-12.png differ diff --git a/icon-themes/hicontrast/vcl/res/spinner-64-01.png b/icon-themes/hicontrast/vcl/res/spinner-64-01.png new file mode 100644 index 000000000000..483b7367c1c2 Binary files /dev/null and b/icon-themes/hicontrast/vcl/res/spinner-64-01.png differ diff --git a/icon-themes/hicontrast/vcl/res/spinner-64-02.png b/icon-themes/hicontrast/vcl/res/spinner-64-02.png new file mode 100644 index 000000000000..fe069140e744 Binary files /dev/null and b/icon-themes/hicontrast/vcl/res/spinner-64-02.png differ diff --git a/icon-themes/hicontrast/vcl/res/spinner-64-03.png b/icon-themes/hicontrast/vcl/res/spinner-64-03.png new file mode 100644 index 000000000000..a94d86434512 Binary files /dev/null and b/icon-themes/hicontrast/vcl/res/spinner-64-03.png differ diff --git a/icon-themes/hicontrast/vcl/res/spinner-64-04.png b/icon-themes/hicontrast/vcl/res/spinner-64-04.png new file mode 100644 index 000000000000..4163edd66151 Binary files /dev/null and b/icon-themes/hicontrast/vcl/res/spinner-64-04.png differ diff --git a/icon-themes/hicontrast/vcl/res/spinner-64-05.png b/icon-themes/hicontrast/vcl/res/spinner-64-05.png new file mode 100644 index 000000000000..9d3532381d7c Binary files /dev/null and b/icon-themes/hicontrast/vcl/res/spinner-64-05.png differ diff --git a/icon-themes/hicontrast/vcl/res/spinner-64-06.png b/icon-themes/hicontrast/vcl/res/spinner-64-06.png new file mode 100644 index 000000000000..cafb8c31b4bc Binary files /dev/null and b/icon-themes/hicontrast/vcl/res/spinner-64-06.png differ diff --git a/icon-themes/hicontrast/vcl/res/spinner-64-07.png b/icon-themes/hicontrast/vcl/res/spinner-64-07.png new file mode 100644 index 000000000000..e09b30f161c4 Binary files /dev/null and b/icon-themes/hicontrast/vcl/res/spinner-64-07.png differ diff --git a/icon-themes/hicontrast/vcl/res/spinner-64-08.png b/icon-themes/hicontrast/vcl/res/spinner-64-08.png new file mode 100644 index 000000000000..53c4ccb7813e Binary files /dev/null and b/icon-themes/hicontrast/vcl/res/spinner-64-08.png differ diff --git a/icon-themes/hicontrast/vcl/res/spinner-64-09.png b/icon-themes/hicontrast/vcl/res/spinner-64-09.png new file mode 100644 index 000000000000..a104b14d41d9 Binary files /dev/null and b/icon-themes/hicontrast/vcl/res/spinner-64-09.png differ diff --git a/icon-themes/hicontrast/vcl/res/spinner-64-10.png b/icon-themes/hicontrast/vcl/res/spinner-64-10.png new file mode 100644 index 000000000000..6edbb14c97c3 Binary files /dev/null and b/icon-themes/hicontrast/vcl/res/spinner-64-10.png differ diff --git a/icon-themes/hicontrast/vcl/res/spinner-64-11.png b/icon-themes/hicontrast/vcl/res/spinner-64-11.png new file mode 100644 index 000000000000..1afe70992c8e Binary files /dev/null and b/icon-themes/hicontrast/vcl/res/spinner-64-11.png differ diff --git a/icon-themes/hicontrast/vcl/res/spinner-64-12.png b/icon-themes/hicontrast/vcl/res/spinner-64-12.png new file mode 100644 index 000000000000..a5473b7210a3 Binary files /dev/null and b/icon-themes/hicontrast/vcl/res/spinner-64-12.png differ diff --git a/vcl/AllLangResTarget_vcl.mk b/vcl/AllLangResTarget_vcl.mk index 183123b45b8f..39efb7f762a3 100644 --- a/vcl/AllLangResTarget_vcl.mk +++ b/vcl/AllLangResTarget_vcl.mk @@ -43,6 +43,7 @@ $(eval $(call gb_SrsTarget_add_files,vcl/source/src,\ 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 \ vcl/source/src/fpicker.src \ vcl/source/edit/textundo.src \ diff --git a/vcl/source/control/throbber.cxx b/vcl/source/control/throbber.cxx index 712ca1d10ec1..7f5768056119 100644 --- a/vcl/source/control/throbber.cxx +++ b/vcl/source/control/throbber.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include "vcl/throbber.hxx" #include "vcl/svapp.hxx" @@ -44,7 +43,6 @@ using ::com::sun::star::uno::UNO_QUERY; using ::com::sun::star::uno::Exception; namespace ImageScaleMode = ::com::sun::star::awt::ImageScaleMode; -//---------------------------------------------------------------------------------------------------------------------- Throbber::Throbber( Window* i_parentWindow, WinBits i_style, const ImageSet i_imageSet ) :ImageControl( i_parentWindow, i_style ) ,mbRepeat( sal_True ) @@ -60,7 +58,6 @@ Throbber::Throbber( Window* i_parentWindow, WinBits i_style, const ImageSet i_im initImages(); } -//-------------------------------------------------------------------- Throbber::Throbber( Window* i_parentWindow, const ResId& i_resId, const ImageSet i_imageSet ) :ImageControl( i_parentWindow, i_resId ) ,mbRepeat( sal_True ) @@ -76,38 +73,14 @@ Throbber::Throbber( Window* i_parentWindow, const ResId& i_resId, const ImageSet initImages(); } -//---------------------------------------------------------------------------------------------------------------------- Throbber::~Throbber() { maWaitTimer.Stop(); } -//---------------------------------------------------------------------------------------------------------------------- namespace { - //.................................................................................................................. - ::rtl::OUString lcl_getHighContrastURL( OUString const& i_imageURL ) - { - INetURLObject aURL( i_imageURL ); - if ( aURL.GetProtocol() != INET_PROT_PRIV_SOFFICE ) - { - OSL_VERIFY( aURL.insertName( "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 > lcl_loadImageSet( const Throbber::ImageSet i_imageSet ) { ::std::vector< Image > aImages; ENSURE_OR_RETURN( i_imageSet != Throbber::IMAGES_NONE, "lcl_loadImageSet: illegal image set", aImages ); @@ -125,16 +98,8 @@ namespace ) { Reference< XGraphic > xGraphic; - if ( i_isHiContrast ) - { - aMediaProperties.put( "URL", lcl_getHighContrastURL( *imageURL ) ); - xGraphic.set( xGraphicProvider->queryGraphic( aMediaProperties.getPropertyValues() ), UNO_QUERY ); - } - if ( !xGraphic.is() ) - { - aMediaProperties.put( "URL", *imageURL ); - xGraphic.set( xGraphicProvider->queryGraphic( aMediaProperties.getPropertyValues() ), UNO_QUERY ); - } + aMediaProperties.put( "URL", *imageURL ); + xGraphic.set( xGraphicProvider->queryGraphic( aMediaProperties.getPropertyValues() ), UNO_QUERY ); aImages.push_back( Image( xGraphic ) ); } @@ -142,7 +107,6 @@ namespace } } -//---------------------------------------------------------------------------------------------------------------------- void Throbber::Resize() { ImageControl::Resize(); @@ -151,7 +115,6 @@ void Throbber::Resize() initImages(); } -//---------------------------------------------------------------------------------------------------------------------- void Throbber::initImages() { if ( meImageSet == IMAGES_NONE ) @@ -160,16 +123,15 @@ void Throbber::initImages() try { ::std::vector< ::std::vector< Image > > aImageSets; - const bool isHiContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); if ( meImageSet == IMAGES_AUTO ) { - aImageSets.push_back( lcl_loadImageSet( IMAGES_16_PX, isHiContrast ) ); - aImageSets.push_back( lcl_loadImageSet( IMAGES_32_PX, isHiContrast ) ); - aImageSets.push_back( lcl_loadImageSet( IMAGES_64_PX, isHiContrast ) ); + aImageSets.push_back( lcl_loadImageSet( IMAGES_16_PX ) ); + aImageSets.push_back( lcl_loadImageSet( IMAGES_32_PX ) ); + aImageSets.push_back( lcl_loadImageSet( IMAGES_64_PX ) ); } else { - aImageSets.push_back( lcl_loadImageSet( meImageSet, isHiContrast ) ); + aImageSets.push_back( lcl_loadImageSet( meImageSet ) ); } // find the best matching image set (size-wise) @@ -281,7 +243,7 @@ void Throbber::setImageList( const Sequence< Reference< XGraphic > >& rImageList for ( size_t i=0; i