This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 366c39a4695bd523e249bb9997cba849a235b555
Author: mseidel <msei...@apache.org>
AuthorDate: Tue Jul 23 22:56:52 2024 +0200
Add spinner for Industrial icon set. Increase the number of graphics for
16x16 from 6 to 12 to get a smoother animation
(cherry picked from commit 2dce64d2790fb6913f940abce907585234c987fd)
---
main/default_images/vcl/res/spinner-16-07.png | Bin 0 -> 510 bytes
main/default_images/vcl/res/spinner-16-07_h.png | Bin 0 -> 3678 bytes
main/default_images/vcl/res/spinner-16-08.png | Bin 0 -> 504 bytes
main/default_images/vcl/res/spinner-16-08_h.png | Bin 0 -> 3681 bytes
main/default_images/vcl/res/spinner-16-09.png | Bin 0 -> 505 bytes
main/default_images/vcl/res/spinner-16-09_h.png | Bin 0 -> 3687 bytes
main/default_images/vcl/res/spinner-16-10.png | Bin 0 -> 494 bytes
main/default_images/vcl/res/spinner-16-10_h.png | Bin 0 -> 3689 bytes
main/default_images/vcl/res/spinner-16-11.png | Bin 0 -> 516 bytes
main/default_images/vcl/res/spinner-16-11_h.png | Bin 0 -> 3694 bytes
main/default_images/vcl/res/spinner-16-12.png | Bin 0 -> 506 bytes
main/default_images/vcl/res/spinner-16-12_h.png | Bin 0 -> 3690 bytes
.../industrial/vcl/res/spinner-16-01.png | Bin 0 -> 533 bytes
.../industrial/vcl/res/spinner-16-02.png | Bin 0 -> 566 bytes
.../industrial/vcl/res/spinner-16-03.png | Bin 0 -> 605 bytes
.../industrial/vcl/res/spinner-16-04.png | Bin 0 -> 555 bytes
.../industrial/vcl/res/spinner-16-05.png | Bin 0 -> 560 bytes
.../industrial/vcl/res/spinner-16-06.png | Bin 0 -> 591 bytes
.../industrial/vcl/res/spinner-16-07.png | Bin 0 -> 564 bytes
.../industrial/vcl/res/spinner-16-08.png | Bin 0 -> 571 bytes
.../industrial/vcl/res/spinner-16-09.png | Bin 0 -> 597 bytes
.../industrial/vcl/res/spinner-16-10.png | Bin 0 -> 562 bytes
.../industrial/vcl/res/spinner-16-11.png | Bin 0 -> 588 bytes
.../industrial/vcl/res/spinner-16-12.png | Bin 0 -> 596 bytes
.../industrial/vcl/res/spinner-32-01.png | Bin 0 -> 1205 bytes
.../industrial/vcl/res/spinner-32-02.png | Bin 0 -> 1135 bytes
.../industrial/vcl/res/spinner-32-03.png | Bin 0 -> 1210 bytes
.../industrial/vcl/res/spinner-32-04.png | Bin 0 -> 1213 bytes
.../industrial/vcl/res/spinner-32-05.png | Bin 0 -> 1134 bytes
.../industrial/vcl/res/spinner-32-06.png | Bin 0 -> 1217 bytes
.../industrial/vcl/res/spinner-32-07.png | Bin 0 -> 1197 bytes
.../industrial/vcl/res/spinner-32-08.png | Bin 0 -> 1170 bytes
.../industrial/vcl/res/spinner-32-09.png | Bin 0 -> 1195 bytes
.../industrial/vcl/res/spinner-32-10.png | Bin 0 -> 1169 bytes
.../industrial/vcl/res/spinner-32-11.png | Bin 0 -> 1164 bytes
.../industrial/vcl/res/spinner-32-12.png | Bin 0 -> 1186 bytes
.../industrial/vcl/res/spinner-64-01.png | Bin 0 -> 2289 bytes
.../industrial/vcl/res/spinner-64-02.png | Bin 0 -> 2249 bytes
.../industrial/vcl/res/spinner-64-03.png | Bin 0 -> 2285 bytes
.../industrial/vcl/res/spinner-64-04.png | Bin 0 -> 2236 bytes
.../industrial/vcl/res/spinner-64-05.png | Bin 0 -> 2274 bytes
.../industrial/vcl/res/spinner-64-06.png | Bin 0 -> 2326 bytes
.../industrial/vcl/res/spinner-64-07.png | Bin 0 -> 2288 bytes
.../industrial/vcl/res/spinner-64-08.png | Bin 0 -> 2274 bytes
.../industrial/vcl/res/spinner-64-09.png | Bin 0 -> 2279 bytes
.../industrial/vcl/res/spinner-64-10.png | Bin 0 -> 2236 bytes
.../industrial/vcl/res/spinner-64-11.png | Bin 0 -> 2240 bytes
.../industrial/vcl/res/spinner-64-12.png | Bin 0 -> 2325 bytes
main/vcl/inc/svids.hrc | 24 ++++----
main/vcl/source/control/throbber.cxx | 18 +++---
main/vcl/source/src/throbber.src | 68 ++++++++++++++++++---
51 files changed, 81 insertions(+), 29 deletions(-)
diff --git a/main/default_images/vcl/res/spinner-16-07.png
b/main/default_images/vcl/res/spinner-16-07.png
new file mode 100644
index 0000000000..4a262dae40
Binary files /dev/null and b/main/default_images/vcl/res/spinner-16-07.png
differ
diff --git a/main/default_images/vcl/res/spinner-16-07_h.png
b/main/default_images/vcl/res/spinner-16-07_h.png
new file mode 100644
index 0000000000..5018887da5
Binary files /dev/null and b/main/default_images/vcl/res/spinner-16-07_h.png
differ
diff --git a/main/default_images/vcl/res/spinner-16-08.png
b/main/default_images/vcl/res/spinner-16-08.png
new file mode 100644
index 0000000000..e4f2f739c1
Binary files /dev/null and b/main/default_images/vcl/res/spinner-16-08.png
differ
diff --git a/main/default_images/vcl/res/spinner-16-08_h.png
b/main/default_images/vcl/res/spinner-16-08_h.png
new file mode 100644
index 0000000000..082ec90f07
Binary files /dev/null and b/main/default_images/vcl/res/spinner-16-08_h.png
differ
diff --git a/main/default_images/vcl/res/spinner-16-09.png
b/main/default_images/vcl/res/spinner-16-09.png
new file mode 100644
index 0000000000..c5f73b7eec
Binary files /dev/null and b/main/default_images/vcl/res/spinner-16-09.png
differ
diff --git a/main/default_images/vcl/res/spinner-16-09_h.png
b/main/default_images/vcl/res/spinner-16-09_h.png
new file mode 100644
index 0000000000..db6de05994
Binary files /dev/null and b/main/default_images/vcl/res/spinner-16-09_h.png
differ
diff --git a/main/default_images/vcl/res/spinner-16-10.png
b/main/default_images/vcl/res/spinner-16-10.png
new file mode 100644
index 0000000000..b22a7df3b6
Binary files /dev/null and b/main/default_images/vcl/res/spinner-16-10.png
differ
diff --git a/main/default_images/vcl/res/spinner-16-10_h.png
b/main/default_images/vcl/res/spinner-16-10_h.png
new file mode 100644
index 0000000000..df295bc33c
Binary files /dev/null and b/main/default_images/vcl/res/spinner-16-10_h.png
differ
diff --git a/main/default_images/vcl/res/spinner-16-11.png
b/main/default_images/vcl/res/spinner-16-11.png
new file mode 100644
index 0000000000..cd9419dfaa
Binary files /dev/null and b/main/default_images/vcl/res/spinner-16-11.png
differ
diff --git a/main/default_images/vcl/res/spinner-16-11_h.png
b/main/default_images/vcl/res/spinner-16-11_h.png
new file mode 100644
index 0000000000..25f74e6939
Binary files /dev/null and b/main/default_images/vcl/res/spinner-16-11_h.png
differ
diff --git a/main/default_images/vcl/res/spinner-16-12.png
b/main/default_images/vcl/res/spinner-16-12.png
new file mode 100644
index 0000000000..3b7f1ba73c
Binary files /dev/null and b/main/default_images/vcl/res/spinner-16-12.png
differ
diff --git a/main/default_images/vcl/res/spinner-16-12_h.png
b/main/default_images/vcl/res/spinner-16-12_h.png
new file mode 100644
index 0000000000..6a4daa3771
Binary files /dev/null and b/main/default_images/vcl/res/spinner-16-12_h.png
differ
diff --git a/main/ooo_custom_images/industrial/vcl/res/spinner-16-01.png
b/main/ooo_custom_images/industrial/vcl/res/spinner-16-01.png
new file mode 100644
index 0000000000..8838787318
Binary files /dev/null and
b/main/ooo_custom_images/industrial/vcl/res/spinner-16-01.png differ
diff --git a/main/ooo_custom_images/industrial/vcl/res/spinner-16-02.png
b/main/ooo_custom_images/industrial/vcl/res/spinner-16-02.png
new file mode 100644
index 0000000000..a034e9d475
Binary files /dev/null and
b/main/ooo_custom_images/industrial/vcl/res/spinner-16-02.png differ
diff --git a/main/ooo_custom_images/industrial/vcl/res/spinner-16-03.png
b/main/ooo_custom_images/industrial/vcl/res/spinner-16-03.png
new file mode 100644
index 0000000000..df52d27a03
Binary files /dev/null and
b/main/ooo_custom_images/industrial/vcl/res/spinner-16-03.png differ
diff --git a/main/ooo_custom_images/industrial/vcl/res/spinner-16-04.png
b/main/ooo_custom_images/industrial/vcl/res/spinner-16-04.png
new file mode 100644
index 0000000000..98c95a0172
Binary files /dev/null and
b/main/ooo_custom_images/industrial/vcl/res/spinner-16-04.png differ
diff --git a/main/ooo_custom_images/industrial/vcl/res/spinner-16-05.png
b/main/ooo_custom_images/industrial/vcl/res/spinner-16-05.png
new file mode 100644
index 0000000000..169fa54d90
Binary files /dev/null and
b/main/ooo_custom_images/industrial/vcl/res/spinner-16-05.png differ
diff --git a/main/ooo_custom_images/industrial/vcl/res/spinner-16-06.png
b/main/ooo_custom_images/industrial/vcl/res/spinner-16-06.png
new file mode 100644
index 0000000000..95837b6055
Binary files /dev/null and
b/main/ooo_custom_images/industrial/vcl/res/spinner-16-06.png differ
diff --git a/main/ooo_custom_images/industrial/vcl/res/spinner-16-07.png
b/main/ooo_custom_images/industrial/vcl/res/spinner-16-07.png
new file mode 100644
index 0000000000..1765216559
Binary files /dev/null and
b/main/ooo_custom_images/industrial/vcl/res/spinner-16-07.png differ
diff --git a/main/ooo_custom_images/industrial/vcl/res/spinner-16-08.png
b/main/ooo_custom_images/industrial/vcl/res/spinner-16-08.png
new file mode 100644
index 0000000000..9701c8cea6
Binary files /dev/null and
b/main/ooo_custom_images/industrial/vcl/res/spinner-16-08.png differ
diff --git a/main/ooo_custom_images/industrial/vcl/res/spinner-16-09.png
b/main/ooo_custom_images/industrial/vcl/res/spinner-16-09.png
new file mode 100644
index 0000000000..5f4a1151b3
Binary files /dev/null and
b/main/ooo_custom_images/industrial/vcl/res/spinner-16-09.png differ
diff --git a/main/ooo_custom_images/industrial/vcl/res/spinner-16-10.png
b/main/ooo_custom_images/industrial/vcl/res/spinner-16-10.png
new file mode 100644
index 0000000000..bbe6dfd81b
Binary files /dev/null and
b/main/ooo_custom_images/industrial/vcl/res/spinner-16-10.png differ
diff --git a/main/ooo_custom_images/industrial/vcl/res/spinner-16-11.png
b/main/ooo_custom_images/industrial/vcl/res/spinner-16-11.png
new file mode 100644
index 0000000000..d69e8fbf6e
Binary files /dev/null and
b/main/ooo_custom_images/industrial/vcl/res/spinner-16-11.png differ
diff --git a/main/ooo_custom_images/industrial/vcl/res/spinner-16-12.png
b/main/ooo_custom_images/industrial/vcl/res/spinner-16-12.png
new file mode 100644
index 0000000000..cb760095df
Binary files /dev/null and
b/main/ooo_custom_images/industrial/vcl/res/spinner-16-12.png differ
diff --git a/main/ooo_custom_images/industrial/vcl/res/spinner-32-01.png
b/main/ooo_custom_images/industrial/vcl/res/spinner-32-01.png
new file mode 100644
index 0000000000..ee52e76828
Binary files /dev/null and
b/main/ooo_custom_images/industrial/vcl/res/spinner-32-01.png differ
diff --git a/main/ooo_custom_images/industrial/vcl/res/spinner-32-02.png
b/main/ooo_custom_images/industrial/vcl/res/spinner-32-02.png
new file mode 100644
index 0000000000..7c8d5e7f17
Binary files /dev/null and
b/main/ooo_custom_images/industrial/vcl/res/spinner-32-02.png differ
diff --git a/main/ooo_custom_images/industrial/vcl/res/spinner-32-03.png
b/main/ooo_custom_images/industrial/vcl/res/spinner-32-03.png
new file mode 100644
index 0000000000..d46eb640dd
Binary files /dev/null and
b/main/ooo_custom_images/industrial/vcl/res/spinner-32-03.png differ
diff --git a/main/ooo_custom_images/industrial/vcl/res/spinner-32-04.png
b/main/ooo_custom_images/industrial/vcl/res/spinner-32-04.png
new file mode 100644
index 0000000000..104b9946d8
Binary files /dev/null and
b/main/ooo_custom_images/industrial/vcl/res/spinner-32-04.png differ
diff --git a/main/ooo_custom_images/industrial/vcl/res/spinner-32-05.png
b/main/ooo_custom_images/industrial/vcl/res/spinner-32-05.png
new file mode 100644
index 0000000000..58751755ec
Binary files /dev/null and
b/main/ooo_custom_images/industrial/vcl/res/spinner-32-05.png differ
diff --git a/main/ooo_custom_images/industrial/vcl/res/spinner-32-06.png
b/main/ooo_custom_images/industrial/vcl/res/spinner-32-06.png
new file mode 100644
index 0000000000..44e797c0f9
Binary files /dev/null and
b/main/ooo_custom_images/industrial/vcl/res/spinner-32-06.png differ
diff --git a/main/ooo_custom_images/industrial/vcl/res/spinner-32-07.png
b/main/ooo_custom_images/industrial/vcl/res/spinner-32-07.png
new file mode 100644
index 0000000000..22c2acc349
Binary files /dev/null and
b/main/ooo_custom_images/industrial/vcl/res/spinner-32-07.png differ
diff --git a/main/ooo_custom_images/industrial/vcl/res/spinner-32-08.png
b/main/ooo_custom_images/industrial/vcl/res/spinner-32-08.png
new file mode 100644
index 0000000000..621e86c9b0
Binary files /dev/null and
b/main/ooo_custom_images/industrial/vcl/res/spinner-32-08.png differ
diff --git a/main/ooo_custom_images/industrial/vcl/res/spinner-32-09.png
b/main/ooo_custom_images/industrial/vcl/res/spinner-32-09.png
new file mode 100644
index 0000000000..69223bba04
Binary files /dev/null and
b/main/ooo_custom_images/industrial/vcl/res/spinner-32-09.png differ
diff --git a/main/ooo_custom_images/industrial/vcl/res/spinner-32-10.png
b/main/ooo_custom_images/industrial/vcl/res/spinner-32-10.png
new file mode 100644
index 0000000000..c7b6346ad3
Binary files /dev/null and
b/main/ooo_custom_images/industrial/vcl/res/spinner-32-10.png differ
diff --git a/main/ooo_custom_images/industrial/vcl/res/spinner-32-11.png
b/main/ooo_custom_images/industrial/vcl/res/spinner-32-11.png
new file mode 100644
index 0000000000..39c42c6572
Binary files /dev/null and
b/main/ooo_custom_images/industrial/vcl/res/spinner-32-11.png differ
diff --git a/main/ooo_custom_images/industrial/vcl/res/spinner-32-12.png
b/main/ooo_custom_images/industrial/vcl/res/spinner-32-12.png
new file mode 100644
index 0000000000..6d7317b8d7
Binary files /dev/null and
b/main/ooo_custom_images/industrial/vcl/res/spinner-32-12.png differ
diff --git a/main/ooo_custom_images/industrial/vcl/res/spinner-64-01.png
b/main/ooo_custom_images/industrial/vcl/res/spinner-64-01.png
new file mode 100644
index 0000000000..25a1126c37
Binary files /dev/null and
b/main/ooo_custom_images/industrial/vcl/res/spinner-64-01.png differ
diff --git a/main/ooo_custom_images/industrial/vcl/res/spinner-64-02.png
b/main/ooo_custom_images/industrial/vcl/res/spinner-64-02.png
new file mode 100644
index 0000000000..9aca9e0c36
Binary files /dev/null and
b/main/ooo_custom_images/industrial/vcl/res/spinner-64-02.png differ
diff --git a/main/ooo_custom_images/industrial/vcl/res/spinner-64-03.png
b/main/ooo_custom_images/industrial/vcl/res/spinner-64-03.png
new file mode 100644
index 0000000000..5dca155ccb
Binary files /dev/null and
b/main/ooo_custom_images/industrial/vcl/res/spinner-64-03.png differ
diff --git a/main/ooo_custom_images/industrial/vcl/res/spinner-64-04.png
b/main/ooo_custom_images/industrial/vcl/res/spinner-64-04.png
new file mode 100644
index 0000000000..ab9e48fb0f
Binary files /dev/null and
b/main/ooo_custom_images/industrial/vcl/res/spinner-64-04.png differ
diff --git a/main/ooo_custom_images/industrial/vcl/res/spinner-64-05.png
b/main/ooo_custom_images/industrial/vcl/res/spinner-64-05.png
new file mode 100644
index 0000000000..5caaa3b4d4
Binary files /dev/null and
b/main/ooo_custom_images/industrial/vcl/res/spinner-64-05.png differ
diff --git a/main/ooo_custom_images/industrial/vcl/res/spinner-64-06.png
b/main/ooo_custom_images/industrial/vcl/res/spinner-64-06.png
new file mode 100644
index 0000000000..82bd29af63
Binary files /dev/null and
b/main/ooo_custom_images/industrial/vcl/res/spinner-64-06.png differ
diff --git a/main/ooo_custom_images/industrial/vcl/res/spinner-64-07.png
b/main/ooo_custom_images/industrial/vcl/res/spinner-64-07.png
new file mode 100644
index 0000000000..3974a9971c
Binary files /dev/null and
b/main/ooo_custom_images/industrial/vcl/res/spinner-64-07.png differ
diff --git a/main/ooo_custom_images/industrial/vcl/res/spinner-64-08.png
b/main/ooo_custom_images/industrial/vcl/res/spinner-64-08.png
new file mode 100644
index 0000000000..f7531c1850
Binary files /dev/null and
b/main/ooo_custom_images/industrial/vcl/res/spinner-64-08.png differ
diff --git a/main/ooo_custom_images/industrial/vcl/res/spinner-64-09.png
b/main/ooo_custom_images/industrial/vcl/res/spinner-64-09.png
new file mode 100644
index 0000000000..1f02bad3e6
Binary files /dev/null and
b/main/ooo_custom_images/industrial/vcl/res/spinner-64-09.png differ
diff --git a/main/ooo_custom_images/industrial/vcl/res/spinner-64-10.png
b/main/ooo_custom_images/industrial/vcl/res/spinner-64-10.png
new file mode 100644
index 0000000000..f9622de9c1
Binary files /dev/null and
b/main/ooo_custom_images/industrial/vcl/res/spinner-64-10.png differ
diff --git a/main/ooo_custom_images/industrial/vcl/res/spinner-64-11.png
b/main/ooo_custom_images/industrial/vcl/res/spinner-64-11.png
new file mode 100644
index 0000000000..f9ca4c1754
Binary files /dev/null and
b/main/ooo_custom_images/industrial/vcl/res/spinner-64-11.png differ
diff --git a/main/ooo_custom_images/industrial/vcl/res/spinner-64-12.png
b/main/ooo_custom_images/industrial/vcl/res/spinner-64-12.png
new file mode 100644
index 0000000000..adc0b834ab
Binary files /dev/null and
b/main/ooo_custom_images/industrial/vcl/res/spinner-64-12.png differ
diff --git a/main/vcl/inc/svids.hrc b/main/vcl/inc/svids.hrc
index 23341e278f..586195b756 100644
--- a/main/vcl/inc/svids.hrc
+++ b/main/vcl/inc/svids.hrc
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,16 +7,16 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
#ifndef _SV_SVIDS_HRC
@@ -33,7 +33,7 @@
#define SV_RESID_BITMAP_RADIO 1010
#define SV_RESID_BITMAP_MSGBOX 1020
-#define SV_RESID_BITMAP_MSGBOX_HC 1021
+#define SV_RESID_BITMAP_MSGBOX_HC 1021
#define SV_RESID_BITMAP_PIN 1030
@@ -47,12 +47,12 @@
#define SV_RESID_BITMAP_CLOSEDOC 1052
#define SV_RESID_BITMAP_CLOSEDOCHC 1053
-#define SV_DISCLOSURE_PLUS 1060
-#define SV_DISCLOSURE_MINUS 1061
-#define SV_DISCLOSURE_PLUS_HC 1062
-#define SV_DISCLOSURE_MINUS_HC 1063
+#define SV_DISCLOSURE_PLUS 1060
+#define SV_DISCLOSURE_MINUS 1061
+#define SV_DISCLOSURE_PLUS_HC 1062
+#define SV_DISCLOSURE_MINUS_HC 1063
-#define RID_STR_PAPERNAMES 1070
+#define RID_STR_PAPERNAMES 1070
#define SV_RESID_MENU_EDIT 2000
#define SV_MENU_EDIT_UNDO 1
@@ -181,7 +181,7 @@
#define SV_BUTTONTEXT_CLOSE SV_HELPTEXT_CLOSE
#define SV_BUTTONTEXT_MORE 10107
#define SV_BUTTONTEXT_IGNORE 10108
-#define SV_BUTTONTEXT_ABORT 10109
+#define SV_BUTTONTEXT_ABORT 10109
#define SV_BUTTONTEXT_LESS 10110
#define SV_STDTEXT_FIRST
SV_STDTEXT_SERVICENOTAVAILABLE
@@ -252,7 +252,7 @@
#define SV_ICON_ID_PRINTERADMIN 501
#define SV_RESID_BITMAP_THROBBER_START 3000
-#define SV_RESID_BITMAP_THROBBER_END 3060
+#define SV_RESID_BITMAP_THROBBER_END 3072
#define HID_PRINTDLG HID_VCL_START
diff --git a/main/vcl/source/control/throbber.cxx
b/main/vcl/source/control/throbber.cxx
index 6f0e9e5728..f6514ed2d3 100644
--- a/main/vcl/source/control/throbber.cxx
+++ b/main/vcl/source/control/throbber.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,20 +7,18 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
#include "precompiled_vcl.hxx"
#include "vcl/throbber.hxx"
@@ -252,7 +250,7 @@ void Throbber::setImageList( const Sequence< Reference<
XGraphic > >& rImageList
::std::vector< ::rtl::OUString > aImageURLs;
sal_Char const* const pResolutions[] = { "16", "32", "64" };
- size_t const nImageCounts[] = { 6, 12, 12 };
+ size_t const nImageCounts[] = { 12, 12, 12 };
size_t index = 0;
switch ( i_imageSet )
@@ -306,7 +304,9 @@ IMPL_LINK( Throbber, TimeOutHdl, void*, EMPTYARG )
}
}
- SetImage( maImageList[ mnCurStep ] );
+ SetImage( maImageList[ mnCurStep ] );
- return 0;
+ return 0;
}
+
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/vcl/source/src/throbber.src b/main/vcl/source/src/throbber.src
index 1a437b58b7..77a3c97c9c 100644
--- a/main/vcl/source/src/throbber.src
+++ b/main/vcl/source/src/throbber.src
@@ -19,15 +19,13 @@
*
*************************************************************/
-
-
#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_16_HC THROBBER_16 + 12
+#define THROBBER_32 THROBBER_16_HC + 12
#define THROBBER_32_HC THROBBER_32 + 12
#define THROBBER_64 THROBBER_32_HC + 12
#define THROBBER_64_HC THROBBER_64 + 12
@@ -37,7 +35,6 @@
// at runtime, instead, the images in images.zip are accessed via
// private:graphicrepository/* URLs.
-
Bitmap (THROBBER_16 + 1)
{
file = "spinner-16-01.png" ;
@@ -68,6 +65,35 @@ Bitmap (THROBBER_16 + 6)
file = "spinner-16-06.png" ;
};
+Bitmap (THROBBER_16 + 7)
+{
+ file = "spinner-16-07.png" ;
+};
+
+Bitmap (THROBBER_16 + 8)
+{
+ file = "spinner-16-08.png" ;
+};
+
+Bitmap (THROBBER_16 + 9)
+{
+ file = "spinner-16-09.png" ;
+};
+
+Bitmap (THROBBER_16 + 10)
+{
+ file = "spinner-16-10.png" ;
+};
+
+Bitmap (THROBBER_16 + 11)
+{
+ file = "spinner-16-11.png" ;
+};
+
+Bitmap (THROBBER_16 + 12)
+{
+ file = "spinner-16-12.png" ;
+};
Bitmap (THROBBER_16_HC + 1)
@@ -100,6 +126,35 @@ Bitmap (THROBBER_16_HC + 6)
file = "spinner-16-06_h.png" ;
};
+Bitmap (THROBBER_16_HC + 7)
+{
+ file = "spinner-16-07_h.png" ;
+};
+
+Bitmap (THROBBER_16_HC + 8)
+{
+ file = "spinner-16-08_h.png" ;
+};
+
+Bitmap (THROBBER_16_HC + 9)
+{
+ file = "spinner-16-09_h.png" ;
+};
+
+Bitmap (THROBBER_16_HC + 10)
+{
+ file = "spinner-16-10_h.png" ;
+};
+
+Bitmap (THROBBER_16_HC + 11)
+{
+ file = "spinner-16-11_h.png" ;
+};
+
+Bitmap (THROBBER_16_HC + 12)
+{
+ file = "spinner-16-12_h.png" ;
+};
Bitmap (THROBBER_32 + 1)
@@ -163,7 +218,6 @@ Bitmap (THROBBER_32 + 12)
};
-
Bitmap (THROBBER_32_HC + 1)
{
file = "spinner-32-01_h.png" ;
@@ -225,7 +279,6 @@ Bitmap (THROBBER_32_HC + 12)
};
-
Bitmap (THROBBER_64 + 1)
{
file = "spinner-64-01.png" ;
@@ -287,7 +340,6 @@ Bitmap (THROBBER_64 + 12)
};
-
Bitmap (THROBBER_64_HC + 1)
{
file = "spinner-64-01_h.png" ;
