Merge ubiquity:kde-show-passwords into ubiquity:master

[Łukasz Zemczak]

Add the ability to show passwords for KDE as well.

Add the ability to show passwords for KDE as well.

Please note that I am lacking some experience in Qt stuff, so it might be suboptimal. But I tested it and it works. I couldn't decide on the icon state appearance (what icon should it be when it's checked and when it's not..?!) but I think it's okayish - I can change that if needed.

[Rik Mills (rikmills)]

My pyqt5 foo is not really up to the task, so IMO perhaps merge this and fine tune later with feedback?

[Łukasz Zemczak (sil2100)]

Makes sense! Let me do that and release a new ubiquity version for jammy.

diff --git a/debian/changelog b/debian/changelog
index e986077..2f71351 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ubiquity (22.04.5) UNRELEASED; urgency=medium
+
+  * Add the ability to unhide passwords for the KDE frontend as well (follow
+    up to the GTK changes released before).
+
+ -- Łukasz 'sil2100' Zemczak <[e-mail]>  Thu, 03 Feb 2022 12:41:46 +0100
+
 ubiquity (22.04.4) jammy; urgency=medium
 
   [ Brian Murray ]
diff --git a/gui/qt/stepUserSetup.ui b/gui/qt/stepUserSetup.ui
index 8bce7df..28eb76e 100644
--- a/gui/qt/stepUserSetup.ui
+++ b/gui/qt/stepUserSetup.ui
@@ -304,7 +304,7 @@
        </property>
       </widget>
      </item>
-     <item row="0" column="2">
+     <item row="0" column="3">
       <widget class="QLabel" name="password_error_image">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@@ -329,6 +329,31 @@
        </property>
       </widget>
      </item>
+     <item row="0" column="2">
+      <widget class="QToolButton" name="show_password">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>32</width>
+         <height>32</height>
+        </size>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>32</width>
+         <height>32</height>
+        </size>
+       </property>
+       <property name="checkable">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
      <item row="0" column="3">
       <widget class="QLabel" name="password_error_reason">
        <property name="sizePolicy">
diff --git a/ubiquity/frontend/kde_components/PartAuto.py b/ubiquity/frontend/kde_components/PartAuto.py
index 624f6e5..81f7957 100644
--- a/ubiquity/frontend/kde_components/PartAuto.py
+++ b/ubiquity/frontend/kde_components/PartAuto.py
@@ -214,6 +214,11 @@ class PartAuto(QtWidgets.QWidget):
         self.verified_password.setEchoMode(QtWidgets.QLineEdit.Password)
         self.verified_password.textChanged.connect(self.verify_password)
         box.addWidget(self.verified_password)
+        self.show_password = QtWidgets.QToolButton()
+        self.show_password.setIcon(QtGui.QIcon.fromTheme("password-show-off"))
+        self.show_password.setCheckable(True)
+        self.show_password.toggled.connect(self.on_show_password)
+        box.addWidget(self.show_password)
         self.badPassword = QtWidgets.QLabel()
         self.badPassword.setPixmap(QtGui.QPixmap(
             "/usr/share/icons/oxygen/16x16/status/dialog-warning.png"))
@@ -234,6 +239,13 @@ class PartAuto(QtWidgets.QWidget):
         b = self.autopartition_buttongroup.button(0)
         b and b.click()
 
+    def on_show_password(self, state):
+        modes = (QtWidgets.QLineEdit.Password, QtWidgets.QLineEdit.Normal)
+        icons = ("password-show-off", "password-show-on")
+        self.password.setEchoMode(modes[state])
+        self.verified_password.setEchoMode(modes[state])
+        self.show_password.setIcon(QtGui.QIcon.fromTheme(icons[state]))
+
     # slot for when partition is resized on the bar
     def on_partitionResized(self, unused, size):
         self.resizeSize = size
diff --git a/ubiquity/plugins/ubi-usersetup.py b/ubiquity/plugins/ubi-usersetup.py
index ceb067f..b97af12 100644
--- a/ubiquity/plugins/ubi-usersetup.py
+++ b/ubiquity/plugins/ubi-usersetup.py
@@ -562,7 +562,7 @@ class PageKde(PageBase):
         self.controller = controller
 
         from PyQt5 import uic
-        from PyQt5.QtGui import QPixmap
+        from PyQt5.QtGui import QPixmap, QIcon
 
         self.plugin_widgets = uic.loadUi(
             '/usr/share/ubiquity/qt/stepUserSetup.ui')
@@ -595,11 +595,14 @@ class PageKde(PageBase):
         self.page.password_error_image.setPixmap(warningIcon)
         self.page.hostname_error_image.setPixmap(warningIcon)
 
+        self.page.show_password.setIcon(QIcon.fromTheme("password-show-off"))
+
         self.clear_errors()
 
         self.page.fullname.textChanged[str].connect(self.on_fullname_changed)
         self.page.username.textChanged[str].connect(self.on_username_changed)
         self.page.hostname.textChanged[str].connect(self.on_hostname_changed)
+        self.page.show_password.toggled.connect(self.on_show_password)
         # self.page.password.textChanged[str].connect(self.on_password_changed)
         # self.page.verified_password.textChanged[str].connect(
         #    self.on_verified_password_changed)
@@ -607,6 +610,16 @@ class PageKde(PageBase):
         self.page.password_debug_warning_label.setVisible(
             'UBIQUITY_DEBUG' in os.environ)
 
+    def on_show_password(self, state):
+        from PyQt5 import QtWidgets
+        from PyQt5.QtGui import QIcon
+
+        modes = (QtWidgets.QLineEdit.Password, QtWidgets.QLineEdit.Normal)
+        icons = ("password-show-off", "password-show-on")
+        self.page.password.setEchoMode(modes[state])
+        self.page.verified_password.setEchoMode(modes[state])
+        self.page.show_password.setIcon(QIcon.fromTheme(icons[state]))
+
     def on_fullname_changed(self):
         # If the user did not manually enter a username create one for him.
         if not self.username_edited: