From 2e9f70f4ad67423a46be0de6e91c630797dfc70d Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Fri, 29 Dec 2017 03:11:45 +0100
Subject: [PATCH] Login, password can be shown (temporarily)

---
 src/blackgui/components/logincomponent.cpp |  11 ++
 src/blackgui/components/logincomponent.h   |   9 +-
 src/blackgui/components/logincomponent.ui  | 163 ++++++++++++++-------
 3 files changed, 127 insertions(+), 56 deletions(-)

diff --git a/src/blackgui/components/logincomponent.cpp b/src/blackgui/components/logincomponent.cpp
index 3add26429..5fa0956e9 100644
--- a/src/blackgui/components/logincomponent.cpp
+++ b/src/blackgui/components/logincomponent.cpp
@@ -91,6 +91,7 @@ namespace BlackGui
             connect(ui->bb_OkCancel, &QDialogButtonBox::accepted, this, &CLoginComponent::toggleNetworkConnection);
             connect(ui->pb_OtherServersGotoSettings, &QPushButton::pressed, this, &CLoginComponent::requestNetworkSettings);
             connect(ui->tb_MappingWizard, &QToolButton::clicked, this, &CLoginComponent::mappingWizard);
+            connect(ui->tb_UnhidePassword, &QToolButton::clicked, this, &CLoginComponent::unhidePassword);
 
             ui->comp_FsdDetails->showEnableInfo(true);
             ui->comp_FsdDetails->setFsdSetupEnabled(false);
@@ -646,6 +647,16 @@ namespace BlackGui
             }
         }
 
+        void CLoginComponent::unhidePassword()
+        {
+            static const QLineEdit::EchoMode originalMode = ui->le_VatsimPassword->echoMode();
+            ui->le_VatsimPassword->setEchoMode(QLineEdit::Normal);
+            QTimer::singleShot(5000, this, [ = ]
+            {
+                ui->le_VatsimPassword->setEchoMode(originalMode);
+            });
+        }
+
         void CLoginComponent::initCompleters(CEntityFlags::Entity entity)
         {
             // completers where possible
diff --git a/src/blackgui/components/logincomponent.h b/src/blackgui/components/logincomponent.h
index e0f8a0a16..82c3bc27f 100644
--- a/src/blackgui/components/logincomponent.h
+++ b/src/blackgui/components/logincomponent.h
@@ -125,6 +125,9 @@ namespace BlackGui
             //! Pause/Continue timeout
             void toggleTimeout();
 
+            //! Temp. unhide password
+            void unhidePassword();
+
             //! GUI aircraft values, formatted
             struct CGuiAircraftValues
             {
@@ -159,7 +162,7 @@ namespace BlackGui
             BlackMisc::Aviation::CCallsign getCallsignFromGui() const;
 
             //! Set ICAO values
-            //! \return changed values
+            //! \return changed values?
             bool setGuiIcaoValues(const BlackMisc::Simulation::CAircraftModel &model, bool onlyIfEmpty);
 
             // -------------- values from GUI -----------------
@@ -209,8 +212,8 @@ namespace BlackGui
             BlackMisc::CDigestSignal m_changedLoginDataDigestSignal { this, &CLoginComponent::loginDataChangedDigest, 1500, 10 };
             bool m_autoPopupWizard = false; //!< automatically popup wizard if mapping is needed
             bool m_visible = false; //!< is this component selected?
-            QIcon m_iconPlay {":/famfamfam/icons/famfamfam/icons/silk/control_play_blue.png"};
-            QIcon m_iconPause {":/famfamfam/icons/famfamfam/icons/silk/control_pause_blue.png"};
+            const QIcon m_iconPlay {":/famfamfam/icons/famfamfam/icons/silk/control_play_blue.png"};
+            const QIcon m_iconPause {":/famfamfam/icons/famfamfam/icons/silk/control_pause_blue.png"};
             const int LogoffIntervalSeconds = 20; //!< time before logoff
             QTimer *m_logoffCountdownTimer { nullptr }; //!< timer for logoff countdown
             BlackMisc::CSettingReadOnly<BlackCore::Vatsim::TTrafficServers> m_otherTrafficNetworkServers { this, &CLoginComponent::reloadSettings };
diff --git a/src/blackgui/components/logincomponent.ui b/src/blackgui/components/logincomponent.ui
index 57038dcde..ccbc82b35 100644
--- a/src/blackgui/components/logincomponent.ui
+++ b/src/blackgui/components/logincomponent.ui
@@ -97,24 +97,24 @@
           <property name="verticalSpacing">
            <number>4</number>
           </property>
-          <item row="1" column="1">
-           <widget class="QLineEdit" name="le_VatsimId"/>
-          </item>
-          <item row="3" column="5">
+          <item row="3" column="6">
            <widget class="BlackGui::CTickLabel" name="lblp_VatsimHomeAirport">
             <property name="text">
              <string/>
             </property>
            </widget>
           </item>
-          <item row="1" column="4">
+          <item row="1" column="1">
+           <widget class="QLineEdit" name="le_VatsimId"/>
+          </item>
+          <item row="1" column="5">
            <widget class="QLineEdit" name="le_VatsimPassword">
             <property name="echoMode">
              <enum>QLineEdit::PasswordEchoOnEdit</enum>
             </property>
            </widget>
           </item>
-          <item row="1" column="5">
+          <item row="1" column="6">
            <widget class="BlackGui::CTickLabel" name="lblp_VatsimPassword">
             <property name="text">
              <string/>
@@ -135,13 +135,30 @@
             </property>
            </widget>
           </item>
-          <item row="2" column="5">
+          <item row="2" column="6">
            <widget class="BlackGui::CTickLabel" name="lblp_VatsimRealName">
             <property name="text">
              <string/>
             </property>
            </widget>
           </item>
+          <item row="3" column="1">
+           <widget class="QLineEdit" name="le_VatsimHomeAirport">
+            <property name="maxLength">
+             <number>4</number>
+            </property>
+            <property name="placeholderText">
+             <string>e.g. &quot;KLAX&quot;</string>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="0">
+           <widget class="QLabel" name="lbl_VatsimServer">
+            <property name="text">
+             <string>Server</string>
+            </property>
+           </widget>
+          </item>
           <item row="3" column="0">
            <widget class="QLabel" name="lbl_VatsimHomeAirport">
             <property name="toolTip">
@@ -152,33 +169,16 @@
             </property>
            </widget>
           </item>
-          <item row="4" column="1" colspan="4">
+          <item row="4" column="1" colspan="5">
            <widget class="BlackGui::Components::CServerListSelector" name="comp_VatsimServer"/>
           </item>
-          <item row="3" column="1">
-           <widget class="QLineEdit" name="le_VatsimHomeAirport">
-            <property name="maxLength">
-             <number>4</number>
-            </property>
-            <property name="placeholderText">
-             <string>e.g. &quot;KLAX&quot;</string>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="1" colspan="4">
+          <item row="2" column="1" colspan="5">
            <widget class="QLineEdit" name="le_VatsimRealName">
             <property name="placeholderText">
              <string>e.g. Joe Doe</string>
             </property>
            </widget>
           </item>
-          <item row="4" column="0">
-           <widget class="QLabel" name="lbl_VatsimServer">
-            <property name="text">
-             <string>Server</string>
-            </property>
-           </widget>
-          </item>
           <item row="1" column="3">
            <widget class="QLabel" name="lbl_VatsimPassword">
             <property name="text">
@@ -193,7 +193,7 @@
             </property>
            </widget>
           </item>
-          <item row="5" column="0" colspan="5">
+          <item row="5" column="0" colspan="6">
            <widget class="QWidget" name="wi_EmptyForSpace" native="true">
             <property name="minimumSize">
              <size>
@@ -203,6 +203,20 @@
             </property>
            </widget>
           </item>
+          <item row="1" column="4">
+           <widget class="QToolButton" name="tb_UnhidePassword">
+            <property name="toolTip">
+             <string>unhide password</string>
+            </property>
+            <property name="text">
+             <string>...</string>
+            </property>
+            <property name="icon">
+             <iconset resource="../../blackmisc/blackmisc.qrc">
+              <normaloff>:/diagona/icons/diagona/icons/question-button.png</normaloff>:/diagona/icons/diagona/icons/question-button.png</iconset>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
         <widget class="QWidget" name="pg_OtherServers">
@@ -662,25 +676,80 @@
      </layout>
     </widget>
    </item>
-   <item>
-    <widget class="QDialogButtonBox" name="bb_OkCancel">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-     <property name="centerButtons">
-      <bool>false</bool>
-     </property>
+   <item alignment="Qt::AlignBottom">
+    <widget class="QFrame" name="fr_Buttons">
+     <layout class="QGridLayout" name="gl_Buttons">
+      <property name="leftMargin">
+       <number>3</number>
+      </property>
+      <property name="topMargin">
+       <number>3</number>
+      </property>
+      <property name="rightMargin">
+       <number>3</number>
+      </property>
+      <property name="bottomMargin">
+       <number>3</number>
+      </property>
+      <item row="1" column="0">
+       <spacer name="hs_Buttons">
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>40</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="1" column="2">
+       <widget class="QPushButton" name="pb_Cancel">
+        <property name="text">
+         <string>cancel</string>
+        </property>
+        <property name="shortcut">
+         <string>Esc</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QPushButton" name="pb_Ok">
+        <property name="text">
+         <string>ok</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
     </widget>
    </item>
   </layout>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>BlackGui::CTickLabel</class>
+   <extends>QLabel</extends>
+   <header>blackgui/ticklabel.h</header>
+  </customwidget>
+  <customwidget>
+   <class>BlackGui::Editors::CFsdSetupForm</class>
+   <extends>QFrame</extends>
+   <header>blackgui/editors/fsdsetupform.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>BlackGui::Components::CDbAircraftIcaoSelectorComponent</class>
+   <extends>QFrame</extends>
+   <header>blackgui/components/dbaircrafticaoselectorcomponent.h</header>
+   <container>1</container>
+  </customwidget>
+  <customwidget>
+   <class>BlackGui::Components::CDbAirlineIcaoSelectorComponent</class>
+   <extends>QFrame</extends>
+   <header>blackgui/components/dbairlineicaoselectorcomponent.h</header>
+   <container>1</container>
+  </customwidget>
   <customwidget>
    <class>BlackGui::CTickLabel</class>
    <extends>QLabel</extends>
@@ -709,18 +778,6 @@
    <header>blackgui/editors/fsdsetupform.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>BlackGui::Components::CDbAircraftIcaoSelectorComponent</class>
-   <extends>QFrame</extends>
-   <header>blackgui/components/dbaircrafticaoselectorcomponent.h</header>
-   <container>1</container>
-  </customwidget>
-  <customwidget>
-   <class>BlackGui::Components::CDbAirlineIcaoSelectorComponent</class>
-   <extends>QFrame</extends>
-   <header>blackgui/components/dbairlineicaoselectorcomponent.h</header>
-   <container>1</container>
-  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>tw_Network</tabstop>