svtools/uiconfig/ui/thineditcontrol.ui | 2 +-
vcl/inc/bitmaps.hlst | 17 +++++++++--------
vcl/source/window/builder.cxx | 2 ++
3 files changed, 12 insertions(+), 9 deletions(-)
New commits:
commit 3f59f4a7e667b571640572f9316216ec73aeca7d
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sun Jun 6 15:41:08 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Sun Jun 6 21:36:20 2021 +0200
add x-office-calendar to allow symbolic names
for gen map to existing sc/res/date.png
Change-Id: Id85f5df27fd93deb7d1e653ae6cac1fb471d3470
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116761
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/svtools/uiconfig/ui/thineditcontrol.ui
b/svtools/uiconfig/ui/thineditcontrol.ui
index 504606663b7b..ba32ab7cc5ce 100644
--- a/svtools/uiconfig/ui/thineditcontrol.ui
+++ b/svtools/uiconfig/ui/thineditcontrol.ui
@@ -5,7 +5,7 @@
<object class="GtkImage" id="image7">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="icon_name">sc/res/date.png</property>
+ <property name="icon_name">x-office-calendar</property>
<property name="icon_size">2</property>
</object>
<object class="GtkBox" id="EditControl">
diff --git a/vcl/inc/bitmaps.hlst b/vcl/inc/bitmaps.hlst
index 0f99c607c9ed..16daf18fef89 100644
--- a/vcl/inc/bitmaps.hlst
+++ b/vcl/inc/bitmaps.hlst
@@ -131,14 +131,15 @@
#define SPINNER_64_12
"vcl/res/spinner-64-12.png"
//end, Throbber::getDefaultImageURLs
-#define IMG_WARN "dbaccess/res/exwarning.png"
-#define IMG_ERROR "dbaccess/res/exerror.png"
-#define IMG_INFO "dbaccess/res/exinfo.png"
-#define IMG_ADD "extensions/res/scanner/plus.png"
-#define IMG_REMOVE "extensions/res/scanner/minus.png"
-#define IMG_COPY "cmd/sc_copy.png"
-#define IMG_PASTE "cmd/sc_paste.png"
-#define IMG_MENU "sfx2/res/menu.png"
+#define IMG_WARN "dbaccess/res/exwarning.png"
+#define IMG_ERROR "dbaccess/res/exerror.png"
+#define IMG_INFO "dbaccess/res/exinfo.png"
+#define IMG_ADD "extensions/res/scanner/plus.png"
+#define IMG_REMOVE "extensions/res/scanner/minus.png"
+#define IMG_COPY "cmd/sc_copy.png"
+#define IMG_PASTE "cmd/sc_paste.png"
+#define IMG_MENU "sfx2/res/menu.png"
+#define IMG_CALENDAR "sc/res/date.png"
#define RID_BMP_TREENODE_COLLAPSED "res/plus.png"
#define RID_BMP_TREENODE_EXPANDED "res/minus.png"
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index ef293d737f59..e80bf84df992 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -108,6 +108,8 @@ namespace
return IMG_PASTE;
else if (sType == u"open-menu-symbolic")
return IMG_MENU;
+ else if (sType == u"x-office-calendar")
+ return IMG_CALENDAR;
return OUString();
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
