use QgsPasswordLineEdit in the master password dialog

alexbruy · alexbruy · commit ec5a8911a800 · 2017-04-17T10:59:16.000+03:00
diff --git a/src/gui/qgscredentialdialog.cpp b/src/gui/qgscredentialdialog.cpp
@@ -208,7 +208,6 @@ void QgsCredentialDialog::requestCredentialsMasterPassword( QString *password, b
 
   // don't leave master password in singleton's text field, or the ability to show it
   leMasterPass->clear();
-  chkMasterPassShow->setChecked( false );
   leMasterPassVerify->clear();
 
   chkbxEraseAuthDb->setChecked( false );
@@ -226,12 +225,6 @@ void QgsCredentialDialog::requestCredentialsMasterPassword( QString *password, b
   }
 }
 
-void QgsCredentialDialog::on_chkMasterPassShow_stateChanged( int state )
-{
-  leMasterPass->setEchoMode( ( state > 0 ) ? QLineEdit::Normal : QLineEdit::Password );
-  leMasterPassVerify->setEchoMode( ( state > 0 ) ? QLineEdit::Normal : QLineEdit::Password );
-}
-
 void QgsCredentialDialog::on_leMasterPass_textChanged( const QString &pass )
 {
   leMasterPass->setStyleSheet( QLatin1String( "" ) );
diff --git a/src/gui/qgscredentialdialog.h b/src/gui/qgscredentialdialog.h
@@ -48,7 +48,6 @@ class GUI_EXPORT QgsCredentialDialog : public QDialog, public QgsCredentials, pr
 
     void requestCredentialsMasterPassword( QString *password, bool stored, bool *ok );
 
-    void on_chkMasterPassShow_stateChanged( int state );
     void on_leMasterPass_textChanged( const QString &pass );
     void on_leMasterPassVerify_textChanged( const QString &pass );
     void on_chkbxEraseAuthDb_toggled( bool checked );
diff --git a/src/ui/qgscredentialdialog.ui b/src/ui/qgscredentialdialog.ui
@@ -121,29 +121,16 @@
         </widget>
        </item>
        <item>
-        <layout class="QGridLayout" name="gridLayout">
-         <item row="0" column="0">
-          <widget class="QLineEdit" name="leMasterPass">
+        <layout class="QVBoxLayout" name="verticalLayout_2">
+         <item>
+          <widget class="QgsPasswordLineEdit" name="leMasterPass">
            <property name="echoMode">
             <enum>QLineEdit::Password</enum>
            </property>
           </widget>
          </item>
-         <item row="0" column="1">
-          <widget class="QCheckBox" name="chkMasterPassShow">
-           <property name="sizePolicy">
-            <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
-             <horstretch>0</horstretch>
-             <verstretch>0</verstretch>
-            </sizepolicy>
-           </property>
-           <property name="text">
-            <string>Show</string>
-           </property>
-          </widget>
-         </item>
-         <item row="1" column="0">
-          <widget class="QLineEdit" name="leMasterPassVerify">
+         <item>
+          <widget class="QgsPasswordLineEdit" name="leMasterPassVerify">
            <property name="echoMode">
             <enum>QLineEdit::Password</enum>
            </property>
@@ -239,7 +226,6 @@ font-style: italic;
   <tabstop>lePassword</tabstop>
   <tabstop>leMasterPass</tabstop>
   <tabstop>leMasterPassVerify</tabstop>
-  <tabstop>chkMasterPassShow</tabstop>
   <tabstop>chkbxEraseAuthDb</tabstop>
  </tabstops>
  <resources/>

Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,6 @@ void QgsCredentialDialog::requestCredentialsMasterPassword( QString *password, b`
`208`	`208`
`209`	`209`	`// don't leave master password in singleton's text field, or the ability to show it`
`210`	`210`	`leMasterPass->clear();`
`211`		`- chkMasterPassShow->setChecked( false );`
`212`	`211`	`leMasterPassVerify->clear();`
`213`	`212`
`214`	`213`	`chkbxEraseAuthDb->setChecked( false );`
`@@ -226,12 +225,6 @@ void QgsCredentialDialog::requestCredentialsMasterPassword( QString *password, b`
`226`	`225`	`}`
`227`	`226`	`}`
`228`	`227`
`229`		`-void QgsCredentialDialog::on_chkMasterPassShow_stateChanged( int state )`
`230`		`-{`
`231`		`- leMasterPass->setEchoMode( ( state > 0 ) ? QLineEdit::Normal : QLineEdit::Password );`
`232`		`- leMasterPassVerify->setEchoMode( ( state > 0 ) ? QLineEdit::Normal : QLineEdit::Password );`
`233`		`-}`
`234`		`-`
`235`	`228`	`void QgsCredentialDialog::on_leMasterPass_textChanged( const QString &pass )`
`236`	`229`	`{`
`237`	`230`	`leMasterPass->setStyleSheet( QLatin1String( "" ) );`