tdf#124149 add bigger 32px icons for border line and shadow
Change-Id: I7ea382f3ba648657d2a6d009bf90dcc3be879c63
Reviewed-on: https://gerrit.libreoffice.org/69925
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
diff --git a/cui/inc/bitmaps.hlst b/cui/inc/bitmaps.hlst
index c6c2d19..8d506a6 100644
--- a/cui/inc/bitmaps.hlst
+++ b/cui/inc/bitmaps.hlst
@@ -11,11 +11,17 @@
#define INCLUDED_CUI_INC_BITMAPS_HRC
#define RID_SVXBMP_CELL_NONE "svx/res/pr01.png"
#define RID_SVXBMP_CELL_NONE_32 "svx/res/border_cell_none_32.png"
#define RID_SVXBMP_CELL_ALL "svx/res/pr02.png"
#define RID_SVXBMP_CELL_ALL_32 "svx/res/border_cell_all_32.png"
#define RID_SVXBMP_CELL_LR "svx/res/pr03.png"
#define RID_SVXBMP_CELL_LR_32 "svx/res/border_cell_lr_32.png"
#define RID_SVXBMP_CELL_TB "svx/res/pr04.png"
#define RID_SVXBMP_CELL_TB_32 "svx/res/border_cell_tb_32.png"
#define RID_SVXBMP_CELL_L "svx/res/pr05.png"
#define RID_SVXBMP_CELL_L_32 "svx/res/border_cell_l_32.png"
#define RID_SVXBMP_CELL_DIAG "svx/res/pr06.png"
#define RID_SVXBMP_CELL_DIAG_32 "svx/res/border_cell_diag_32.png"
#define RID_SVXBMP_HOR_NONE "svx/res/pr07.png"
#define RID_SVXBMP_HOR_OUTER "svx/res/pr08.png"
#define RID_SVXBMP_HOR_HOR "svx/res/pr09.png"
@@ -31,11 +37,17 @@
#define RID_SVXBMP_TABLE_OUTERH "svx/res/pr019.png"
#define RID_SVXBMP_TABLE_ALL "svx/res/pr020.png"
#define RID_SVXBMP_TABLE_OUTER2 "svx/res/pr021.png"
#define RID_SVXBMP_SHADOWNONE "svx/res/sh01.png"
#define RID_SVXBMP_SHADOWNONE_32 "svx/res/shadow_none_32.png"
#define RID_SVXBMP_SHADOW_BOT_RIGHT "svx/res/sh02.png"
#define RID_SVXBMP_SHADOW_BOT_RIGHT_32 "svx/res/shadow_bottom_right_32.png"
#define RID_SVXBMP_SHADOW_BOT_LEFT "svx/res/sh03.png"
#define RID_SVXBMP_SHADOW_BOT_LEFT_32 "svx/res/shadow_bottom_left_32.png"
#define RID_SVXBMP_SHADOW_TOP_RIGHT "svx/res/sh04.png"
#define RID_SVXBMP_SHADOW_TOP_RIGHT_32 "svx/res/shadow_top_right_32.png"
#define RID_SVXBMP_SHADOW_TOP_LEFT "svx/res/sh05.png"
#define RID_SVXBMP_SHADOW_TOP_LEFT_32 "svx/res/shadow_top_left_32.png"
#define RID_SVXBMP_BOTTOMLOCK "svx/res/lo01.png"
#define RID_SVXBMP_TOPLOCK "svx/res/lo02.png"
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index eefb6a6..b6c177f 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -44,6 +44,7 @@
#include <svl/int64item.hxx>
#include <sal/macros.h>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <comphelper/lok.hxx>
using namespace ::editeng;
using ::com::sun::star::uno::Reference;
@@ -269,45 +270,82 @@
, m_xRemoveAdjcentCellBordersCB(m_xBuilder->weld_check_button("rmadjcellborders"))
, m_xRemoveAdjcentCellBordersFT(m_xBuilder->weld_label("rmadjcellbordersft"))
{
static const OUStringLiteral pnBorderImgIds[] =
static std::vector<OUStringLiteral> aBorderImageIds;
if (aBorderImageIds.empty())
{
RID_SVXBMP_CELL_NONE,
RID_SVXBMP_CELL_ALL,
RID_SVXBMP_CELL_LR,
RID_SVXBMP_CELL_TB,
RID_SVXBMP_CELL_L,
RID_SVXBMP_CELL_DIAG,
RID_SVXBMP_HOR_NONE,
RID_SVXBMP_HOR_OUTER,
RID_SVXBMP_HOR_HOR,
RID_SVXBMP_HOR_ALL,
RID_SVXBMP_HOR_OUTER2,
RID_SVXBMP_VER_NONE,
RID_SVXBMP_VER_OUTER,
RID_SVXBMP_VER_VER,
RID_SVXBMP_VER_ALL,
RID_SVXBMP_VER_OUTER2,
RID_SVXBMP_TABLE_NONE,
RID_SVXBMP_TABLE_OUTER,
RID_SVXBMP_TABLE_OUTERH,
RID_SVXBMP_TABLE_ALL,
RID_SVXBMP_TABLE_OUTER2
};
if (comphelper::LibreOfficeKit::isActive())
{
aBorderImageIds.insert(aBorderImageIds.end(), {
RID_SVXBMP_CELL_NONE_32,
RID_SVXBMP_CELL_ALL_32,
RID_SVXBMP_CELL_LR_32,
RID_SVXBMP_CELL_TB_32,
RID_SVXBMP_CELL_L_32,
RID_SVXBMP_CELL_DIAG_32
});
}
else
{
aBorderImageIds.insert(aBorderImageIds.end(), {
RID_SVXBMP_CELL_NONE,
RID_SVXBMP_CELL_ALL,
RID_SVXBMP_CELL_LR,
RID_SVXBMP_CELL_TB,
RID_SVXBMP_CELL_L,
RID_SVXBMP_CELL_DIAG
});
}
aBorderImageIds.insert(aBorderImageIds.end(), {
RID_SVXBMP_HOR_NONE,
RID_SVXBMP_HOR_OUTER,
RID_SVXBMP_HOR_HOR,
RID_SVXBMP_HOR_ALL,
RID_SVXBMP_HOR_OUTER2,
RID_SVXBMP_VER_NONE,
RID_SVXBMP_VER_OUTER,
RID_SVXBMP_VER_VER,
RID_SVXBMP_VER_ALL,
RID_SVXBMP_VER_OUTER2,
RID_SVXBMP_TABLE_NONE,
RID_SVXBMP_TABLE_OUTER,
RID_SVXBMP_TABLE_OUTERH,
RID_SVXBMP_TABLE_ALL,
RID_SVXBMP_TABLE_OUTER2
});
}
for (size_t i = 0; i < SAL_N_ELEMENTS(pnBorderImgIds); ++i)
m_aBorderImgVec.emplace_back(StockImage::Yes, pnBorderImgIds[i]);
for (auto const & rImageId : aBorderImageIds)
m_aBorderImgVec.emplace_back(StockImage::Yes, rImageId);
static const OUStringLiteral pnShadowImgIds[SVX_BORDER_SHADOW_COUNT] =
static std::vector<OUStringLiteral> aShadowImageIds;
if (aShadowImageIds.empty())
{
RID_SVXBMP_SHADOWNONE,
RID_SVXBMP_SHADOW_BOT_RIGHT,
RID_SVXBMP_SHADOW_TOP_RIGHT,
RID_SVXBMP_SHADOW_BOT_LEFT,
RID_SVXBMP_SHADOW_TOP_LEFT
};
if (comphelper::LibreOfficeKit::isActive())
{
aShadowImageIds.insert(aShadowImageIds.end(), {
RID_SVXBMP_SHADOWNONE_32,
RID_SVXBMP_SHADOW_BOT_RIGHT_32,
RID_SVXBMP_SHADOW_TOP_RIGHT_32,
RID_SVXBMP_SHADOW_BOT_LEFT_32,
RID_SVXBMP_SHADOW_TOP_LEFT_32
});
}
else
{
aShadowImageIds.insert(aShadowImageIds.end(), {
RID_SVXBMP_SHADOWNONE,
RID_SVXBMP_SHADOW_BOT_RIGHT,
RID_SVXBMP_SHADOW_TOP_RIGHT,
RID_SVXBMP_SHADOW_BOT_LEFT,
RID_SVXBMP_SHADOW_TOP_LEFT
});
}
}
for (size_t i = 0; i < SAL_N_ELEMENTS(pnShadowImgIds); ++i)
m_aShadowImgVec.emplace_back(StockImage::Yes, pnShadowImgIds[i]);
for (auto const & rImageId : aShadowImageIds)
m_aShadowImgVec.emplace_back(StockImage::Yes, rImageId);
assert(m_aShadowImgVec.size() == SVX_BORDER_SHADOW_COUNT);
// this page needs ExchangeSupport
diff --git a/icon-themes/colibre/svx/res/border_cell_all_32.png b/icon-themes/colibre/svx/res/border_cell_all_32.png
new file mode 100644
index 0000000..0d058dd
--- /dev/null
+++ b/icon-themes/colibre/svx/res/border_cell_all_32.png
Binary files differ
diff --git a/icon-themes/colibre/svx/res/border_cell_diag_32.png b/icon-themes/colibre/svx/res/border_cell_diag_32.png
new file mode 100644
index 0000000..6bc5a0b
--- /dev/null
+++ b/icon-themes/colibre/svx/res/border_cell_diag_32.png
Binary files differ
diff --git a/icon-themes/colibre/svx/res/border_cell_l_32.png b/icon-themes/colibre/svx/res/border_cell_l_32.png
new file mode 100644
index 0000000..5671a35
--- /dev/null
+++ b/icon-themes/colibre/svx/res/border_cell_l_32.png
Binary files differ
diff --git a/icon-themes/colibre/svx/res/border_cell_lr_32.png b/icon-themes/colibre/svx/res/border_cell_lr_32.png
new file mode 100644
index 0000000..3dbad69
--- /dev/null
+++ b/icon-themes/colibre/svx/res/border_cell_lr_32.png
Binary files differ
diff --git a/icon-themes/colibre/svx/res/border_cell_none_32.png b/icon-themes/colibre/svx/res/border_cell_none_32.png
new file mode 100644
index 0000000..956eecc
--- /dev/null
+++ b/icon-themes/colibre/svx/res/border_cell_none_32.png
Binary files differ
diff --git a/icon-themes/colibre/svx/res/border_cell_tb_32.png b/icon-themes/colibre/svx/res/border_cell_tb_32.png
new file mode 100644
index 0000000..1d36fa6
--- /dev/null
+++ b/icon-themes/colibre/svx/res/border_cell_tb_32.png
Binary files differ
diff --git a/icon-themes/colibre/svx/res/shadow_bottom_left_32.png b/icon-themes/colibre/svx/res/shadow_bottom_left_32.png
new file mode 100644
index 0000000..36f4664
--- /dev/null
+++ b/icon-themes/colibre/svx/res/shadow_bottom_left_32.png
Binary files differ
diff --git a/icon-themes/colibre/svx/res/shadow_bottom_right_32.png b/icon-themes/colibre/svx/res/shadow_bottom_right_32.png
new file mode 100644
index 0000000..491edf2
--- /dev/null
+++ b/icon-themes/colibre/svx/res/shadow_bottom_right_32.png
Binary files differ
diff --git a/icon-themes/colibre/svx/res/shadow_none_32.png b/icon-themes/colibre/svx/res/shadow_none_32.png
new file mode 100644
index 0000000..0fd56b6
--- /dev/null
+++ b/icon-themes/colibre/svx/res/shadow_none_32.png
Binary files differ
diff --git a/icon-themes/colibre/svx/res/shadow_top_left_32.png b/icon-themes/colibre/svx/res/shadow_top_left_32.png
new file mode 100644
index 0000000..209f9c0
--- /dev/null
+++ b/icon-themes/colibre/svx/res/shadow_top_left_32.png
Binary files differ
diff --git a/icon-themes/colibre/svx/res/shadow_top_right_32.png b/icon-themes/colibre/svx/res/shadow_top_right_32.png
new file mode 100644
index 0000000..e7b1b14
--- /dev/null
+++ b/icon-themes/colibre/svx/res/shadow_top_right_32.png
Binary files differ
diff --git a/icon-themes/colibre_svg/svx/res/border_cell_all_32.svg b/icon-themes/colibre_svg/svx/res/border_cell_all_32.svg
new file mode 100644
index 0000000..256c545
--- /dev/null
+++ b/icon-themes/colibre_svg/svx/res/border_cell_all_32.svg
@@ -0,0 +1,4 @@
<svg version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
<path d="m0 0v32h32v-32zm4.2667 4.2667h23.467v23.467h-23.467z" fill="#808080" stroke-width="2.1333"/>
<path d="m4.2667 4.2667v23.467h23.467v-23.467z" fill="#808080" opacity=".4" stroke-width="2.1333"/>
</svg>
diff --git a/icon-themes/colibre_svg/svx/res/border_cell_diag_32.svg b/icon-themes/colibre_svg/svx/res/border_cell_diag_32.svg
new file mode 100644
index 0000000..953d725
--- /dev/null
+++ b/icon-themes/colibre_svg/svx/res/border_cell_diag_32.svg
@@ -0,0 +1,6 @@
<svg version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
<path d="m4.282 4.2824h23.435v23.435h-23.435z" fill="#808080" opacity=".4" stroke-width="2.1305"/>
<path d="m0.021016 0.02151v31.956h31.957v-31.956zm4.2609 4.2609h23.435v23.435h-23.435z" fill="#fff" stroke-width="2.1305"/>
<path d="m2.1515 29.848 27.696-27.696" fill="none" stroke="#808080" stroke-linecap="round" stroke-linejoin="round" stroke-width="4.2609"/>
<path d="m29.848 29.848-27.696-27.696" fill="none" stroke="#808080" stroke-linecap="round" stroke-linejoin="round" stroke-width="4.2609"/>
</svg>
diff --git a/icon-themes/colibre_svg/svx/res/border_cell_l_32.svg b/icon-themes/colibre_svg/svx/res/border_cell_l_32.svg
new file mode 100644
index 0000000..b7a3b68
--- /dev/null
+++ b/icon-themes/colibre_svg/svx/res/border_cell_l_32.svg
@@ -0,0 +1,7 @@
<svg version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
<g>
<path d="m4.2667-9e-7v4.2667h23.467v23.467h-23.467v4.2667h27.733v-32z" fill="#fff"/>
<path d="m4.2667 4.2667v23.467h23.467v-23.467z" fill="#808080" opacity=".4"/>
<path d="m0-9e-7v32h4.2667v-32z" fill="#808080"/>
</g>
</svg>
diff --git a/icon-themes/colibre_svg/svx/res/border_cell_lr_32.svg b/icon-themes/colibre_svg/svx/res/border_cell_lr_32.svg
new file mode 100644
index 0000000..38539c7
--- /dev/null
+++ b/icon-themes/colibre_svg/svx/res/border_cell_lr_32.svg
@@ -0,0 +1,8 @@
<svg version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
<path d="m4.2667-9e-7v4.2667h23.467v-4.2667zm0 27.733v4.2667h23.467v-4.2667z" fill="#fff"/>
<g fill="#808080">
<path d="m4.2667 4.2667v23.467h23.467v-23.467z" opacity=".4"/>
<path d="m27.733-9e-7v32h4.2667v-32z"/>
<path d="m0-9e-7v32h4.2667v-32z"/>
</g>
</svg>
diff --git a/icon-themes/colibre_svg/svx/res/border_cell_none_32.svg b/icon-themes/colibre_svg/svx/res/border_cell_none_32.svg
new file mode 100644
index 0000000..ad7f79b
--- /dev/null
+++ b/icon-themes/colibre_svg/svx/res/border_cell_none_32.svg
@@ -0,0 +1,4 @@
<svg version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
<path d="m0 0v32h32v-32zm4.2667 4.2667h23.467v23.467h-23.467z" fill="#fff" stroke-width="2.1333"/>
<path d="m4.2667 4.2667v23.467h23.467v-23.467z" fill="#808080" opacity=".4" stroke-width="2.1333"/>
</svg>
diff --git a/icon-themes/colibre_svg/svx/res/border_cell_tb_32.svg b/icon-themes/colibre_svg/svx/res/border_cell_tb_32.svg
new file mode 100644
index 0000000..0e2f4f7
--- /dev/null
+++ b/icon-themes/colibre_svg/svx/res/border_cell_tb_32.svg
@@ -0,0 +1,7 @@
<svg version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
<g>
<path d="m0 4.2667v23.467h4.2667v-23.467zm27.733 0v23.467h4.2667v-23.467z" fill="#fff"/>
<path d="m4.2667 4.2667v23.467h23.467v-23.467z" fill="#808080" opacity=".4"/>
<path d="m0-9e-7v4.2667h32v-4.2667zm0 27.733v4.2667h32v-4.2667z" fill="#808080"/>
</g>
</svg>
diff --git a/icon-themes/colibre_svg/svx/res/shadow_bottom_left_32.svg b/icon-themes/colibre_svg/svx/res/shadow_bottom_left_32.svg
new file mode 100644
index 0000000..63eab1c
--- /dev/null
+++ b/icon-themes/colibre_svg/svx/res/shadow_bottom_left_32.svg
@@ -0,0 +1,8 @@
<svg version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
<rect y="8" width="24" height="24" ry="2.1818" fill="#b8b8b8" stroke-width="2.1818"/>
<g stroke-width="2">
<path d="m6 6v20h20v-20zm2 2h16v16h-16z" fill="#4d4d4d"/>
<path d="m6 4c-1.108 0-2 0.892-2 2v20c0 1.108 0.892 2 2 2h20c1.108 0 2-0.892 2-2v-20c0-1.108-0.892-2-2-2zm0 2h20v20h-20z" fill="#808080"/>
<path d="m6 6h20v20h-20z" fill="#fff"/>
</g>
</svg>
diff --git a/icon-themes/colibre_svg/svx/res/shadow_bottom_right_32.svg b/icon-themes/colibre_svg/svx/res/shadow_bottom_right_32.svg
new file mode 100644
index 0000000..9b4c935
--- /dev/null
+++ b/icon-themes/colibre_svg/svx/res/shadow_bottom_right_32.svg
@@ -0,0 +1,8 @@
<svg version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
<rect x="8" y="8" width="24" height="24" ry="2.1818" fill="#b8b8b8" stroke-width="2.1818"/>
<g stroke-width="2">
<path d="m6 6v20h20v-20zm2 2h16v16h-16z" fill="#4d4d4d"/>
<path d="m6 4c-1.108 0-2 0.892-2 2v20c0 1.108 0.892 2 2 2h20c1.108 0 2-0.892 2-2v-20c0-1.108-0.892-2-2-2zm0 2h20v20h-20z" fill="#808080"/>
<path d="m6 6h20v20h-20z" fill="#fff"/>
</g>
</svg>
diff --git a/icon-themes/colibre_svg/svx/res/shadow_none_32.svg b/icon-themes/colibre_svg/svx/res/shadow_none_32.svg
new file mode 100644
index 0000000..380acb3
--- /dev/null
+++ b/icon-themes/colibre_svg/svx/res/shadow_none_32.svg
@@ -0,0 +1,7 @@
<svg version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
<g transform="matrix(.85716 0 0 .85716 2.2857 2.2857)" stroke-width="2.3333">
<path d="m4.3333 4.3333v23.333h23.333v-23.333zm2.3333 2.3333h18.667v18.667h-18.667z" fill="#4d4d4d"/>
<path d="m4.3333 2c-1.2927 0-2.3333 1.0407-2.3333 2.3333v23.333c0 1.2927 1.0407 2.3333 2.3333 2.3333h23.333c1.2927 0 2.3333-1.0407 2.3333-2.3333v-23.333c0-1.2927-1.0407-2.3333-2.3333-2.3333zm0 2.3333h23.333v23.333h-23.333z" fill="#808080"/>
<path d="m4.3333 4.3333h23.333v23.333h-23.333z" fill="#fff"/>
</g>
</svg>
diff --git a/icon-themes/colibre_svg/svx/res/shadow_top_left_32.svg b/icon-themes/colibre_svg/svx/res/shadow_top_left_32.svg
new file mode 100644
index 0000000..5057a85
--- /dev/null
+++ b/icon-themes/colibre_svg/svx/res/shadow_top_left_32.svg
@@ -0,0 +1,8 @@
<svg version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
<rect width="24" height="24" ry="2.1818" fill="#b8b8b8" stroke-width="2.1818"/>
<g stroke-width="2">
<path d="m6 6v20h20v-20zm2 2h16v16h-16z" fill="#4d4d4d"/>
<path d="m6 4c-1.108 0-2 0.892-2 2v20c0 1.108 0.892 2 2 2h20c1.108 0 2-0.892 2-2v-20c0-1.108-0.892-2-2-2zm0 2h20v20h-20z" fill="#808080"/>
<path d="m6 6h20v20h-20z" fill="#fff"/>
</g>
</svg>
diff --git a/icon-themes/colibre_svg/svx/res/shadow_top_right_32.svg b/icon-themes/colibre_svg/svx/res/shadow_top_right_32.svg
new file mode 100644
index 0000000..1cc4910
--- /dev/null
+++ b/icon-themes/colibre_svg/svx/res/shadow_top_right_32.svg
@@ -0,0 +1,8 @@
<svg version="1.1" viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
<rect x="8" width="24" height="24" ry="2.1818" fill="#b8b8b8" stroke-width="2.1818"/>
<g stroke-width="2">
<path d="m6 6v20h20v-20zm2 2h16v16h-16z" fill="#4d4d4d"/>
<path d="m6 4c-1.108 0-2 0.892-2 2v20c0 1.108 0.892 2 2 2h20c1.108 0 2-0.892 2-2v-20c0-1.108-0.892-2-2-2zm0 2h20v20h-20z" fill="#808080"/>
<path d="m6 6h20v20h-20z" fill="#fff"/>
</g>
</svg>
