added username in host combobox; restore current options when saving

maindialog.cpp

@@ -118,7 +118,7 @@ void MainDialog::loadAll()
     for (int i = 1; i < m_rdpOptions.size(); ++i)
     {
         RdpOptions opt = m_rdpOptions.at(i);
-        ui->lineComputer->addItem(opt.host());
+        ui->lineComputer->addItem(opt.visibleName());
     }
 
     ui->lineComputer->setFocus();
@@ -160,8 +160,10 @@ void MainDialog::on_slidResolution_valueChanged(int value)
 
 void MainDialog::on_btnSaveSession_clicked()
 {
+    RdpOptions options = getRdpOptions();
     RdpOptionsHelper::save(getRdpOptions());
     loadAll();
+    setRdpOptions(options);
 }
 
 void MainDialog::on_btnSaveAsSession_clicked()

rdpoptions.cpp

@@ -159,6 +159,21 @@ void RdpOptions::setKeymap(const QString &keymap)
     m_keymap = keymap;
 }
 
+QString RdpOptions::visibleName() const
+{
+    QString str;
+    if (!m_username.isEmpty()) {
+        str += m_username;
+    }
+    if (!m_host.isEmpty()) {
+        if (!str.isEmpty()) {
+            str += "@";
+        }
+        str += m_host;
+    }
+    return str;
+}
+
 
 
 

rdpoptions.h

@@ -76,6 +76,8 @@ public:
     QString keymap() const;
     void setKeymap(const QString &keymap);
 
+    QString visibleName() const;
+
 private:
     QString m_host;