Using variables in the connection describer has been extended

limereport/databrowser/lrconnectiondialog.cpp

@@ -118,7 +118,7 @@ ConnectionDesc *ConnectionDialog::uiToConnection(LimeReport::ConnectionDesc* con
     result ->setName(ConnectionDesc::connectionNameForReport(ui->leConnectionName->text()));
     result ->setHost(ui->leServerName->text());
     if (!ui->lePort->text().isEmpty())
-        result->setPort(ui->lePort->text().toInt());
+        result->setPort(ui->lePort->text());
     result ->setDriver(ui->cbbDrivers->currentText());
     result ->setUserName(ui->leUserName->text());
     result ->setPassword(ui->lePassword->text());
@@ -141,7 +141,7 @@ void ConnectionDialog::connectionToUI()
     ui->cbbDrivers->setCurrentIndex(ui->cbbDrivers->findText(m_connection->driver()));
     ui->cbAutoConnect->setChecked(m_connection->autoconnect());
     ui->cbbKeepCredentials->setChecked(!m_connection->keepDBCredentials());
-    ui->lePort->setText(m_connection->port()!=-1?QString::number(m_connection->port()):"");
+    ui->lePort->setText(m_connection->port());
 }
 
 void ConnectionDialog::on_toolButton_clicked()
@@ -160,6 +160,10 @@ void ConnectionDialog::on_cbbUseDefaultConnection_toggled(bool checked)
         ui->leConnectionName->setEnabled(true);
     }
 }
+void ConnectionDialog::on_toolButton_2_toggled(bool checked)
+{
+    ui->lePassword->setEchoMode(checked ? QLineEdit::Normal : QLineEdit::Password);
+}
 
 } // namespace LimeReport
 
@@ -167,3 +171,5 @@ void ConnectionDialog::on_cbbUseDefaultConnection_toggled(bool checked)
 
 
 
+
+

limereport/databrowser/lrconnectiondialog.h

@@ -60,6 +60,8 @@ private slots:
     void on_toolButton_clicked();
     void on_cbbUseDefaultConnection_toggled(bool checked);
 
+    void on_toolButton_2_toggled(bool checked);
+
 private:
     Ui::ConnectionDialog *ui;
     ConnectionDesc* m_connection;

limereport/databrowser/lrconnectiondialog.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>420</width>
-    <height>323</height>
+    <height>363</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -44,7 +44,7 @@
     </widget>
    </item>
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_4">
+    <layout class="QHBoxLayout" name="horizontalLayout_5">
      <item>
       <layout class="QVBoxLayout" name="verticalLayout_2">
        <item>
@@ -114,14 +114,39 @@
         </widget>
        </item>
        <item>
-        <widget class="QLineEdit" name="lePassword">
-         <property name="text">
-          <string/>
+        <layout class="QHBoxLayout" name="horizontalLayout_4">
+         <property name="spacing">
+          <number>2</number>
          </property>
-         <property name="echoMode">
-          <enum>QLineEdit::Password</enum>
-         </property>
-        </widget>
+         <item>
+          <widget class="QLineEdit" name="lePassword">
+           <property name="text">
+            <string/>
+           </property>
+           <property name="echoMode">
+            <enum>QLineEdit::Password</enum>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QToolButton" name="toolButton_2">
+           <property name="focusPolicy">
+            <enum>Qt::ClickFocus</enum>
+           </property>
+           <property name="text">
+            <string/>
+           </property>
+           <property name="icon">
+            <iconset resource="lrdatabrowser.qrc">
+             <normaloff>:/databrowser/images/closed_eye.png</normaloff>
+             <normalon>:/databrowser/images/eye.png</normalon>:/databrowser/images/closed_eye.png</iconset>
+           </property>
+           <property name="checkable">
+            <bool>true</bool>
+           </property>
+          </widget>
+         </item>
+        </layout>
        </item>
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout_3">
@@ -137,6 +162,9 @@
          </item>
          <item>
           <widget class="QToolButton" name="toolButton">
+           <property name="focusPolicy">
+            <enum>Qt::ClickFocus</enum>
+           </property>
            <property name="text">
             <string>...</string>
            </property>
@@ -221,8 +249,24 @@
    </item>
   </layout>
  </widget>
+ <tabstops>
+  <tabstop>leConnectionName</tabstop>
+  <tabstop>cbbUseDefaultConnection</tabstop>
+  <tabstop>cbbDrivers</tabstop>
+  <tabstop>leServerName</tabstop>
+  <tabstop>lePort</tabstop>
+  <tabstop>leUserName</tabstop>
+  <tabstop>lePassword</tabstop>
+  <tabstop>leDataBase</tabstop>
+  <tabstop>cbAutoConnect</tabstop>
+  <tabstop>cbbKeepCredentials</tabstop>
+  <tabstop>pbCheckConnection</tabstop>
+  <tabstop>pbCancel</tabstop>
+  <tabstop>pbOk</tabstop>
+ </tabstops>
  <resources>
   <include location="lrdatabrowser.qrc"/>
+  <include location="lrdatabrowser.qrc"/>
  </resources>
  <connections>
   <connection>

limereport/databrowser/lrdatabrowser.qrc

@@ -44,5 +44,7 @@
         <file alias="/images/value_edit">images/value_edit2.png</file>
         <file alias="/images/value">images/value1.png</file>
         <file alias="/images/varToReport">images/varToReport.png</file>
+        <file>images/eye.png</file>
+        <file>images/closed_eye.png</file>
     </qresource>
 </RCC>