icon-themes/galaxy/vcl/res/spinner-16-01.png |binary
icon-themes/galaxy/vcl/res/spinner-16-02.png |binary
icon-themes/galaxy/vcl/res/spinner-16-03.png |binary
icon-themes/galaxy/vcl/res/spinner-16-04.png |binary
icon-themes/galaxy/vcl/res/spinner-16-05.png |binary
icon-themes/galaxy/vcl/res/spinner-16-06.png |binary
icon-themes/galaxy/vcl/res/spinner-32-01.png |binary
icon-themes/galaxy/vcl/res/spinner-32-02.png |binary
icon-themes/galaxy/vcl/res/spinner-32-03.png |binary
icon-themes/galaxy/vcl/res/spinner-32-04.png |binary
icon-themes/galaxy/vcl/res/spinner-32-05.png |binary
icon-themes/galaxy/vcl/res/spinner-32-06.png |binary
icon-themes/galaxy/vcl/res/spinner-32-07.png |binary
icon-themes/galaxy/vcl/res/spinner-32-08.png |binary
icon-themes/galaxy/vcl/res/spinner-32-09.png |binary
icon-themes/galaxy/vcl/res/spinner-32-10.png |binary
icon-themes/galaxy/vcl/res/spinner-32-11.png |binary
icon-themes/galaxy/vcl/res/spinner-32-12.png |binary
icon-themes/galaxy/vcl/res/spinner-64-01.png |binary
icon-themes/galaxy/vcl/res/spinner-64-02.png |binary
icon-themes/galaxy/vcl/res/spinner-64-03.png |binary
icon-themes/galaxy/vcl/res/spinner-64-04.png |binary
icon-themes/galaxy/vcl/res/spinner-64-05.png |binary
icon-themes/galaxy/vcl/res/spinner-64-06.png |binary
icon-themes/galaxy/vcl/res/spinner-64-07.png |binary
icon-themes/galaxy/vcl/res/spinner-64-08.png |binary
icon-themes/galaxy/vcl/res/spinner-64-09.png |binary
icon-themes/galaxy/vcl/res/spinner-64-10.png |binary
icon-themes/galaxy/vcl/res/spinner-64-11.png |binary
icon-themes/galaxy/vcl/res/spinner-64-12.png |binary
icon-themes/hicontrast/vcl/res/spinner-16-01.png |binary
icon-themes/hicontrast/vcl/res/spinner-16-02.png |binary
icon-themes/hicontrast/vcl/res/spinner-16-03.png |binary
icon-themes/hicontrast/vcl/res/spinner-16-04.png |binary
icon-themes/hicontrast/vcl/res/spinner-16-05.png |binary
icon-themes/hicontrast/vcl/res/spinner-16-06.png |binary
icon-themes/hicontrast/vcl/res/spinner-32-01.png |binary
icon-themes/hicontrast/vcl/res/spinner-32-02.png |binary
icon-themes/hicontrast/vcl/res/spinner-32-03.png |binary
icon-themes/hicontrast/vcl/res/spinner-32-04.png |binary
icon-themes/hicontrast/vcl/res/spinner-32-05.png |binary
icon-themes/hicontrast/vcl/res/spinner-32-06.png |binary
icon-themes/hicontrast/vcl/res/spinner-32-07.png |binary
icon-themes/hicontrast/vcl/res/spinner-32-08.png |binary
icon-themes/hicontrast/vcl/res/spinner-32-09.png |binary
icon-themes/hicontrast/vcl/res/spinner-32-10.png |binary
icon-themes/hicontrast/vcl/res/spinner-32-11.png |binary
icon-themes/hicontrast/vcl/res/spinner-32-12.png |binary
icon-themes/hicontrast/vcl/res/spinner-64-01.png |binary
icon-themes/hicontrast/vcl/res/spinner-64-02.png |binary
icon-themes/hicontrast/vcl/res/spinner-64-03.png |binary
icon-themes/hicontrast/vcl/res/spinner-64-04.png |binary
icon-themes/hicontrast/vcl/res/spinner-64-05.png |binary
icon-themes/hicontrast/vcl/res/spinner-64-06.png |binary
icon-themes/hicontrast/vcl/res/spinner-64-07.png |binary
icon-themes/hicontrast/vcl/res/spinner-64-08.png |binary
icon-themes/hicontrast/vcl/res/spinner-64-09.png |binary
icon-themes/hicontrast/vcl/res/spinner-64-10.png |binary
icon-themes/hicontrast/vcl/res/spinner-64-11.png |binary
icon-themes/hicontrast/vcl/res/spinner-64-12.png |binary
vcl/AllLangResTarget_vcl.mk | 1
vcl/source/control/throbber.cxx | 54 +----------
vcl/source/src/throbber.src | 108 +++++++----------------
63 files changed, 42 insertions(+), 121 deletions(-)
New commits:
commit ae2c256e228b3d4d01e85abdbc797a907c7f6563
Author: Michael Meeks <michael.me...@suse.com>
Date: Thu Apr 4 11:07:54 2013 +0100
unwind tangled mess around spinner buttons
Restore removed spinner artwork, cleanup the code: hicontrast - is now
a function of icon theme, not a global boolean.
uwith thanks to Ariel Constenla-Haile)
Change-Id: I68d4c7293a6faa130274cf45f53509ce140fa8c0
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 0000000..16134fc
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 0000000..b78f934
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 0000000..c17dfdc
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 0000000..c0c6a00
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 0000000..ebc7e35
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 0000000..3a2b29d
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 0000000..2c6b693
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 0000000..4662ddf
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 0000000..8c1a0be
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 0000000..ba323f3
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 0000000..f733dd1
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 0000000..bbaebc3
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 0000000..d005cb5
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 0000000..bda1e71
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 0000000..3e68842
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 0000000..d43e886
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 0000000..d67c895
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 0000000..9c3c4a8
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 0000000..01afa46
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 0000000..16a19c2
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 0000000..af37f8f
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 0000000..02c14e6
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 0000000..97f975b
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 0000000..c8e7944
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 0000000..c598e47
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 0000000..73d54f2
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 0000000..fafd367
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 0000000..225598a
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 0000000..193b7b8
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 0000000..6ca2873
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 0000000..5018887
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 0000000..082ec90
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 0000000..db6de05
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 0000000..df295bc
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 0000000..25f74e6
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 0000000..6a4daa3
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 0000000..c3596c1
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 0000000..e2ca6b9
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 0000000..6609d3a
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 0000000..e70a393
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 0000000..63eb3e1
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 0000000..c072e39
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 0000000..801ea3b
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 0000000..60635b1
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 0000000..0a4513d
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 0000000..06fbd02
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 0000000..89e14cd
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 0000000..2ced938
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 0000000..483b736
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 0000000..fe06914
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 0000000..a94d864
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 0000000..4163edd
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 0000000..9d35323
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 0000000..cafb8c3
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 0000000..e09b30f
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 0000000..53c4ccb
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 0000000..a104b14
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 0000000..6edbb14
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 0000000..1afe709
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 0000000..a5473b7
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 183123b..39efb7f 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 712ca1d..7f57680 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<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 )
diff --git a/vcl/source/src/throbber.src b/vcl/source/src/throbber.src
index 1a2848b..41a5f50 100644
--- a/vcl/source/src/throbber.src
+++ b/vcl/source/src/throbber.src
@@ -22,88 +22,46 @@
// at runtime, instead, the images in images.zip are accessed via
// private:graphicrepository/* URLs.
-Resource 1000
+Resource 3000
{
- 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"; }; };
+ Image 1 { ImageBitmap = Bitmap{ file = "spinner-16-01.png"; }; };
+ Image 2 { ImageBitmap = Bitmap{ file = "spinner-16-02.png"; }; };
+ Image 3 { ImageBitmap = Bitmap{ file = "spinner-16-03.png"; }; };
+ Image 4 { ImageBitmap = Bitmap{ file = "spinner-16-04.png"; }; };
+ Image 5 { ImageBitmap = Bitmap{ file = "spinner-16-05.png"; }; };
+ Image 6 { ImageBitmap = Bitmap{ file = "spinner-16-06.png"; }; };
};
-Resource 1001
+Resource 3001
{
- 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"; }; };
+ Image 1 { ImageBitmap = Bitmap{ file = "spinner-32-01.png"; }; };
+ Image 2 { ImageBitmap = Bitmap{ file = "spinner-32-02.png"; }; };
+ Image 3 { ImageBitmap = Bitmap{ file = "spinner-32-03.png"; }; };
+ Image 4 { ImageBitmap = Bitmap{ file = "spinner-32-04.png"; }; };
+ Image 5 { ImageBitmap = Bitmap{ file = "spinner-32-05.png"; }; };
+ Image 6 { ImageBitmap = Bitmap{ file = "spinner-32-06.png"; }; };
+ Image 7 { ImageBitmap = Bitmap{ file = "spinner-32-07.png"; }; };
+ Image 8 { ImageBitmap = Bitmap{ file = "spinner-32-08.png"; }; };
+ Image 9 { ImageBitmap = Bitmap{ file = "spinner-32-09.png"; }; };
+ Image 10 { ImageBitmap = Bitmap{ file = "spinner-32-10.png"; }; };
+ Image 11 { ImageBitmap = Bitmap{ file = "spinner-32-11.png"; }; };
+ Image 12 { ImageBitmap = Bitmap{ file = "spinner-32-12.png"; }; };
};
-Resource 1002
+Resource 3002
{
- 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"; }; };
+ Image 1 { ImageBitmap = Bitmap{ file = "spinner-64-01.png"; }; };
+ Image 2 { ImageBitmap = Bitmap{ file = "spinner-64-02.png"; }; };
+ Image 3 { ImageBitmap = Bitmap{ file = "spinner-64-03.png"; }; };
+ Image 4 { ImageBitmap = Bitmap{ file = "spinner-64-04.png"; }; };
+ Image 5 { ImageBitmap = Bitmap{ file = "spinner-64-05.png"; }; };
+ Image 6 { ImageBitmap = Bitmap{ file = "spinner-64-06.png"; }; };
+ Image 7 { ImageBitmap = Bitmap{ file = "spinner-64-07.png"; }; };
+ Image 8 { ImageBitmap = Bitmap{ file = "spinner-64-08.png"; }; };
+ Image 9 { ImageBitmap = Bitmap{ file = "spinner-64-09.png"; }; };
+ Image 10 { ImageBitmap = Bitmap{ file = "spinner-64-10.png"; }; };
+ Image 11 { ImageBitmap = Bitmap{ file = "spinner-64-11.png"; }; };
+ Image 12 { ImageBitmap = Bitmap{ file = "spinner-64-12.png"; }; };
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
