ui improvement; added rdp options

maindialog.cpp

@@ -3,7 +3,6 @@
 #include <QDebug>
 #include "maindialog.h"
 #include "ui_maindialog.h"
-#include "rdpoptions.h"
 #include "rdesktoplauncher.h"
 
 MainDialog::MainDialog(QWidget *parent) :
@@ -22,24 +21,17 @@ MainDialog::~MainDialog()
     delete ui;
 }
 
-void MainDialog::on_btnConnect_clicked()
+RdpOptions MainDialog::getRdpOptions() const
 {
     RdpOptions opt;
-    opt.setBitmapCache(ui->checkCacheBitmap->isChecked());
-    opt.setExperience((RdpOptions::Experience)ui->comboExperience->currentIndex());
-    opt.setFullescreen(ui->slidResolution->value() == m_resolutions.size());
     opt.setHost(ui->lineComputer->currentText());
-    int meta = ui->comboMetaKeys->currentIndex();
-    opt.setMetaKeys(meta == 0 || (opt.fullescreen() && meta == 2));
-    opt.setPassword(ui->linePassword->text());
-    opt.setResolution(m_resolutions.at(m_resolutions.size() - 1));
     opt.setUsername(ui->lineUsername->text());
-    opt.setUseShell(ui->checkShell->isChecked());
-    if (opt.useShell())
-    {
-        opt.setShell(ui->lineShellPath->text());
-        opt.setShellWorkingDir(ui->lineShellWorkingDir->text());
-    }
+    opt.setPassword(ui->linePassword->text());
+    opt.setFullescreen(ui->slidResolution->value() == m_resolutions.size());
+    if (!opt.fullescreen())
+        opt.setResolution(m_resolutions.at(m_resolutions.size() - 1));
+    opt.setUseAllMonitors(ui->checkAllDisplays->isChecked());
+
     int colors = ui->comboColors->currentIndex();
     RdpOptions::Colors c;
     if (colors == 0)
@@ -51,6 +43,63 @@ void MainDialog::on_btnConnect_clicked()
     else if (colors == 3)
         c = RdpOptions::HighestQuality;
     opt.setColors(c);
+
+    opt.setFullscreenBar(ui->checkFullscreenBar->isChecked());
+    int meta = ui->comboMetaKeys->currentIndex();
+    opt.setMetaKeys(meta == 0 || (opt.fullescreen() && meta == 2));
+    opt.setUseShell(ui->checkShell->isChecked());
+    if (opt.useShell())
+    {
+        opt.setShell(ui->lineShellPath->text());
+        opt.setShellWorkingDir(ui->lineShellWorkingDir->text());
+    }
+    opt.setExperience((RdpOptions::Experience)ui->comboExperience->currentIndex());
+    opt.setBitmapCache(ui->checkCacheBitmap->isChecked());
+    opt.setAutoReconnect(ui->checkAutoReconnect->isChecked());
+    return opt;
+}
+
+void MainDialog::setRdpOptions(const RdpOptions &opt)
+{
+    ui->lineComputer->lineEdit()->setText(opt.host());
+    ui->lineUsername->setText(opt.username());
+    ui->linePassword->setText(opt.password());
+    if (opt.fullescreen())
+    {
+        ui->slidResolution->setValue(ui->slidResolution->maximum());
+    }
+    else
+    {
+
+    }
+    ui->checkAllDisplays->setChecked(opt.useAllMonitors());
+
+    int index = 0;
+    RdpOptions::Colors c = opt.colors();
+    if (c == RdpOptions::HighColor_15)
+        index = 0;
+    else if (c == RdpOptions::HighColor_16)
+        index = 1;
+    else if (c == RdpOptions::TrueColor)
+        index = 2;
+    else if (c == RdpOptions::HighestQuality)
+        index = 3;
+    ui->comboColors->setCurrentIndex(index);
+
+    ui->checkFullscreenBar->setChecked(opt.fullscreenBar());
+    ui->comboMetaKeys->setCurrentIndex(opt.metaKeys() ? 2 : 1);
+    ui->checkShell->setChecked(opt.useShell());
+    ui->lineShellPath->setText(opt.shell());
+    ui->lineShellWorkingDir->setText(opt.shellWorkingDir());
+    ui->comboExperience->setCurrentIndex((int)opt.experience());
+    ui->checkCacheBitmap->setChecked(opt.bitmapCache());
+    ui->checkAutoReconnect->setChecked(opt.autoReconnect());
+}
+
+void MainDialog::on_btnConnect_clicked()
+{
+    RdpOptions opt = getRdpOptions();
+
     RDesktopLauncher launcher;
     launcher.start(opt);
 }
@@ -80,3 +129,18 @@ void MainDialog::on_slidResolution_valueChanged(int value)
         ui->lblResolution->setText(tr("Plein écran"));
     }
 }
+
+void MainDialog::on_btnSaveSession_clicked()
+{
+
+}
+
+void MainDialog::on_btnSaveAsSession_clicked()
+{
+
+}
+
+void MainDialog::on_btnOpenSession_clicked()
+{
+
+}

maindialog.h

@@ -2,6 +2,7 @@
 #define MAINDIALOG_H
 
 #include <QDialog>
+#include "rdpoptions.h"
 
 namespace Ui {
 class MainDialog;
@@ -15,6 +16,11 @@ public:
     explicit MainDialog(QWidget *parent = 0);
     ~MainDialog();
 
+    RdpOptions getRdpOptions() const;
+
+public slots:
+    void setRdpOptions(const RdpOptions& opt);
+
 private slots:
     void on_btnConnect_clicked();
 
@@ -24,6 +30,12 @@ private slots:
 
     void on_slidResolution_valueChanged(int value);
 
+    void on_btnSaveSession_clicked();
+
+    void on_btnSaveAsSession_clicked();
+
+    void on_btnOpenSession_clicked();
+
 private:
     Ui::MainDialog *ui;
 

maindialog.ui

@@ -94,7 +94,7 @@
       </font>
      </property>
      <property name="currentIndex">
-      <number>3</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="tabGeneral">
       <attribute name="title">
@@ -142,9 +142,6 @@
           </item>
           <item row="4" column="1" colspan="2">
            <widget class="QCheckBox" name="checkSaveSession">
-            <property name="enabled">
-             <bool>false</bool>
-            </property>
             <property name="text">
              <string>Me permettre d'enregistrer les informations d'idenfication</string>
             </property>
@@ -204,9 +201,6 @@
        </item>
        <item>
         <widget class="QGroupBox" name="groupBox_2">
-         <property name="enabled">
-          <bool>false</bool>
-         </property>
          <property name="title">
           <string>Paramètres de connexion</string>
          </property>
@@ -292,9 +286,6 @@
          <layout class="QGridLayout" name="gridLayout_3">
           <item row="3" column="1" colspan="3">
            <widget class="QCheckBox" name="checkAllDisplays">
-            <property name="enabled">
-             <bool>false</bool>
-            </property>
             <property name="sizePolicy">
              <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
               <horstretch>0</horstretch>
@@ -475,9 +466,6 @@
        </item>
        <item>
         <widget class="QCheckBox" name="checkFullscreenBar">
-         <property name="enabled">
-          <bool>false</bool>
-         </property>
          <property name="text">
           <string>Afficher la barre de connexion en cas de mode plein écran</string>
          </property>
@@ -928,9 +916,6 @@
        </item>
        <item>
         <widget class="QCheckBox" name="checkAutoReconnect">
-         <property name="enabled">
-          <bool>false</bool>
-         </property>
          <property name="text">
           <string>Rétablir la connexion si elle est interrompue</string>
          </property>

rdpoptions.cpp

@@ -122,6 +122,36 @@ void RdpOptions::setColors(const Colors &colors)
 {
     m_colors = colors;
 }
+bool RdpOptions::useAllMonitors() const
+{
+    return m_useAllMonitors;
+}
+
+void RdpOptions::setUseAllMonitors(bool useAllMonitors)
+{
+    m_useAllMonitors = useAllMonitors;
+}
+bool RdpOptions::fullscreenBar() const
+{
+    return m_fullscreenBar;
+}
+
+void RdpOptions::setFullscreenBar(bool fullscreenBar)
+{
+    m_fullscreenBar = fullscreenBar;
+}
+bool RdpOptions::autoReconnect() const
+{
+    return m_autoReconnect;
+}
+
+void RdpOptions::setAutoReconnect(bool autoReconnect)
+{
+    m_autoReconnect = autoReconnect;
+}
+
+
+
 
 
 

rdpoptions.h

@@ -64,6 +64,15 @@ public:
     Colors colors() const;
     void setColors(const Colors &colors);
 
+    bool useAllMonitors() const;
+    void setUseAllMonitors(bool useAllMonitors);
+
+    bool fullscreenBar() const;
+    void setFullscreenBar(bool fullscreenBar);
+
+    bool autoReconnect() const;
+    void setAutoReconnect(bool autoReconnect);
+
 private:
     QString m_host;
 
@@ -71,13 +80,15 @@ private:
 
     QString m_password;
 
+    bool m_fullescreen;
+
     QSize m_resolution;
 
-    bool m_fullescreen;
+    bool m_useAllMonitors;
 
-    Experience m_experience;
+    Colors m_colors;
 
-    bool m_bitmapCache;
+    bool m_fullscreenBar;
 
     bool m_metaKeys;
 
@@ -87,7 +98,11 @@ private:
 
     QString m_shellWorkingDir;
 
-    Colors m_colors;
+    Experience m_experience;
+
+    bool m_bitmapCache;
+
+    bool m_autoReconnect;
 };
 
 #endif // RDPOPTIONS_H