xmlsecurity/uiconfig/ui/selectcertificatedialog.ui | 101 +++++++++++----------
1 file changed, 54 insertions(+), 47 deletions(-)
New commits:
commit 6b0684b2c48bcd8fd6ded3817cbe12aa4e02b4dc
Author: TokieSan <elto...@aucegypt.edu>
AuthorDate: Sun Jul 9 13:25:52 2023 +0300
Commit: Thorsten Behrens <thorsten.behr...@allotropia.de>
CommitDate: Tue Jul 11 13:57:57 2023 +0200
Allow columns' sorting in certificate chooser dialog
Allowed native GTK TreeViewColumn sorting for the Certificate Chooser
Dialog (selectcertificatedialog.ui)
Change-Id: I4acba667ebd6fd5801730bf4413a00149b3b6528
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154227
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org>
Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de>
diff --git a/xmlsecurity/uiconfig/ui/selectcertificatedialog.ui
b/xmlsecurity/uiconfig/ui/selectcertificatedialog.ui
index 3296173792f7..fde094088e91 100644
--- a/xmlsecurity/uiconfig/ui/selectcertificatedialog.ui
+++ b/xmlsecurity/uiconfig/ui/selectcertificatedialog.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="xsc">
<requires lib="gtk+" version="3.20"/>
<object class="GtkTreeStore" id="liststore3">
@@ -19,29 +19,29 @@
</columns>
</object>
<object class="GtkDialog" id="SelectCertificateDialog">
- <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="selectcertificatedialog|SelectCertificateDialog">Select
Certificate</property>
<property name="resizable">False</property>
<property name="modal">True</property>
- <property name="type_hint">dialog</property>
+ <property name="type-hint">dialog</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" id="dialog-action_area1">
- <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="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>
@@ -54,8 +54,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>
@@ -68,8 +68,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>
@@ -83,58 +83,58 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="pack_type">end</property>
+ <property name="pack-type">end</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <!-- n-columns=1 n-rows=1 -->
+ <!-- n-columns=1 n-rows=5 -->
<object class="GtkGrid" id="grid1">
<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="row_spacing">12</property>
- <property name="column_spacing">12</property>
+ <property name="row-spacing">12</property>
+ <property name="column-spacing">12</property>
<child>
<object class="GtkLabel" id="sign">
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="selectcertificatedialog|sign">Select the certificate you want to use
for signing:</property>
<property name="xalign">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>
<object class="GtkLabel" id="encrypt">
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="selectcertificatedialog|encrypt">Select the certificate you want to
use for encryption:</property>
<property name="xalign">0</property>
</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="signatures">
<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">liststore3</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>
@@ -143,6 +143,8 @@
<property name="resizable">True</property>
<property name="spacing">6</property>
<property name="title" translatable="yes"
context="selectcertificatedialog|issuedto">Issued to</property>
+ <property name="sort-indicator">True</property>
+ <property name="sort-column-id">0</property>
<child>
<object class="GtkCellRendererText"
id="cellrenderer1"/>
<attributes>
@@ -156,6 +158,8 @@
<property name="resizable">True</property>
<property name="spacing">6</property>
<property name="title" translatable="yes"
context="selectcertificatedialog|issuedby">Issued by</property>
+ <property name="sort-indicator">True</property>
+ <property name="sort-column-id">1</property>
<child>
<object class="GtkCellRendererText"
id="cellrenderer2"/>
<attributes>
@@ -169,6 +173,8 @@
<property name="resizable">True</property>
<property name="spacing">6</property>
<property name="title" translatable="yes"
context="selectcertificatedialog|type">Type</property>
+ <property name="sort-indicator">True</property>
+ <property name="sort-column-id">2</property>
<child>
<object class="GtkCellRendererText"
id="cellrenderer3"/>
<attributes>
@@ -182,6 +188,8 @@
<property name="resizable">True</property>
<property name="spacing">6</property>
<property name="title" translatable="yes"
context="selectcertificatedialog|expiration">Expiration date</property>
+ <property name="sort-indicator">True</property>
+ <property name="sort-column-id">3</property>
<child>
<object class="GtkCellRendererText"
id="cellrenderer4"/>
<attributes>
@@ -195,6 +203,8 @@
<property name="resizable">True</property>
<property name="spacing">6</property>
<property name="title" translatable="yes"
context="selectcertificatedialog|usage">Certificate usage</property>
+ <property name="sort-indicator">True</property>
+ <property name="sort-column-id">4</property>
<child>
<object class="GtkCellRendererText"
id="cellrenderer5"/>
<attributes>
@@ -212,16 +222,16 @@
</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>
<child>
<object class="GtkButton" id="viewcert">
<property name="label" translatable="yes"
context="selectcertificatedialog|viewcert">View Certificate...</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="halign">end</property>
<child internal-child="accessible">
<object class="AtkObject" id="viewcert-atkobject">
@@ -230,19 +240,19 @@
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">3</property>
</packing>
</child>
<child>
<object class="GtkBox" id="dialog-hbox1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="description-label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can-focus">False</property>
<property name="label" translatable="yes"
context="selectcertificatedialog|label2">Description:</property>
</object>
<packing>
@@ -254,8 +264,8 @@
<child>
<object class="GtkEntry" id="description">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="activates_default">True</property>
+ <property name="can-focus">True</property>
+ <property name="activates-default">True</property>
<property name="truncate-multiline">True</property>
<child internal-child="accessible">
<object class="AtkObject" id="description-atkobject">
@@ -271,8 +281,8 @@
</child>
</object>
<packing>
- <property name="left_attach">0</property>
- <property name="top_attach">4</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">4</property>
</packing>
</child>
</object>
@@ -289,9 +299,6 @@
<action-widget response="-6">cancel</action-widget>
<action-widget response="-11">help</action-widget>
</action-widgets>
- <child type="titlebar">
- <placeholder/>
- </child>
<child internal-child="accessible">
<object class="AtkObject" id="SelectCertificateDialog-atkobject">
<property name="AtkObject::accessible-description" translatable="yes"
context="selectcertificatedialog|extended_tip|SelectCertificateDialog">Select
the certificate that you want to digitally sign the current document
with.</property>
