diff options
author | bhatman1441 <blackhat1441@protonmail.com> | 2023-06-27 15:01:22 +0300 |
---|---|---|
committer | bhatman1441 <blackhat1441@protonmail.com> | 2023-06-27 15:01:22 +0300 |
commit | 88fd6019613e54fc23e0fa61b355f1bb98bd6186 (patch) | |
tree | 941fb7c85d5b10b5cb6f1be4b587b3635d7ef750 | |
parent | ebcd73e650a93d19753f31b56f18881f1cd8982a (diff) | |
parent | 06bcaf30514afac1623450ee9cde8903f3f29e09 (diff) |
Merge branch 'remmina-password-ui' into 'master'
Fix UI bugs in Remmina Preferences set new password
See merge request Remmina/Remmina!2508
-rw-r--r-- | data/ui/remmina_passwd.glade | 157 | ||||
-rw-r--r-- | data/ui/remmina_unlock.glade | 13 | ||||
-rw-r--r-- | po/en_AU.po | 4 | ||||
-rw-r--r-- | po/en_GB.po | 4 | ||||
-rw-r--r-- | po/en_US.po | 4 |
5 files changed, 74 insertions, 108 deletions
diff --git a/data/ui/remmina_passwd.glade b/data/ui/remmina_passwd.glade index a98df1771..68ffc6e5a 100644 --- a/data/ui/remmina_passwd.glade +++ b/data/ui/remmina_passwd.glade @@ -3,11 +3,13 @@ <interface> <requires lib="gtk+" version="3.18"/> <object class="GtkDialog" id="RemminaPasswdDialog"> + <property name="title" translatable="yes">Set new password</property> <property name="can-focus">False</property> <property name="type-hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox"> <property name="can-focus">False</property> + <property name="visible">True</property> <property name="orientation">vertical</property> <property name="spacing">2</property> <child internal-child="action_area"> @@ -49,110 +51,85 @@ </packing> </child> <child> - <object class="GtkBox"> + <!-- n-columns=2 n-rows=2 --> + <object class="GtkGrid"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="orientation">vertical</property> <child> - <object class="GtkHeaderBar"> + <object class="GtkLabel" id="label_password"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="title" translatable="yes">Set Primary Password</property> - <property name="show-close-button">True</property> + <property name="halign">end</property> + <property name="valign">center</property> + <property name="margin-start">18</property> + <property name="margin-end">6</property> + <property name="margin-top">18</property> + <property name="margin-bottom">9</property> + <property name="label" translatable="yes">Password</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">0</property> </packing> </child> <child> - <!-- n-columns=2 n-rows=2 --> - <object class="GtkGrid"> + <object class="GtkLabel" id="label_verify"> <property name="visible">True</property> <property name="can-focus">False</property> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="halign">end</property> - <property name="valign">center</property> - <property name="margin-start">18</property> - <property name="margin-end">6</property> - <property name="margin-top">18</property> - <property name="margin-bottom">9</property> - <property name="label" translatable="yes">Password</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="halign">end</property> - <property name="valign">center</property> - <property name="margin-start">18</property> - <property name="margin-end">6</property> - <property name="margin-top">9</property> - <property name="margin-bottom">18</property> - <property name="label" translatable="yes">Verify password</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">1</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="entry_password"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="valign">start</property> - <property name="margin-start">6</property> - <property name="margin-end">18</property> - <property name="margin-top">18</property> - <property name="margin-bottom">9</property> - <property name="visibility">False</property> - <property name="invisible-char">•</property> - <property name="width-chars">24</property> - <property name="input-purpose">password</property> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="entry_verify"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="valign">start</property> - <property name="margin-start">6</property> - <property name="margin-end">18</property> - <property name="margin-top">9</property> - <property name="margin-bottom">18</property> - <property name="visibility">False</property> - <property name="invisible-char">•</property> - <property name="width-chars">24</property> - <property name="shadow-type">none</property> - <property name="input-purpose">password</property> - <signal name="changed" handler="remmina_passwd_repwd_on_changed" swapped="no"/> - <style> - <class name="entry_verify"/> - </style> - </object> - <packing> - <property name="left-attach">1</property> - <property name="top-attach">1</property> - </packing> - </child> + <property name="halign">end</property> + <property name="valign">center</property> + <property name="margin-start">18</property> + <property name="margin-end">6</property> + <property name="margin-top">9</property> + <property name="margin-bottom">18</property> + <property name="label" translatable="yes">Verify password</property> </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">1</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="entry_password"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="valign">start</property> + <property name="margin-start">6</property> + <property name="margin-end">18</property> + <property name="margin-top">18</property> + <property name="margin-bottom">9</property> + <property name="visibility">False</property> + <property name="invisible-char">•</property> + <property name="width-chars">24</property> + <property name="input-purpose">password</property> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="entry_verify"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="valign">start</property> + <property name="margin-start">6</property> + <property name="margin-end">18</property> + <property name="margin-top">9</property> + <property name="margin-bottom">18</property> + <property name="visibility">False</property> + <property name="invisible-char">•</property> + <property name="width-chars">24</property> + <property name="shadow-type">none</property> + <property name="input-purpose">password</property> + <signal name="changed" handler="remmina_passwd_repwd_on_changed" swapped="no"/> + <style> + <class name="entry_verify"/> + </style> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">1</property> </packing> </child> </object> diff --git a/data/ui/remmina_unlock.glade b/data/ui/remmina_unlock.glade index d11edcf08..c98786dd8 100644 --- a/data/ui/remmina_unlock.glade +++ b/data/ui/remmina_unlock.glade @@ -27,6 +27,7 @@ Author: Antenore Gatta <!-- interface-copyright Antenore Gatta, Giovanni Panozzo --> <!-- interface-authors Antenore Gatta --> <object class="GtkDialog" id="RemminaUnlockDialog"> + <property name="title" translatable="yes">Unlock Remmina</property> <property name="can-focus">False</property> <property name="type-hint">dialog</property> <child internal-child="vbox"> @@ -79,18 +80,6 @@ Author: Antenore Gatta <property name="can-focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkHeaderBar"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="title" translatable="yes">Unlock Remmina</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> <!-- n-columns=2 n-rows=1 --> <object class="GtkGrid"> <property name="visible">True</property> diff --git a/po/en_AU.po b/po/en_AU.po index 2551db11f..92a27be7f 100644 --- a/po/en_AU.po +++ b/po/en_AU.po @@ -4576,7 +4576,7 @@ msgstr "<span weight='bold' size='larger'>Multi Password Changer</span>" #: data/ui/remmina_passwd.glade:33 #, fuzzy msgid "OK" -msgstr "_OK" +msgstr "OK" #: data/ui/remmina_passwd.glade:60 #, fuzzy @@ -4586,7 +4586,7 @@ msgstr "Set new password" #: data/ui/remmina_passwd.glade:101 #, fuzzy msgid "Verify password" -msgstr "User password" +msgstr "Verify password" #: data/ui/remmina_news.glade:75 #, fuzzy diff --git a/po/en_GB.po b/po/en_GB.po index a1fc1f5c7..496b583ff 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -4122,7 +4122,7 @@ msgstr "<span weight='bold' size='larger'>Multi Password Changer</span>" #: data/ui/remmina_passwd.glade:33 msgid "OK" -msgstr "_OK" +msgstr "OK" #: data/ui/remmina_passwd.glade:60 msgid "Set Primary Password" @@ -4130,7 +4130,7 @@ msgstr "Set new password" #: data/ui/remmina_passwd.glade:101 msgid "Verify password" -msgstr "User password" +msgstr "Verify password" #: data/ui/remmina_news.glade:75 msgid "" diff --git a/po/en_US.po b/po/en_US.po index df35dc644..8fc01e1c6 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -3992,7 +3992,7 @@ msgstr "" #: data/ui/remmina_passwd.glade:33 msgid "OK" -msgstr "" +msgstr "OK" #: data/ui/remmina_passwd.glade:60 #, fuzzy @@ -4002,7 +4002,7 @@ msgstr "Send new password" #: data/ui/remmina_passwd.glade:101 #, fuzzy msgid "Verify password" -msgstr "Save Password" +msgstr "Verify password" #: data/ui/remmina_news.glade:75 msgid "" |