[Libreoffice-commits] core.git: Branch 'feature/eszka' - 15467 commits - accessibility/inc accessibility/Library_acc.mk accessibility/README accessibility/README.md accessibility/source android/Bootstrap android/.gitignore android/README android/README.md android/source animations/README animations/README.md animations/source apple_remote/README apple_remote/README.md apple_remote/source autogen.sh avmedia/inc avmedia/Library_avmediagst.mk avmedia/Library_avmediavlc.mk avmedia/Module_avmedia.mk avmedia/README avmedia/README.md avmedia/source basctl/inc basctl/qa basctl/README basctl/README.md basctl/source basctl/uiconfig basegfx/CppunitTest_basegfx.mk basegfx/inc basegfx/README basegfx/README.md basegfx/source basegfx/test basic/CppunitTest_basic_macros.mk basic/inc basic/qa basic/README basic/README.md basic/source bean/BUCK bean/com bean/native bean/README bean/README.md binaryurp/README binaryurp/README.md binaryurp/source bin/check-elf-dynamic-objects bin/check-missing-export-asserts.py bin/ check-missing-unittests.py bin/compare-crashreport-stats.py bin/convwatch.py bin/find-can-be-private-symbols.classes.results bin/find-can-be-private-symbols.functions.results bin/find-can-be-private-symbols.py bin/find-headers-to-move-inside-modules.py bin/find-mergedlib-can-be-private.classes.results bin/find-undocumented-classes bin/find-unneeded-includes bin/find-unused-defines.py bin/find-unused-typedefs.py bin/fixincludeguards.sh bin/gbuild-to-ide bin/gen-boost-headers bin/gen-iwyu-dummy-lib bin/gla11y bin/lint-ui.py bin/lo-all-static-libs bin/merge-app-bundles bin/moveglobalheaders.sh bin/oss-fuzz-build.sh bin/oss-fuzz-setup.sh bin/pack-debug bin/README bin/README.md bin/sanitize-excludelist.txt bin/sanitize-image-links bin/symbolstore.py bin/symstore.sh bin/ui-checkdomain.sh bin/ui-rules-enforcer.py bin/ui-translatable.sh bin/unpack-sources bin/update bin/update_pch bin/update_pch_bisect bin/update_pch.sh bin/upload_symbols.py bridges/inc bridges/Library_cpp_uno.mk bridges/Mo dule_bridges.mk bridges/README bridges/README.md bridges/source BUCK canvas/CppunitTest_canvas_test.mk canvas/Executable_canvasdemo.mk canvas/inc canvas/Library_directx9canvas.mk canvas/Library_gdipluscanvas.mk canvas/Library_vclcanvas.mk canvas/Module_canvas.mk canvas/qa canvas/README canvas/README.md canvas/source canvas/StaticLibrary_directxcanvas.mk canvas/workben chart2/CppunitTest_chart2_dump.mk chart2/CppunitTest_chart2_export2.mk chart2/CppunitTest_chart2_export.mk chart2/CppunitTest_chart2_geometry.mk chart2/CppunitTest_chart2_import2.mk chart2/CppunitTest_chart2_import.mk chart2/CppunitTest_chart2_pivot_chart_test.mk chart2/CppunitTest_chart2_trendcalculators.mk chart2/CppunitTest_chart2_xshape.mk chart2/export_setup.mk chart2/import_setup.mk chart2/inc chart2/IwyuFilter_chart2.yaml chart2/Library_chartcontroller.mk chart2/Library_chartcore.mk chart2/Module_chart2.mk chart2/qa chart2/README chart2/README.md chart2/source chart2/uiconfig chart2/UIConfig_chart2.mk chart2/wor kbench cli_ure/Module_cli_ure.mk cli_ure/qa cli_ure/README cli_ure/README.md cli_ure/source codemaker/Executable_cppumaker.mk codemaker/Executable_javamaker.mk codemaker/README codemaker/README.md codemaker/source comphelper/CppunitTest_comphelper_test.mk comphelper/inc comphelper/Library_comphelper.mk comphelper/qa comphelper/README comphelper/README.md comphelper/source comphelper/util compilerplugins/clang compilerplugins/LICENSE.TXT compilerplugins/Makefile-clang.mk compilerplugins/README compilerplugins/README.md config_host/config_buildconfig.h.in config_host/config_crypto.h.in config_host/config_features.h.in config_host/config_firebird.h.in config_host/config_gpgme.h.in config_host/config_oauth2.h.in config_host/config_poppler.h.in config_host/config_python.h.in config_host/config_qrcodegen.h.in config_host/config_skia.h.in config_host/config_vclplug.h.in config_host/config_zxing.h.in config_host.mk.in config_host/README config_host/README.md configmgr/inc configmgr/README c onfigmgr/README.md configmgr/source configure.ac connectivity/Configuration_mork.mk connectivity/CppunitTest_connectivity_mork.mk connectivity/CppunitTest_connectivity_sharedresources.mk connectivity/Executable_mork_helper.mk connectivity/inc connectivity/IwyuFilter_connectivity.yaml connectivity/Library_ado.mk connectivity/Library_dbase.mk connectivity/Library_dbtools.mk connectivity/Library_firebird_sdbc.mk connectivity/Library_mork.mk connectivity/Library_mysql_jdbc.mk connectivity/Library_odbc.mk connectivity/Module_connectivity.mk connectivity/qa connectivity/README connectivity/README.md connectivity/registry connectivity/source connectivity/workben cppcanvas/inc cppcanvas/qa cppcanvas/README cppcanvas/README.md cppcanvas/source cppuhelper/inc cppuhelper/Library_cppuhelper.mk cppuhelper/qa cppuhelper/README cppuhelper/README.md cppuhelper/source cppu/Library_cppu.mk cppu/Library_purpenvhelper.mk cppu/qa cppu/README cppu/README.md cppu/source cpputools/README cpputools/README.m d cpputools/source cui/inc cui/Library_cui.mk cui/Module_cui.mk cui/qa cui/README cui/README.md cui/source cui/uiconfig cui/UIConfig_cui.mk cui/UITest_cui_tabpages.mk cui/util dbaccess/CppunitTest_dbaccess_dialog_save.mk dbaccess/CppunitTest_dbaccess_empty_stdlib_save.mk dbaccess/CppunitTest_dbaccess_firebird_regression_test.mk dbaccess/CppunitTest_dbaccess_firebird_test.mk dbaccess/CppunitTest_dbaccess_hsqlbinary_import.mk dbaccess/CppunitTest_dbaccess_hsqlschema_import.mk dbaccess/CppunitTest_dbaccess_macros_test.mk dbaccess/CppunitTest_dbaccess_nolib_save.mk dbaccess/CppunitTest_dbaccess_RowSetClones.mk dbaccess/CppunitTest_dbaccess_tdf119625.mk dbaccess/CppunitTest_dbaccess_tdf126268.mk dbaccess/inc dbaccess/Module_dbaccess.mk dbaccess/qa dbaccess/README dbaccess/README.md dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbaccess.mk dbaccess/util desktop/CppunitTest_desktop_app.mk desktop/CppunitTest_desktop_lib.mk desktop/Executable_soffice_bin.mk desktop/inc desktop/Library _deployment.mk desktop/Library_sofficeapp.mk desktop/lokclipboard.component desktop/Package_scripts.mk desktop/qa desktop/README desktop/README.md desktop/scripts desktop/source desktop/test desktop/uiconfig desktop/unx desktop/win32 dictionaries distro-configs/CPAndroidBranding.conf distro-configs/CPLinux.conf distro-configs/CPLinux-LOKit.conf distro-configs/CPOSX.conf distro-configs/CPWin32.conf distro-configs/CPWin32-MPL.conf distro-configs/CPWin64.conf distro-configs/Jenkins distro-configs/LibreOfficeAndroidAarch64.conf distro-configs/LibreOfficeAndroid.conf distro-configs/LibreOfficeAndroidX86_64.conf distro-configs/LibreOfficeAndroidX86.conf distro-configs/LibreOfficeCoverity.conf distro-configs/LibreOfficeFlatpak.conf distro-configs/LibreOfficeHaiku.conf distro-configs/LibreOfficeiOS.conf distro-configs/LibreOfficeiOS_Sim.conf distro-configs/LibreOfficeLinux.conf distro-configs/LibreOfficeMacOSX.conf distro-configs/LibreOfficeOnline.conf distro-configs/LibreOfficeOssFuzz.conf distro-configs/LibreOfficeVanillaMacAppStore.conf distro-configs/LibreOfficeWASM32.conf distro-configs/LibreOfficeWin32.conf distro-configs/LibreOfficeWin64.conf distro-configs/LibreOfficeWinArm64.conf distro-configs/README distro-configs/README.md download.lst drawinglayer/CppunitTest_drawinglayer_processors.mk drawinglayer/inc drawinglayer/Library_drawinglayer.mk drawinglayer/Module_drawinglayer.mk drawinglayer/qa drawinglayer/README drawinglayer/README.md drawinglayer/source editeng/inc editeng/qa editeng/README editeng/README.md editeng/source editeng/uiconfig embeddedobj/CppunitTest_embeddedobj_msole.mk embeddedobj/Module_embeddedobj.mk embeddedobj/qa embeddedobj/README embeddedobj/README.md embeddedobj/source embeddedobj/test embedserv/README embedserv/README.md embedserv/source emfio/CppunitTest_emfio_emf.mk emfio/CppunitTest_emfio_wmf.mk emfio/inc emfio/Library_emfio.mk emfio/qa emfio/README emfio/README.md emfio/source eventattacher/README eventattacher/README.md eventatta cher/source extensions/CppunitTest_extensions_bibliography.mk extensions/inc extensions/Library_bib.mk extensions/Library_oleautobridge.mk extensions/Module_extensions.mk extensions/qa extensions/README extensions/README.md extensions/source extensions/test extensions/uiconfig extensions/UIConfig_sbibliography.mk external/apache-commons external/apr external/boost external/breakpad external/cairo external/clew external/clucene external/coinmp external/cppunit external/ct2n external/curl external/epm external/epoxy external/expat external/firebird external/fontconfig external/freetype external/glm external/gpgmepp external/harfbuzz external/hunspell external/hyphen external/icu external/iODBC external/jfreereport external/lcms2 external/libabw external/libassuan external/libatomic_ops external/libcdr external/libcmis external/libebook external/libeot external/libepubgen external/libetonyek external/libexttextcat external/libffi external/libfreehand external/libgpg-error external/libj peg-turbo external/liblangtag external/libmspub external/libmwaw external/libnumbertext external/libodfgen external/liborcus external/libpagemaker external/libpng external/libqxp external/librevenge external/libstaroffice external/libtiff external/libvisio external/libwebp external/libwpd external/libwpg external/libwps external/libxml2 external/libxslt external/libzmf external/mariadb-connector-c external/mdds external/Module_external.mk external/more_fonts external/mythes external/neon external/noto_font external/nss external/openldap external/openssl external/owncloud-android-lib external/pdfium external/poppler external/postgresql external/python3 external/qrcodegen external/README external/README.md external/redland external/rhino external/serf external/skia external/unixODBC external/xmlsec external/zlib external/zxing extras/CustomTarget_autotextshare.mk extras/CustomTarget_tpldraw.mk extras/CustomTarget_tplpresnt.mk extras/Package_gallsystemstr.mk extras/Package_tpldraw.mk e xtras/Package_tplpresnt.mk extras/README extras/README.md extras/source filter/Configuration_filter.mk filter/CppunitTest_filter_dxf_test.mk filter/CppunitTest_filter_eps_test.mk filter/CppunitTest_filter_met_test.mk filter/CppunitTest_filter_pcd_test.mk filter/CppunitTest_filter_pcx_test.mk filter/CppunitTest_filter_pict_test.mk filter/CppunitTest_filter_ppm_test.mk filter/CppunitTest_filter_psd_test.mk filter/CppunitTest_filter_ras_test.mk filter/CppunitTest_filter_tga_test.mk filter/CppunitTest_filter_tiff_test.mk filter/inc filter/Library_gie.mk filter/Module_filter.mk filter/qa filter/README filter/README.md filter/source filter/uiconfig forms/inc forms/README forms/README.md forms/source formula/inc formula/qa formula/README formula/README.md formula/source formula/uiconfig fpicker/inc fpicker/Library_fps_aqua.mk fpicker/Library_fps.mk fpicker/qa fpicker/README fpicker/README.md fpicker/source fpicker/uiconfig framework/dtd framework/inc framework/Library_fwk.mk framework/qa f ramework/README framework/README.md framework/source framework/uiconfig framework/util g .git-blame-ignore-revs .git-hooks/pre-commit .github/lockdown.yml .gitignore .gitpod.dockerfile .gitreview hardened_runtime.xcent.in helpcompiler/inc helpcompiler/Module_helpcompiler.mk helpcompiler/source helpcontent2 hwpfilter/inc hwpfilter/qa hwpfilter/README hwpfilter/README.md hwpfilter/source i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk i18nlangtag/qa i18nlangtag/README i18nlangtag/README.md i18nlangtag/source i18npool/CustomTarget_breakiterator.mk i18npool/CustomTarget_collator.mk i18npool/inc i18npool/Library_localedata_en.mk i18npool/Library_localedata_others.mk i18npool/qa i18npool/README i18npool/README.md i18npool/source i18nutil/README i18nutil/README.md i18nutil/source icon-themes/breeze icon-themes/breeze_dark icon-themes/breeze_dark_svg icon-themes/breeze_svg icon-themes/colibre icon-themes/colibre_svg icon-themes/elementary icon-themes/elementary_svg icon-themes/galax y icon-themes/karasa_jaga icon-themes/karasa_jaga_svg icon-themes/README icon-themes/README.md icon-themes/sifr icon-themes/sifr_dark icon-themes/sifr_dark_svg icon-themes/sifr_svg icon-themes/sukapura icon-themes/sukapura_svg idlc/Executable_idlc.mk idlc/inc idlc/README idlc/README.md idlc/source idl/Executable_svidl.mk idl/inc idl/README idl/README.md idl/source include/avmedia include/basegfx include/basic include/codemaker include/com include/comphelper include/connectivity include/cppu include/cppuhelper include/cui include/dbaccess include/default.rc include/desktop include/drawinglayer include/editeng include/filter include/formula include/fpicker include/framework include/helpcompiler include/i18nlangtag include/i18nutil include/IwyuFilter_include.yaml include/jvmaccess include/jvmfwk include/LibreOfficeKit include/linguistic include/o3tl include/oox include/osl include/package include/registry include/rtl include/sal include/salhelper include/sax include/sfx2 include/sot in clude/store include/svl include/svtools include/svx include/systools include/test include/toolkit include/tools include/typelib include/ucbhelper include/uno include/unoidl include/unotest include/unotools include/vbahelper include/vcl include/xmloff include/xmlreader include/xmlscript install_deps.sh instsetoo_native/CustomTarget_install.mk instsetoo_native/CustomTarget_setup.mk instsetoo_native/inc_common instsetoo_native/inc_ooohelppack instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo instsetoo_native/ooenv instsetoo_native/README instsetoo_native/README.md instsetoo_native/util io/Executable_io-testconnection.mk io/Library_io.mk io/Module_io.mk io/README io/README.md ios/CustomTarget_iOS_link.mk ios/CustomTarget_iOS_setup.mk ios/DISCLAIMER_WARNING ios/.gitignore ios/LibreOfficeLight ios/Module_ios.mk io/source ios/README ios/README.md ios/source io/test javaunohelper/BUCK javaunohelper/README javaunohelper/README.md javaunohelper/source jurt/BUCK jurt/README jurt/READM E.md jurt/source jvmaccess/README jvmaccess/README.md jvmaccess/workbench jvmfwk/CppunitTest_jvmfwk_sunversion.mk jvmfwk/distributions jvmfwk/inc jvmfwk/Library_jvmfwk.mk jvmfwk/Module_jvmfwk.mk jvmfwk/Package_rcfiles.mk jvmfwk/plugins jvmfwk/qa jvmfwk/README jvmfwk/README.md jvmfwk/source l10ntools/inc l10ntools/README l10ntools/README.md l10ntools/source leak-suppress.txt librelogo/CustomTarget_librelogo.mk librelogo/Package_librelogo_properties.mk librelogo/README librelogo/README.md librelogo/source libreofficekit/Executable_gtktiledviewer.mk libreofficekit/Library_libreofficekitgtk.mk libreofficekit/Module_libreofficekit.mk libreofficekit/qa libreofficekit/README libreofficekit/README.md libreofficekit/source lingucomponent/config lingucomponent/Library_LanguageTool.mk lingucomponent/Module_lingucomponent.mk lingucomponent/README lingucomponent/README.md lingucomponent/source linguistic/Library_lng.mk linguistic/README linguistic/README.md linguistic/source logerrit lotuswordpr o/inc lotuswordpro/Library_lwpft.mk lotuswordpro/qa lotuswordpro/README lotuswordpro/README.md lotuswordpro/source lo.xcent lo.xcent.in m4/libgcrypt.m4 m4/libo_externals.m4 m4/README m4/README.md Makefile.fetch Makefile.in nlpsolver/README nlpsolver/README.md nlpsolver/src nlpsolver/ThirdParty o3tl/CppunitTest_o3tl_tests.mk o3tl/qa o3tl/README o3tl/README.md odk/CustomTarget_build-examples.mk odk/CustomTarget_check.mk odk/CustomTarget_unowinreg.mk odk/docs odk/examples odk/index.html odk/index_online.html odk/Library_unowinreg.mk odk/Module_odk.mk odk/Package_examples.mk odk/Package_unowinreg.mk odk/README odk/README.md odk/settings odk/source odk/util offapi/com offapi/README offapi/README.md offapi/type_reference offapi/UnoApi_offapi.mk offapi/util officecfg/Configuration_officecfg.mk officecfg/CustomTarget_registry.mk officecfg/README officecfg/README.md officecfg/registry onlineupdate/README onlineupdate/README.md onlineupdate/source oovbaapi/ooo oovbaapi/README oovbaapi/README. md oox/CppunitTest_oox_drawingml.mk oox/CppunitTest_oox_export.mk oox/CppunitTest_oox_shape.mk oox/inc oox/Library_oox.mk oox/Module_oox.mk oox/qa oox/README oox/README.md oox/source oox/util opencl/inc opencl/opencltest opencl/README opencl/README.md opencl/source osx/README osx/README.md osx/soffice.xcodeproj package/dtd package/inc package/qa package/README package/README.md package/source pch/inc pch/README pch/README.md postprocess/CustomTarget_images.mk postprocess/CustomTarget_registry.mk postprocess/CustomTarget_signing.mk postprocess/qa postprocess/Rdb_services.mk postprocess/README postprocess/README.md postprocess/signing pyuno/qa pyuno/README pyuno/README.md pyuno/source qadevOOo/qa qadevOOo/README qadevOOo/README.md qadevOOo/runner qadevOOo/tests readlicense_oo/docs readlicense_oo/license readlicense_oo/Package_files.mk readlicense_oo/README readlicense_oo/README.md README.help.md README.md registry/CustomTarget_regcompare_test.mk registry/Module_registry.mk registry/RE ADME registry/README.md registry/source registry/test remotebridges/README remotebridges/README.md reportbuilder/Jar_reportbuilder.mk reportbuilder/java reportbuilder/README reportbuilder/README.md reportdesign/inc reportdesign/Library_rpt.mk reportdesign/Library_rptxml.mk reportdesign/qa reportdesign/README reportdesign/README.md reportdesign/source reportdesign/uiconfig reportdesign/util RepositoryExternal.mk RepositoryFixes.mk Repository.mk RepositoryModule_build.mk RepositoryModule_host.mk ridljar/BUCK ridljar/com ridljar/README ridljar/README.md ridljar/source sal/cppunittester sal/CppunitTest_sal_comtools.mk sal/CppunitTest_sal_osl.mk sal/CppunitTest_sal_retry_if_failed.mk sal/Executable_cppunittester.mk salhelper/Library_salhelper.mk salhelper/README salhelper/README.md salhelper/source sal/inc sal/Library_sal.mk sal/Module_sal.mk sal/osl sal/qa sal/README sal/README.md sal/rtl sal/textenc sal/util sax/qa sax/README sax/README.md sax/README.vars sax/source scaddins/inc scaddi ns/IwyuFilter_scaddins.yaml scaddins/README scaddins/README.md scaddins/source sccomp/CppunitTest_sccomp_swarmsolvertest.mk sccomp/inc sccomp/IwyuFilter_sccomp.yaml sccomp/qa sccomp/README sccomp/README.md sccomp/source sc/CppunitTest_sc_anchor_test.mk sc/CppunitTest_sc_bugfix_test.mk sc/CppunitTest_sc_cache_test.mk sc/CppunitTest_sc_chart2dataprovider.mk sc/CppunitTest_sc_chart_regression_test.mk sc/CppunitTest_sc_cond_format_merge.mk sc/CppunitTest_sc_copypaste.mk sc/CppunitTest_sc_datapilotitemobj.mk sc/CppunitTest_sc_datapilottablesobj.mk sc/CppunitTest_sc_dataprovider.mk sc/CppunitTest_sc_datatransformation.mk sc/CppunitTest_sc_filters_test.mk sc/CppunitTest_sc_jumbosheets_test.mk sc/CppunitTest_sc_macros_test.mk sc/CppunitTest_sc_mark_test.mk sc/CppunitTest_sc_namedrangeobj.mk sc/CppunitTest_sc_new_cond_format_api.mk sc/CppunitTest_sc_parallelism.mk sc/CppunitTest_sc_pdf_export.mk sc/CppunitTest_sc_perfobj.mk sc/CppunitTest_sc_pivottable_filters_test.mk sc/CppunitTest_sc_range lst_test.mk sc/CppunitTest_sc_range_test.mk sc/CppunitTest_sc_shapetest.mk sc/CppunitTest_sc_sparkline_test.mk sc/CppunitTest_sc_subsequent_export_test2.mk sc/CppunitTest_sc_subsequent_export_test.mk sc/CppunitTest_sc_subsequent_filters_test2.mk sc/CppunitTest_sc_subsequent_filters_test.mk sc/CppunitTest_sc_tablecolumnsobj.mk sc/CppunitTest_sc_tablerowsobj.mk sc/CppunitTest_sc_tablesheetobj.mk sc/CppunitTest_sc_tiledrendering.mk sc/CppunitTest_sc_ucalc_condformat.mk sc/CppunitTest_sc_ucalc_copypaste.mk sc/CppunitTest_sc_ucalc_formula.mk sc/CppunitTest_sc_ucalc.mk sc/CppunitTest_sc_ucalc_pivottable.mk sc/CppunitTest_sc_ucalc_sharedformula.mk sc/CppunitTest_sc_ucalc_sort.mk sc/CppunitTest_sc_uicalc.mk schema/libreoffice schema/odf1.3 schema/README schema/README.md sc/inc sc/IwyuFilter_sc.yaml sc/Library_scfilt.mk sc/Library_sc.mk sc/Module_sc.mk scp2/inc scp2/InstallModule_python.mk scp2/README scp2/README.md scp2/source sc/qa sc/README sc/README.md scripting/examples scripting/Format _java_code.sh scripting/Jar_ScriptFramework.mk scripting/java scripting/Library_dlgprov.mk scripting/Package_ScriptsBeanShell.mk scripting/README scripting/README.md scripting/source sc/sdi sc/source sc/subsequent_setup.mk sc/ucalc_setup.mk sc/uiconfig sc/UIConfig_scalc.mk sc/UITest_autofilter2.mk sc/UITest_chart2.mk sc/UITest_csv_dialog.mk sc/UITest_hideShowSheet.mk sc/UITest_pasteSpecial.mk sc/UITest_textToColumns.mk sd/CppunitTest_sd_export_ooxml1.mk sd/CppunitTest_sd_export_ooxml2.mk sd/CppunitTest_sd_export_tests.mk sd/CppunitTest_sd_export_tests-ooxml1.mk sd/CppunitTest_sd_export_tests-ooxml2.mk sd/CppunitTest_sd_export_tests-ooxml3.mk sd/CppunitTest_sd_filter_eppt.mk sd/CppunitTest_sd_import_tests2.mk sd/CppunitTest_sd_import_tests.mk sd/CppunitTest_sd_import_tests-smartart.mk sd/CppunitTest_sd_import_tests_smartart.mk sd/CppunitTest_sd_misc_tests.mk sd/CppunitTest_sd_pdf_import_test.mk sd/CppunitTest_sd_shape_import_export_tests.mk sd/CppunitTest_sd_tiledrendering.mk sd/expo rt_setup.mk sdext/CppunitTest_sdext_pdfimport.mk sdext/Executable_xpdfimport.mk sdext/inc sdext/README sdext/README.md sdext/source sd/import_setup.mk sd/inc sd/IwyuFilter_sd.yaml sd/Library_sd.mk sd/Module_sd.mk sd/qa sd/README sd/README.md sd/sdi sd/source sd/uiconfig sd/UIConfig_sdraw.mk sd/UIConfig_simpress.mk sd/workben sd/xml setup_native/Package_packinfo.mk setup_native/README.md setup_native/scripts setup_native/source sfx2/classification sfx2/CppunitTest_sfx2_doc.mk sfx2/inc sfx2/IwyuFilter_sfx2.yaml sfx2/Library_sfx.mk sfx2/Module_sfx2.mk sfx2/Package_classification.mk sfx2/qa sfx2/README sfx2/README.md sfx2/sdi sfx2/source sfx2/uiconfig sfx2/UIConfig_sfx.mk sfx2/util shell/inc shell/Library_kf5be.mk shell/Package_senddoc.mk shell/qa shell/README shell/README.md shell/source slideshow/CppunitTest_slideshow_engine.mk slideshow/inc slideshow/IwyuFilter_slideshow.yaml slideshow/Library_slideshow.mk slideshow/Module_slideshow.mk slideshow/qa slideshow/README slideshow/README.m d slideshow/source smoketest/README smoketest/README.md smoketest/smoketest.cxx solenv/bin solenv/buck solenv/clang-format solenv/CompilerTest_compilerplugins_clang.mk solenv/Executable_gbuildtojson.mk solenv/Executable_gcc-wrapper.mk solenv/Executable_g++-wrapper.mk solenv/flatpak-manifest.in solenv/gbuild solenv/gbuildtojson solenv/gcc-wrappers solenv/gdb solenv/maven solenv/README solenv/README.md solenv/sanitizers solenv/StaticLibrary_wrapper.mk solenv/vs soltools/cpp soltools/mkdepend soltools/README.md sot/inc sot/qa sot/README sot/README.md sot/source starmath/CppunitTest_starmath_qa_cppunit.mk starmath/inc starmath/IwyuFilter_starmath.yaml starmath/Library_sm.mk starmath/qa starmath/README starmath/README.md starmath/sdi starmath/source starmath/uiconfig starmath/UIConfig_smath.mk starmath/util starmath/visual-editor-todo stoc/IwyuFilter_stoc.yaml stoc/README stoc/README.md stoc/source stoc/test store/README store/README.md store/source svgio/CppunitTest_svgio_tools.mk svgio /inc svgio/Library_svgio.mk svgio/Module_svgio.mk svgio/qa svgio/README svgio/README.md svgio/source svl/CppunitTest_svl_adrparse.mk svl/CppunitTest_svl_itempool.mk svl/CppunitTest_svl_items.mk svl/inc svl/IwyuFilter_svl.yaml svl/Library_svl.mk svl/Module_svl.mk svl/qa svl/README svl/README.md svl/source svl/unx svtools/inc svtools/IwyuFilter_svtools.yaml svtools/Library_svt.mk svtools/qa svtools/README svtools/README.md svtools/source svtools/uiconfig svtools/UIConfig_svt.mk svtools/util svx/CppunitTest_svx_core.mk svx/CppunitTest_svx_removewhichrange.mk svx/CppunitTest_svx_styles.mk svx/CppunitTest_svx_unit.mk svx/Executable_gengal.mk svx/inc svx/IwyuFilter_svx.yaml svx/Library_svxcore.mk svx/Library_svx.mk svx/Module_svx.mk svx/qa svx/README svx/README.md svx/sdi svx/source svx/uiconfig svx/UIConfig_svx.mk svx/UITest_svx_table.mk svx/util sw/CppunitTest_sw_apitests.mk sw/CppunitTest_sw_core_accessibilitycheck.mk sw/CppunitTest_sw_core_attr.mk sw/CppunitTest_sw_core_doc.mk sw/Cppu nitTest_sw_core_edit.mk sw/CppunitTest_sw_core_fields.mk sw/CppunitTest_sw_core_text.mk sw/CppunitTest_sw_core_tox.mk sw/CppunitTest_sw_core_txtnode.mk sw/CppunitTest_sw_filter_ww8.mk sw/CppunitTest_sw_htmlexport.mk sw/CppunitTest_sw_indexingexport.mk sw/CppunitTest_sw_layoutwriter2.mk sw/CppunitTest_sw_layoutwriter.mk sw/CppunitTest_sw_macros_test.mk sw/CppunitTest_sw_odfexport2.mk sw/CppunitTest_sw_odfexport.mk sw/CppunitTest_sw_odfimport.mk sw/CppunitTest_sw_ooxmlexport16.mk sw/CppunitTest_sw_ooxmlexport17.mk sw/CppunitTest_sw_ooxmlexport18.mk sw/CppunitTest_sw_ooxmlexport5.mk sw/CppunitTest_sw_ooxmlimport2.mk sw/CppunitTest_sw_ooxmllinks.mk sw/CppunitTest_sw_rtfexport2.mk sw/CppunitTest_sw_rtfexport3.mk sw/CppunitTest_sw_rtfexport4.mk sw/CppunitTest_sw_rtfexport5.mk sw/CppunitTest_sw_rtfexport.mk sw/CppunitTest_sw_txtencexport.mk sw/CppunitTest_sw_uibase_dochdl.mk sw/CppunitTest_sw_uibase_fldui.mk sw/CppunitTest_sw_uibase_frmdlg.mk sw/CppunitTest_sw_uibase_shells.mk sw/CppunitTe st_sw_uibase_uno.mk sw/CppunitTest_sw_uibase_wrtsh.mk sw/CppunitTest_sw_uiwriter2.mk sw/CppunitTest_sw_uiwriter3.mk sw/CppunitTest_sw_uiwriter4.mk sw/CppunitTest_sw_uiwriter.mk sw/CppunitTest_sw_uwriter.mk sw/CppunitTest_sw_ww8export2.mk sw/CppunitTest_sw_ww8export3.mk sw/CppunitTest_sw_ww8export.mk swext/mediawiki swext/README swext/README.md sw/inc sw/IwyuFilter_sw.yaml sw/layoutwriter_setup.mk sw/Library_sw.mk sw/Library_swui.mk sw/Library_vbaswobj.mk sw/Module_sw.mk sw/ooxmlexport_setup.mk sw/qa sw/README sw/README.md sw/rtfexport_setup.mk sw/sdi sw/source sw/uiconfig sw/UIConfig_sglobal.mk sw/UIConfig_sweb.mk sw/UIConfig_swreport.mk sw/UIConfig_swriter.mk sw/UIConfig_swxform.mk sw/UITest_sw_chart.mk sw/UITest_sw_findSimilarity.mk sw/UITest_sw_sidebar.mk sw/UITest_sw_uibase_docvw.mk sw/UITest_sw_uibase_shells.mk sw/UITest_sw_ui_index.mk sw/UITest_sw_ui_misc.mk sw/uiwriter_setup.mk sw/util sw/ww8export_setup.mk sysui/CustomTarget_deb.mk sysui/CustomTarget_rpm.mk sysui/desktop sys ui/productlist.mk sysui/README sysui/README.md TEMPLATE.SOURCECODE.HEADER test/Library_test.mk test/qa test/README test/README.md test/signing-keys test/source testtools/com testtools/README testtools/README.md testtools/source test/user-template toolkit/inc toolkit/Library_tk.mk toolkit/qa toolkit/README toolkit/README.md toolkit/source toolkit/util tools/CppunitTest_tools_test.mk tools/inc tools/qa tools/README tools/README.md tools/source translations tsan-suppress.txt ucb/CppunitTest_ucb_webdav_core.mk ucb/CppunitTest_ucb_webdav_local_neon.mk ucb/CppunitTest_ucb_webdav_neon_opts.mk ucb/CppunitTest_ucb_webdav_propfindcache.mk ucb/CppunitTest_ucb_webdav_res_access.mk ucbhelper/README ucbhelper/README.md ucbhelper/source ucb/Library_ucpdav1.mk ucb/Module_ucb.mk ucb/qa ucb/README ucb/README.md ucb/source udkapi/com udkapi/README udkapi/README.md uitest/demo_ui uitest/impress_tests uitest/libreoffice uitest/math_tests uitest/README uitest/README.md uitest/test_main.py uitest/uitest U noControls/inc UnoControls/README UnoControls/README.md UnoControls/source unodevtools/inc unodevtools/README unodevtools/README.md unodevtools/source unoidl/CustomTarget_unoidl-check_test.mk unoidl/Executable_unoidl-check.mk unoidl/Executable_unoidl-write.mk unoidl/Module_unoidl.mk unoidl/qa unoidl/README unoidl/README.md unoidl/source unoil/Module_unoil.mk unoil/README unoil/README.md unotest/Library_unotest.mk unotest/README.md unotest/source unotools/inc unotools/Library_utl.mk unotools/qa unotools/README unotools/README.md unotools/source unotools/util unoxml/inc unoxml/qa unoxml/README unoxml/README.md unoxml/source ure/README ure/README.md ure/source uui/inc uui/Library_uui.mk uui/qa uui/README uui/README.md uui/source uui/uiconfig vbahelper/inc vbahelper/README vbahelper/README.md vbahelper/source vcl/android vcl/backendtest vcl/commonfuzzer.mk vcl/CppunitTest_vcl_backend_test.mk vcl/CppunitTest_vcl_bitmap_test.mk vcl/CppunitTest_vcl_complextext.mk vcl/CppunitTest_vcl_drawmo de.mk vcl/CppunitTest_vcl_filter_igif.mk vcl/CppunitTest_vcl_filters_test.mk vcl/CppunitTest_vcl_font.mk vcl/CppunitTest_vcl_graphic_test.mk vcl/CppunitTest_vcl_pdfium_library_test.mk vcl/CppunitTest_vcl_svm_test.mk vcl/CppunitTest_vcl_text.mk vcl/CustomTarget_qt5_moc.mk vcl/CustomTarget_qt6_moc.mk vcl/Executable_602fuzzer.mk vcl/Executable_bmpfuzzer.mk vcl/Executable_cgmfuzzer.mk vcl/Executable_dbffuzzer.mk vcl/Executable_diffuzzer.mk vcl/Executable_docxfuzzer.mk vcl/Executable_dxffuzzer.mk vcl/Executable_epsfuzzer.mk vcl/Executable_fftester.mk vcl/Executable_fodpfuzzer.mk vcl/Executable_fodsfuzzer.mk vcl/Executable_fodtfuzzer.mk vcl/Executable_giffuzzer.mk vcl/Executable_htmlfuzzer.mk vcl/Executable_hwpfuzzer.mk vcl/Executable_icontest.mk vcl/Executable_jpgfuzzer.mk vcl/Executable_lo_kde5filepicker.mk vcl/Executable_lwpfuzzer.mk vcl/Executable_metfuzzer.mk vcl/Executable_mmlfuzzer.mk vcl/Executable_mtfdemo.mk vcl/Executable_mtpfuzzer.mk vcl/Executable_olefuzzer.mk vcl/Executable_p cdfuzzer.mk vcl/Executable_pctfuzzer.mk vcl/Executable_pcxfuzzer.mk vcl/Executable_pngfuzzer.mk vcl/Executable_ppmfuzzer.mk vcl/Executable_pptfuzzer.mk vcl/Executable_pptxfuzzer.mk vcl/Executable_psdfuzzer.mk vcl/Executable_qpwfuzzer.mk vcl/Executable_rasfuzzer.mk vcl/Executable_rtffuzzer.mk vcl/Executable_scrtffuzzer.mk vcl/Executable_sftfuzzer.mk vcl/Executable_slkfuzzer.mk vcl/Executable_svdemo.mk vcl/Executable_svmfuzzer.mk vcl/Executable_svpclient.mk vcl/Executable_svptest.mk vcl/Executable_tgafuzzer.mk vcl/Executable_tiffuzzer.mk vcl/Executable_ui-previewer.mk vcl/Executable_vcldemo.mk vcl/Executable_visualbackendtest.mk vcl/Executable_webpfuzzer.mk vcl/Executable_wksfuzzer.mk vcl/Executable_wmffuzzer.mk vcl/Executable_ww2fuzzer.mk vcl/Executable_ww6fuzzer.mk vcl/Executable_ww8fuzzer.mk vcl/Executable_xbmfuzzer.mk vcl/Executable_xlsfuzzer.mk vcl/Executable_xlsxfuzzer.mk vcl/Executable_xpmfuzzer.mk vcl/headless vcl/inc vcl/ios vcl/IwyuFilter_vcl.yaml vcl/jsdialog vcl/Library_vc l.mk vcl/Library_vclplug_gen.mk vcl/Library_vclplug_gtk3_kde5.mk vcl/Library_vclplug_gtk3.mk vcl/Library_vclplug_gtk4.mk vcl/Library_vclplug_kf5.mk vcl/Library_vclplug_osx.mk vcl/Library_vclplug_qt5.mk vcl/Library_vclplug_qt6.mk vcl/Library_vclplug_win.mk vcl/Module_vcl.mk vcl/null vcl/opengl vcl/osx vcl/Package_opengl_denylist.mk vcl/Package_opengl_shader.mk vcl/Package_tipoftheday.mk vcl/qa vcl/qt5 vcl/qt6 vcl/quartz vcl/README vcl/README.GDIMetaFile vcl/README.GDIMetaFile.md vcl/README.lifecycle vcl/README.lifecycle.md vcl/README.md vcl/README.scheduler vcl/README.scheduler.md vcl/README.vars vcl/README.vars.md vcl/skia vcl/source vcl/StaticLibrary_fuzzerstubs.mk vcl/uiconfig vcl/UIConfig_vcl.mk vcl/unx vcl/win vcl/WinResTarget_vcl.mk vcl/workben .vscode/vs-code-template.code-workspace.in wasm-qt/CustomTarget_wasm-qt5-mandelbrot_moc.mk wasm-qt/Executable_wasm-qt5-mandelbrot.mk wasm-qt/Makefile wasm-qt/Module_wasm-qt.mk wasm-qt/README.md wasm-qt/source winaccessibility/inc winacce ssibility/Library_uacccom.mk winaccessibility/README winaccessibility/README.md winaccessibility/source wizards/com wizards/CustomTarget_wizards.mk wizards/Module_wizards.mk wizards/Package_scriptforge.mk wizards/Package_sfdialogs.mk wizards/Package_sfdocuments.mk wizards/Package_sfwidgets.mk wizards/Package_wizards_properties.mk wizards/README wizards/README.md wizards/source writerfilter/CppunitTest_writerfilter_dmapper.mk writerfilter/CppunitTest_writerfilter_rtftok.mk writerfilter/CustomTarget_source.mk writerfilter/inc writerfilter/Library_writerfilter.mk writerfilter/qa writerfilter/README writerfilter/README.md writerfilter/source writerperfect/inc writerperfect/qa writerperfect/README writerperfect/README.md writerperfect/source writerperfect/uiconfig xmerge/README xmerge/README.md xmerge/source xmlhelp/README xmlhelp/README.md xmlhelp/source xmloff/CppunitTest_xmloff_draw.mk xmloff/CppunitTest_xmloff_style.mk xmloff/CppunitTest_xmloff_text.mk xmloff/dtd xmloff/inc xmloff/Li brary_xo.mk xmloff/qa xmloff/README.md xmloff/source xmlreader/README xmlreader/README.md xmlreader/source xmlscript/CppunitTest_xmlscript_cppunit.mk xmlscript/dtd xmlscript/inc xmlscript/Module_xmlscript.mk xmlscript/qa xmlscript/README xmlscript/README.md xmlscript/source xmlscript/test xmlsecurity/CppunitTest_xmlsecurity_pdfsigning.mk xmlsecurity/CppunitTest_xmlsecurity_signing.mk xmlsecurity/inc xmlsecurity/IwyuFilter_xmlsecurity.yaml xmlsecurity/Library_xmlsecurity.mk xmlsecurity/Library_xsec_xmlsec.mk xmlsecurity/Module_xmlsecurity.mk xmlsecurity/qa xmlsecurity/README xmlsecurity/README.md xmlsecurity/source xmlsecurity/uiconfig xmlsecurity/workben

[andreas kainz (via logerrit)]

Rebased ref, commits from common ancestor:
commit 0cde1f82b7966a687f6f6cb8707d7a72a88892f5
Author:     andreas kainz <kain...@gmail.com>
AuthorDate: Thu Oct 27 23:03:08 2022 +0200
Commit:     Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Mon Nov 14 12:33:01 2022 +0100

    tdf#148017 harmonize sidebar .ui files for chart2
    
    Change-Id: Iaacee42c23878b9f03623eec36a5f3a10051f926
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141949
    Tested-by: Jenkins
    Reviewed-by: Pedro Silva <pedro.si...@collabora.com>

diff --git a/chart2/uiconfig/ui/sidebaraxis.ui 
b/chart2/uiconfig/ui/sidebaraxis.ui
index db8ad151329b..873d6565ce1e 100644
--- a/chart2/uiconfig/ui/sidebaraxis.ui
+++ b/chart2/uiconfig/ui/sidebaraxis.ui
@@ -1,130 +1,130 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.38.2 -->
 <interface domain="chart">
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkAdjustment" id="adjustmentSpinDegrees">
     <property name="upper">359</property>
-    <property name="step_increment">5</property>
+    <property name="step-increment">5</property>
   </object>
   <!-- n-columns=1 n-rows=1 -->
   <object class="GtkGrid" id="ChartAxisPanel">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="row_spacing">6</property>
-    <property name="column_spacing">6</property>
+    <property name="can-focus">False</property>
     <child>
-      <!-- n-columns=1 n-rows=1 -->
+      <!-- n-columns=2 n-rows=4 -->
       <object class="GtkGrid" id="grid1">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="row_spacing">6</property>
-        <property name="column_spacing">6</property>
+        <property name="can-focus">False</property>
+        <property name="hexpand">True</property>
+        <property name="border-width">6</property>
+        <property name="row-spacing">3</property>
+        <property name="column-spacing">6</property>
         <child>
           <object class="GtkCheckButton" id="checkbutton_show_label">
             <property name="label" translatable="yes" 
context="sidebaraxis|checkbutton_show_label">Show labels</property>
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">False</property>
-            <property name="use_underline">True</property>
-            <property name="draw_indicator">True</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">False</property>
+            <property name="halign">start</property>
+            <property name="use-underline">True</property>
+            <property name="draw-indicator">True</property>
           </object>
           <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
+            <property name="left-attach">0</property>
+            <property name="top-attach">0</property>
+            <property name="width">2</property>
           </packing>
         </child>
         <child>
           <object class="GtkCheckButton" id="checkbutton_reverse">
             <property name="label" translatable="yes" 
context="sidebaraxis|checkbutton_reverse">Reverse direction</property>
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">False</property>
-            <property name="use_underline">True</property>
-            <property name="draw_indicator">True</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">False</property>
+            <property name="halign">start</property>
+            <property name="use-underline">True</property>
+            <property name="draw-indicator">True</property>
           </object>
           <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
+            <property name="left-attach">1</property>
+            <property name="top-attach">3</property>
           </packing>
         </child>
         <child>
-          <!-- n-columns=1 n-rows=1 -->
-          <object class="GtkGrid" id="label_props">
+          <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="margin-start">12</property>
-            <property name="row_spacing">6</property>
-            <property name="column_spacing">5</property>
-            <child>
-              <object class="GtkLabel" id="label1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="halign">end</property>
-                <property name="label" translatable="yes" 
context="sidebaraxis|label1">_Label position:</property>
-                <property name="use_underline">True</property>
-                <property 
name="mnemonic_widget">comboboxtext_label_position</property>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkComboBoxText" id="comboboxtext_label_position">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <items>
-                  <item translatable="yes" 
context="sidebaraxis|comboboxtext_label_position">Near Axis</item>
-                  <item translatable="yes" 
context="sidebaraxis|comboboxtext_label_position">Near Axis (other side)</item>
-                  <item translatable="yes" 
context="sidebaraxis|comboboxtext_label_position">Outside start</item>
-                  <item translatable="yes" 
context="sidebaraxis|comboboxtext_label_position">Outside end</item>
-                </items>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="label2">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="halign">end</property>
-                <property name="valign">center</property>
-                <property name="label" translatable="yes" 
context="sidebaraxis|label2">_Text orientation:</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">spinbutton1</property>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkSpinButton" id="spinbutton1">
-                <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="truncate-multiline">True</property>
-                <property name="adjustment">adjustmentSpinDegrees</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
-              </packing>
-            </child>
+            <property name="can-focus">False</property>
+            <property name="halign">start</property>
+            <property name="label" translatable="yes" 
context="sidebaraxis|label1">_Label position:</property>
+            <property name="use-underline">True</property>
+            <property 
name="mnemonic-widget">comboboxtext_label_position</property>
+          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkComboBoxText" id="comboboxtext_label_position">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="hexpand">True</property>
+            <items>
+              <item translatable="yes" 
context="sidebaraxis|comboboxtext_label_position">Near Axis</item>
+              <item translatable="yes" 
context="sidebaraxis|comboboxtext_label_position">Near Axis (other side)</item>
+              <item translatable="yes" 
context="sidebaraxis|comboboxtext_label_position">Outside start</item>
+              <item translatable="yes" 
context="sidebaraxis|comboboxtext_label_position">Outside end</item>
+            </items>
+          </object>
+          <packing>
+            <property name="left-attach">1</property>
+            <property name="top-attach">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="label2">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="halign">start</property>
+            <property name="valign">center</property>
+            <property name="label" translatable="yes" 
context="sidebaraxis|label2">_Text orientation:</property>
+            <property name="use-underline">True</property>
+            <property name="mnemonic-widget">spinbutton1</property>
+          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkSpinButton" id="spinbutton1">
+            <property name="visible">True</property>
+            <property name="can-focus">True</property>
+            <property name="truncate-multiline">True</property>
+            <property name="adjustment">adjustmentSpinDegrees</property>
           </object>
           <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
+            <property name="left-attach">1</property>
+            <property name="top-attach">2</property>
           </packing>
         </child>
         <child>
-          <placeholder/>
+          <object class="GtkBox" id="label_props">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <child>
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">3</property>
+          </packing>
         </child>
       </object>
       <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">0</property>
+        <property name="left-attach">0</property>
+        <property name="top-attach">0</property>
       </packing>
     </child>
   </object>
diff --git a/chart2/uiconfig/ui/sidebarelements.ui 
b/chart2/uiconfig/ui/sidebarelements.ui
index c16216bf6dae..14c31ce68e82 100644
--- a/chart2/uiconfig/ui/sidebarelements.ui
+++ b/chart2/uiconfig/ui/sidebarelements.ui
@@ -1,549 +1,469 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.2 -->
+<!-- Generated with glade 3.38.2 -->
 <interface domain="chart">
   <requires lib="gtk+" version="3.20"/>
   <!-- n-columns=1 n-rows=1 -->
   <object class="GtkGrid" id="ChartElementsPanel">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <child>
-      <object class="GtkBox" id="container">
+      <!-- n-columns=2 n-rows=16 -->
+      <object class="GtkGrid" id="grid1">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="border_width">6</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">6</property>
+        <property name="can-focus">False</property>
+        <property name="hexpand">True</property>
+        <property name="border-width">6</property>
+        <property name="row-spacing">3</property>
+        <property name="column-spacing">6</property>
+        <child type="label">
+          <object class="GtkLabel" id="l">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="halign">start</property>
+            <property name="margin-top">6</property>
+            <property name="margin-bottom">3</property>
+            <property name="label" translatable="yes" 
context="sidebarelements|l">Titles</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
+          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">0</property>
+            <property name="width">2</property>
+          </packing>
+        </child>
         <child>
-          <object class="GtkFrame" id="frame1">
+          <object class="GtkCheckButton" id="checkbutton_title">
+            <property name="label" translatable="yes" 
context="sidebarelements|checkbutton_title">Title</property>
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">False</property>
+            <property name="halign">start</property>
+            <property name="use-underline">True</property>
+            <property name="draw-indicator">True</property>
+            <accessibility>
+              <relation type="label-for" target="edit_title"/>
+            </accessibility>
+          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkEntry" id="edit_title">
+            <property name="visible">True</property>
+            <property name="can-focus">True</property>
             <property name="hexpand">True</property>
-            <property name="label_xalign">0</property>
-            <property name="shadow_type">none</property>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkGrid" id="grid1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="row_spacing">6</property>
-                <property name="column_spacing">6</property>
-                <property name="margin-start">12</property>
-                <property name="margin-top">6</property>
-                <child>
-                  <object class="GtkCheckButton" id="checkbutton_title">
-                    <property name="label" translatable="yes" 
context="sidebarelements|checkbutton_title">Title</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
-                    <property name="draw_indicator">True</property>
-                    <accessibility>
-                      <relation type="label-for" target="edit_title"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkCheckButton" id="checkbutton_subtitle">
-                    <property name="label" translatable="yes" 
context="sidebarelements|checkbutton_subtitle">Subtitle</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
-                    <property name="draw_indicator">True</property>
-                    <accessibility>
-                      <relation type="label-for" target="edit_subtitle"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkEntry" id="edit_title">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="hexpand">True</property>
-                    <property name="truncate-multiline">True</property>
-                    <accessibility>
-                      <relation type="labelled-by" target="checkbutton_title"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkEntry" id="edit_subtitle">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="hexpand">True</property>
-                    <property name="truncate-multiline">True</property>
-                    <accessibility>
-                      <relation type="labelled-by" 
target="checkbutton_subtitle"/>
-                    </accessibility>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">3</property>
-                  </packing>
-                </child>
-              </object>
-            </child>
-            <child type="label">
-              <object class="GtkLabel" id="l">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes" 
context="sidebarelements|l">Titles</property>
-                <attributes>
-                  <attribute name="weight" value="bold"/>
-                </attributes>
-              </object>
-            </child>
+            <property name="truncate-multiline">True</property>
+            <accessibility>
+              <relation type="labelled-by" target="checkbutton_title"/>
+            </accessibility>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
+            <property name="left-attach">1</property>
+            <property name="top-attach">1</property>
           </packing>
         </child>
         <child>
-          <object class="GtkFrame" id="frame3">
+          <object class="GtkCheckButton" id="checkbutton_subtitle">
+            <property name="label" translatable="yes" 
context="sidebarelements|checkbutton_subtitle">Subtitle</property>
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label_xalign">0</property>
-            <property name="shadow_type">none</property>
-            <child>
-              <object class="GtkBox" id="box_legend2">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="orientation">vertical</property>
-                <property name="spacing">6</property>
-                <property name="margin-start">12</property>
-                <property name="margin-top">6</property>
-                <child>
-                  <object class="GtkCheckButton" id="checkbutton_legend">
-                    <property name="label" translatable="yes" 
context="sidebarelements|checkbutton_legend">Show legend</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="tooltip_text" translatable="yes" 
context="sidebarelements|checkbutton_legend|tooltip_text">Show Legend</property>
-                    <property name="use_underline">True</property>
-                    <property name="draw_indicator">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkBox" id="box_legend">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkLabel" id="placement_label">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="halign">end</property>
-                        <property name="margin-start">4</property>
-                        <property name="label" translatable="yes" 
context="sidebarelements|placement_label">_Placement:</property>
-                        <property name="use_underline">True</property>
-                        <property name="ellipsize">end</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkComboBoxText" id="comboboxtext_legend">
-                        <property name="width_request">100</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <items>
-                          <item translatable="yes" 
context="sidebarelements|comboboxtext_legend">Right</item>
-                          <item translatable="yes" 
context="sidebarelements|comboboxtext_legend">Top</item>
-                          <item translatable="yes" 
context="sidebarelements|comboboxtext_legend">Bottom</item>
-                          <item translatable="yes" 
context="sidebarelements|comboboxtext_legend">Left</item>
-                        </items>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">3</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkCheckButton" id="checkbutton_no_overlay">
-                    <property name="label" translatable="yes" 
context="sidebarelements|checkbutton_no_overlay">Show the legend without 
overlapping the chart</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
-                    <property name="draw_indicator">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-              </object>
-            </child>
-            <child type="label">
-              <object class="GtkLabel" id="label_legen">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes" 
context="sidebarelements|label_legen">Legend</property>
-                <attributes>
-                  <attribute name="weight" value="bold"/>
-                </attributes>
-              </object>
-            </child>
+            <property name="can-focus">True</property>
+            <property name="receives-default">False</property>
+            <property name="halign">start</property>
+            <property name="use-underline">True</property>
+            <property name="draw-indicator">True</property>
+            <accessibility>
+              <relation type="label-for" target="edit_subtitle"/>
+            </accessibility>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
+            <property name="left-attach">0</property>
+            <property name="top-attach">2</property>
           </packing>
         </child>
         <child>
-          <object class="GtkFrame" id="frame2">
+          <object class="GtkEntry" id="edit_subtitle">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label_xalign">0</property>
-            <property name="shadow_type">none</property>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkGrid" id="grid2">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="row_spacing">6</property>
-                <property name="column_spacing">6</property>
-                <property name="margin-start">12</property>
-                <property name="margin-top">6</property>
-                <child>
-                  <object class="GtkCheckButton" id="checkbutton_x_axis">
-                    <property name="label" translatable="yes" 
context="sidebarelements|checkbutton_x_axis">X axis</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
-                    <property name="draw_indicator">True</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkCheckButton" id="checkbutton_x_axis_title">
-                    <property name="label" translatable="yes" 
context="sidebarelements|checkbutton_x_axis_title">X axis title</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
-                    <property name="draw_indicator">True</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkCheckButton" id="checkbutton_y_axis">
-                    <property name="label" translatable="yes" 
context="sidebarelements|checkbutton_y_axis">Y axis</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
-                    <property name="draw_indicator">True</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkCheckButton" id="checkbutton_y_axis_title">
-                    <property name="label" translatable="yes" 
context="sidebarelements|checkbutton_y_axis_title">Y axis title</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
-                    <property name="draw_indicator">True</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkCheckButton" id="checkbutton_z_axis">
-                    <property name="label" translatable="yes" 
context="sidebarelements|checkbutton_z_axis">Z axis</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
-                    <property name="draw_indicator">True</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkCheckButton" id="checkbutton_z_axis_title">
-                    <property name="label" translatable="yes" 
context="sidebarelements|checkbutton_z_axis_title">Z axis title</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
-                    <property name="draw_indicator">True</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkCheckButton" id="checkbutton_2nd_x_axis">
-                    <property name="label" translatable="yes" 
context="sidebarelements|checkbutton_2nd_x_axis">2nd X axis</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
-                    <property name="draw_indicator">True</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">3</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkCheckButton" 
id="checkbutton_2nd_x_axis_title">
-                    <property name="label" translatable="yes" 
context="sidebarelements|checkbutton_2nd_x_axis_title">2nd X axis 
title</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
-                    <property name="draw_indicator">True</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">3</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkCheckButton" id="checkbutton_2nd_y_axis">
-                    <property name="label" translatable="yes" 
context="sidebarelements|checkbutton_2nd_y_axis">2nd Y axis</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
-                    <property name="draw_indicator">True</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">4</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkCheckButton" 
id="checkbutton_2nd_y_axis_title">
-                    <property name="label" translatable="yes" 
context="sidebarelements|checkbutton_2nd_y_axis_title">2nd Y axis 
title</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
-                    <property name="draw_indicator">True</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">4</property>
-                  </packing>
-                </child>
-              </object>
-            </child>
-            <child type="label">
-              <object class="GtkLabel" id="label_axes">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes" 
context="sidebarelements|label_axes">Axes</property>
-                <attributes>
-                  <attribute name="weight" value="bold"/>
-                </attributes>
-              </object>
-            </child>
+            <property name="can-focus">True</property>
+            <property name="truncate-multiline">True</property>
+            <accessibility>
+              <relation type="labelled-by" target="checkbutton_subtitle"/>
+            </accessibility>
+          </object>
+          <packing>
+            <property name="left-attach">1</property>
+            <property name="top-attach">2</property>
+          </packing>
+        </child>
+        <child type="label">
+          <object class="GtkLabel" id="label_legen">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="halign">start</property>
+            <property name="margin-top">12</property>
+            <property name="margin-bottom">3</property>
+            <property name="label" translatable="yes" 
context="sidebarelements|label_legen">Legend</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">2</property>
+            <property name="left-attach">0</property>
+            <property name="top-attach">3</property>
+            <property name="width">2</property>
           </packing>
         </child>
         <child>
-          <object class="GtkFrame" id="frame4">
+          <object class="GtkCheckButton" id="checkbutton_legend">
+            <property name="label" translatable="yes" 
context="sidebarelements|checkbutton_legend">Show legend</property>
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label_xalign">0</property>
-            <property name="shadow_type">none</property>
-            <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkGrid" id="grid3">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="row_spacing">6</property>
-                <property name="column_spacing">6</property>
-                <property name="margin-start">12</property>
-                <property name="margin-top">6</property>
-                <child>
-                  <object class="GtkCheckButton" 
id="checkbutton_gridline_horizontal_major">
-                    <property name="label" translatable="yes" 
context="sidebarelements|checkbutton_gridline_horizontal_major">Horizontal 
major</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
-                    <property name="draw_indicator">True</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkCheckButton" 
id="checkbutton_gridline_vertical_major">
-                    <property name="label" translatable="yes" 
context="sidebarelements|checkbutton_gridline_vertical_major">Vertical 
major</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
-                    <property name="draw_indicator">True</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkCheckButton" 
id="checkbutton_gridline_horizontal_minor">
-                    <property name="label" translatable="yes" 
context="sidebarelements|checkbutton_gridline_horizontal_minor">Horizontal 
minor</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
-                    <property name="draw_indicator">True</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkCheckButton" 
id="checkbutton_gridline_vertical_minor">
-                    <property name="label" translatable="yes" 
context="sidebarelements|checkbutton_gridline_vertical_minor">Vertical 
minor</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
-                    <property name="draw_indicator">True</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">1</property>
-                  </packing>
-                </child>
-              </object>
-            </child>
-            <child type="label">
-              <object class="GtkLabel" id="label_gri">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes" 
context="sidebarelements|label_gri">Gridlines</property>
-                <attributes>
-                  <attribute name="weight" value="bold"/>
-                </attributes>
-              </object>
-            </child>
+            <property name="can-focus">True</property>
+            <property name="receives-default">False</property>
+            <property name="tooltip-text" translatable="yes" 
context="sidebarelements|checkbutton_legend|tooltip_text">Show Legend</property>
+            <property name="halign">start</property>
+            <property name="use-underline">True</property>
+            <property name="draw-indicator">True</property>
+          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">4</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkComboBoxText" id="comboboxtext_legend">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="hexpand">True</property>
+            <items>
+              <item translatable="yes" 
context="sidebarelements|comboboxtext_legend">Right</item>
+              <item translatable="yes" 
context="sidebarelements|comboboxtext_legend">Top</item>
+              <item translatable="yes" 
context="sidebarelements|comboboxtext_legend">Bottom</item>
+              <item translatable="yes" 
context="sidebarelements|comboboxtext_legend">Left</item>
+            </items>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">3</property>
+            <property name="left-attach">1</property>
+            <property name="top-attach">4</property>
           </packing>
         </child>
         <child>
-          <!-- n-columns=1 n-rows=1 -->
-          <object class="GtkGrid" id="grid4">
-            <property name="can_focus">False</property>
+          <object class="GtkCheckButton" id="checkbutton_no_overlay">
+            <property name="label" translatable="yes" 
context="sidebarelements|checkbutton_no_overlay">Show the legend without 
overlapping the chart</property>
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="receives-default">False</property>
+            <property name="halign">start</property>
+            <property name="use-underline">True</property>
+            <property name="draw-indicator">True</property>
+          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">5</property>
+            <property name="width">2</property>
+          </packing>
+        </child>
+        <child type="label">
+          <object class="GtkLabel" id="label_axes">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="halign">start</property>
+            <property name="margin-top">12</property>
+            <property name="margin-bottom">3</property>
+            <property name="label" translatable="yes" 
context="sidebarelements|label_axes">Axes</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
+          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">6</property>
+            <property name="width">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkCheckButton" id="checkbutton_x_axis">
+            <property name="label" translatable="yes" 
context="sidebarelements|checkbutton_x_axis">X axis</property>
+            <property name="visible">True</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">False</property>
+            <property name="halign">start</property>
+            <property name="use-underline">True</property>
+            <property name="draw-indicator">True</property>
+          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">7</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkCheckButton" id="checkbutton_y_axis">
+            <property name="label" translatable="yes" 
context="sidebarelements|checkbutton_y_axis">Y axis</property>
+            <property name="visible">True</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">False</property>
+            <property name="halign">start</property>
+            <property name="use-underline">True</property>
+            <property name="draw-indicator">True</property>
+          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">8</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkCheckButton" id="checkbutton_z_axis">
+            <property name="label" translatable="yes" 
context="sidebarelements|checkbutton_z_axis">Z axis</property>
+            <property name="visible">True</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">False</property>
+            <property name="halign">start</property>
+            <property name="use-underline">True</property>
+            <property name="draw-indicator">True</property>
+          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">9</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkCheckButton" id="checkbutton_2nd_x_axis">
+            <property name="label" translatable="yes" 
context="sidebarelements|checkbutton_2nd_x_axis">2nd X axis</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">False</property>
+            <property name="halign">start</property>
+            <property name="use-underline">True</property>
+            <property name="draw-indicator">True</property>
+          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">10</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkCheckButton" id="checkbutton_2nd_y_axis">
+            <property name="label" translatable="yes" 
context="sidebarelements|checkbutton_2nd_y_axis">2nd Y axis</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">False</property>
+            <property name="halign">start</property>
+            <property name="use-underline">True</property>
+            <property name="draw-indicator">True</property>
+          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">11</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkCheckButton" id="checkbutton_x_axis_title">
+            <property name="label" translatable="yes" 
context="sidebarelements|checkbutton_x_axis_title">X axis title</property>
+            <property name="visible">True</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">False</property>
+            <property name="halign">start</property>
+            <property name="use-underline">True</property>
+            <property name="draw-indicator">True</property>
+          </object>
+          <packing>
+            <property name="left-attach">1</property>
+            <property name="top-attach">7</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkCheckButton" id="checkbutton_y_axis_title">
+            <property name="label" translatable="yes" 
context="sidebarelements|checkbutton_y_axis_title">Y axis title</property>
+            <property name="visible">True</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">False</property>
+            <property name="halign">start</property>
+            <property name="use-underline">True</property>
+            <property name="draw-indicator">True</property>
+          </object>
+          <packing>
+            <property name="left-attach">1</property>
+            <property name="top-attach">8</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkCheckButton" id="checkbutton_z_axis_title">
+            <property name="label" translatable="yes" 
context="sidebarelements|checkbutton_z_axis_title">Z axis title</property>
+            <property name="visible">True</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">False</property>
+            <property name="halign">start</property>
+            <property name="use-underline">True</property>
+            <property name="draw-indicator">True</property>
+          </object>
+          <packing>
+            <property name="left-attach">1</property>
+            <property name="top-attach">9</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkCheckButton" id="checkbutton_2nd_x_axis_title">
+            <property name="label" translatable="yes" 
context="sidebarelements|checkbutton_2nd_x_axis_title">2nd X axis 
title</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">False</property>
+            <property name="halign">start</property>
+            <property name="use-underline">True</property>
+            <property name="draw-indicator">True</property>
+          </object>
+          <packing>
+            <property name="left-attach">1</property>
+            <property name="top-attach">10</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkCheckButton" id="checkbutton_2nd_y_axis_title">
+            <property name="label" translatable="yes" 
context="sidebarelements|checkbutton_2nd_y_axis_title">2nd Y axis 
title</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">False</property>
+            <property name="halign">start</property>
+            <property name="use-underline">True</property>
+            <property name="draw-indicator">True</property>
+          </object>
+          <packing>
+            <property name="left-attach">1</property>
+            <property name="top-attach">11</property>
+          </packing>
+        </child>
+        <child type="label">
+          <object class="GtkLabel" id="label_gri">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="halign">start</property>
+            <property name="margin-top">12</property>
+            <property name="margin-bottom">3</property>
+            <property name="label" translatable="yes" 
context="sidebarelements|label_gri">Gridlines</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
+          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">12</property>
+            <property name="width">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkCheckButton" 
id="checkbutton_gridline_horizontal_major">
+            <property name="label" translatable="yes" 
context="sidebarelements|checkbutton_gridline_horizontal_major">Horizontal 
major</property>
+            <property name="visible">True</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">False</property>
+            <property name="halign">start</property>
+            <property name="use-underline">True</property>
+            <property name="draw-indicator">True</property>
+          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">13</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkCheckButton" 
id="checkbutton_gridline_vertical_major">
+            <property name="label" translatable="yes" 
context="sidebarelements|checkbutton_gridline_vertical_major">Vertical 
major</property>
+            <property name="visible">True</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">False</property>
+            <property name="halign">start</property>
+            <property name="use-underline">True</property>
+            <property name="draw-indicator">True</property>
+          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">14</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkCheckButton" 
id="checkbutton_gridline_horizontal_minor">
+            <property name="label" translatable="yes" 
context="sidebarelements|checkbutton_gridline_horizontal_minor">Horizontal 
minor</property>
+            <property name="visible">True</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">False</property>
+            <property name="halign">start</property>
+            <property name="use-underline">True</property>
+            <property name="draw-indicator">True</property>
+          </object>
+          <packing>
+            <property name="left-attach">1</property>
+            <property name="top-attach">13</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkCheckButton" 
id="checkbutton_gridline_vertical_minor">
+            <property name="label" translatable="yes" 
context="sidebarelements|checkbutton_gridline_vertical_minor">Vertical 
minor</property>
+            <property name="visible">True</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">False</property>
+            <property name="halign">start</property>
+            <property name="use-underline">True</property>
+            <property name="draw-indicator">True</property>
+          </object>
+          <packing>
+            <property name="left-attach">1</property>
+            <property name="top-attach">14</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox" id="box_legend">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
             <child>
               <object class="GtkLabel" id="text_title">
-                <property name="can_focus">False</property>
-                <property name="no_show_all">True</property>
+                <property name="can-focus">False</property>
+                <property name="no-show-all">True</property>
+                <property name="halign">start</property>
                 <property name="label" translatable="yes" 
context="sidebarelements|text_title">Title</property>
               </object>
               <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel" id="text_subtitle">
-                <property name="can_focus">False</property>
-                <property name="no_show_all">True</property>
+                <property name="can-focus">False</property>
+                <property name="no-show-all">True</property>
+                <property name="halign">start</property>
                 <property name="label" translatable="yes" 
context="sidebarelements|text_subtitle">Subtitle</property>
               </object>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">0</property>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="placement_label">
+                <property name="can-focus">False</property>
+                <property name="halign">end</property>
+                <property name="margin-start">4</property>
+                <property name="label" translatable="yes" 
context="sidebarelements|placement_label">_Placement:</property>
+                <property name="use-underline">True</property>
+                <property name="ellipsize">end</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">4</property>
+            <property name="left-attach">0</property>
+            <property name="top-attach">15</property>
+            <property name="width">2</property>
           </packing>
         </child>
       </object>
       <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">0</property>
+        <property name="left-attach">0</property>
+        <property name="top-attach">0</property>
       </packing>
     </child>
   </object>
-  <object class="GtkSizeGroup" id="sizegroup1">
-    <widgets>
-      <widget name="checkbutton_title"/>
-      <widget name="checkbutton_x_axis"/>
-      <widget name="checkbutton_y_axis"/>
-      <widget name="checkbutton_z_axis"/>
-      <widget name="checkbutton_2nd_x_axis"/>
-      <widget name="checkbutton_2nd_y_axis"/>
-      <widget name="checkbutton_gridline_vertical_major"/>
-      <widget name="checkbutton_gridline_horizontal_major"/>
-    </widgets>
-  </object>
-  <object class="GtkSizeGroup" id="sizegroup2">
-    <widgets>
-      <widget name="checkbutton_subtitle"/>
-      <widget name="checkbutton_x_axis_title"/>
-      <widget name="checkbutton_y_axis_title"/>
-      <widget name="checkbutton_z_axis_title"/>
-      <widget name="checkbutton_2nd_x_axis_title"/>
-      <widget name="checkbutton_2nd_y_axis_title"/>
-      <widget name="checkbutton_gridline_vertical_minor"/>
-      <widget name="checkbutton_gridline_horizontal_minor"/>
-    </widgets>
-  </object>
 </interface>
diff --git a/chart2/uiconfig/ui/sidebarerrorbar.ui 
b/chart2/uiconfig/ui/sidebarerrorbar.ui
index 7ffdc3a68192..32c3ef130ad0 100644
--- a/chart2/uiconfig/ui/sidebarerrorbar.ui
+++ b/chart2/uiconfig/ui/sidebarerrorbar.ui
@@ -1,218 +1,146 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.38.2 -->
 <interface domain="chart">
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkAdjustment" id="adjustmentNEG">
     <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
+    <property name="step-increment">1</property>
+    <property name="page-increment">10</property>
   </object>
   <object class="GtkAdjustment" id="adjustmentPOS">
     <property name="upper">100</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
+    <property name="step-increment">1</property>
+    <property name="page-increment">10</property>
   </object>
   <object class="GtkImage" id="image1">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">chart2/res/errorup_30.png</property>
+    <property name="can-focus">False</property>
+    <property name="icon-name">chart2/res/errorup_30.png</property>
   </object>
   <object class="GtkImage" id="image2">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">chart2/res/errorbothverti_30.png</property>
+    <property name="can-focus">False</property>
+    <property name="icon-name">chart2/res/errorbothverti_30.png</property>
   </object>
   <object class="GtkImage" id="image3">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="icon_name">chart2/res/errordown_30.png</property>
+    <property name="can-focus">False</property>
+    <property name="icon-name">chart2/res/errordown_30.png</property>
   </object>
   <!-- n-columns=1 n-rows=1 -->
   <object class="GtkGrid" id="ChartErrorBarPanel">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <child>
-      <object class="GtkBox" id="box1">
+      <!-- n-columns=2 n-rows=4 -->
+      <object class="GtkGrid" id="grid1">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="border_width">6</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">6</property>
-        <property name="baseline_position">top</property>
+        <property name="can-focus">False</property>
+        <property name="hexpand">True</property>
+        <property name="border-width">6</property>
+        <property name="row-spacing">3</property>
+        <property name="column-spacing">6</property>
         <child>
-          <object class="GtkBox" id="box3">
+          <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="orientation">vertical</property>
+            <property name="can-focus">False</property>
+            <property name="halign">start</property>
+            <property name="label" translatable="yes" 
context="sidebarerrorbar|label2">Category:</property>
+            <property name="use-underline">True</property>
+            <property name="mnemonic-widget">comboboxtext_type</property>
+          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkComboBoxText" id="comboboxtext_type">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="hexpand">True</property>
+            <items>
+              <item translatable="yes" 
context="sidebarerrorbar|comboboxtext_type">Constant</item>
+              <item translatable="yes" 
context="sidebarerrorbar|comboboxtext_type">Percentage</item>
+              <item translatable="yes" 
context="sidebarerrorbar|comboboxtext_type">Cell Range or Data Table</item>
+              <item translatable="yes" 
context="sidebarerrorbar|comboboxtext_type">Standard deviation</item>
+              <item translatable="yes" 
context="sidebarerrorbar|comboboxtext_type">Standard error</item>
+              <item translatable="yes" 
context="sidebarerrorbar|comboboxtext_type">Variance</item>
+              <item translatable="yes" 
context="sidebarerrorbar|comboboxtext_type">Error margin</item>
+            </items>
+          </object>
+          <packing>
+            <property name="left-attach">1</property>
+            <property name="top-attach">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="label3">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="halign">start</property>
+            <property name="label" translatable="yes" 
context="sidebarerrorbar|label3">Positive (+):</property>
+          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="label4">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="halign">start</property>
+            <property name="label" translatable="yes" 
context="sidebarerrorbar|label4">Negative (-):</property>
+          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkSpinButton" id="spinbutton_pos">
+            <property name="visible">True</property>
+            <property name="can-focus">True</property>
+            <property name="text" translatable="yes" 
context="sidebarerrorbar|spinbutton_pos">0.00</property>
+            <property name="truncate-multiline">True</property>
+            <property name="adjustment">adjustmentPOS</property>
+            <property name="digits">2</property>
+          </object>
+          <packing>
+            <property name="left-attach">1</property>
+            <property name="top-attach">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkSpinButton" id="spinbutton_neg">
+            <property name="visible">True</property>
+            <property name="can-focus">True</property>
+            <property name="text" translatable="yes" 
context="sidebarerrorbar|spinbutton_neg">0.00</property>
+            <property name="truncate-multiline">True</property>
+            <property name="adjustment">adjustmentNEG</property>
+            <property name="digits">2</property>
+          </object>
+          <packing>
+            <property name="left-attach">1</property>
+            <property name="top-attach">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox" id="box2">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
             <property name="spacing">6</property>
             <child>
-              <!-- n-columns=1 n-rows=1 -->
-              <object class="GtkGrid" id="grid1">
+              <object class="GtkRadioButton" 
id="radiobutton_positive_negative">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="row_spacing">6</property>
-                <property name="column_spacing">6</property>
-                <child>
-                  <object class="GtkLabel" id="label2">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">start</property>
-                    <property name="label" translatable="yes" 
context="sidebarerrorbar|label2">Category:</property>
-                    <property name="use_underline">True</property>
-                    <property 
name="mnemonic_widget">comboboxtext_type</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkComboBoxText" id="comboboxtext_type">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <items>
-                      <item translatable="yes" 
context="sidebarerrorbar|comboboxtext_type">Constant</item>
-                      <item translatable="yes" 
context="sidebarerrorbar|comboboxtext_type">Percentage</item>
-                      <item translatable="yes" 
context="sidebarerrorbar|comboboxtext_type">Cell Range or Data Table</item>
-                      <item translatable="yes" 
context="sidebarerrorbar|comboboxtext_type">Standard deviation</item>
-                      <item translatable="yes" 
context="sidebarerrorbar|comboboxtext_type">Standard error</item>
-                      <item translatable="yes" 
context="sidebarerrorbar|comboboxtext_type">Variance</item>
-                      <item translatable="yes" 
context="sidebarerrorbar|comboboxtext_type">Error margin</item>
-                    </items>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label3">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">start</property>
-                    <property name="label" translatable="yes" 
context="sidebarerrorbar|label3">Positive (+):</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label4">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">start</property>
-                    <property name="label" translatable="yes" 
context="sidebarerrorbar|label4">Negative (-):</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkSpinButton" id="spinbutton_pos">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="halign">start</property>
-                    <property name="text" translatable="yes" 
context="sidebarerrorbar|spinbutton_pos">0.00</property>
-                    <property name="adjustment">adjustmentPOS</property>
-                    <property name="truncate-multiline">True</property>
-                    <property name="digits">2</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkSpinButton" id="spinbutton_neg">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="halign">start</property>
-                    <property name="text" translatable="yes" 
context="sidebarerrorbar|spinbutton_neg">0.00</property>
-                    <property name="adjustment">adjustmentNEG</property>
-                    <property name="truncate-multiline">True</property>
-                    <property name="digits">2</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">2</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkBox" id="box2">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkRadioButton" 
id="radiobutton_positive_negative">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="tooltip_text" translatable="yes" 
context="sidebarerrorbar|radiobutton_positive_negative|tooltip_text">Positive 
and Negative</property>
-                        <property name="image">image2</property>
-                        <property name="use_underline">True</property>
-                        <property name="active">True</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkRadioButton" id="radiobutton_positive">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="tooltip_text" translatable="yes" 
context="sidebarerrorbar|radiobutton_positive|tooltip_text">Positive</property>
-                        <property name="image">image1</property>
-                        <property name="use_underline">True</property>
-                        <property name="draw_indicator">True</property>
-                        <property 
name="group">radiobutton_positive_negative</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkRadioButton" id="radiobutton_negative">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="tooltip_text" translatable="yes" 
context="sidebarerrorbar|radiobutton_negative|tooltip_text">Negative</property>
-                        <property name="image">image3</property>
-                        <property name="use_underline">True</property>
-                        <property name="draw_indicator">True</property>
-                        <property 
name="group">radiobutton_positive_negative</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">2</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">3</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkLabel" id="label5">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="halign">start</property>
-                    <property name="label" translatable="yes" 
context="sidebarerrorbar|label5">Indicator</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">3</property>
-                  </packing>
-                </child>
+                <property name="can-focus">True</property>
+                <property name="receives-default">False</property>
+                <property name="tooltip-text" translatable="yes" 
context="sidebarerrorbar|radiobutton_positive_negative|tooltip_text">Positive 
and Negative</property>
+                <property name="image">image2</property>
+                <property name="use-underline">True</property>
+                <property name="active">True</property>
+                <property name="draw-indicator">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -220,17 +148,62 @@
                 <property name="position">0</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkRadioButton" id="radiobutton_positive">
+                <property name="visible">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">False</property>
+                <property name="tooltip-text" translatable="yes" 
context="sidebarerrorbar|radiobutton_positive|tooltip_text">Positive</property>
+                <property name="image">image1</property>
+                <property name="use-underline">True</property>
+                <property name="draw-indicator">True</property>
+                <property name="group">radiobutton_positive_negative</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkRadioButton" id="radiobutton_negative">
+                <property name="visible">True</property>
+                <property name="can-focus">True</property>
+                <property name="receives-default">False</property>
+                <property name="tooltip-text" translatable="yes" 
context="sidebarerrorbar|radiobutton_negative|tooltip_text">Negative</property>
+                <property name="image">image3</property>
+                <property name="use-underline">True</property>
+                <property name="draw-indicator">True</property>
+                <property name="group">radiobutton_positive_negative</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="left-attach">1</property>
+            <property name="top-attach">3</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel" id="label5">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="halign">start</property>
+            <property name="label" translatable="yes" 
context="sidebarerrorbar|label5">Indicator</property>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">0</property>
+            <property name="left-attach">0</property>
+            <property name="top-attach">3</property>
           </packing>
         </child>
       </object>
       <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">0</property>
+        <property name="left-attach">0</property>
+        <property name="top-attach">0</property>
       </packing>
     </child>
   </object>
diff --git a/chart2/uiconfig/ui/sidebarseries.ui 
b/chart2/uiconfig/ui/sidebarseries.ui
index e7ec66f134e5..399094310ef9 100644
--- a/chart2/uiconfig/ui/sidebarseries.ui
+++ b/chart2/uiconfig/ui/sidebarseries.ui
@@ -1,288 +1,241 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.22.1 -->
+<!-- Generated with glade 3.38.2 -->
 <interface domain="chart">
   <requires lib="gtk+" version="3.20"/>
   <!-- n-columns=1 n-rows=1 -->
   <object class="GtkGrid" id="ChartSeriesPanel">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
+    <property name="can-focus">False</property>
     <child>
-      <object class="GtkBox" id="box1">
+      <!-- n-columns=2 n-rows=10 -->
+      <object class="GtkGrid" id="grid1">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
-        <property name="border_width">6</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">6</property>
+        <property name="can-focus">False</property>
+        <property name="hexpand">True</property>
+        <property name="border-width">5</property>
+        <property name="row-spacing">3</property>
+        <property name="column-spacing">6</property>
+        <child type="label">
+          <object class="GtkLabel" id="label_series_name">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="halign">start</property>
+            <property name="margin-top">6</property>
+            <property name="margin-bottom">3</property>
+            <property name="label" translatable="no">Label</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
+          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">0</property>
+            <property name="width">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkCheckButton" id="checkbutton_label">
+            <property name="label" translatable="yes" 
context="sidebarseries|checkbutton_label">Show data labels</property>
+            <property name="visible">True</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">False</property>
+            <property name="use-underline">True</property>
+            <property name="draw-indicator">True</property>
+          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkComboBoxText" id="comboboxtext_label">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="hexpand">True</property>
+            <items>
+              <item translatable="yes" 
context="sidebarseries|comboboxtext_label">Above</item>
+              <item translatable="yes" 
context="sidebarseries|comboboxtext_label">Below</item>
+              <item translatable="yes" 
context="sidebarseries|comboboxtext_label">Center</item>
+              <item translatable="yes" 
context="sidebarseries|comboboxtext_label">Outside</item>
+              <item translatable="yes" 
context="sidebarseries|comboboxtext_label">Inside</item>
+              <item translatable="yes" 
context="sidebarseries|comboboxtext_label">Near origin</item>
+            </items>
+          </object>
+          <packing>
+            <property name="left-attach">1</property>
+            <property name="top-attach">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkCheckButton" id="checkbutton_trendline">
+            <property name="label" translatable="yes" 
context="sidebarseries|checkbutton_trendline">Show trendline</property>
+            <property name="visible">True</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">False</property>
+            <property name="halign">start</property>
+            <property name="use-underline">True</property>
+            <property name="draw-indicator">True</property>
+          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">2</property>
+            <property name="width">2</property>
+          </packing>
+        </child>
+        <child type="label">
+          <object class="GtkLabel" id="label1">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="halign">start</property>
+            <property name="margin-top">12</property>
+            <property name="margin-bottom">3</property>
+            <property name="label" translatable="yes" 
context="sidebarseries|label1">Error Bars</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
+          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">3</property>
+            <property name="width">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkCheckButton" id="checkbutton_y_error">
+            <property name="label" translatable="yes" 
context="sidebarseries|checkbutton_y_error">Y error bars</property>
+            <property name="visible">True</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">False</property>
+            <property name="halign">start</property>
+            <property name="use-underline">True</property>
+            <property name="draw-indicator">True</property>
+          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">4</property>
+            <property name="width">2</property>
+          </packing>
+        </child>
         <child>
-          <placeholder/>
+          <object class="GtkCheckButton" id="checkbutton_x_error">
+            <property name="label" translatable="yes" 
context="sidebarseries|checkbutton_x_error">X error bars</property>
+            <property name="visible">True</property>
+            <property name="can-focus">True</property>
+            <property name="receives-default">False</property>
+            <property name="halign">start</property>
+            <property name="use-underline">True</property>
+            <property name="draw-indicator">True</property>
+          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">5</property>
+            <property name="width">2</property>
+          </packing>
+        </child>
+        <child type="label">
+          <object class="GtkLabel" id="axis_label">
+            <property name="visible">True</property>
+            <property name="can-focus">False</property>
+            <property name="halign">start</property>
+            <property name="margin-top">12</property>
+            <property name="margin-bottom">3</property>
+            <property name="label" translatable="yes" 
context="sidebarseries|axis_label">Align Series to Axis</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
+          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">6</property>
+            <property name="width">2</property>
+          </packing>
         </child>
         <child>
-          <object class="GtkFrame" id="frame1">
+          <object class="GtkLabel" id="label_series_tmpl">
+            <property name="can-focus">False</property>
+            <property name="halign">start</property>
+            <property name="label" translatable="yes" 
context="sidebarseries|label_series_tmpl">Data series '%1'</property>
+          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">8</property>
+            <property name="width">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox" id="box5">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label_xalign">0</property>
-            <property name="shadow_type">none</property>
+            <property name="can-focus">False</property>
+            <property name="orientation">vertical</property>
+            <property name="spacing">6</property>
             <child>
-              <object class="GtkBox" id="box2">
+              <object class="GtkRadioButton" id="radiobutton_primary_axis">
+                <property name="label" translatable="yes" 
context="sidebarseries|radiobutton_primary_axis">Primary Y axis</property>
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="orientation">vertical</property>
-                <property name="spacing">6</property>
-                <property name="margin-start">12</property>
-                <property name="margin-top">6</property>
-                <child>
-                  <object class="GtkBox" id="box3">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="orientation">vertical</property>
-                    <property name="spacing">6</property>
-                    <child>
-                      <object class="GtkCheckButton" id="checkbutton_label">
-                        <property name="label" translatable="yes" 
context="sidebarseries|checkbutton_label">Show data labels</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkBox" id="datalabel_box">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="margin-start">12</property>
-                        <property name="spacing">6</property>
-                        <child>
-                          <object class="GtkLabel" id="label_box">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="label" translatable="yes" 
context="sidebarseries|label_box">P_lacement:</property>
-                            <property name="use_underline">True</property>
-                            <property 
name="mnemonic_widget">comboboxtext_label</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkComboBoxText" 
id="comboboxtext_label">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <items>
-                              <item translatable="yes" 
context="sidebarseries|comboboxtext_label">Above</item>
-                              <item translatable="yes" 
context="sidebarseries|comboboxtext_label">Below</item>
-                              <item translatable="yes" 
context="sidebarseries|comboboxtext_label">Center</item>
-                              <item translatable="yes" 
context="sidebarseries|comboboxtext_label">Outside</item>
-                              <item translatable="yes" 
context="sidebarseries|comboboxtext_label">Inside</item>
-                              <item translatable="yes" 
context="sidebarseries|comboboxtext_label">Near origin</item>
-                            </items>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">0</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkCheckButton" id="checkbutton_trendline">
-                    <property name="label" translatable="yes" 
context="sidebarseries|checkbutton_trendline">Show trendline</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">False</property>
-                    <property name="use_underline">True</property>
-                    <property name="draw_indicator">True</property>
-                  </object>
-                  <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">True</property>
-                    <property name="position">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <object class="GtkFrame" id="frame3">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="label_xalign">0</property>
-                    <property name="shadow_type">none</property>
-                    <child>
-                      <object class="GtkBox" id="box6">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="spacing">6</property>
-                        <property name="margin-start">12</property>
-                        <property name="margin-top">6</property>
-                        <child>
-                          <object class="GtkCheckButton" 
id="checkbutton_y_error">
-                            <property name="label" translatable="yes" 
context="sidebarseries|checkbutton_y_error">Y error bars</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="use_underline">True</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkCheckButton" 
id="checkbutton_x_error">
-                            <property name="label" translatable="yes" 
context="sidebarseries|checkbutton_x_error">X error bars</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>

... etc. - the rest is truncated