cui/uiconfig/ui/certdialog.ui | 115 ++++++-------
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 1
2 files changed, 57 insertions(+), 59 deletions(-)
New commits:
commit 3ffd9de3c4bac6bfa46472698e6146713185a3f2
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Fri Jul 19 17:10:19 2024 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Fri Jul 19 21:36:16 2024 +0200
resave with latest glade
Change-Id: I9ff2454c5226c224a5211f2b4cb977e84a8c4219
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170777
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/cui/uiconfig/ui/certdialog.ui b/cui/uiconfig/ui/certdialog.ui
index 29b19e3d3742..52740882ff3a 100644
--- a/cui/uiconfig/ui/certdialog.ui
+++ b/cui/uiconfig/ui/certdialog.ui
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.36.0 -->
+<!-- Generated with glade 3.40.0 -->
<interface domain="cui">
<requires lib="gtk+" version="3.20"/>
<object class="GtkTreeStore" id="liststore1">
@@ -19,29 +19,29 @@
</columns>
</object>
<object class="GtkDialog" id="CertDialog">
- <property name="can_focus">False</property>
- <property name="border_width">6</property>
+ <property name="can-focus">False</property>
+ <property name="border-width">6</property>
<property name="title" translatable="yes"
context="certdialog|CertDialog">Certificate Path</property>
<property name="modal">True</property>
- <property name="default_width">0</property>
- <property name="type_hint">normal</property>
+ <property name="default-width">0</property>
+ <property name="type-hint">normal</property>
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child internal-child="action_area">
<object class="GtkButtonBox">
- <property name="can_focus">False</property>
- <property name="layout_style">end</property>
+ <property name="can-focus">False</property>
+ <property name="layout-style">end</property>
<child>
<object class="GtkButton" id="add">
<property name="label" translatable="yes"
context="certdialog|add">_Select NSS path...</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="receives_default">True</property>
- <property name="use_underline">True</property>
+ <property name="can-focus">True</property>
+ <property name="can-default">True</property>
+ <property name="receives-default">True</property>
+ <property name="use-underline">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="add-atkobject">
<property name="AtkObject::accessible-description"
translatable="yes" context="certdialog|extended_tip|add">Opens the Select Path
dialog to add a new Network Security Services Certificate directory to the
list.</property>
@@ -58,8 +58,8 @@
<object class="GtkButton" id="cancel">
<property name="label" translatable="yes"
context="stock">_Cancel</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
<property name="use-underline">True</property>
</object>
<packing>
@@ -72,10 +72,10 @@
<object class="GtkButton" id="ok">
<property name="label" translatable="yes"
context="stock">_OK</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
- <property name="receives_default">True</property>
+ <property name="can-focus">True</property>
+ <property name="can-default">True</property>
+ <property name="has-default">True</property>
+ <property name="receives-default">True</property>
<property name="use-underline">True</property>
</object>
<packing>
@@ -88,8 +88,8 @@
<object class="GtkButton" id="help">
<property name="label" translatable="yes"
context="stock">_Help</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
<property name="use-underline">True</property>
</object>
<packing>
@@ -103,97 +103,97 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="pack_type">end</property>
+ <property name="pack-type">end</property>
<property name="position">3</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="label-xalign">0</property>
+ <property name="shadow-type">none</property>
<child>
- <!-- n-columns=1 n-rows=1 -->
+ <!-- n-columns=1 n-rows=3 -->
<object class="GtkGrid" id="grid1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="row_spacing">6</property>
+ <property name="can-focus">False</property>
<property name="margin-start">12</property>
<property name="margin-top">6</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="row-spacing">6</property>
<child>
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="certdialog|label2">Select or add the correct Network Security Services
Certificate directory to use for digital signatures:</property>
- <property name="use_underline">True</property>
+ <property name="use-underline">True</property>
<property name="wrap">True</property>
- <property name="mnemonic_widget">paths</property>
- <property name="width_chars">60</property>
- <property name="max_width_chars">60</property>
+ <property name="mnemonic-widget">paths</property>
+ <property name="width-chars">60</property>
+ <property name="max-width-chars">60</property>
<property name="xalign">0</property>
<property name="yalign">0</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>
</packing>
</child>
<child>
- <!-- n-columns=1 n-rows=1 -->
+ <!-- n-columns=2 n-rows=1 -->
<object class="GtkGrid" id="grid2">
- <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>
<child>
<object class="GtkLabel" id="manual">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="hexpand">True</property>
<property name="label" translatable="yes"
context="certdialog|manual">manual</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>
</packing>
</child>
<child>
<object class="GtkLabel" id="certdir">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="certdialog|certdir">Select a Certificate directory</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
+ <property name="left-attach">1</property>
+ <property name="top-attach">0</property>
</packing>
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">1</property>
</packing>
</child>
<child>
<object class="GtkScrolledWindow">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can-focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
- <property name="shadow_type">in</property>
+ <property name="shadow-type">in</property>
<child>
<object class="GtkTreeView" id="paths">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
+ <property name="can-focus">True</property>
+ <property name="receives-default">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="model">liststore1</property>
- <property name="search_column">0</property>
- <property name="show_expanders">False</property>
+ <property name="search-column">0</property>
+ <property name="show-expanders">False</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="Macro Library
List-selection2"/>
</child>
@@ -236,8 +236,8 @@
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">2</property>
</packing>
</child>
</object>
@@ -245,7 +245,7 @@
<child type="label">
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="certdialog|label1">Certificate Path</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -267,9 +267,6 @@
<action-widget response="-5">ok</action-widget>
<action-widget response="-11">help</action-widget>
</action-widgets>
- <child type="titlebar">
- <placeholder/>
- </child>
<child internal-child="accessible">
<object class="AtkObject" id="CertDialog-atkobject">
<property name="AtkObject::accessible-description" translatable="yes"
context="certdialog|extended_tip|CertDialog">Select or add the correct Network
Security Services Certificate directory to use for digital
signatures.</property>
commit dfb3b6568292614a6eeedc7aac2973c7fb301e57
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Fri Jul 19 17:30:57 2024 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Fri Jul 19 21:36:08 2024 +0200
getting the "manual cert path" throws unexpectedly
OUString sManualCertPath =
officecfg::Office::Common::Security::Scripting::ManualCertDir::get();
in CertPathDialog::Init throws rather unexpectedly
since:
commit eca31344795f7dca5b3407c56ab240c11a97c58f
AuthorDate: Tue Oct 1 15:24:26 2019 +0000
tdf#127909 save manually selected certificate path
Change-Id: Icafb8001e8cae2dff350f2267994d19dd73fe1a2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170776
Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com>
Reviewed-by: Stephan Bergmann <stephan.bergm...@allotropia.de>
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index c2e0e97159d1..a6c5c6e631fe 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -2371,6 +2371,7 @@
<info>
<desc>Contains the last path manually selected by the user for the
CertDir property.</desc>
</info>
+ <value></value>
</prop>
<prop oor:name="CertMgrPath" oor:type="xs:string" oor:nillable="false">
<info>
