Replace Gtk.Entry + peek button with Gtk.PasswordEntry

Author: dar5hak

src/MainView.vala

@@ -23,9 +23,8 @@ public class Obliviate.MainView : Gtk.Overlay {
     private Granite.Toast toast;
 
     private Gtk.Entry site;
-    private Gtk.Entry cipher_key;
-    private Gtk.Entry generated_pass;
-    private Gtk.ToggleButton show_generated_pass;
+    private Gtk.PasswordEntry cipher_key;
+    private Gtk.PasswordEntry generated_pass;
     private Gtk.Button copy_btn;
     private Gtk.Button copy_without_symbols_btn;
     private Gtk.Label clearing_label;
@@ -68,42 +67,23 @@ public class Obliviate.MainView : Gtk.Overlay {
             margin_end = 4
         };
 
-        // TODO: replace with Gtk.PasswordEntry after updating to Gtk4
-        cipher_key = new Gtk.Entry () {
-            visibility = false,
-            caps_lock_warning = true,
-            input_purpose = Gtk.InputPurpose.PASSWORD,
+        cipher_key = new Gtk.PasswordEntry () {
+            show_peek_icon = true,
             placeholder_text = _ ("correct horse battery staple"),
             width_chars = 24
         };
 
         cipher_key.changed.connect (handle_generate_password);
 
-        var show_cipher_key = new Gtk.ToggleButton () {
-            active = true,
-            tooltip_text = _ ("Show or hide the cipher key")
-        };
-
-        show_cipher_key.add (new Gtk.Image.from_icon_name ("image-red-eye-symbolic", Gtk.IconSize.BUTTON));
-        show_cipher_key.bind_property ("active", cipher_key, "visibility", BindingFlags.INVERT_BOOLEAN);
-
-        this.generated_pass = new Gtk.Entry () {
-            visibility = false,
+        this.generated_pass = new Gtk.PasswordEntry () {
+            show_peek_icon = true,
             editable = false,
-            sensitive = false
+            sensitive = false,
+            width_chars = 24
         };
 
         this.generated_pass.add_css_class (Granite.STYLE_CLASS_FLAT);
 
-        show_generated_pass = new Gtk.ToggleButton () {
-            active = true,
-            tooltip_text = _ ("Show or hide the password"),
-            sensitive = false
-        };
-
-        show_generated_pass.set_icon_name ("image-red-eye-symbolic");
-        show_generated_pass.bind_property ("active", generated_pass, "visibility", BindingFlags.INVERT_BOOLEAN);
-
         copy_btn = new Gtk.Button.with_label (_ ("Copy")) {
             sensitive = false
         };
@@ -156,12 +136,10 @@ public class Obliviate.MainView : Gtk.Overlay {
 
         grid.attach (cipher_key_label, 0, 2, 1, 1);
         grid.attach_next_to (cipher_key, cipher_key_label, Gtk.PositionType.RIGHT);
-        grid.attach_next_to (show_cipher_key, cipher_key, Gtk.PositionType.RIGHT);
 
         grid.attach_next_to (equals_label, cipher_key, Gtk.PositionType.BOTTOM);
 
         grid.attach_next_to (generated_pass, equals_label, Gtk.PositionType.BOTTOM);
-        grid.attach_next_to (show_generated_pass, generated_pass, Gtk.PositionType.RIGHT);
         grid.attach_next_to (button_box, generated_pass, Gtk.PositionType.BOTTOM);
 
         clipboard = this.get_clipboard ();
@@ -170,15 +148,13 @@ public class Obliviate.MainView : Gtk.Overlay {
     private void handle_generate_password () {
         if (site.text.length == 0 || cipher_key.text.length == 0) {
             generated_pass.text = "";
-            show_generated_pass.sensitive = false;
             copy_btn.sensitive = false;
             copy_without_symbols_btn.sensitive = false;
             return;
         }
 
         try {
             generated_pass.text = Service.derive_password (cipher_key.text, site.text.down ());
-            show_generated_pass.sensitive = true;
             copy_btn.sensitive = true;
             copy_without_symbols_btn.sensitive = true;
             animate_password ();