From fed7b3068dcea2ebf65314c4f212350720631706 Mon Sep 17 00:00:00 2001
From: Sarper Akdemir <sarper.akdemir.extern@allotropia.de>
Date: Mon, 13 Nov 2023 17:19:01 +0300
Subject: tdf#157518: enforce password policy on setmasterpassworddlg

Change-Id: I7e7adde8f0d55808d16dc9247954a7645a1d3601
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159384
Tested-by: Jenkins
Reviewed-by: Sarper Akdemir <sarper.akdemir.extern@allotropia.de>
---
 uui/uiconfig/ui/setmasterpassworddlg.ui | 44 +++++++++++++++++++++++++++------
 1 file changed, 37 insertions(+), 7 deletions(-)

(limited to 'uui/uiconfig/ui/setmasterpassworddlg.ui')

diff --git a/uui/uiconfig/ui/setmasterpassworddlg.ui b/uui/uiconfig/ui/setmasterpassworddlg.ui
index 52cec48eb30a..1fd06e0e5c57 100644
--- a/uui/uiconfig/ui/setmasterpassworddlg.ui
+++ b/uui/uiconfig/ui/setmasterpassworddlg.ui
@@ -95,14 +95,43 @@
               </packing>
             </child>
             <child>
-              <object class="GtkLabel" id="label2">
+              <!-- n-columns=2 n-rows=1 -->
+              <object class="GtkGrid">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="margin_top">6</property>
-                <property name="label" translatable="yes" context="setmasterpassworddlg|label2">_Enter password:</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">password1</property>
-                <property name="xalign">0</property>
+                <property name="can-focus">False</property>
+                <property name="column-spacing">12</property>
+                <property name="baseline-row">1</property>
+                <child>
+                  <object class="GtkLabel" id="label2">
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="valign">end</property>
+                    <property name="margin-top">6</property>
+                    <property name="vexpand">True</property>
+                    <property name="label" translatable="yes" context="setmasterpassworddlg|label2">_Enter password:</property>
+                    <property name="use-underline">True</property>
+                    <property name="mnemonic-widget">password1</property>
+                    <property name="xalign">0</property>
+                  </object>
+                  <packing>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkLabel" id="passpolicylabel">
+                    <property name="can-focus">False</property>
+                    <property name="no-show-all">True</property>
+                    <property name="halign">end</property>
+                    <property name="margin-top">6</property>
+                    <property name="hexpand">True</property>
+                    <property name="wrap">True</property>
+                  </object>
+                  <packing>
+                    <property name="left-attach">1</property>
+                    <property name="top-attach">0</property>
+                  </packing>
+                </child>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -133,6 +162,7 @@
               <object class="GtkLevelBar" id="password1levelbar">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
+                <property name="tooltip-text" translatable="yes" context="setmasterpassworddlg|password1levelbar">Bar that displays password strength visually.</property>
               </object>
               <packing>
                 <property name="expand">False</property>
-- 
cgit