cui/inc/strings.hrc | 2 ++
cui/source/options/optsave.cxx | 3 +++
cui/uiconfig/ui/optsavepage.ui | 5 -----
desktop/uiconfig/ui/dependenciesdialog.ui | 6 +++---
sd/uiconfig/sdraw/ui/notebookbar.ui | 16 ++++++++--------
sd/uiconfig/simpress/ui/notebookbar.ui | 16 ++++++++--------
sw/uiconfig/swriter/ui/notebookbar.ui | 2 +-
7 files changed, 25 insertions(+), 25 deletions(-)
New commits:
commit dc4af409ab8236ad36c603502042e826c4ff183b
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Tue Jul 25 16:10:32 2023 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Tue Jul 25 20:49:20 2023 +0200
fix .ui indent
Change-Id: Ib6ebed36b857d5ffa449f66319ef67f2f84722dc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154897
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/desktop/uiconfig/ui/dependenciesdialog.ui
b/desktop/uiconfig/ui/dependenciesdialog.ui
index a260079be526..d4f2fd6419b1 100644
--- a/desktop/uiconfig/ui/dependenciesdialog.ui
+++ b/desktop/uiconfig/ui/dependenciesdialog.ui
@@ -102,9 +102,9 @@
<property name="headers_visible">False</property>
<property name="search_column">0</property>
<property name="show_expanders">False</property>
- <accessibility>
- <relation type="labelled-by" target="label1"/>
- </accessibility>
+ <accessibility>
+ <relation type="labelled-by" target="label1"/>
+ </accessibility>
<child internal-child="selection">
<object class="GtkTreeSelection" id="Macro Library
List-selection2"/>
</child>
diff --git a/sd/uiconfig/sdraw/ui/notebookbar.ui
b/sd/uiconfig/sdraw/ui/notebookbar.ui
index ea430f492fb3..4f91cd52e122 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar.ui
@@ -14860,27 +14860,27 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom138">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom138">
<property name="width_request">148</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton"
id="Media-AVMediaToolBox">
+ <object class="GtkToolButton"
id="Media-AVMediaToolBox">
<property name="visible">True</property>
<property
name="action_name">.uno:AVMediaToolBox</property>
- </object>
- <packing>
+ </object>
+ <packing>
<property name="expand">False</property>
<property name="homogeneous">True</property>
- </packing>
+ </packing>
</child>
- </object>
- <packing>
+ </object>
+ <packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
- </packing>
+ </packing>
</child>
</object>
<packing>
diff --git a/sd/uiconfig/simpress/ui/notebookbar.ui
b/sd/uiconfig/simpress/ui/notebookbar.ui
index 3e761fd8a2f9..47b3109dd899 100644
--- a/sd/uiconfig/simpress/ui/notebookbar.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar.ui
@@ -14881,27 +14881,27 @@
</packing>
</child>
<child>
- <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom138">
+ <object class="sfxlo-NotebookbarToolBox"
id="SectionBottom138">
<property name="width_request">148</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="show_arrow">False</property>
<child>
- <object class="GtkToolButton"
id="Media-AVMediaToolBox">
+ <object class="GtkToolButton"
id="Media-AVMediaToolBox">
<property name="visible">True</property>
<property
name="action_name">.uno:AVMediaToolBox</property>
- </object>
- <packing>
+ </object>
+ <packing>
<property name="expand">False</property>
<property name="homogeneous">True</property>
- </packing>
+ </packing>
</child>
- </object>
- <packing>
+ </object>
+ <packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
- </packing>
+ </packing>
</child>
</object>
<packing>
diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui
b/sw/uiconfig/swriter/ui/notebookbar.ui
index f902206817c0..3b1ea93f6f19 100644
--- a/sw/uiconfig/swriter/ui/notebookbar.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar.ui
@@ -6299,7 +6299,7 @@
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
- <child>
+ <child>
<object class="GtkBox" id="GroupB33">
<property name="visible">True</property>
<property name="can_focus">False</property>
commit bc31aed0eda23fd0a143a54f6aecdbbde1018ccc
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Tue Jul 25 16:06:32 2023 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Tue Jul 25 20:49:14 2023 +0200
move %PRODUCTNAME using accessible description into a .hrc
similar reason as
commit 3cca2c605313576187878a195fb612eb25bd6150
Author: Caolán McNamara <caol...@redhat.com>
Date: Sat Jun 4 21:10:16 2022 +0100
restore %PRODUCTNAME to accessible descriptions that need them
reading all a11y desc at load time in order to possibly substitute
%PRODUCTNAME and re-write a11y desc at runtime explodes gtk's a11y, so
we limit it to where we have to do it.
Change-Id: I6e92bfa7db2ba769e2bd899b31d3ef42b4d37e8c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154896
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/cui/inc/strings.hrc b/cui/inc/strings.hrc
index b88e21f39aae..ffcf10e73556 100644
--- a/cui/inc/strings.hrc
+++ b/cui/inc/strings.hrc
@@ -398,6 +398,8 @@
#define RID_LANGUAGETOOL_LEAVE_EMPTY
NC_("RID_LANGUAGETOOL_LEAVE_EMPTY", "Leave this field empty to use the free
version")
#define RID_LANGUAGETOOL_REST_LEAVE_EMPTY
NC_("RID_LANGUAGETOOL_REST_LEAVE_EMPTY", "Leave this field empty to use
LanguageTool protocol")
+#define RID_CUISTR_A11Y_DESC_BACKUP
NC_("RID_CUISTR_A11Y_DESC_BACKUP", "Specifies if the backup copy should be
stored in the same folder as the original document. If not selected, the backup
copy is stored in the folder specified in Tools - Options - %PRODUCTNAME -
Paths - Backups.")
+
// Translatable names of color schemes
#define RID_COLOR_SCHEME_LIBREOFFICE_AUTOMATIC
NC_("RID_COLOR_SCHEME_LIBREOFFICE_AUTOMATIC", "Automatic")
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index b257c43fa820..565d765a4f8a 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -24,7 +24,9 @@
#include <o3tl/string_view.hxx>
#include <svl/eitem.hxx>
#include <svl/intitem.hxx>
+#include <dialmgr.hxx>
#include "optsave.hxx"
+#include <strings.hrc>
#include <treeopt.hxx>
#include <officecfg/Office/Common.hxx>
#include <comphelper/processfactory.hxx>
@@ -99,6 +101,7 @@ SvxSaveTabPage::SvxSaveTabPage(weld::Container* pPage,
weld::DialogController* p
, m_xODFWarningFT(m_xBuilder->weld_label("odfwarning_label"))
{
m_xAutoSaveEdit->set_max_length(2);
+
m_xBackupIntoDocumentFolderCB->set_accessible_description(CuiResId(RID_CUISTR_A11Y_DESC_BACKUP));
m_xODFVersionLB->set_id(0, OUString::number(SvtSaveOptions::ODFVER_011));
// 1.0/1.1
m_xODFVersionLB->set_id(1, OUString::number(SvtSaveOptions::ODFVER_012));
// 1.2
diff --git a/cui/uiconfig/ui/optsavepage.ui b/cui/uiconfig/ui/optsavepage.ui
index 8ccb0c2948a1..9bc208085bed 100644
--- a/cui/uiconfig/ui/optsavepage.ui
+++ b/cui/uiconfig/ui/optsavepage.ui
@@ -284,11 +284,6 @@
<property name="margin-start">18</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject"
id="backupintodocumentfolder-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes" context="optsavepage|backupintodocumentfolder">Specifies if
the backup copy should be stored in the same folder as the original document.
If not selected, the backup copy is stored in the folder specified in Tools -
Options - %PRODUCTNAME - Paths - Backups.</property>
- </object>
- </child>
</object>
<packing>
<property name="left_attach">0</property>
