Merge pull request #59 from silicon-heaven/add-eye-to-password-textbo…

…x-in-server-editor add eye to password textbox in broker properties
silicon-heaven · Oct 7, 2024 · d6f3b6d · d6f3b6d
2 parents 8b082b1 + aed74ad
commit d6f3b6d
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 17 deletions.
diff --git a/.github/actions/cmake/action.yml b/.github/actions/cmake/action.yml
@@ -33,6 +33,10 @@ runs:
     - name: Install windows deps
       if: runner.os == 'Windows'
       run: |
+        # https://github.com/microsoft/vcpkg/issues/41199#issuecomment-2378255699
+        export SystemDrive="$SYSTEMDRIVE"
+        export SystemRoot="$SYSTEMROOT"
+        export windir="$WINDIR"
         vcpkg install doctest:x64-mingw-dynamic trompeloeil:x64-mingw-dynamic
         echo cmake_extra_args="'-DCMAKE_TOOLCHAIN_FILE=$VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake' '-DMINGW=ON' '-G MinGW Makefiles'" >> "$GITHUB_ENV"
       shell: bash

diff --git a/shvspy/src/appversion.h b/shvspy/src/appversion.h
@@ -1,4 +1,4 @@
 #pragma once
 
-#define APP_VERSION "1.9.8"
+#define APP_VERSION "1.9.9"
 
diff --git a/shvspy/src/dlgbrokerproperties.cpp b/shvspy/src/dlgbrokerproperties.cpp
@@ -68,6 +68,9 @@ DlgBrokerProperties::DlgBrokerProperties(QWidget *parent) :
 	connect(ui->lstSecurityType, &QComboBox::currentTextChanged, this,
 			[this] (const QString &security_type_text) { ui->chkPeerVerify->setDisabled(security_type_text == "none"); });
 
+	connect(ui->tbShowPassword, &QToolButton::toggled, this, [this](bool checked) {
+		ui->edPassword->setEchoMode(checked ? QLineEdit::EchoMode::Normal : QLineEdit::EchoMode::Password);
+	});
 	QSettings settings;
 	restoreGeometry(settings.value(QStringLiteral("ui/dlgServerProperties/geometry")).toByteArray());
 }

diff --git a/shvspy/src/dlgbrokerproperties.ui b/shvspy/src/dlgbrokerproperties.ui
@@ -331,26 +331,23 @@
       <bool>true</bool>
      </property>
      <layout class="QGridLayout" name="gridLayout">
-      <item row="0" column="0">
-       <widget class="QLabel" name="label_2">
+      <item row="0" column="3">
+       <widget class="QCheckBox" name="cbLoginWithAzure">
         <property name="text">
-         <string>&amp;User</string>
-        </property>
-        <property name="buddy">
-         <cstring>edUser</cstring>
+         <string>login with Azure</string>
         </property>
        </widget>
       </item>
-      <item row="0" column="1">
-       <widget class="QLineEdit" name="edUser"/>
-      </item>
-      <item row="0" column="2">
-       <widget class="QCheckBox" name="cbLoginWithAzure">
+      <item row="1" column="3">
+       <widget class="QCheckBox" name="cbPlainTextPassword">
         <property name="text">
-         <string>login with Azure</string>
+         <string>plain text password</string>
         </property>
        </widget>
       </item>
+      <item row="0" column="1">
+       <widget class="QLineEdit" name="edUser"/>
+      </item>
       <item row="1" column="0">
        <widget class="QLabel" name="label_5">
         <property name="text">
@@ -364,14 +361,31 @@
       <item row="1" column="1">
        <widget class="QLineEdit" name="edPassword">
         <property name="echoMode">
-         <enum>QLineEdit::Password</enum>
+         <enum>QLineEdit::EchoMode::Password</enum>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0">
+       <widget class="QLabel" name="label_2">
+        <property name="text">
+         <string>&amp;User</string>
+        </property>
+        <property name="buddy">
+         <cstring>edUser</cstring>
         </property>
        </widget>
       </item>
       <item row="1" column="2">
-       <widget class="QCheckBox" name="cbPlainTextPassword">
+       <widget class="QToolButton" name="tbShowPassword">
         <property name="text">
-         <string>plain text password</string>
+         <string>...</string>
+        </property>
+        <property name="icon">
+         <iconset resource="../shvspy.qrc">
+          <normaloff>:/shvspy/images/show.svg</normaloff>:/shvspy/images/show.svg</iconset>
+        </property>
+        <property name="checkable">
+         <bool>true</bool>
         </property>
        </widget>
       </item>
@@ -397,7 +411,9 @@
   <tabstop>device_mountPoint</tabstop>
   <tabstop>chkMuteHeartBeats</tabstop>
  </tabstops>
- <resources/>
+ <resources>
+  <include location="../shvspy.qrc"/>
+ </resources>
  <connections>
   <connection>
    <sender>buttonBox</sender>