[Libreoffice-commits] core.git: Branch 'feature/msforms' - 45 commits - avmedia/source chart2/source compilerplugins/clang cui/source cui/uiconfig desktop/source extensions/source extensions/uiconfig extras/source framework/inc framework/source helpcontent2 icon-themes/sifr icon-themes/sifr_dark icon-themes/sifr_svg include/sfx2 include/svtools include/svx include/unotools include/vcl include/xmloff odk/config officecfg/registry onlineupdate/source sc/inc sc/qa sc/source sc/uiconfig sfx2/Library_sfx.mk sfx2/source solenv/bin solenv/clang-format solenv/sanitizers svtools/source svtools/uiconfig svtools/UIConfig_svt.mk svx/source sw/inc sw/Library_swui.mk sw/qa sw/sdi sw/source sw/uiconfig sw/UIConfig_swriter.mk unotools/Library_utl.mk unotools/source vcl/qa vcl/qt5 vcl/source vcl/unx writerfilter/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Feb 18 12:09:02 UTC 2019
Rebased ref, commits from common ancestor:
commit 425800db98a3bedd39a1fddedc93975bd22240c7
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Mon Feb 18 08:32:42 2019 +0100
Commit: Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Mon Feb 18 13:08:02 2019 +0100
MSForms: Fix drop-down form field properties dialog to work with vcl backend
Change-Id: I28a8d96d3ff31a53512af6d61c58594da7b9f73e
diff --git a/sw/source/ui/fldui/DropDownFormFieldDialog.cxx b/sw/source/ui/fldui/DropDownFormFieldDialog.cxx
index cb00cc2a255b..09564999d321 100644
--- a/sw/source/ui/fldui/DropDownFormFieldDialog.cxx
+++ b/sw/source/ui/fldui/DropDownFormFieldDialog.cxx
@@ -27,8 +27,8 @@ DropDownFormFieldDialog::DropDownFormFieldDialog(weld::Window* pParent,
, m_xListUpButton(m_xBuilder->weld_button("up_button"))
, m_xListDownButton(m_xBuilder->weld_button("down_button"))
{
- getDialog()->connect_key_press(LINK(this, DropDownFormFieldDialog, KeyPressedHdl));
- getDialog()->connect_key_release(LINK(this, DropDownFormFieldDialog, KeyReleasedHdl));
+ m_xListItemEntry->connect_key_press(LINK(this, DropDownFormFieldDialog, KeyPressedHdl));
+ m_xListItemEntry->connect_key_release(LINK(this, DropDownFormFieldDialog, KeyReleasedHdl));
m_xListItemsTreeView->set_size_request(m_xListItemEntry->get_preferred_size().Width(),
m_xListItemEntry->get_preferred_size().Height() * 5);
@@ -49,20 +49,18 @@ IMPL_LINK_NOARG(DropDownFormFieldDialog, ListChangedHdl, weld::TreeView&, void)
IMPL_LINK(DropDownFormFieldDialog, KeyPressedHdl, const KeyEvent&, rEvent, bool)
{
- if (m_xListItemEntry->has_focus() && rEvent.GetKeyCode().GetCode() == KEY_RETURN)
+ if(rEvent.GetKeyCode().GetCode() == KEY_RETURN && !m_xListItemEntry->get_text().isEmpty())
{
AppendItemToList();
+ return true;
}
- return false; // Call the dialog's input handler too
+ return false;
}
IMPL_LINK_NOARG(DropDownFormFieldDialog, KeyReleasedHdl, const KeyEvent&, bool)
{
- if (m_xListItemEntry->has_focus())
- {
- UpdateButtons();
- }
- return false; // Call the dialog's input handler too
+ UpdateButtons();
+ return false;
}
IMPL_LINK(DropDownFormFieldDialog, ButtonPushedHdl, weld::Button&, rButton, void)
commit ceca6f1275522f443f769cfc818d01fd06e2c079
Author: andreas kainz <kainz.a at gmail.com>
AuthorDate: Sat Feb 16 22:05:16 2019 +0100
Commit: andreas_kainz <kainz.a at gmail.com>
CommitDate: Sun Feb 17 08:24:07 2019 +0100
Sifr icon theme update
Change-Id: I7b6ce4cfd02c57c9dbcfa5b5a16499882a507556
Reviewed-on: https://gerrit.libreoffice.org/67930
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a at gmail.com>
diff --git a/icon-themes/sifr/chart2/res/typearea_16.png b/icon-themes/sifr/chart2/res/typearea_16.png
new file mode 100644
index 000000000000..e231c72eb3ba
Binary files /dev/null and b/icon-themes/sifr/chart2/res/typearea_16.png differ
diff --git a/icon-themes/sifr/chart2/res/typebar_16.png b/icon-themes/sifr/chart2/res/typebar_16.png
new file mode 100644
index 000000000000..2d6553253a8b
Binary files /dev/null and b/icon-themes/sifr/chart2/res/typebar_16.png differ
diff --git a/icon-themes/sifr/chart2/res/typebubble_16.png b/icon-themes/sifr/chart2/res/typebubble_16.png
new file mode 100644
index 000000000000..1a1e460c2b6c
Binary files /dev/null and b/icon-themes/sifr/chart2/res/typebubble_16.png differ
diff --git a/icon-themes/sifr/chart2/res/typecolumn_16.png b/icon-themes/sifr/chart2/res/typecolumn_16.png
new file mode 100644
index 000000000000..1eee3198701b
Binary files /dev/null and b/icon-themes/sifr/chart2/res/typecolumn_16.png differ
diff --git a/icon-themes/sifr/chart2/res/typecolumnline_16.png b/icon-themes/sifr/chart2/res/typecolumnline_16.png
new file mode 100644
index 000000000000..f5c120739e77
Binary files /dev/null and b/icon-themes/sifr/chart2/res/typecolumnline_16.png differ
diff --git a/icon-themes/sifr/chart2/res/typenet_16.png b/icon-themes/sifr/chart2/res/typenet_16.png
new file mode 100644
index 000000000000..8786e2777074
Binary files /dev/null and b/icon-themes/sifr/chart2/res/typenet_16.png differ
diff --git a/icon-themes/sifr/chart2/res/typepie_16.png b/icon-themes/sifr/chart2/res/typepie_16.png
new file mode 100644
index 000000000000..aa2cab7cc940
Binary files /dev/null and b/icon-themes/sifr/chart2/res/typepie_16.png differ
diff --git a/icon-themes/sifr/chart2/res/typepointline_16.png b/icon-themes/sifr/chart2/res/typepointline_16.png
new file mode 100644
index 000000000000..15731fb02968
Binary files /dev/null and b/icon-themes/sifr/chart2/res/typepointline_16.png differ
diff --git a/icon-themes/sifr/chart2/res/typestock_16.png b/icon-themes/sifr/chart2/res/typestock_16.png
new file mode 100644
index 000000000000..566da086562b
Binary files /dev/null and b/icon-themes/sifr/chart2/res/typestock_16.png differ
diff --git a/icon-themes/sifr/chart2/res/typexy_16.png b/icon-themes/sifr/chart2/res/typexy_16.png
new file mode 100644
index 000000000000..6b2b08f21bd2
Binary files /dev/null and b/icon-themes/sifr/chart2/res/typexy_16.png differ
diff --git a/icon-themes/sifr/cmd/lc_starshapes.signet.png b/icon-themes/sifr/cmd/lc_starshapes.signet.png
index 4258dcb1cab0..d4e0f4246d19 100644
Binary files a/icon-themes/sifr/cmd/lc_starshapes.signet.png and b/icon-themes/sifr/cmd/lc_starshapes.signet.png differ
diff --git a/icon-themes/sifr/dbaccess/res/exwarning.png b/icon-themes/sifr/dbaccess/res/exwarning.png
new file mode 100644
index 000000000000..48b5cfb24374
Binary files /dev/null and b/icon-themes/sifr/dbaccess/res/exwarning.png differ
diff --git a/icon-themes/sifr/dbaccess/res/exwarning.svg b/icon-themes/sifr/dbaccess/res/exwarning.svg
new file mode 100644
index 000000000000..1a9abf3df90c
--- /dev/null
+++ b/icon-themes/sifr/dbaccess/res/exwarning.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+ <path
+ style="fill:#555753"
+ d="M 7 2 L 7 10 L 9 10 L 9 2 L 7 2 z M 7 12 L 7 14 L 9 14 L 9 12 L 7 12 z "
+ />
+</svg>
diff --git a/icon-themes/sifr/dbaccess/res/forms_32.png b/icon-themes/sifr/dbaccess/res/forms_32.png
new file mode 100644
index 000000000000..1bcb9bd2423b
Binary files /dev/null and b/icon-themes/sifr/dbaccess/res/forms_32.png differ
diff --git a/icon-themes/sifr/dbaccess/res/forms_32.svg b/icon-themes/sifr/dbaccess/res/forms_32.svg
new file mode 100644
index 000000000000..a32ceadf860a
--- /dev/null
+++ b/icon-themes/sifr/dbaccess/res/forms_32.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+ <path
+ style="fill:#555753"
+ d="M 7 2 C 5.892 2 5 2.892 5 4 L 5 28 C 5 29.108 5.892 30 7 30 L 25 30 C 26.108 30 27 29.108 27 28 L 27 10 C 27 8 23 2 19 2 L 7 2 z M 7 4 L 19 4 L 19 11 L 25 11 L 25 28 L 7 28 L 7 4 z M 9 6 L 9 10 L 17 10 L 17 6 L 9 6 z M 9 14 L 9 18 L 13 18 L 13 14 L 9 14 z M 15 14 L 15 18 L 23 18 L 23 14 L 15 14 z M 9 21 L 9 25 L 13 25 L 13 21 L 9 21 z M 15 21 L 15 25 L 23 25 L 23 21 L 15 21 z "
+ />
+</svg>
diff --git a/icon-themes/sifr/dbaccess/res/jo02.png b/icon-themes/sifr/dbaccess/res/jo02.png
new file mode 100644
index 000000000000..5b7d5fc63ae3
Binary files /dev/null and b/icon-themes/sifr/dbaccess/res/jo02.png differ
diff --git a/icon-themes/sifr/dbaccess/res/jo02.svg b/icon-themes/sifr/dbaccess/res/jo02.svg
new file mode 100644
index 000000000000..13381ee95e20
--- /dev/null
+++ b/icon-themes/sifr/dbaccess/res/jo02.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 11 11">
+ <path
+ style="fill:#555753"
+ d="m 2,0 v 4 h 2 v 7 H 6 V 10 H 7 V 8 H 6 V 7 H 8 V 5 H 6 V 4 H 9 V 0 Z"
+ />
+</svg>
diff --git a/icon-themes/sifr/dbaccess/res/pkey.png b/icon-themes/sifr/dbaccess/res/pkey.png
new file mode 100644
index 000000000000..d79aeeebc531
Binary files /dev/null and b/icon-themes/sifr/dbaccess/res/pkey.png differ
diff --git a/icon-themes/sifr/dbaccess/res/pkey.svg b/icon-themes/sifr/dbaccess/res/pkey.svg
new file mode 100644
index 000000000000..30256eb2871b
--- /dev/null
+++ b/icon-themes/sifr/dbaccess/res/pkey.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 11 11">
+ <path
+ style="opacity:0.35;fill:#555753"
+ d="m 2,0 v 4 h 2 v 7 H 6 V 10 H 7 V 8 H 6 V 7 H 8 V 5 H 6 V 4 H 9 V 0 Z"
+ />
+</svg>
diff --git a/icon-themes/sifr/dbaccess/res/queries_32.png b/icon-themes/sifr/dbaccess/res/queries_32.png
new file mode 100644
index 000000000000..76ee7161e68d
Binary files /dev/null and b/icon-themes/sifr/dbaccess/res/queries_32.png differ
diff --git a/icon-themes/sifr/dbaccess/res/queries_32.svg b/icon-themes/sifr/dbaccess/res/queries_32.svg
new file mode 100644
index 000000000000..2ed1d4649a8a
--- /dev/null
+++ b/icon-themes/sifr/dbaccess/res/queries_32.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+ <path
+ style="fill:#555753"
+ d="M 16 3 A 14 6 0 0 0 2 9 L 2 24 A 14 6 0 0 0 16 30 A 14 6 0 0 0 30 24 L 30 19 L 30 14 L 30 9 A 14 6 0 0 0 16 3 z M 16 5 A 12 4 0 0 1 28 9 A 12 4 0 0 1 16 13 A 12 4 0 0 1 4 9 A 12 4 0 0 1 16 5 z M 4 12.078125 A 14 6 0 0 0 16 15 A 14 6 0 0 0 28 12.078125 L 28 14 A 12 4 0 0 1 16 18 A 12 4 0 0 1 4 14 L 4 12.078125 z M 4 17.078125 A 14 6 0 0 0 16 20 A 14 6 0 0 0 28 17.078125 L 28 19 A 12 4 0 0 1 16 23 A 12 4 0 0 1 4 19 L 4 17.078125 z M 4 22.078125 A 14 6 0 0 0 16 25 A 14 6 0 0 0 28 22.078125 L 28 24 A 12 4 0 0 1 16 28 A 12 4 0 0 1 4 24 L 4 22.078125 z "
+ />
+</svg>
diff --git a/icon-themes/sifr/dbaccess/res/reports_32.png b/icon-themes/sifr/dbaccess/res/reports_32.png
new file mode 100644
index 000000000000..77045730c03b
Binary files /dev/null and b/icon-themes/sifr/dbaccess/res/reports_32.png differ
diff --git a/icon-themes/sifr/dbaccess/res/reports_32.svg b/icon-themes/sifr/dbaccess/res/reports_32.svg
new file mode 100644
index 000000000000..521aeaef77d3
--- /dev/null
+++ b/icon-themes/sifr/dbaccess/res/reports_32.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+ <path
+ style="fill:#555753"
+ d="M 8 2 C 6.9092972 2 6 2.9092972 6 4 L 6 7 L 3.9394531 7 C 3.418651 7 3 7.418651 3 7.9394531 L 3 8.0605469 C 3 8.581349 3.418651 9 3.9394531 9 L 6 9 L 6 12 L 3.9394531 12 C 3.418651 12 3 12.418651 3 12.939453 L 3 13.060547 C 3 13.581349 3.418651 14 3.9394531 14 L 6 14 L 6 17 L 3.9394531 17 C 3.418651 17 3 17.418651 3 17.939453 L 3 18.060547 C 3 18.581349 3.418651 19 3.9394531 19 L 6 19 L 6 22 L 3.9394531 22 C 3.418651 22 3 22.418651 3 22.939453 L 3 23.060547 C 3 23.581349 3.418651 24 3.9394531 24 L 6 24 L 6 28 C 6 29.090703 6.9092972 30 8 30 L 26 30 C 27.090703 30 28 29.090703 28 28 L 28 4 C 28 2.9092972 27.090703 2 26 2 L 8 2 z M 9 5 L 25 5 L 25 27 L 9 27 L 9 5 z M 12 7 C 11.446 7 11 7.446 11 8 C 11 8.554 11.446 9 12 9 L 22 9 C 22.554 9 23 8.554 23 8 C 23 7.446 22.554 7 22 7 L 12 7 z M 12 12 C 11.446 12 11 12.446 11 13 C 11 13.554 11.446 14 12 14 L 22 14 C 22.554 14 23 13.554 23 13 C 23 12.446 22.554 12 22 12 L 12 12 z M 12 17 C 11.446 17 11 17.446 11 18 C 11 18.554 11.446 1
9 12 19 L 22 19 C 22.554 19 23 18.554 23 18 C 23 17.446 22.554 17 22 17 L 12 17 z M 12 22 C 11.446 22 11 22.446 11 23 C 11 23.554 11.446 24 12 24 L 22 24 C 22.554 24 23 23.554 23 23 C 23 22.446 22.554 22 22 22 L 12 22 z "
+ />
+</svg>
diff --git a/icon-themes/sifr/dbaccess/res/tables_32.png b/icon-themes/sifr/dbaccess/res/tables_32.png
new file mode 100644
index 000000000000..fd22eec50edf
Binary files /dev/null and b/icon-themes/sifr/dbaccess/res/tables_32.png differ
diff --git a/icon-themes/sifr/dbaccess/res/tables_32.svg b/icon-themes/sifr/dbaccess/res/tables_32.svg
new file mode 100644
index 000000000000..812da545463a
--- /dev/null
+++ b/icon-themes/sifr/dbaccess/res/tables_32.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+ <path
+ style="fill:#555753"
+ d="M 2,2 V 30 H 30 V 2 Z M 4,4 H 9 V 9 H 4 Z m 7,0 h 4 v 5 h -4 z m 6,0 h 4 v 5 h -4 z m 6,0 h 5 V 9 H 23 Z M 4,11 h 5 v 4 H 4 Z m 7,0 h 4 v 4 h -4 z m 6,0 h 4 v 4 h -4 z m 6,0 h 5 v 4 H 23 Z M 4,17 h 5 v 4 H 4 Z m 7,0 h 4 v 4 h -4 z m 6,0 h 4 v 4 h -4 z m 6,0 h 5 v 4 H 23 Z M 4,23 h 5 v 5 H 4 Z m 7,0 h 4 v 5 h -4 z m 6,0 h 4 v 5 h -4 z m 6,0 h 5 v 5 h -5 z"
+ />
+</svg>
diff --git a/icon-themes/sifr/xmlsecurity/res/certificate_16.png b/icon-themes/sifr/xmlsecurity/res/certificate_16.png
new file mode 100644
index 000000000000..513734676051
Binary files /dev/null and b/icon-themes/sifr/xmlsecurity/res/certificate_16.png differ
diff --git a/icon-themes/sifr/xmlsecurity/res/certificate_16.svg b/icon-themes/sifr/xmlsecurity/res/certificate_16.svg
new file mode 100644
index 000000000000..92bf89776263
--- /dev/null
+++ b/icon-themes/sifr/xmlsecurity/res/certificate_16.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+ <path
+ style="fill:#555753"
+ d="M 7.2265625,0 C 6.7368313,0 6.2941859,0.249945 6.0292969,0.5078125 5.7644078,0.76568 5.6098249,1.0268698 5.4746094,1.2519531 5.2047246,1.7012103 4.9839319,1.9287369 5.0253906,1.9121094 5.0683375,1.8943202 4.749484,1.890703 4.2402344,1.7636719 3.9856095,1.7001563 3.6917926,1.6239467 3.3222656,1.6289062 2.9527387,1.6338658 2.4633851,1.7709656 2.1171875,2.1171875 1.7709498,2.463369 1.6338624,2.9527524 1.6289062,3.3222656 1.6239502,3.6917788 1.700161,3.9856178 1.7636719,4.2402344 1.8906937,4.7494675 1.8943804,5.0681986 1.9121094,5.0253906 1.9287921,4.9837937 1.7012292,5.2047126 1.2519531,5.4746094 1.0268604,5.6098309 0.7656841,5.764398 0.5078125,6.0292969 0.2499409,6.2941957 0,6.7368203 0,7.2265625 0,7.7163047 0.24993077,8.1589385 0.5078125,8.4238281 0.76569423,8.6887178 1.0268687,8.8433087 1.2519531,8.9785156 1.7021219,9.2489295 1.9297764,9.4703892 1.9121094,9.4277344 h 0.00195 c -0.017791,-0.042951 -0.023366,0.2759116 -0.1503906,0.7851566 -0.063512,0.254622 -0.1397213,0.548451
-0.1347657,0.917968 0.00496,0.369517 0.1420913,0.858862 0.4882813,1.205079 0.34624,0.346181 0.8355828,0.483353 1.2050781,0.488281 0.3694954,0.0049 0.6633655,-0.07126 0.9179688,-0.134766 0.5092064,-0.12702 0.8280843,-0.130648 0.7851562,-0.148437 -0.042746,-0.0177 0.1787953,0.209983 0.4492188,0.660156 0.1352117,0.225086 0.2898051,0.486262 0.5546875,0.74414 0.2648824,0.257882 0.7075087,0.507813 1.1972656,0.507813 0.4897569,0 0.9323832,-0.249931 1.1972656,-0.507813 0.2648824,-0.25788 0.4194758,-0.519054 0.5546875,-0.74414 0.2289631,-0.381154 0.3527167,-0.510285 0.3808594,-0.558594 l 3.0839841,3.082031 c 0.514244,0.514072 1.392349,0.275776 1.576172,-0.427734 L 14,14 l 1.296872,0.01953 c 0.70351,-0.183823 0.941806,-1.061928 0.427734,-1.576172 L 12.642578,9.359375 c 0.04833,-0.028187 0.177444,-0.1519047 0.558594,-0.3808594 0.225084,-0.1352068 0.486261,-0.2897979 0.74414,-0.5546875 0.257883,-0.2648895 0.507813,-0.7075231 0.507813,-1.1972656 0,-0.4897425 -0.249941,-0.9323669 -0.507813,-1.19
72656 -0.257869,-0.2648988 -0.519047,-0.419466 -0.74414,-0.5546875 -0.450186,-0.270443 -0.677866,-0.491969 -0.660156,-0.4492188 0.01772,0.042799 0.02141,-0.2759291 0.148437,-0.7851562 0.06351,-0.2546136 0.139722,-0.548455 0.134766,-0.9179688 -0.005,-0.3695137 -0.142075,-0.8588863 -0.488281,-1.2050781 -0.3462,-0.3462216 -0.835552,-0.4833217 -1.205079,-0.4882813 -0.369527,-0.00496 -0.663344,0.07125 -0.917968,0.1347657 C 9.7036402,1.890703 9.3847886,1.8943207 9.4277344,1.9121094 9.4691998,1.9287393 9.2484002,1.7012091 8.9785156,1.2519531 8.8433002,1.0268705 8.6887171,0.76567971 8.4238281,0.5078125 8.1589391,0.24994529 7.7162937,0 7.2265625,0 Z M 7.5,5 C 8.8807119,5 10,6.1192881 10,7.5 10,8.8807119 8.8807119,10 7.5,10 6.1192881,10 5,8.8807119 5,7.5 5,6.1192881 6.1192881,5 7.5,5 Z"
+ />
+</svg>
diff --git a/icon-themes/sifr/xmlsecurity/res/certificate_40x56.png b/icon-themes/sifr/xmlsecurity/res/certificate_40x56.png
new file mode 100644
index 000000000000..d82ca8a544eb
Binary files /dev/null and b/icon-themes/sifr/xmlsecurity/res/certificate_40x56.png differ
diff --git a/icon-themes/sifr/xmlsecurity/res/certificate_40x56.svg b/icon-themes/sifr/xmlsecurity/res/certificate_40x56.svg
new file mode 100644
index 000000000000..678b021243d3
--- /dev/null
+++ b/icon-themes/sifr/xmlsecurity/res/certificate_40x56.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 40">
+ <path
+ style="fill:#555753"
+ d="M 6 4 C 4.892 4 4 4.892 4 6 L 4 34 C 4 35.108 4.892 36 6 36 L 29 36 L 29 34 L 6 34 L 6 6 L 50 6 L 50 34 L 49 34 L 49 36 L 50 36 C 51.108 36 52 35.108 52 34 L 52 6 C 52 4.892 51.108 4 50 4 L 6 4 z M 37.5 18 C 36.951231 18 36.457414 18.282255 36.15625 18.580078 C 35.855085 18.877902 35.673797 19.18822 35.513672 19.458984 C 35.193422 20.000513 34.927009 20.305612 34.919922 20.308594 C 34.913122 20.311394 34.511275 20.287572 33.908203 20.134766 C 33.606667 20.058366 33.263874 19.968877 32.84375 19.974609 C 32.423626 19.980309 31.878151 20.135233 31.490234 20.529297 C 31.102324 20.923354 30.948994 21.477542 30.943359 21.904297 C 30.937759 22.331051 31.026345 22.680038 31.101562 22.986328 C 31.251988 23.598908 31.276264 24.006742 31.273438 24.013672 C 31.270537 24.020772 30.968681 24.291854 30.435547 24.617188 C 30.16898 24.779854 29.863503 24.963583 29.570312 25.269531 C 29.277123 25.575479 29 26.077327 29 26.634766 C 29 27.192205 29.277109 27.694065 29.570312 28 C 29.863515 28.3
05935 30.16899 28.489697 30.435547 28.652344 C 30.96866 28.977637 31.270501 29.248655 31.273438 29.255859 C 31.276138 29.262559 31.251993 29.670592 31.101562 30.283203 C 31.026353 30.589509 30.937725 30.938475 30.943359 31.365234 C 30.948959 31.791994 31.102308 32.34616 31.490234 32.740234 C 31.878177 33.134271 32.423645 33.289212 32.84375 33.294922 C 33.263855 33.300622 33.60668 33.211163 33.908203 33.134766 C 34.511248 32.981968 34.913137 32.958084 34.919922 32.960938 C 34.926922 32.963837 35.193427 33.270965 35.513672 33.8125 C 35.673795 34.083267 35.855089 34.393573 36.15625 34.691406 C 36.45741 34.989239 36.951214 35.269531 37.5 35.269531 C 38.048786 35.269531 38.542589 34.989239 38.84375 34.691406 C 39.14491 34.393573 39.326206 34.083267 39.486328 33.8125 C 39.634874 33.561308 39.656659 33.559373 39.761719 33.416016 L 44.275391 38 L 45.748047 35.011719 C 46.927731 34.595192 48.001957 34.253148 48 33.177734 C 48.0017 32.662615 47.731685 32.477934 47.445312 32.222656 C 47.24065
32.065426 45.80647 30.78761 45.484375 30.544922 C 44.954649 30.145791 44.327489 29.675219 43.753906 29.238281 C 43.774186 29.216001 44.049327 28.96786 44.566406 28.652344 C 44.83296 28.489696 45.138444 28.305938 45.431641 28 C 45.724842 27.694065 46.001953 27.192191 46.001953 26.634766 C 46.001953 26.077327 45.724831 25.575479 45.431641 25.269531 C 45.138449 24.963583 44.832973 24.779854 44.566406 24.617188 C 44.033271 24.291854 43.731401 24.020744 43.728516 24.013672 C 43.725716 24.006772 43.74996 23.598909 43.900391 22.986328 C 43.975611 22.680037 44.064229 22.331051 44.058594 21.904297 C 44.052994 21.477542 43.899628 20.923354 43.511719 20.529297 C 43.123801 20.135233 42.578328 19.98034 42.158203 19.974609 C 41.738079 19.968909 41.395285 20.05836 41.09375 20.134766 C 40.490678 20.28757 40.088803 20.311444 40.082031 20.308594 C 40.074931 20.305594 39.806578 20.000513 39.486328 19.458984 C 39.326203 19.18822 39.144914 18.877902 38.84375 18.580078 C 38.542585 18.282255 38.048769 18
37.5 18 z M 37.5 20.111328 C 37.56574 20.189968 37.653999 20.305243 37.771484 20.503906 C 38.051732 20.977791 38.3645 21.787784 39.314453 22.1875 C 40.264125 22.587044 41.050443 22.239169 41.578125 22.105469 C 41.800004 22.049249 41.942069 22.029734 42.042969 22.021484 C 42.034869 22.12398 42.016287 22.268756 41.960938 22.494141 C 41.829313 23.030159 41.487519 23.82635 41.880859 24.791016 C 42.274393 25.755946 43.070618 26.074709 43.537109 26.359375 C 43.733062 26.478951 43.846557 26.568015 43.923828 26.634766 C 43.846428 26.701526 43.732674 26.790824 43.537109 26.910156 C 43.070613 27.194807 42.274396 27.513586 41.880859 28.478516 C 41.645205 29.05669 41.727511 29.569592 41.792969 29.943359 C 41.863069 30.204142 42.000784 30.418007 42.173828 30.574219 C 42.809876 31.094082 44.503364 32.597838 45.115234 33.058594 L 44.255859 33.496094 L 43.726562 34.568359 L 40.496094 31.287109 L 40.548828 31.345703 C 40.253724 30.995272 39.667997 30.949778 39.431641 31.027344 C 39.313228 31.066204
39.276888 31.122085 39.210938 31.166016 C 38.369104 31.58302 38.037495 32.315803 37.771484 32.765625 C 37.653997 32.964296 37.565743 33.079558 37.5 33.158203 C 37.43425 33.079563 37.346003 32.964296 37.228516 32.765625 C 36.948264 32.291719 36.635585 31.483636 35.685547 31.083984 C 34.735886 30.684344 33.951536 31.030352 33.423828 31.164062 C 33.201937 31.220282 33.0599 31.239787 32.958984 31.248047 C 32.967084 31.145529 32.985666 31.000784 33.041016 30.775391 C 33.172643 30.239356 33.514526 29.443194 33.121094 28.478516 C 32.727617 27.513514 31.931356 27.194811 31.464844 26.910156 C 31.269272 26.790822 31.155532 26.701535 31.078125 26.634766 C 31.155395 26.568016 31.268891 26.478951 31.464844 26.359375 C 31.931336 26.074709 32.72756 25.755944 33.121094 24.791016 C 33.514441 23.82635 33.172646 23.030159 33.041016 22.494141 C 32.985666 22.268756 32.967114 22.12398 32.958984 22.021484 C 33.059885 22.029784 33.201949 22.049259 33.423828 22.105469 C 33.95151 22.239171 34.735875 22.58704
5 35.685547 22.1875 C 36.6355 21.787785 36.948268 20.977791 37.228516 20.503906 C 37.346001 20.305243 37.434261 20.189965 37.5 20.111328 z "
+ />
+</svg>
diff --git a/icon-themes/sifr/xmlsecurity/res/notcertificate_16.png b/icon-themes/sifr/xmlsecurity/res/notcertificate_16.png
new file mode 100644
index 000000000000..6de537c59827
Binary files /dev/null and b/icon-themes/sifr/xmlsecurity/res/notcertificate_16.png differ
diff --git a/icon-themes/sifr/xmlsecurity/res/notcertificate_16.svg b/icon-themes/sifr/xmlsecurity/res/notcertificate_16.svg
new file mode 100644
index 000000000000..e492fac8ba18
--- /dev/null
+++ b/icon-themes/sifr/xmlsecurity/res/notcertificate_16.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+ <path
+ style="fill:#555753"
+ d="M 8 0 C 5.6666682 1.1612064 3.3333324 1.6347781 1 2.0761719 L 1 8.7304688 C 1 11.153637 4.7812196 14.464158 8 16 C 11.218781 14.464158 15 11.153637 15 8.7304688 L 15 2.0761719 C 12.666669 1.6347781 10.333332 1.1612064 8 0 z M 7 2 L 9 2 L 9 10 L 7 10 L 7 2 z M 7 12 L 9 12 L 9 14 L 7 14 L 7 12 z "
+ />
+</svg>
diff --git a/icon-themes/sifr/xmlsecurity/res/notcertificate_40x56.png b/icon-themes/sifr/xmlsecurity/res/notcertificate_40x56.png
new file mode 100644
index 000000000000..2903db614bc6
Binary files /dev/null and b/icon-themes/sifr/xmlsecurity/res/notcertificate_40x56.png differ
diff --git a/icon-themes/sifr/xmlsecurity/res/notcertificate_40x56.svg b/icon-themes/sifr/xmlsecurity/res/notcertificate_40x56.svg
new file mode 100644
index 000000000000..684d049e1e5a
--- /dev/null
+++ b/icon-themes/sifr/xmlsecurity/res/notcertificate_40x56.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 40">
+ <path
+ style="fill:#555753"
+ d="M 6 4 C 4.892 4 4 4.892 4 6 L 4 19 L 6 19 L 6 6 L 50 6 L 50 34 L 49 34 L 49 36 L 50 36 C 51.108 36 52 35.108 52 34 L 52 6 C 52 4.892 51.108 4 50 4 L 6 4 z M 37.5 18 C 36.951231 18 36.457414 18.282255 36.15625 18.580078 C 35.855085 18.877902 35.673797 19.18822 35.513672 19.458984 C 35.193422 20.000513 34.927009 20.305612 34.919922 20.308594 C 34.913122 20.311394 34.511275 20.287574 33.908203 20.134766 C 33.606667 20.058366 33.263874 19.968877 32.84375 19.974609 C 32.423626 19.980309 31.878151 20.135233 31.490234 20.529297 C 31.102324 20.923354 30.948994 21.477542 30.943359 21.904297 C 30.937759 22.331051 31.026349 22.680038 31.101562 22.986328 C 31.251988 23.598908 31.276263 24.006742 31.273438 24.013672 C 31.270537 24.020772 30.968681 24.291854 30.435547 24.617188 C 30.16898 24.779854 29.863504 24.963583 29.570312 25.269531 C 29.277123 25.575479 29 26.077327 29 26.634766 C 29 27.192205 29.277109 27.694065 29.570312 28 C 29.863515 28.305935 30.16899 28.489697 30.435547 28.652
344 C 30.96866 28.977637 31.270501 29.248655 31.273438 29.255859 C 31.276138 29.262559 31.251999 29.670592 31.101562 30.283203 C 31.026353 30.589509 30.937725 30.938475 30.943359 31.365234 C 30.948959 31.791994 31.102308 32.34616 31.490234 32.740234 C 31.878177 33.134271 32.423645 33.289212 32.84375 33.294922 C 33.263855 33.300622 33.60668 33.211162 33.908203 33.134766 C 34.511248 32.981968 34.913137 32.958084 34.919922 32.960938 C 34.926922 32.963837 35.193427 33.270965 35.513672 33.8125 C 35.673795 34.083267 35.855089 34.393573 36.15625 34.691406 C 36.45741 34.989239 36.951214 35.269531 37.5 35.269531 C 38.048786 35.269531 38.542589 34.989239 38.84375 34.691406 C 39.14491 34.393573 39.326206 34.083267 39.486328 33.8125 C 39.634874 33.561308 39.656659 33.559373 39.761719 33.416016 L 44.275391 38 L 45.748047 35.011719 C 46.927731 34.595192 48.001957 34.253148 48 33.177734 C 48.0017 32.662615 47.731685 32.477934 47.445312 32.222656 C 47.240651 32.065426 45.80647 30.78761 45.484375 30
.544922 C 44.954649 30.145791 44.327489 29.675219 43.753906 29.238281 C 43.774186 29.216001 44.049327 28.96786 44.566406 28.652344 C 44.83296 28.489696 45.138444 28.305938 45.431641 28 C 45.724842 27.694065 46.001953 27.192191 46.001953 26.634766 C 46.001953 26.077327 45.724831 25.575479 45.431641 25.269531 C 45.138449 24.963583 44.832973 24.779854 44.566406 24.617188 C 44.033271 24.291853 43.731401 24.020744 43.728516 24.013672 C 43.725716 24.006772 43.749956 23.598909 43.900391 22.986328 C 43.975611 22.680037 44.064229 22.331051 44.058594 21.904297 C 44.052994 21.477542 43.899628 20.923354 43.511719 20.529297 C 43.123801 20.135233 42.578328 19.98034 42.158203 19.974609 C 41.738079 19.968909 41.395285 20.058359 41.09375 20.134766 C 40.490678 20.28757 40.088803 20.311444 40.082031 20.308594 C 40.074931 20.305594 39.806578 20.000513 39.486328 19.458984 C 39.326203 19.18822 39.144914 18.877902 38.84375 18.580078 C 38.542585 18.282255 38.048769 18 37.5 18 z M 9 20 C 6.666668 21.161206
4.333332 21.634778 2 22.076172 L 2 30.730469 C 2 33.153637 5.78122 36.464158 9 38 C 12.218782 36.464158 16 33.153637 16 30.730469 L 16 22.076172 C 13.666668 21.634778 11.333332 21.161206 9 20 z M 37.5 20.111328 C 37.56574 20.189968 37.653999 20.305243 37.771484 20.503906 C 38.051732 20.977791 38.3645 21.787784 39.314453 22.1875 C 40.264125 22.587044 41.050443 22.239169 41.578125 22.105469 C 41.800004 22.049249 41.942069 22.029734 42.042969 22.021484 C 42.034869 22.12398 42.016288 22.268756 41.960938 22.494141 C 41.829313 23.030159 41.487521 23.82635 41.880859 24.791016 C 42.274393 25.755946 43.070618 26.074709 43.537109 26.359375 C 43.733062 26.478951 43.846557 26.568015 43.923828 26.634766 C 43.846428 26.701526 43.732674 26.790824 43.537109 26.910156 C 43.070613 27.194807 42.274396 27.513586 41.880859 28.478516 C 41.645205 29.05669 41.727511 29.569592 41.792969 29.943359 C 41.863069 30.204142 42.000784 30.418007 42.173828 30.574219 C 42.809876 31.094082 44.503364 32.597838 45.11523
4 33.058594 L 44.255859 33.496094 L 43.726562 34.568359 L 40.496094 31.287109 L 40.548828 31.345703 C 40.253724 30.995272 39.667997 30.949778 39.431641 31.027344 C 39.313228 31.066204 39.276886 31.122084 39.210938 31.166016 C 38.369104 31.58302 38.037495 32.315803 37.771484 32.765625 C 37.653997 32.964296 37.565743 33.079558 37.5 33.158203 C 37.43425 33.079563 37.346003 32.964296 37.228516 32.765625 C 36.948264 32.291719 36.635585 31.483636 35.685547 31.083984 C 34.735886 30.684344 33.951536 31.030353 33.423828 31.164062 C 33.201937 31.220282 33.0599 31.239787 32.958984 31.248047 C 32.967084 31.145529 32.985666 31.000784 33.041016 30.775391 C 33.172643 30.239356 33.514522 29.443194 33.121094 28.478516 C 32.727617 27.513514 31.931356 27.194811 31.464844 26.910156 C 31.269272 26.790822 31.155532 26.701535 31.078125 26.634766 C 31.155395 26.568016 31.268891 26.478951 31.464844 26.359375 C 31.931336 26.074709 32.72756 25.755944 33.121094 24.791016 C 33.514441 23.82635 33.172646 23.03015
9 33.041016 22.494141 C 32.985666 22.268756 32.967114 22.12398 32.958984 22.021484 C 33.059885 22.029784 33.201949 22.049259 33.423828 22.105469 C 33.95151 22.239171 34.735875 22.587047 35.685547 22.1875 C 36.6355 21.787785 36.948268 20.977791 37.228516 20.503906 C 37.346005 20.30525 37.434261 20.189965 37.5 20.111328 z M 8 22 L 10 22 L 10 32 L 8 32 L 8 22 z M 8 34 L 10 34 L 10 36 L 8 36 L 8 34 z M 17 34 L 17 36 L 29 36 L 29 34 L 17 34 z "
+ />
+</svg>
diff --git a/icon-themes/sifr_dark/chart2/res/typearea_16.png b/icon-themes/sifr_dark/chart2/res/typearea_16.png
new file mode 100644
index 000000000000..d9453b414354
Binary files /dev/null and b/icon-themes/sifr_dark/chart2/res/typearea_16.png differ
diff --git a/icon-themes/sifr_dark/chart2/res/typebar_16.png b/icon-themes/sifr_dark/chart2/res/typebar_16.png
new file mode 100644
index 000000000000..e4c346ed3dee
Binary files /dev/null and b/icon-themes/sifr_dark/chart2/res/typebar_16.png differ
diff --git a/icon-themes/sifr_dark/chart2/res/typebubble_16.png b/icon-themes/sifr_dark/chart2/res/typebubble_16.png
new file mode 100644
index 000000000000..01e087abf703
Binary files /dev/null and b/icon-themes/sifr_dark/chart2/res/typebubble_16.png differ
diff --git a/icon-themes/sifr_dark/chart2/res/typecolumn_16.png b/icon-themes/sifr_dark/chart2/res/typecolumn_16.png
new file mode 100644
index 000000000000..07b70be03a1a
Binary files /dev/null and b/icon-themes/sifr_dark/chart2/res/typecolumn_16.png differ
diff --git a/icon-themes/sifr_dark/chart2/res/typecolumnline_16.png b/icon-themes/sifr_dark/chart2/res/typecolumnline_16.png
new file mode 100644
index 000000000000..a0731617c1b1
Binary files /dev/null and b/icon-themes/sifr_dark/chart2/res/typecolumnline_16.png differ
diff --git a/icon-themes/sifr_dark/chart2/res/typenet_16.png b/icon-themes/sifr_dark/chart2/res/typenet_16.png
new file mode 100644
index 000000000000..e019c5d8e259
Binary files /dev/null and b/icon-themes/sifr_dark/chart2/res/typenet_16.png differ
diff --git a/icon-themes/sifr_dark/chart2/res/typepie_16.png b/icon-themes/sifr_dark/chart2/res/typepie_16.png
new file mode 100644
index 000000000000..6ff292b3771a
Binary files /dev/null and b/icon-themes/sifr_dark/chart2/res/typepie_16.png differ
diff --git a/icon-themes/sifr_dark/chart2/res/typepointline_16.png b/icon-themes/sifr_dark/chart2/res/typepointline_16.png
new file mode 100644
index 000000000000..83a34cf814a9
Binary files /dev/null and b/icon-themes/sifr_dark/chart2/res/typepointline_16.png differ
diff --git a/icon-themes/sifr_dark/chart2/res/typestock_16.png b/icon-themes/sifr_dark/chart2/res/typestock_16.png
new file mode 100644
index 000000000000..8266794e14d6
Binary files /dev/null and b/icon-themes/sifr_dark/chart2/res/typestock_16.png differ
diff --git a/icon-themes/sifr_dark/chart2/res/typexy_16.png b/icon-themes/sifr_dark/chart2/res/typexy_16.png
new file mode 100644
index 000000000000..938eb332309f
Binary files /dev/null and b/icon-themes/sifr_dark/chart2/res/typexy_16.png differ
diff --git a/icon-themes/sifr_dark/cmd/lc_starshapes.signet.png b/icon-themes/sifr_dark/cmd/lc_starshapes.signet.png
index 18209f3ff769..ad8792c6bcd7 100644
Binary files a/icon-themes/sifr_dark/cmd/lc_starshapes.signet.png and b/icon-themes/sifr_dark/cmd/lc_starshapes.signet.png differ
diff --git a/icon-themes/sifr_dark/dbaccess/res/exwarning.png b/icon-themes/sifr_dark/dbaccess/res/exwarning.png
new file mode 100644
index 000000000000..a6280f2fdcba
Binary files /dev/null and b/icon-themes/sifr_dark/dbaccess/res/exwarning.png differ
diff --git a/icon-themes/sifr_dark/dbaccess/res/forms_32.png b/icon-themes/sifr_dark/dbaccess/res/forms_32.png
new file mode 100644
index 000000000000..4505749371d9
Binary files /dev/null and b/icon-themes/sifr_dark/dbaccess/res/forms_32.png differ
diff --git a/icon-themes/sifr_dark/dbaccess/res/jo02.png b/icon-themes/sifr_dark/dbaccess/res/jo02.png
new file mode 100644
index 000000000000..4eacfc20bad8
Binary files /dev/null and b/icon-themes/sifr_dark/dbaccess/res/jo02.png differ
diff --git a/icon-themes/sifr_dark/dbaccess/res/pkey.png b/icon-themes/sifr_dark/dbaccess/res/pkey.png
new file mode 100644
index 000000000000..f1308a934756
Binary files /dev/null and b/icon-themes/sifr_dark/dbaccess/res/pkey.png differ
diff --git a/icon-themes/sifr_dark/dbaccess/res/queries_32.png b/icon-themes/sifr_dark/dbaccess/res/queries_32.png
new file mode 100644
index 000000000000..d18e0644b599
Binary files /dev/null and b/icon-themes/sifr_dark/dbaccess/res/queries_32.png differ
diff --git a/icon-themes/sifr_dark/dbaccess/res/reports_32.png b/icon-themes/sifr_dark/dbaccess/res/reports_32.png
new file mode 100644
index 000000000000..f93adcc92c03
Binary files /dev/null and b/icon-themes/sifr_dark/dbaccess/res/reports_32.png differ
diff --git a/icon-themes/sifr_dark/dbaccess/res/tables_32.png b/icon-themes/sifr_dark/dbaccess/res/tables_32.png
new file mode 100644
index 000000000000..3c63fa32bd92
Binary files /dev/null and b/icon-themes/sifr_dark/dbaccess/res/tables_32.png differ
diff --git a/icon-themes/sifr_dark/xmlsecurity/res/certificate_16.png b/icon-themes/sifr_dark/xmlsecurity/res/certificate_16.png
new file mode 100644
index 000000000000..206231b63071
Binary files /dev/null and b/icon-themes/sifr_dark/xmlsecurity/res/certificate_16.png differ
diff --git a/icon-themes/sifr_dark/xmlsecurity/res/certificate_40x56.png b/icon-themes/sifr_dark/xmlsecurity/res/certificate_40x56.png
new file mode 100644
index 000000000000..e1cc2ac9907b
Binary files /dev/null and b/icon-themes/sifr_dark/xmlsecurity/res/certificate_40x56.png differ
diff --git a/icon-themes/sifr_dark/xmlsecurity/res/notcertificate_16.png b/icon-themes/sifr_dark/xmlsecurity/res/notcertificate_16.png
new file mode 100644
index 000000000000..54ace9729e2c
Binary files /dev/null and b/icon-themes/sifr_dark/xmlsecurity/res/notcertificate_16.png differ
diff --git a/icon-themes/sifr_dark/xmlsecurity/res/notcertificate_40x56.png b/icon-themes/sifr_dark/xmlsecurity/res/notcertificate_40x56.png
new file mode 100644
index 000000000000..5dc0ba0bfca0
Binary files /dev/null and b/icon-themes/sifr_dark/xmlsecurity/res/notcertificate_40x56.png differ
diff --git a/icon-themes/sifr_svg/chart2/res/typearea_16.svg b/icon-themes/sifr_svg/chart2/res/typearea_16.svg
new file mode 100644
index 000000000000..b07a7b3eff27
--- /dev/null
+++ b/icon-themes/sifr_svg/chart2/res/typearea_16.svg
@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+ <path
+ style="opacity:0.35;fill:#555753"
+ d="m 7.3007812,1 -4,4 H 1 c 0,3 0,6 0,9 H 15 C 15,9.6666667 15,5.3333333 15,1 14.777344,1 14.554687,1 14.332031,1 L 14.199219,1.0996094 10.552734,3.8398438 7.7148438,1 Z"
+ />
+ <path
+ style="fill:#555753"
+ d="m 7.3007812,8 -2,2 H 1 c 0,1.333333 0,2.666667 0,4 h 14 c 0,-1.333333 0,-2.666667 0,-4 -0.761719,0 -1.523437,0 -2.285156,0 l -2,-2 z"
+ />
+</svg>
diff --git a/icon-themes/sifr_svg/chart2/res/typebar_16.svg b/icon-themes/sifr_svg/chart2/res/typebar_16.svg
new file mode 100644
index 000000000000..fdda71bdeceb
--- /dev/null
+++ b/icon-themes/sifr_svg/chart2/res/typebar_16.svg
@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+ <path
+ style="fill:#555753"
+ d="M 1 9 L 1 13 L 9 13 L 9 9 L 1 9 z "
+ />
+ <path
+ style="opacity:0.35;fill:#555753"
+ d="M 1 3 L 1 7 L 15 7 L 15 3 L 1 3 z "
+ />
+</svg>
diff --git a/icon-themes/sifr_svg/chart2/res/typebubble_16.svg b/icon-themes/sifr_svg/chart2/res/typebubble_16.svg
new file mode 100644
index 000000000000..7aeacce4c6d1
--- /dev/null
+++ b/icon-themes/sifr_svg/chart2/res/typebubble_16.svg
@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+ <path
+ style="fill:#555753"
+ d="M 12 1 A 3 3 0 0 0 9 4 A 3 3 0 0 0 12 7 A 3 3 0 0 0 15 4 A 3 3 0 0 0 12 1 z M 4 11 A 2 2 0 0 0 2 13 A 2 2 0 0 0 4 15 A 2 2 0 0 0 6 13 A 2 2 0 0 0 4 11 z "
+ />
+ <path
+ style="opacity:0.35;fill:#555753"
+ d="M 4 2 A 2 2 0 0 0 2 4 A 2 2 0 0 0 4 6 A 2 2 0 0 0 6 4 A 2 2 0 0 0 4 2 z M 12 9 C 10.343146 9 9 10.343146 9 12 C 9 13.656854 10.343146 15 12 15 C 13.656854 15 15 13.656854 15 12 C 15 10.343146 13.656854 9 12 9 z "
+ />
+</svg>
diff --git a/icon-themes/sifr_svg/chart2/res/typecolumn_16.svg b/icon-themes/sifr_svg/chart2/res/typecolumn_16.svg
new file mode 100644
index 000000000000..6254a627aeb2
--- /dev/null
+++ b/icon-themes/sifr_svg/chart2/res/typecolumn_16.svg
@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+ <path
+ style="fill:#555753"
+ d="m 3,7 v 8 H 7 V 7 Z"
+ />
+ <path
+ style="opacity:0.35;fill:#555753"
+ d="M 9 1 L 9 15 L 13 15 L 13 1 L 9 1 z "
+ />
+</svg>
diff --git a/icon-themes/sifr_svg/chart2/res/typecolumnline_16.svg b/icon-themes/sifr_svg/chart2/res/typecolumnline_16.svg
new file mode 100644
index 000000000000..a7a812ec32cf
--- /dev/null
+++ b/icon-themes/sifr_svg/chart2/res/typecolumnline_16.svg
@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+ <path
+ style="fill:#555753"
+ d="M 15 1 L 1 5 L 1 7 L 15 3 L 15 1 z M 3 9 L 3 15 L 7 15 L 7 9 L 3 9 z "
+ />
+ <path
+ style="opacity:0.35;fill:#555753"
+ d="m 9,6 v 9 h 4 V 6 Z"
+ />
+</svg>
diff --git a/icon-themes/sifr_svg/chart2/res/typenet_16.svg b/icon-themes/sifr_svg/chart2/res/typenet_16.svg
new file mode 100644
index 000000000000..7db130ab1d59
--- /dev/null
+++ b/icon-themes/sifr_svg/chart2/res/typenet_16.svg
@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+ <path
+ style="fill:#555753"
+ d="M 8,0 5.75,6 H 0 L 4.3300781,9.7890625 2,16 8,13 14,16 11.669922,9.7890625 16,6 H 10.25 Z M 8,5.6972656 8.8632812,8 H 10.675781 L 9.3105469,9.1953125 10.337891,11.931641 8,10.763672 5.6621094,11.931641 6.6894531,9.1953125 5.3242188,8 h 1.8125 z"
+ />
+ <path
+ style="opacity:0.35;fill:#555753"
+ d="M 8,5.6972656 8.8632812,8 H 10.675781 L 9.3105469,9.1953125 10.337891,11.931641 8,10.763672 5.6621094,11.931641 6.6894531,9.1953125 5.3242188,8 h 1.8125 z"
+ />
+</svg>
diff --git a/icon-themes/sifr_svg/chart2/res/typepie_16.svg b/icon-themes/sifr_svg/chart2/res/typepie_16.svg
new file mode 100644
index 000000000000..f3c720d01cc7
--- /dev/null
+++ b/icon-themes/sifr_svg/chart2/res/typepie_16.svg
@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+ <path
+ style="fill:#555753"
+ d="M 14,7.5 C 14,3.9 11.1,1 7.5,1 3.9,1 1,3.9 1,7.5 1,11.1 3.9,14 7.5,14 7.67,14 7.8336709,13.992093 8,14 V 8 h 5.98 C 14,7.83 14,7.67 14,7.5 Z"
+ />
+ <path
+ style="opacity:0.35;fill:#555753"
+ d="M 9,9 V 15 c 0.9,-0 1.77,-0.33 2.54,-0.74 C 13.46,13.24 14.8,11.3 15,9 Z"
+ />
+</svg>
diff --git a/icon-themes/sifr_svg/chart2/res/typepointline_16.svg b/icon-themes/sifr_svg/chart2/res/typepointline_16.svg
new file mode 100644
index 000000000000..d8669232e5f0
--- /dev/null
+++ b/icon-themes/sifr_svg/chart2/res/typepointline_16.svg
@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+ <path
+ style="opacity:0.35;fill:#555753"
+ d="M 7,2 3.3007812,6 H 1.0078125 L 1,8 H 3.7402344 L 7.5,4.2070312 10,7 h 1 L 14.992188,3.75 15,2 H 14 L 10.552734,4.8398438 8,2 Z"
+ />
+ <path
+ style="fill:#555753"
+ d="m 7.09375,10 -2,2 H 1 v 2 h 4.921875 l 2,-2 h 2.171875 l 2,2 H 15 v -2 h -2.078125 l -2,-2 z"
+ />
+</svg>
diff --git a/icon-themes/sifr_svg/chart2/res/typestock_16.svg b/icon-themes/sifr_svg/chart2/res/typestock_16.svg
new file mode 100644
index 000000000000..f80816eb6136
--- /dev/null
+++ b/icon-themes/sifr_svg/chart2/res/typestock_16.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+ <path
+ style="fill:#555753"
+ d="M 9 2 L 9 11 L 11 11 L 11 6 L 13 6 L 13 4 L 11 4 L 11 2 L 9 2 z M 3 6 L 3 14 L 5 14 L 5 12 L 7 12 L 7 10 L 5 10 L 5 6 L 3 6 z "
+ />
+</svg>
diff --git a/icon-themes/sifr_svg/chart2/res/typexy_16.svg b/icon-themes/sifr_svg/chart2/res/typexy_16.svg
new file mode 100644
index 000000000000..aaa37ffcb34f
--- /dev/null
+++ b/icon-themes/sifr_svg/chart2/res/typexy_16.svg
@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+ <path
+ style="fill:#555753"
+ d="M 11 1 L 11 3 L 9 3 L 9 5 L 11 5 L 11 7 L 13 7 L 13 5 L 15 5 L 15 3 L 13 3 L 13 1 L 11 1 z M 3 9 L 3 11 L 1 11 L 1 13 L 3 13 L 3 15 L 5 15 L 5 13 L 7 13 L 7 11 L 5 11 L 5 9 L 3 9 z "
+ />
+ <path
+ style="opacity:0.35;fill:#555753"
+ d="M 2,2 V 6 H 6 V 2 Z m 7,7 v 6 h 6 V 9 Z m 2,2 h 2 v 2 h -2 z"
+ />
+</svg>
diff --git a/icon-themes/sifr_svg/cmd/lc_starshapes.signet.svg b/icon-themes/sifr_svg/cmd/lc_starshapes.signet.svg
new file mode 100644
index 000000000000..3c241cbf6c5b
--- /dev/null
+++ b/icon-themes/sifr_svg/cmd/lc_starshapes.signet.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+ <path
+ style="fill:#555753"
+ d="M 11.5,2 C 10.95,2 10.5,2.2815507 10.156887,2.5793742 9.8557217,2.8771978 9.6743764,3.1875919 9.5142513,3.4583564 9.194001,3.9998853 8.9275356,4.3065783 8.9204485,4.3 8.9,4.3124097 8.5117116,4.2877584 7.9086397,4.1349544 7.6071038,4.0585523 7.2642163,3.9685064 6.8440919,3.9742376 6.4239676,3.9799687 5.878373,4.1357379 5.5,4.5298019 5.1,4.9238589 4.95,5.478069 4.9435323,5.9048236 4.9379018,6.3315782 5.0265367,6.6798996 5.1017494,6.9861899 5.2521752,7.5987704 5.3,8.0070536 5.2736397,8.0139839 5.2707595,8.0210545 4.97,8.2918352 4.4356746,8.617168 4.1691076,8.7798344 3.8635538,8.9640078 3.5703632,9.2699561 3.2771727,9.5759043 3,10.077618 3,10.635057 c 0,0.557439 0.2771601,1.059166 0.5703632,1.365101 0.2932032,0.305935 0.5987548,0.490141 0.8653114,0.652788 0.5331131,0.325293 0.8350279,0.59598 0.8379651,0.603184 0.00274,0.0067 -0.021464,0.415183 -0.1718903,1.027794 -0.075214,0.306306 -0.1638513,0.654607 -0.1582171,1.081366 0.00563,0.42676 0.1589972,0.980949 0.5469236,1.375023 0.38
79435,0.394037 0.9335312,0.549854 1.353636,0.555564 0.4201049,0.0057 0.7630254,-0.08432 1.0645478,-0.160717 0.603045,-0.152798 1.0050247,-0.177461 1.0118088,-0.174607 0.007,0.0029 0.2735573,0.30967 0.5938028,0.851205 0.1601228,0.270767 0.3414746,0.581149 0.6426357,0.878982 0.30116,0.297833 0.795083,0.579374 1.343869,0.579374 0.548786,0 1.042709,-0.281541 1.34387,-0.579374 0.30116,-0.297833 0.482513,-0.608215 0.642635,-0.878982 0.148546,-0.251192 0.170355,-0.251491 0.275415,-0.394848 L 18.275056,22 19.747844,19.011858 c 1.179684,-0.416527 2.254105,-0.757949 2.252148,-1.833363 0.0017,-0.515119 -0.268167,-0.70077 -0.55454,-0.956048 -0.204663,-0.15723 -1.639475,-1.433929 -1.96157,-1.676617 -0.529726,-0.399131 -1.15704,-0.870622 -1.730623,-1.30756 0.02028,-0.02228 0.295494,-0.269811 0.812573,-0.585327 0.266554,-0.162648 0.572115,-0.34685 0.865312,-0.652788 0.293201,-0.305935 0.570368,-0.807673 0.570368,-1.365098 0,-0.557439 -0.277172,-1.0591527 -0.570362,-1.3651009 C 19.137958,8.9640079
18.832405,8.7798344 18.565838,8.617168 18.032703,8.2918353 17.730757,8.0210561 17.727872,8.0139839 c -0.0028,-0.00693 0.02146,-0.4152133 0.171891,-1.027794 C 17.97498,6.6798995 18.063615,6.3315781 18.05798,5.9048236 18.05238,5.4780691 17.898966,4.9238589 17.511057,4.5298019 17.123139,4.1357379 16.577545,3.9799687 16.15742,3.9742376 15.737296,3.9685064 15.394408,4.0585523 15.092873,4.1349544 14.489801,4.2877584 14.087836,4.3124098 14.081064,4.3 14.073976,4.306578 13.807511,3.9998852 13.487261,3.4583564 13.327136,3.187592 13.14579,2.8771977 12.844626,2.5793742 12.543461,2.2815508 12.049525,2 11.5,2 Z m 0,2.1 c 0.06574,0.078638 0.154023,0.1942005 0.271508,0.3928634 0.280248,0.4738855 0.593154,1.28285 1.543107,1.6825662 0.949672,0.3995441 1.734238,0.052352 2.26192,-0.08135 0.221879,-0.056219 0.363985,-0.075078 0.464885,-0.083334 -0.0081,0.1024963 -0.02669,0.2468447 -0.08204,0.4722296 -0.131625,0.5360184 -0.47343,1.3329895 -0.08009,2.2976554 0.393534,0.9649297 1.189906,1.2828189 1.656397
,1.5674849 0.195953,0.119576 0.309482,0.209047 0.386753,0.275798 -0.0774,0.06676 -0.191188,0.156466 -0.386753,0.275798 -0.466496,0.284651 -1.26286,0.602555 -1.656397,1.567485 -0.235654,0.578174 -0.153358,1.090542 -0.0879,1.464309 0.0701,0.260783 0.207854,0.47475 0.380898,0.630962 0.636048,0.519863 2.329851,2.025006 2.941721,2.485762 l -0.859451,0.436514 -0.529344,1.07343 -3.23081,-3.281409 0.05273,0.05754 c -0.295104,-0.350431 -0.878977,-0.395031 -1.115333,-0.317465 -0.118413,0.03886 -0.154773,0.09496 -0.220723,0.138891 -0.841833,0.417004 -1.173571,1.149409 -1.439582,1.599231 -0.117487,0.198671 -0.205765,0.314219 -0.271508,0.392864 -0.06575,-0.07864 -0.154021,-0.194193 -0.271508,-0.392864 -0.280252,-0.473906 -0.593068,-1.282915 -1.5431064,-1.682567 -0.9496606,-0.39964 -1.7342113,-0.05236 -2.26192,0.08135 -0.2218907,0.05622 -0.3639691,0.07507 -0.464885,0.08333 0.00813,-0.102518 0.026693,-0.246837 0.082038,-0.47223 C 7.1729899,14.239958 7.5148845,13.443018 7.1214516,12.47834 6.7279779
,11.513338 5.9315755,11.19551 5.4650631,10.910855 5.2694912,10.791521 5.1557168,10.701826 5.0783099,10.635057 5.1555817,10.568306 5.2691102,10.478835 5.4650631,10.359259 5.9315546,10.074593 6.7279255,9.7567021 7.1214604,8.791774 7.5148067,7.8271079 7.1730002,7.0301371 7.0413751,6.4941186 6.9860295,6.2687337 6.9674664,6.1243852 6.9593366,6.021889 c 0.1009002,0.00826 0.2430056,0.027116 0.464885,0.083334 0.5276818,0.133702 1.3122478,0.4808948 2.26192,0.08135 C 10.636094,5.7868577 10.949,4.9778933 11.229248,4.5040079 11.346733,4.305345 11.435017,4.1897822 11.5,4.1 Z"
+ />
+</svg>
diff --git a/icon-themes/sifr_svg/dbaccess/res/exwarning.svg b/icon-themes/sifr_svg/dbaccess/res/exwarning.svg
new file mode 100644
index 000000000000..1a9abf3df90c
--- /dev/null
+++ b/icon-themes/sifr_svg/dbaccess/res/exwarning.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+ <path
+ style="fill:#555753"
+ d="M 7 2 L 7 10 L 9 10 L 9 2 L 7 2 z M 7 12 L 7 14 L 9 14 L 9 12 L 7 12 z "
+ />
+</svg>
diff --git a/icon-themes/sifr_svg/dbaccess/res/forms_32.svg b/icon-themes/sifr_svg/dbaccess/res/forms_32.svg
new file mode 100644
index 000000000000..a32ceadf860a
--- /dev/null
+++ b/icon-themes/sifr_svg/dbaccess/res/forms_32.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+ <path
+ style="fill:#555753"
+ d="M 7 2 C 5.892 2 5 2.892 5 4 L 5 28 C 5 29.108 5.892 30 7 30 L 25 30 C 26.108 30 27 29.108 27 28 L 27 10 C 27 8 23 2 19 2 L 7 2 z M 7 4 L 19 4 L 19 11 L 25 11 L 25 28 L 7 28 L 7 4 z M 9 6 L 9 10 L 17 10 L 17 6 L 9 6 z M 9 14 L 9 18 L 13 18 L 13 14 L 9 14 z M 15 14 L 15 18 L 23 18 L 23 14 L 15 14 z M 9 21 L 9 25 L 13 25 L 13 21 L 9 21 z M 15 21 L 15 25 L 23 25 L 23 21 L 15 21 z "
+ />
+</svg>
diff --git a/icon-themes/sifr_svg/dbaccess/res/jo02.svg b/icon-themes/sifr_svg/dbaccess/res/jo02.svg
new file mode 100644
index 000000000000..13381ee95e20
--- /dev/null
+++ b/icon-themes/sifr_svg/dbaccess/res/jo02.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 11 11">
+ <path
+ style="fill:#555753"
+ d="m 2,0 v 4 h 2 v 7 H 6 V 10 H 7 V 8 H 6 V 7 H 8 V 5 H 6 V 4 H 9 V 0 Z"
+ />
+</svg>
diff --git a/icon-themes/sifr_svg/dbaccess/res/pkey.svg b/icon-themes/sifr_svg/dbaccess/res/pkey.svg
new file mode 100644
index 000000000000..30256eb2871b
--- /dev/null
+++ b/icon-themes/sifr_svg/dbaccess/res/pkey.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 11 11">
+ <path
+ style="opacity:0.35;fill:#555753"
+ d="m 2,0 v 4 h 2 v 7 H 6 V 10 H 7 V 8 H 6 V 7 H 8 V 5 H 6 V 4 H 9 V 0 Z"
+ />
+</svg>
diff --git a/icon-themes/sifr_svg/dbaccess/res/queries_32.svg b/icon-themes/sifr_svg/dbaccess/res/queries_32.svg
new file mode 100644
index 000000000000..2ed1d4649a8a
--- /dev/null
+++ b/icon-themes/sifr_svg/dbaccess/res/queries_32.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+ <path
+ style="fill:#555753"
+ d="M 16 3 A 14 6 0 0 0 2 9 L 2 24 A 14 6 0 0 0 16 30 A 14 6 0 0 0 30 24 L 30 19 L 30 14 L 30 9 A 14 6 0 0 0 16 3 z M 16 5 A 12 4 0 0 1 28 9 A 12 4 0 0 1 16 13 A 12 4 0 0 1 4 9 A 12 4 0 0 1 16 5 z M 4 12.078125 A 14 6 0 0 0 16 15 A 14 6 0 0 0 28 12.078125 L 28 14 A 12 4 0 0 1 16 18 A 12 4 0 0 1 4 14 L 4 12.078125 z M 4 17.078125 A 14 6 0 0 0 16 20 A 14 6 0 0 0 28 17.078125 L 28 19 A 12 4 0 0 1 16 23 A 12 4 0 0 1 4 19 L 4 17.078125 z M 4 22.078125 A 14 6 0 0 0 16 25 A 14 6 0 0 0 28 22.078125 L 28 24 A 12 4 0 0 1 16 28 A 12 4 0 0 1 4 24 L 4 22.078125 z "
+ />
+</svg>
diff --git a/icon-themes/sifr_svg/dbaccess/res/reports_32.svg b/icon-themes/sifr_svg/dbaccess/res/reports_32.svg
new file mode 100644
index 000000000000..521aeaef77d3
--- /dev/null
+++ b/icon-themes/sifr_svg/dbaccess/res/reports_32.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+ <path
+ style="fill:#555753"
+ d="M 8 2 C 6.9092972 2 6 2.9092972 6 4 L 6 7 L 3.9394531 7 C 3.418651 7 3 7.418651 3 7.9394531 L 3 8.0605469 C 3 8.581349 3.418651 9 3.9394531 9 L 6 9 L 6 12 L 3.9394531 12 C 3.418651 12 3 12.418651 3 12.939453 L 3 13.060547 C 3 13.581349 3.418651 14 3.9394531 14 L 6 14 L 6 17 L 3.9394531 17 C 3.418651 17 3 17.418651 3 17.939453 L 3 18.060547 C 3 18.581349 3.418651 19 3.9394531 19 L 6 19 L 6 22 L 3.9394531 22 C 3.418651 22 3 22.418651 3 22.939453 L 3 23.060547 C 3 23.581349 3.418651 24 3.9394531 24 L 6 24 L 6 28 C 6 29.090703 6.9092972 30 8 30 L 26 30 C 27.090703 30 28 29.090703 28 28 L 28 4 C 28 2.9092972 27.090703 2 26 2 L 8 2 z M 9 5 L 25 5 L 25 27 L 9 27 L 9 5 z M 12 7 C 11.446 7 11 7.446 11 8 C 11 8.554 11.446 9 12 9 L 22 9 C 22.554 9 23 8.554 23 8 C 23 7.446 22.554 7 22 7 L 12 7 z M 12 12 C 11.446 12 11 12.446 11 13 C 11 13.554 11.446 14 12 14 L 22 14 C 22.554 14 23 13.554 23 13 C 23 12.446 22.554 12 22 12 L 12 12 z M 12 17 C 11.446 17 11 17.446 11 18 C 11 18.554 11.446 1
9 12 19 L 22 19 C 22.554 19 23 18.554 23 18 C 23 17.446 22.554 17 22 17 L 12 17 z M 12 22 C 11.446 22 11 22.446 11 23 C 11 23.554 11.446 24 12 24 L 22 24 C 22.554 24 23 23.554 23 23 C 23 22.446 22.554 22 22 22 L 12 22 z "
+ />
+</svg>
diff --git a/icon-themes/sifr_svg/dbaccess/res/tables_32.svg b/icon-themes/sifr_svg/dbaccess/res/tables_32.svg
new file mode 100644
index 000000000000..812da545463a
--- /dev/null
+++ b/icon-themes/sifr_svg/dbaccess/res/tables_32.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+ <path
+ style="fill:#555753"
+ d="M 2,2 V 30 H 30 V 2 Z M 4,4 H 9 V 9 H 4 Z m 7,0 h 4 v 5 h -4 z m 6,0 h 4 v 5 h -4 z m 6,0 h 5 V 9 H 23 Z M 4,11 h 5 v 4 H 4 Z m 7,0 h 4 v 4 h -4 z m 6,0 h 4 v 4 h -4 z m 6,0 h 5 v 4 H 23 Z M 4,17 h 5 v 4 H 4 Z m 7,0 h 4 v 4 h -4 z m 6,0 h 4 v 4 h -4 z m 6,0 h 5 v 4 H 23 Z M 4,23 h 5 v 5 H 4 Z m 7,0 h 4 v 5 h -4 z m 6,0 h 4 v 5 h -4 z m 6,0 h 5 v 5 h -5 z"
+ />
+</svg>
diff --git a/icon-themes/sifr_svg/xmlsecurity/res/certificate_16.svg b/icon-themes/sifr_svg/xmlsecurity/res/certificate_16.svg
new file mode 100644
index 000000000000..92bf89776263
--- /dev/null
+++ b/icon-themes/sifr_svg/xmlsecurity/res/certificate_16.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+ <path
+ style="fill:#555753"
+ d="M 7.2265625,0 C 6.7368313,0 6.2941859,0.249945 6.0292969,0.5078125 5.7644078,0.76568 5.6098249,1.0268698 5.4746094,1.2519531 5.2047246,1.7012103 4.9839319,1.9287369 5.0253906,1.9121094 5.0683375,1.8943202 4.749484,1.890703 4.2402344,1.7636719 3.9856095,1.7001563 3.6917926,1.6239467 3.3222656,1.6289062 2.9527387,1.6338658 2.4633851,1.7709656 2.1171875,2.1171875 1.7709498,2.463369 1.6338624,2.9527524 1.6289062,3.3222656 1.6239502,3.6917788 1.700161,3.9856178 1.7636719,4.2402344 1.8906937,4.7494675 1.8943804,5.0681986 1.9121094,5.0253906 1.9287921,4.9837937 1.7012292,5.2047126 1.2519531,5.4746094 1.0268604,5.6098309 0.7656841,5.764398 0.5078125,6.0292969 0.2499409,6.2941957 0,6.7368203 0,7.2265625 0,7.7163047 0.24993077,8.1589385 0.5078125,8.4238281 0.76569423,8.6887178 1.0268687,8.8433087 1.2519531,8.9785156 1.7021219,9.2489295 1.9297764,9.4703892 1.9121094,9.4277344 h 0.00195 c -0.017791,-0.042951 -0.023366,0.2759116 -0.1503906,0.7851566 -0.063512,0.254622 -0.1397213,0.548451
-0.1347657,0.917968 0.00496,0.369517 0.1420913,0.858862 0.4882813,1.205079 0.34624,0.346181 0.8355828,0.483353 1.2050781,0.488281 0.3694954,0.0049 0.6633655,-0.07126 0.9179688,-0.134766 0.5092064,-0.12702 0.8280843,-0.130648 0.7851562,-0.148437 -0.042746,-0.0177 0.1787953,0.209983 0.4492188,0.660156 0.1352117,0.225086 0.2898051,0.486262 0.5546875,0.74414 0.2648824,0.257882 0.7075087,0.507813 1.1972656,0.507813 0.4897569,0 0.9323832,-0.249931 1.1972656,-0.507813 0.2648824,-0.25788 0.4194758,-0.519054 0.5546875,-0.74414 0.2289631,-0.381154 0.3527167,-0.510285 0.3808594,-0.558594 l 3.0839841,3.082031 c 0.514244,0.514072 1.392349,0.275776 1.576172,-0.427734 L 14,14 l 1.296872,0.01953 c 0.70351,-0.183823 0.941806,-1.061928 0.427734,-1.576172 L 12.642578,9.359375 c 0.04833,-0.028187 0.177444,-0.1519047 0.558594,-0.3808594 0.225084,-0.1352068 0.486261,-0.2897979 0.74414,-0.5546875 0.257883,-0.2648895 0.507813,-0.7075231 0.507813,-1.1972656 0,-0.4897425 -0.249941,-0.9323669 -0.507813,-1.19
72656 -0.257869,-0.2648988 -0.519047,-0.419466 -0.74414,-0.5546875 -0.450186,-0.270443 -0.677866,-0.491969 -0.660156,-0.4492188 0.01772,0.042799 0.02141,-0.2759291 0.148437,-0.7851562 0.06351,-0.2546136 0.139722,-0.548455 0.134766,-0.9179688 -0.005,-0.3695137 -0.142075,-0.8588863 -0.488281,-1.2050781 -0.3462,-0.3462216 -0.835552,-0.4833217 -1.205079,-0.4882813 -0.369527,-0.00496 -0.663344,0.07125 -0.917968,0.1347657 C 9.7036402,1.890703 9.3847886,1.8943207 9.4277344,1.9121094 9.4691998,1.9287393 9.2484002,1.7012091 8.9785156,1.2519531 8.8433002,1.0268705 8.6887171,0.76567971 8.4238281,0.5078125 8.1589391,0.24994529 7.7162937,0 7.2265625,0 Z M 7.5,5 C 8.8807119,5 10,6.1192881 10,7.5 10,8.8807119 8.8807119,10 7.5,10 6.1192881,10 5,8.8807119 5,7.5 5,6.1192881 6.1192881,5 7.5,5 Z"
+ />
+</svg>
diff --git a/icon-themes/sifr_svg/xmlsecurity/res/certificate_40x56.svg b/icon-themes/sifr_svg/xmlsecurity/res/certificate_40x56.svg
new file mode 100644
index 000000000000..678b021243d3
--- /dev/null
+++ b/icon-themes/sifr_svg/xmlsecurity/res/certificate_40x56.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 40">
+ <path
+ style="fill:#555753"
+ d="M 6 4 C 4.892 4 4 4.892 4 6 L 4 34 C 4 35.108 4.892 36 6 36 L 29 36 L 29 34 L 6 34 L 6 6 L 50 6 L 50 34 L 49 34 L 49 36 L 50 36 C 51.108 36 52 35.108 52 34 L 52 6 C 52 4.892 51.108 4 50 4 L 6 4 z M 37.5 18 C 36.951231 18 36.457414 18.282255 36.15625 18.580078 C 35.855085 18.877902 35.673797 19.18822 35.513672 19.458984 C 35.193422 20.000513 34.927009 20.305612 34.919922 20.308594 C 34.913122 20.311394 34.511275 20.287572 33.908203 20.134766 C 33.606667 20.058366 33.263874 19.968877 32.84375 19.974609 C 32.423626 19.980309 31.878151 20.135233 31.490234 20.529297 C 31.102324 20.923354 30.948994 21.477542 30.943359 21.904297 C 30.937759 22.331051 31.026345 22.680038 31.101562 22.986328 C 31.251988 23.598908 31.276264 24.006742 31.273438 24.013672 C 31.270537 24.020772 30.968681 24.291854 30.435547 24.617188 C 30.16898 24.779854 29.863503 24.963583 29.570312 25.269531 C 29.277123 25.575479 29 26.077327 29 26.634766 C 29 27.192205 29.277109 27.694065 29.570312 28 C 29.863515 28.3
05935 30.16899 28.489697 30.435547 28.652344 C 30.96866 28.977637 31.270501 29.248655 31.273438 29.255859 C 31.276138 29.262559 31.251993 29.670592 31.101562 30.283203 C 31.026353 30.589509 30.937725 30.938475 30.943359 31.365234 C 30.948959 31.791994 31.102308 32.34616 31.490234 32.740234 C 31.878177 33.134271 32.423645 33.289212 32.84375 33.294922 C 33.263855 33.300622 33.60668 33.211163 33.908203 33.134766 C 34.511248 32.981968 34.913137 32.958084 34.919922 32.960938 C 34.926922 32.963837 35.193427 33.270965 35.513672 33.8125 C 35.673795 34.083267 35.855089 34.393573 36.15625 34.691406 C 36.45741 34.989239 36.951214 35.269531 37.5 35.269531 C 38.048786 35.269531 38.542589 34.989239 38.84375 34.691406 C 39.14491 34.393573 39.326206 34.083267 39.486328 33.8125 C 39.634874 33.561308 39.656659 33.559373 39.761719 33.416016 L 44.275391 38 L 45.748047 35.011719 C 46.927731 34.595192 48.001957 34.253148 48 33.177734 C 48.0017 32.662615 47.731685 32.477934 47.445312 32.222656 C 47.24065
32.065426 45.80647 30.78761 45.484375 30.544922 C 44.954649 30.145791 44.327489 29.675219 43.753906 29.238281 C 43.774186 29.216001 44.049327 28.96786 44.566406 28.652344 C 44.83296 28.489696 45.138444 28.305938 45.431641 28 C 45.724842 27.694065 46.001953 27.192191 46.001953 26.634766 C 46.001953 26.077327 45.724831 25.575479 45.431641 25.269531 C 45.138449 24.963583 44.832973 24.779854 44.566406 24.617188 C 44.033271 24.291854 43.731401 24.020744 43.728516 24.013672 C 43.725716 24.006772 43.74996 23.598909 43.900391 22.986328 C 43.975611 22.680037 44.064229 22.331051 44.058594 21.904297 C 44.052994 21.477542 43.899628 20.923354 43.511719 20.529297 C 43.123801 20.135233 42.578328 19.98034 42.158203 19.974609 C 41.738079 19.968909 41.395285 20.05836 41.09375 20.134766 C 40.490678 20.28757 40.088803 20.311444 40.082031 20.308594 C 40.074931 20.305594 39.806578 20.000513 39.486328 19.458984 C 39.326203 19.18822 39.144914 18.877902 38.84375 18.580078 C 38.542585 18.282255 38.048769 18
37.5 18 z M 37.5 20.111328 C 37.56574 20.189968 37.653999 20.305243 37.771484 20.503906 C 38.051732 20.977791 38.3645 21.787784 39.314453 22.1875 C 40.264125 22.587044 41.050443 22.239169 41.578125 22.105469 C 41.800004 22.049249 41.942069 22.029734 42.042969 22.021484 C 42.034869 22.12398 42.016287 22.268756 41.960938 22.494141 C 41.829313 23.030159 41.487519 23.82635 41.880859 24.791016 C 42.274393 25.755946 43.070618 26.074709 43.537109 26.359375 C 43.733062 26.478951 43.846557 26.568015 43.923828 26.634766 C 43.846428 26.701526 43.732674 26.790824 43.537109 26.910156 C 43.070613 27.194807 42.274396 27.513586 41.880859 28.478516 C 41.645205 29.05669 41.727511 29.569592 41.792969 29.943359 C 41.863069 30.204142 42.000784 30.418007 42.173828 30.574219 C 42.809876 31.094082 44.503364 32.597838 45.115234 33.058594 L 44.255859 33.496094 L 43.726562 34.568359 L 40.496094 31.287109 L 40.548828 31.345703 C 40.253724 30.995272 39.667997 30.949778 39.431641 31.027344 C 39.313228 31.066204
39.276888 31.122085 39.210938 31.166016 C 38.369104 31.58302 38.037495 32.315803 37.771484 32.765625 C 37.653997 32.964296 37.565743 33.079558 37.5 33.158203 C 37.43425 33.079563 37.346003 32.964296 37.228516 32.765625 C 36.948264 32.291719 36.635585 31.483636 35.685547 31.083984 C 34.735886 30.684344 33.951536 31.030352 33.423828 31.164062 C 33.201937 31.220282 33.0599 31.239787 32.958984 31.248047 C 32.967084 31.145529 32.985666 31.000784 33.041016 30.775391 C 33.172643 30.239356 33.514526 29.443194 33.121094 28.478516 C 32.727617 27.513514 31.931356 27.194811 31.464844 26.910156 C 31.269272 26.790822 31.155532 26.701535 31.078125 26.634766 C 31.155395 26.568016 31.268891 26.478951 31.464844 26.359375 C 31.931336 26.074709 32.72756 25.755944 33.121094 24.791016 C 33.514441 23.82635 33.172646 23.030159 33.041016 22.494141 C 32.985666 22.268756 32.967114 22.12398 32.958984 22.021484 C 33.059885 22.029784 33.201949 22.049259 33.423828 22.105469 C 33.95151 22.239171 34.735875 22.58704
5 35.685547 22.1875 C 36.6355 21.787785 36.948268 20.977791 37.228516 20.503906 C 37.346001 20.305243 37.434261 20.189965 37.5 20.111328 z "
+ />
+</svg>
diff --git a/icon-themes/sifr_svg/xmlsecurity/res/notcertificate_16.svg b/icon-themes/sifr_svg/xmlsecurity/res/notcertificate_16.svg
new file mode 100644
index 000000000000..e492fac8ba18
--- /dev/null
+++ b/icon-themes/sifr_svg/xmlsecurity/res/notcertificate_16.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+ <path
+ style="fill:#555753"
+ d="M 8 0 C 5.6666682 1.1612064 3.3333324 1.6347781 1 2.0761719 L 1 8.7304688 C 1 11.153637 4.7812196 14.464158 8 16 C 11.218781 14.464158 15 11.153637 15 8.7304688 L 15 2.0761719 C 12.666669 1.6347781 10.333332 1.1612064 8 0 z M 7 2 L 9 2 L 9 10 L 7 10 L 7 2 z M 7 12 L 9 12 L 9 14 L 7 14 L 7 12 z "
+ />
+</svg>
diff --git a/icon-themes/sifr_svg/xmlsecurity/res/notcertificate_40x56.svg b/icon-themes/sifr_svg/xmlsecurity/res/notcertificate_40x56.svg
new file mode 100644
index 000000000000..684d049e1e5a
--- /dev/null
+++ b/icon-themes/sifr_svg/xmlsecurity/res/notcertificate_40x56.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 56 40">
+ <path
+ style="fill:#555753"
+ d="M 6 4 C 4.892 4 4 4.892 4 6 L 4 19 L 6 19 L 6 6 L 50 6 L 50 34 L 49 34 L 49 36 L 50 36 C 51.108 36 52 35.108 52 34 L 52 6 C 52 4.892 51.108 4 50 4 L 6 4 z M 37.5 18 C 36.951231 18 36.457414 18.282255 36.15625 18.580078 C 35.855085 18.877902 35.673797 19.18822 35.513672 19.458984 C 35.193422 20.000513 34.927009 20.305612 34.919922 20.308594 C 34.913122 20.311394 34.511275 20.287574 33.908203 20.134766 C 33.606667 20.058366 33.263874 19.968877 32.84375 19.974609 C 32.423626 19.980309 31.878151 20.135233 31.490234 20.529297 C 31.102324 20.923354 30.948994 21.477542 30.943359 21.904297 C 30.937759 22.331051 31.026349 22.680038 31.101562 22.986328 C 31.251988 23.598908 31.276263 24.006742 31.273438 24.013672 C 31.270537 24.020772 30.968681 24.291854 30.435547 24.617188 C 30.16898 24.779854 29.863504 24.963583 29.570312 25.269531 C 29.277123 25.575479 29 26.077327 29 26.634766 C 29 27.192205 29.277109 27.694065 29.570312 28 C 29.863515 28.305935 30.16899 28.489697 30.435547 28.652
344 C 30.96866 28.977637 31.270501 29.248655 31.273438 29.255859 C 31.276138 29.262559 31.251999 29.670592 31.101562 30.283203 C 31.026353 30.589509 30.937725 30.938475 30.943359 31.365234 C 30.948959 31.791994 31.102308 32.34616 31.490234 32.740234 C 31.878177 33.134271 32.423645 33.289212 32.84375 33.294922 C 33.263855 33.300622 33.60668 33.211162 33.908203 33.134766 C 34.511248 32.981968 34.913137 32.958084 34.919922 32.960938 C 34.926922 32.963837 35.193427 33.270965 35.513672 33.8125 C 35.673795 34.083267 35.855089 34.393573 36.15625 34.691406 C 36.45741 34.989239 36.951214 35.269531 37.5 35.269531 C 38.048786 35.269531 38.542589 34.989239 38.84375 34.691406 C 39.14491 34.393573 39.326206 34.083267 39.486328 33.8125 C 39.634874 33.561308 39.656659 33.559373 39.761719 33.416016 L 44.275391 38 L 45.748047 35.011719 C 46.927731 34.595192 48.001957 34.253148 48 33.177734 C 48.0017 32.662615 47.731685 32.477934 47.445312 32.222656 C 47.240651 32.065426 45.80647 30.78761 45.484375 30
.544922 C 44.954649 30.145791 44.327489 29.675219 43.753906 29.238281 C 43.774186 29.216001 44.049327 28.96786 44.566406 28.652344 C 44.83296 28.489696 45.138444 28.305938 45.431641 28 C 45.724842 27.694065 46.001953 27.192191 46.001953 26.634766 C 46.001953 26.077327 45.724831 25.575479 45.431641 25.269531 C 45.138449 24.963583 44.832973 24.779854 44.566406 24.617188 C 44.033271 24.291853 43.731401 24.020744 43.728516 24.013672 C 43.725716 24.006772 43.749956 23.598909 43.900391 22.986328 C 43.975611 22.680037 44.064229 22.331051 44.058594 21.904297 C 44.052994 21.477542 43.899628 20.923354 43.511719 20.529297 C 43.123801 20.135233 42.578328 19.98034 42.158203 19.974609 C 41.738079 19.968909 41.395285 20.058359 41.09375 20.134766 C 40.490678 20.28757 40.088803 20.311444 40.082031 20.308594 C 40.074931 20.305594 39.806578 20.000513 39.486328 19.458984 C 39.326203 19.18822 39.144914 18.877902 38.84375 18.580078 C 38.542585 18.282255 38.048769 18 37.5 18 z M 9 20 C 6.666668 21.161206
4.333332 21.634778 2 22.076172 L 2 30.730469 C 2 33.153637 5.78122 36.464158 9 38 C 12.218782 36.464158 16 33.153637 16 30.730469 L 16 22.076172 C 13.666668 21.634778 11.333332 21.161206 9 20 z M 37.5 20.111328 C 37.56574 20.189968 37.653999 20.305243 37.771484 20.503906 C 38.051732 20.977791 38.3645 21.787784 39.314453 22.1875 C 40.264125 22.587044 41.050443 22.239169 41.578125 22.105469 C 41.800004 22.049249 41.942069 22.029734 42.042969 22.021484 C 42.034869 22.12398 42.016288 22.268756 41.960938 22.494141 C 41.829313 23.030159 41.487521 23.82635 41.880859 24.791016 C 42.274393 25.755946 43.070618 26.074709 43.537109 26.359375 C 43.733062 26.478951 43.846557 26.568015 43.923828 26.634766 C 43.846428 26.701526 43.732674 26.790824 43.537109 26.910156 C 43.070613 27.194807 42.274396 27.513586 41.880859 28.478516 C 41.645205 29.05669 41.727511 29.569592 41.792969 29.943359 C 41.863069 30.204142 42.000784 30.418007 42.173828 30.574219 C 42.809876 31.094082 44.503364 32.597838 45.11523
4 33.058594 L 44.255859 33.496094 L 43.726562 34.568359 L 40.496094 31.287109 L 40.548828 31.345703 C 40.253724 30.995272 39.667997 30.949778 39.431641 31.027344 C 39.313228 31.066204 39.276886 31.122084 39.210938 31.166016 C 38.369104 31.58302 38.037495 32.315803 37.771484 32.765625 C 37.653997 32.964296 37.565743 33.079558 37.5 33.158203 C 37.43425 33.079563 37.346003 32.964296 37.228516 32.765625 C 36.948264 32.291719 36.635585 31.483636 35.685547 31.083984 C 34.735886 30.684344 33.951536 31.030353 33.423828 31.164062 C 33.201937 31.220282 33.0599 31.239787 32.958984 31.248047 C 32.967084 31.145529 32.985666 31.000784 33.041016 30.775391 C 33.172643 30.239356 33.514522 29.443194 33.121094 28.478516 C 32.727617 27.513514 31.931356 27.194811 31.464844 26.910156 C 31.269272 26.790822 31.155532 26.701535 31.078125 26.634766 C 31.155395 26.568016 31.268891 26.478951 31.464844 26.359375 C 31.931336 26.074709 32.72756 25.755944 33.121094 24.791016 C 33.514441 23.82635 33.172646 23.03015
9 33.041016 22.494141 C 32.985666 22.268756 32.967114 22.12398 32.958984 22.021484 C 33.059885 22.029784 33.201949 22.049259 33.423828 22.105469 C 33.95151 22.239171 34.735875 22.587047 35.685547 22.1875 C 36.6355 21.787785 36.948268 20.977791 37.228516 20.503906 C 37.346005 20.30525 37.434261 20.189965 37.5 20.111328 z M 8 22 L 10 22 L 10 32 L 8 32 L 8 22 z M 8 34 L 10 34 L 10 36 L 8 36 L 8 34 z M 17 34 L 17 36 L 29 36 L 29 34 L 17 34 z "
+ />
+</svg>
commit 99e12aed50765d0c2ac7be29c44469641f2567b5
Author: Zdeněk Crhonek <zcrhonek at gmail.com>
AuthorDate: Sat Feb 16 21:03:34 2019 +0100
Commit: Zdenek Crhonek <zcrhonek at gmail.com>
CommitDate: Sat Feb 16 22:22:58 2019 +0100
uitest for Chart X axis dialog
Change-Id: I21d904e614e81ad8a0f4b2189ad8a03ce2dd6871
Reviewed-on: https://gerrit.libreoffice.org/67928
Tested-by: Jenkins
Reviewed-by: Zdenek Crhonek <zcrhonek at gmail.com>
diff --git a/sc/qa/uitest/chart/chartXAxis.py b/sc/qa/uitest/chart/chartXAxis.py
new file mode 100644
index 000000000000..f49302f223f7
--- /dev/null
+++ b/sc/qa/uitest/chart/chartXAxis.py
@@ -0,0 +1,290 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+from uitest.framework import UITestCase
+from uitest.uihelper.common import get_state_as_dict
+from uitest.uihelper.common import select_pos
+from uitest.uihelper.calc import enter_text_to_cell
+from libreoffice.calc.document import get_cell_by_position
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.uihelper.common import get_state_as_dict, type_text
+from uitest.debug import sleep
+import org.libreoffice.unotest
+import pathlib
+
+def get_url_for_data_file(file_name):
+ return pathlib.Path(org.libreoffice.unotest.makeCopyFromTDOC(file_name)).as_uri()
+
+#Chart - X Axis
+
+class chartXAxis(UITestCase):
+ def test_chart_x_axis_dialog(self):
+ calc_doc = self.ui_test.load_file(get_url_for_data_file("tdf122398.ods"))
+ xCalcDoc = self.xUITest.getTopFocusWindow()
+ gridwin = xCalcDoc.getChild("grid_window")
+ document = self.ui_test.get_component()
+
+ self.ui_test.execute_dialog_through_command(".uno:OptionsTreeDialog") #optionsdialog, set centimeters
+ xDialog = self.xUITest.getTopFocusWindow()
+
+ xPages = xDialog.getChild("pages")
+ xCalcEntry = xPages.getChild('3') # calc
+ xCalcEntry.executeAction("EXPAND", tuple())
+ xCalcGeneralEntry = xCalcEntry.getChild('0')
+ xCalcGeneralEntry.executeAction("SELECT", tuple()) #General
+ xMetric = xDialog.getChild("unitlb")
+ props = {"TEXT": "Centimeter"}
+ actionProps = mkPropertyValues(props)
+ xMetric.executeAction("SELECT", actionProps)
+ xOKBtn = xDialog.getChild("ok")
+ self.ui_test.close_dialog_through_button(xOKBtn)
+
+ gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT": "Object 1"}))
+ gridwin.executeAction("ACTIVATE", tuple())
+ xChartMainTop = self.xUITest.getTopFocusWindow()
+ xChartMain = xChartMainTop.getChild("chart_window")
+ xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
+ self.ui_test.execute_dialog_through_action(xSeriesObj, "COMMAND", mkPropertyValues({"COMMAND": "DiagramAxisX"})) # X Axis...
+ xDialog = self.xUITest.getTopFocusWindow()
+ #Click on tab "Scale".
+ tabcontrol = xDialog.getChild("tabcontrol")
+ select_pos(tabcontrol, "0")
+
+ reverseDirection = xDialog.getChild("CBX_REVERSE")
+ logarithmicScale = xDialog.getChild("CBX_LOGARITHM")
+ autoMinimum = xDialog.getChild("CBX_AUTO_MIN")
+ autoMaximum = xDialog.getChild("CBX_AUTO_MAX")
+ majorInterval = xDialog.getChild("CBX_AUTO_STEP_MAIN")
+ minorInterval = xDialog.getChild("CBX_AUTO_STEP_HELP")
+ minimum = xDialog.getChild("EDT_MIN")
+ maximum = xDialog.getChild("EDT_MAX")
+ major = xDialog.getChild("EDT_STEP_MAIN")
+ minor = xDialog.getChild("MT_STEPHELP")
+
+ reverseDirection.executeAction("CLICK", tuple())
+ logarithmicScale.executeAction("CLICK", tuple())
+ autoMinimum.executeAction("CLICK", tuple())
+ autoMaximum.executeAction("CLICK", tuple())
+ majorInterval.executeAction("CLICK", tuple())
+ minorInterval.executeAction("CLICK", tuple())
+
+ minimum.executeAction("DOWN", tuple()) #10.12.2017
+ maximum.executeAction("DOWN", tuple()) #29.04.2018
+ major.executeAction("DOWN", tuple()) #19
+ minor.executeAction("UP", tuple()) #3
+ xOKBtn = xDialog.getChild("ok")
+ self.ui_test.close_dialog_through_button(xOKBtn)
+
+ #reopen and verify
+ gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT": "Object 1"}))
+ gridwin.executeAction("ACTIVATE", tuple())
+ xChartMainTop = self.xUITest.getTopFocusWindow()
+ xChartMain = xChartMainTop.getChild("chart_window")
+ xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
+ self.ui_test.execute_dialog_through_action(xSeriesObj, "COMMAND", mkPropertyValues({"COMMAND": "DiagramAxisX"}))
+ xDialog = self.xUITest.getTopFocusWindow()
+ #Click on tab "Scale".
+ tabcontrol = xDialog.getChild("tabcontrol")
+ select_pos(tabcontrol, "0")
+
+ reverseDirection = xDialog.getChild("CBX_REVERSE")
+ logarithmicScale = xDialog.getChild("CBX_LOGARITHM")
+ autoMinimum = xDialog.getChild("CBX_AUTO_MIN")
+ autoMaximum = xDialog.getChild("CBX_AUTO_MAX")
+ majorInterval = xDialog.getChild("CBX_AUTO_STEP_MAIN")
+ minorInterval = xDialog.getChild("CBX_AUTO_STEP_HELP")
+ minimum = xDialog.getChild("EDT_MIN")
+ maximum = xDialog.getChild("EDT_MAX")
+ major = xDialog.getChild("EDT_STEP_MAIN")
+ minor = xDialog.getChild("MT_STEPHELP")
+
+ self.assertEqual(get_state_as_dict(reverseDirection)["Selected"], "true")
+ self.assertEqual(get_state_as_dict(logarithmicScale)["Selected"], "true")
+ self.assertEqual(get_state_as_dict(autoMinimum)["Selected"], "false")
+ self.assertEqual(get_state_as_dict(autoMaximum)["Selected"], "false")
+ self.assertEqual(get_state_as_dict(majorInterval)["Selected"], "false")
+ self.assertEqual(get_state_as_dict(minorInterval)["Selected"], "false")
+ self.assertEqual(get_state_as_dict(minimum)["Text"], "10.12.2017")
+ self.assertEqual(get_state_as_dict(maximum)["Text"], "29.04.2018")
+ self.assertEqual(get_state_as_dict(major)["Text"], "19")
+ self.assertEqual(get_state_as_dict(minor)["Text"], "3")
+
+ #Click on tab "positioning".
+ tabcontrol = xDialog.getChild("tabcontrol")
+ select_pos(tabcontrol, "1")
+
+ crossAxis = xDialog.getChild("LB_CROSSES_OTHER_AXIS_AT")
+ crossAxisValue = xDialog.getChild("EDT_CROSSES_OTHER_AXIS_AT") #only available when crossAxis = Value
+ placeLabels = xDialog.getChild("LB_PLACE_LABELS")
+ innerMajorTick = xDialog.getChild("CB_TICKS_INNER")
+ outerMajorTick = xDialog.getChild("CB_TICKS_OUTER")
+ innerMinorTick = xDialog.getChild("CB_MINOR_INNER")
+ outerMinorTick = xDialog.getChild("CB_MINOR_OUTER")
+ placeMarks = xDialog.getChild("LB_PLACE_TICKS")
+
+ props = {"TEXT": "Start"}
+ actionProps = mkPropertyValues(props)
+ crossAxis.executeAction("SELECT", actionProps)
+ props2 = {"TEXT": "Outside end"}
+ actionProps2 = mkPropertyValues(props2)
+ placeLabels.executeAction("SELECT", actionProps2)
+ innerMajorTick.executeAction("CLICK", tuple())
+ outerMajorTick.executeAction("CLICK", tuple())
+ innerMinorTick.executeAction("CLICK", tuple())
+ outerMinorTick.executeAction("CLICK", tuple())
+ props3 = {"TEXT": "At axis"}
+ actionProps3 = mkPropertyValues(props3)
+ placeMarks.executeAction("SELECT", actionProps3)
+
+ xOKBtn = xDialog.getChild("ok")
+ self.ui_test.close_dialog_through_button(xOKBtn)
+
+ #reopen and verify tab "positioning".
+ gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT": "Object 1"}))
+ gridwin.executeAction("ACTIVATE", tuple())
+ xChartMainTop = self.xUITest.getTopFocusWindow()
+ xChartMain = xChartMainTop.getChild("chart_window")
+ xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
+ self.ui_test.execute_dialog_through_action(xSeriesObj, "COMMAND", mkPropertyValues({"COMMAND": "DiagramAxisX"}))
+ xDialog = self.xUITest.getTopFocusWindow()
+
+ tabcontrol = xDialog.getChild("tabcontrol")
+ select_pos(tabcontrol, "1")
+
+ crossAxis = xDialog.getChild("LB_CROSSES_OTHER_AXIS_AT")
+ crossAxisValue = xDialog.getChild("EDT_CROSSES_OTHER_AXIS_AT") #only available when crossAxis = Value
+ placeLabels = xDialog.getChild("LB_PLACE_LABELS")
+ innerMajorTick = xDialog.getChild("CB_TICKS_INNER")
+ outerMajorTick = xDialog.getChild("CB_TICKS_OUTER")
+ innerMinorTick = xDialog.getChild("CB_MINOR_INNER")
+ outerMinorTick = xDialog.getChild("CB_MINOR_OUTER")
+ placeMarks = xDialog.getChild("LB_PLACE_TICKS")
+
+ self.assertEqual(get_state_as_dict(crossAxis)["SelectEntryText"], "Start")
+ self.assertEqual(get_state_as_dict(placeLabels)["SelectEntryText"], "Outside end")
+ self.assertEqual(get_state_as_dict(innerMajorTick)["Selected"], "true")
+ self.assertEqual(get_state_as_dict(outerMajorTick)["Selected"], "false")
+ self.assertEqual(get_state_as_dict(innerMinorTick)["Selected"], "true")
+ self.assertEqual(get_state_as_dict(outerMinorTick)["Selected"], "true")
+ self.assertEqual(get_state_as_dict(placeMarks)["SelectEntryText"], "At axis")
+ #change tab "positioning".
+ props = {"TEXT": "Value"}
+ actionProps = mkPropertyValues(props)
+ crossAxis.executeAction("SELECT", actionProps)
+ crossAxisValue.executeAction("UP", tuple()) #1
+
+ xOKBtn = xDialog.getChild("ok")
+ self.ui_test.close_dialog_through_button(xOKBtn)
+
+ #reopen and verify tab "positioning".
+ gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT": "Object 1"}))
+ gridwin.executeAction("ACTIVATE", tuple())
+ xChartMainTop = self.xUITest.getTopFocusWindow()
+ xChartMain = xChartMainTop.getChild("chart_window")
+ xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
+ self.ui_test.execute_dialog_through_action(xSeriesObj, "COMMAND", mkPropertyValues({"COMMAND": "DiagramAxisX"}))
+ xDialog = self.xUITest.getTopFocusWindow()
+
+ tabcontrol = xDialog.getChild("tabcontrol")
+ select_pos(tabcontrol, "1")
+
+ crossAxis = xDialog.getChild("LB_CROSSES_OTHER_AXIS_AT")
+ crossAxisValue = xDialog.getChild("EDT_CROSSES_OTHER_AXIS_AT") #only available when crossAxis = Value
+ placeLabels = xDialog.getChild("LB_PLACE_LABELS")
+ innerMajorTick = xDialog.getChild("CB_TICKS_INNER")
+ outerMajorTick = xDialog.getChild("CB_TICKS_OUTER")
+ innerMinorTick = xDialog.getChild("CB_MINOR_INNER")
+ outerMinorTick = xDialog.getChild("CB_MINOR_OUTER")
+ placeMarks = xDialog.getChild("LB_PLACE_TICKS")
+
+ self.assertEqual(get_state_as_dict(crossAxis)["SelectEntryText"], "Value")
+ self.assertEqual(get_state_as_dict(crossAxisValue)["Text"], "1")
+ self.assertEqual(get_state_as_dict(placeLabels)["SelectEntryText"], "Outside end")
+ self.assertEqual(get_state_as_dict(innerMajorTick)["Selected"], "true")
+ self.assertEqual(get_state_as_dict(outerMajorTick)["Selected"], "false")
+ self.assertEqual(get_state_as_dict(innerMinorTick)["Selected"], "true")
+ self.assertEqual(get_state_as_dict(outerMinorTick)["Selected"], "true")
+ self.assertEqual(get_state_as_dict(placeMarks)["SelectEntryText"], "At axis")
+ #change tab "Line".
+ select_pos(tabcontrol, "2")
+
+ xWidth = xDialog.getChild("MTR_FLD_LINE_WIDTH")
+ transparency = xDialog.getChild("MTR_LINE_TRANSPARENT")
+
+ xWidth.executeAction("UP", tuple())
+ transparency.executeAction("UP", tuple())
+
+ xOKBtn = xDialog.getChild("ok")
+ self.ui_test.close_dialog_through_button(xOKBtn)
+
+ #reopen and verify tab "Line".
+ gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT": "Object 1"}))
+ gridwin.executeAction("ACTIVATE", tuple())
+ xChartMainTop = self.xUITest.getTopFocusWindow()
+ xChartMain = xChartMainTop.getChild("chart_window")
+ xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
+ self.ui_test.execute_dialog_through_action(xSeriesObj, "COMMAND", mkPropertyValues({"COMMAND": "DiagramAxisX"}))
+ xDialog = self.xUITest.getTopFocusWindow()
+
+ tabcontrol = xDialog.getChild("tabcontrol")
+ select_pos(tabcontrol, "2")
+
+ xWidth = xDialog.getChild("MTR_FLD_LINE_WIDTH")
+ transparency = xDialog.getChild("MTR_LINE_TRANSPARENT")
+
+ self.assertEqual(get_state_as_dict(xWidth)["Text"], "0.10 cm")
+ self.assertEqual(get_state_as_dict(transparency)["Text"], "5%")
+
+ #change tab "Label"
+ tabcontrol = xDialog.getChild("tabcontrol")
+ select_pos(tabcontrol, "3")
+
+ tile = xDialog.getChild("tile")
+ overlapCB = xDialog.getChild("overlapCB")
+ breakCB = xDialog.getChild("breakCB")
+ stackedCB = xDialog.getChild("stackedCB")
+ textdirLB = xDialog.getChild("textdirLB")
+
+ tile.executeAction("CLICK", tuple())
+ overlapCB.executeAction("CLICK", tuple())
+ breakCB.executeAction("CLICK", tuple())
+ stackedCB.executeAction("CLICK", tuple())
+ props = {"TEXT": "Right-to-left"}
+ actionProps = mkPropertyValues(props)
+ textdirLB.executeAction("SELECT", actionProps)
+
+ xOKBtn = xDialog.getChild("ok")
+ self.ui_test.close_dialog_through_button(xOKBtn)
+
+ #reopen and verify tab "Label".
+ gridwin.executeAction("SELECT", mkPropertyValues({"OBJECT": "Object 1"}))
+ gridwin.executeAction("ACTIVATE", tuple())
+ xChartMainTop = self.xUITest.getTopFocusWindow()
+ xChartMain = xChartMainTop.getChild("chart_window")
+ xSeriesObj = xChartMain.getChild("CID/D=0:CS=0:CT=0:Series=0")
+ self.ui_test.execute_dialog_through_action(xSeriesObj, "COMMAND", mkPropertyValues({"COMMAND": "DiagramAxisX"}))
+ xDialog = self.xUITest.getTopFocusWindow()
+
+ tabcontrol = xDialog.getChild("tabcontrol")
+ select_pos(tabcontrol, "3")
+
+ tile = xDialog.getChild("tile")
+ overlapCB = xDialog.getChild("overlapCB")
+ breakCB = xDialog.getChild("breakCB")
+ stackedCB = xDialog.getChild("stackedCB")
+ textdirLB = xDialog.getChild("textdirLB")
+
+ self.assertEqual(get_state_as_dict(tile)["Checked"], "true")
+ self.assertEqual(get_state_as_dict(overlapCB)["Selected"], "true")
+ self.assertEqual(get_state_as_dict(breakCB)["Selected"], "true")
+ self.assertEqual(get_state_as_dict(stackedCB)["Selected"], "true")
+ self.assertEqual(get_state_as_dict(textdirLB)["SelectEntryText"], "Right-to-left")
+
+ xOKBtn = xDialog.getChild("ok")
+ self.ui_test.close_dialog_through_button(xOKBtn)
+
+ self.ui_test.close_doc()
+# vim: set shiftwidth=4 softtabstop=4 expandtab:
commit eef8c4952da288629f9aad23f75d6f894eba83b4
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Feb 16 17:10:32 2019 +0000
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Sat Feb 16 20:58:10 2019 +0100
weld DBChangeDialog_Impl
Change-Id: I8d5330f07e4c76c6cdf51a878949bcac9ad3e92e
Reviewed-on: https://gerrit.libreoffice.org/67915
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index b2e8119cf257..5af530a355cc 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -448,41 +448,35 @@ IMPL_LINK_NOARG(MappingDialog_Impl, OkHdl, Button*, void)
EndDialog(bModified ? RET_OK : RET_CANCEL);
}
-class DBChangeDialog_Impl : public ModalDialog
+class DBChangeDialog_Impl : public weld::GenericDialogController
{
- VclPtr<ListBox> m_pSelectionLB;
- DBChangeDialogConfig_Impl aConfig;
-
+ DBChangeDialogConfig_Impl aConfig;
BibDataManager* pDatMan;
- DECL_LINK(DoubleClickHdl, ListBox&, void);
+ std::unique_ptr<weld::TreeView> m_xSelectionLB;
+
+ DECL_LINK(DoubleClickHdl, weld::TreeView&, void);
public:
- DBChangeDialog_Impl(vcl::Window* pParent, BibDataManager* pMan );
- virtual ~DBChangeDialog_Impl() override;
- virtual void dispose() override;
+ DBChangeDialog_Impl(weld::Window* pParent, BibDataManager* pMan);
OUString GetCurrentURL()const;
};
-DBChangeDialog_Impl::DBChangeDialog_Impl(vcl::Window* pParent, BibDataManager* pMan )
- : ModalDialog(pParent, "ChooseDataSourceDialog",
- "modules/sbibliography/ui/choosedatasourcedialog.ui")
- ,
- pDatMan(pMan)
+DBChangeDialog_Impl::DBChangeDialog_Impl(weld::Window* pParent, BibDataManager* pMan )
+ : GenericDialogController(pParent, "modules/sbibliography/ui/choosedatasourcedialog.ui", "ChooseDataSourceDialog")
+ , pDatMan(pMan)
+ , m_xSelectionLB(m_xBuilder->weld_tree_view("treeview"))
{
- get(m_pSelectionLB, "treeview");
- m_pSelectionLB->set_height_request(m_pSelectionLB->GetTextHeight() * 6);
-
- m_pSelectionLB->SetStyle(m_pSelectionLB->GetStyle() | WB_SORT);
- m_pSelectionLB->SetDoubleClickHdl( LINK(this, DBChangeDialog_Impl, DoubleClickHdl));
+ m_xSelectionLB->set_size_request(-1, m_xSelectionLB->get_height_rows(6));
+ m_xSelectionLB->connect_row_activated(LINK(this, DBChangeDialog_Impl, DoubleClickHdl));
+ m_xSelectionLB->make_sorted();
try
{
OUString sActiveSource = pDatMan->getActiveDataSource();
for (const OUString& rSourceName : aConfig.GetDataSourceNames())
- m_pSelectionLB->InsertEntry(rSourceName);
-
- m_pSelectionLB->SelectEntry(sActiveSource);
+ m_xSelectionLB->append_text(rSourceName);
+ m_xSelectionLB->select_text(sActiveSource);
}
catch (const Exception& e)
{
@@ -492,25 +486,14 @@ DBChangeDialog_Impl::DBChangeDialog_Impl(vcl::Window* pParent, BibDataManager* p
}
}
-IMPL_LINK_NOARG(DBChangeDialog_Impl, DoubleClickHdl, ListBox&, void)
-{
- EndDialog(RET_OK);
-}
-
-DBChangeDialog_Impl::~DBChangeDialog_Impl()
+IMPL_LINK_NOARG(DBChangeDialog_Impl, DoubleClickHdl, weld::TreeView&, void)
{
- disposeOnce();
-}
-
-void DBChangeDialog_Impl::dispose()
-{
- m_pSelectionLB.clear();
- ModalDialog::dispose();
+ m_xDialog->response(RET_OK);
}
OUString DBChangeDialog_Impl::GetCurrentURL()const
{
- return m_pSelectionLB->GetSelectedEntry();
+ return m_xSelectionLB->get_selected_text();
}
// XDispatchProvider
@@ -1483,13 +1466,13 @@ void BibDataManager::CreateMappingDialog(vcl::Window* pParent)
}
}
-OUString BibDataManager::CreateDBChangeDialog(vcl::Window* pParent)
+OUString BibDataManager::CreateDBChangeDialog(weld::Window* pParent)
{
OUString uRet;
- VclPtrInstance< DBChangeDialog_Impl > pDlg(pParent, this );
- if(RET_OK == pDlg->Execute())
+ DBChangeDialog_Impl aDlg(pParent, this);
+ if (aDlg.run() == RET_OK)
{
- OUString sNewURL = pDlg->GetCurrentURL();
+ OUString sNewURL = aDlg.GetCurrentURL();
if(sNewURL != getActiveDataSource())
{
uRet = sNewURL;
diff --git a/extensions/source/bibliography/datman.hxx b/extensions/source/bibliography/datman.hxx
index e405fd355842..e9aa2559f849 100644
--- a/extensions/source/bibliography/datman.hxx
+++ b/extensions/source/bibliography/datman.hxx
@@ -35,7 +35,7 @@
#include <vcl/vclptr.hxx>
namespace vcl { class Window; }
-
+namespace weld { class Window; }
namespace bib
{
@@ -157,7 +157,7 @@ public:
bool bForceListBox);
void CreateMappingDialog(vcl::Window* pParent);
- OUString CreateDBChangeDialog(vcl::Window* pParent);
+ OUString CreateDBChangeDialog(weld::Window* pParent);
void DispatchDBChangeDialog();
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index 8ac29d500d07..a2d83e49b51a 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -385,7 +385,7 @@ void BibFrameController_Impl::dispatch(const util::URL& _rURL, const uno::Sequen
}
else if(aCommand == "Bib/sdbsource")
{
- OUString aURL = m_xDatMan->CreateDBChangeDialog(pParent);
+ OUString aURL = m_xDatMan->CreateDBChangeDialog(pParent ? pParent->GetFrameWeld() : nullptr);
if(!aURL.isEmpty())
{
try
diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx
index 28feeb20c96e..2a632a546626 100644
--- a/extensions/source/bibliography/toolbar.cxx
+++ b/extensions/source/bibliography/toolbar.cxx
@@ -373,7 +373,8 @@ void BibToolBar::Click()
{
if(pDatMan)
{
- OUString sNew = pDatMan->CreateDBChangeDialog(GetParent());
+ vcl::Window* pWin = GetParent();
+ OUString sNew = pDatMan->CreateDBChangeDialog(pWin ? pWin->GetFrameWeld() : nullptr);
if(!sNew.isEmpty())
pDatMan->setActiveDataSource(sNew);
}
diff --git a/extensions/uiconfig/sbibliography/ui/choosedatasourcedialog.ui b/extensions/uiconfig/sbibliography/ui/choosedatasourcedialog.ui
index 6039efd71d8f..0145dd0dc0c2 100644
--- a/extensions/uiconfig/sbibliography/ui/choosedatasourcedialog.ui
+++ b/extensions/uiconfig/sbibliography/ui/choosedatasourcedialog.ui
@@ -1,12 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.1 -->
+<!-- Generated with glade 3.22.1 -->
<interface domain="pcr">
<requires lib="gtk+" version="3.18"/>
+ <object class="GtkTreeStore" id="liststore2">
+ <columns>
+ <!-- column-name text -->
+ <column type="gchararray"/>
+ <!-- column-name id -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
<object class="GtkDialog" id="ChooseDataSourceDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
<property name="title" translatable="yes" context="choosedatasourcedialog|ChooseDataSourceDialog">Choose Data Source</property>
+ <property name="modal">True</property>
+ <property name="default_width">0</property>
+ <property name="default_height">0</property>
<property name="type_hint">dialog</property>
+ <child>
+ <placeholder/>
+ </child>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
@@ -71,14 +85,39 @@
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkTreeView" id="treeview:border">
+ <object class="GtkScrolledWindow">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="show_expanders">False</property>
- <child internal-child="selection">
- <object class="GtkTreeSelection" id="treeview-selection1"/>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTreeView" id="treeview">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="model">liststore2</property>
+ <property name="headers_visible">False</property>
+ <property name="search_column">1</property>
+ <property name="show_expanders">False</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="Macro Library List-selection2"/>
+ </child>
+ <child>
+ <object class="GtkTreeViewColumn" id="treeviewcolumn5">
+ <property name="resizable">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkCellRendererText" id="cellrenderer4"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ </child>
+ </object>
</child>
</object>
</child>
commit 81c9c3f2c13c88a06fd86fabebe9f451806ad99e
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Feb 16 17:15:16 2019 +0000
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Sat Feb 16 20:57:58 2019 +0100
Options pops up a dialog, so add ... to it
Change-Id: I01a72c0a74fa4a57dd641f8d513a28b35f1e2dcd
Reviewed-on: https://gerrit.libreoffice.org/67916
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/cui/uiconfig/ui/hangulhanjaconversiondialog.ui b/cui/uiconfig/ui/hangulhanjaconversiondialog.ui
index 2a41cde48499..bed6c495cc16 100644
--- a/cui/uiconfig/ui/hangulhanjaconversiondialog.ui
+++ b/cui/uiconfig/ui/hangulhanjaconversiondialog.ui
@@ -514,7 +514,7 @@
</child>
<child>
<object class="GtkButton" id="options">
- <property name="label" translatable="yes" context="hangulhanjaconversiondialog|options">Options</property>
+ <property name="label" translatable="yes" context="hangulhanjaconversiondialog|options">Options...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
commit 6a4653ed1b24a161950a9cd84caabdd5ad4fe536
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Fri Feb 15 17:50:18 2019 +0100
Commit: Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Sat Feb 16 18:46:21 2019 +0100
MSForms: Rework the MS compatible Forms menu a bit
* DateField is saved as a content control in MSO file formats
so let have it under content controls submenu
* The MS compatible forms menu is a Writer specific thing so better
to have the related commands as Writer commands.
Change-Id: I2d66130f54c055a422f56b18ff2c98667e4f6469
Reviewed-on: https://gerrit.libreoffice.org/67912
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 5e8709ba4938..ccaed35731b0 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -6833,16 +6833,6 @@
<value xml:lang="en-US">More Fields</value>
</prop>
</node>
- <node oor:name=".uno:MSCompatActiveXControls" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">ActiveX Controls</value>
- </prop>
- </node>
- <node oor:name=".uno:MSCompatLegacyControls" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">Legacy Forms</value>
- </prop>
- </node>
</node>
</node>
</oor:component-data>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index cc136f04a7c6..e88f44c8e6ce 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -3402,6 +3402,21 @@
<value>1</value>
</prop>
</node>
+ <node oor:name=".uno:MSCompatActiveXControls" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">ActiveX Controls</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:MSCompatLegacyControls" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Legacy Form Fields</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:MSCompatContentControls" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Content Controls</value>
+ </prop>
+ </node>
</node>
</node>
</oor:component-data>
diff --git a/sw/uiconfig/swriter/menubar/mscompatibleformsmenu.xml b/sw/uiconfig/swriter/menubar/mscompatibleformsmenu.xml
index 4c8e34467d3e..4d157908dd71 100644
--- a/sw/uiconfig/swriter/menubar/mscompatibleformsmenu.xml
+++ b/sw/uiconfig/swriter/menubar/mscompatibleformsmenu.xml
@@ -21,7 +21,6 @@
<menu:menuitem menu:id=".uno:RadioButton"/>
<menu:menuitem menu:id=".uno:ListBox"/>
<menu:menuitem menu:id=".uno:Pushbutton"/>
- <menu:menuitem menu:id=".uno:DateField"/>
</menu:menupopup>
</menu:menu>
<menu:menu menu:id=".uno:MSCompatLegacyControls">
@@ -31,6 +30,11 @@
<menu:menuitem menu:id=".uno:DropDownFormField"/>
</menu:menupopup>
</menu:menu>
+ <menu:menu menu:id=".uno:MSCompatContentControls">
+ <menu:menupopup>
+ <menu:menuitem menu:id=".uno:DateField"/>
+ </menu:menupopup>
+ </menu:menu>
</menu:menupopup>
</menu:menu>
</menu:menubar>
commit 770ef0d216a30efd756b4be26e9fc6e077748fed
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Fri Feb 15 14:11:37 2019 +0100
Commit: Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Sat Feb 16 18:34:57 2019 +0100
MSForms: Make Control Properties menu to work with drop-down form field
Always forward the Execute and State method to the form shell,
so if a form control is selected the Control Properites will
work correctly.
Otherwise we check whether there is any field next to the cursor.
Change-Id: I25055c17d887a2f2a716d8325f46825cc408179e
Reviewed-on: https://gerrit.libreoffice.org/67911
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>
diff --git a/sw/sdi/_textsh.sdi b/sw/sdi/_textsh.sdi
index f8c2daee6d65..3724ee041ecc 100644
--- a/sw/sdi/_textsh.sdi
+++ b/sw/sdi/_textsh.sdi
@@ -1694,5 +1694,11 @@ interface BaseText
StateMethod = StateField ;
]
+ SID_FM_CTL_PROPERTIES
+ [
+ ExecMethod = Execute ;
+ StateMethod = GetState ;
+ ]
+
} // end of interface text
diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx
index fd759463b971..270fcabc08dc 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -119,6 +119,8 @@
#include <svx/drawitem.hxx>
#include <numrule.hxx>
#include <memory>
+#include <xmloff/odffields.hxx>
+#include <swabstdlg.hxx>
using namespace ::com::sun::star;
using namespace com::sun::star::beans;
@@ -1367,6 +1369,32 @@ void SwTextShell::Execute(SfxRequest &rReq)
GetView().UpdateWordCount(this, nSlot);
}
break;
+ case SID_FM_CTL_PROPERTIES:
+ {
+ SwPosition aPos(*GetShell().GetCursor()->GetPoint());
+ sw::mark::IFieldmark* pFieldBM = GetShell().getIDocumentMarkAccess()->getFieldmarkFor(aPos);
+ if ( !pFieldBM )
+ {
+ --aPos.nContent;
+ pFieldBM = GetShell().getIDocumentMarkAccess()->getFieldmarkFor(aPos);
+ }
+
+ if ( pFieldBM && pFieldBM->GetFieldname() == ODF_FORMDROPDOWN )
+ {
+ SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
+ ScopedVclPtr<VclAbstractDialog> pDlg(pFact->CreateDropDownFormFieldDialog(rWrtSh.GetView().GetFrameWeld(), pFieldBM));
+ pDlg->Execute();
+ pFieldBM->Invalidate();
+ rWrtSh.InvalidateWindows( rWrtSh.GetView().GetVisArea() );
+ }
+ else
+ {
+ SfxRequest aReq( GetView().GetViewFrame(), SID_FM_CTL_PROPERTIES );
+ aReq.AppendItem( SfxBoolItem( SID_FM_CTL_PROPERTIES, true ) );
+ rWrtSh.GetView().GetFormShell()->Execute( aReq );
+ }
+ }
+ break;
default:
OSL_ENSURE(false, "wrong dispatcher");
return;
@@ -1906,6 +1934,37 @@ void SwTextShell::GetState( SfxItemSet &rSet )
rSet.DisableItem(nWhich);
}
break;
+ case SID_FM_CTL_PROPERTIES:
+ {
+ bool bDisable = false;
+
+ // First get the state from the form shell
+ SfxItemSet aSet(GetShell().GetAttrPool(), svl::Items<SID_FM_CTL_PROPERTIES, SID_FM_CTL_PROPERTIES>{});
+ aSet.Put(SfxBoolItem( SID_FM_CTL_PROPERTIES, true ));
+ GetShell().GetView().GetFormShell()->GetState( aSet );
+
+ if(SfxItemState::DISABLED == aSet.GetItemState(SID_FM_CTL_PROPERTIES))
+ {
+ bDisable = true;
+ }
+
+ // Enable it if we have a valid object other than what form shell knows
+ SwPosition aPos(*GetShell().GetCursor()->GetPoint());
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list