save rdp options

maindialog.cpp

@@ -4,6 +4,7 @@
 #include "maindialog.h"
 #include "ui_maindialog.h"
 #include "rdesktoplauncher.h"
+#include "rdpoptionshelper.h"
 
 MainDialog::MainDialog(QWidget *parent) :
     QDialog(parent),
@@ -13,6 +14,25 @@ MainDialog::MainDialog(QWidget *parent) :
     connect(ui->lineComputer->lineEdit(), SIGNAL(returnPressed()), ui->btnConnect, SLOT(animateClick()));
     connect(ui->lineComputer->lineEdit(), SIGNAL(textChanged(QString)), this, SLOT(textChanged(QString)));
     computeResolutions();
+    QStringList layouts;
+    for (int l = QLocale::Abkhazian; l <= QLocale::Shambala; ++l)
+    {
+        QString name = QLocale((QLocale::Language)l).name();
+        if (!layouts.contains(name))
+            layouts.append(name);
+    }
+    layouts.sort();
+    ui->comboKeyboard->addItems(layouts);
+    ui->comboKeyboard->setCurrentIndex(ui->comboKeyboard->findText("en_US"));
+
+    m_rdpOptions = RdpOptionsHelper::loadAll();
+    ui->lineComputer->addItem("");
+    for (int i = 1; i < m_rdpOptions.size(); ++i)
+    {
+        RdpOptions opt = m_rdpOptions.at(i);
+        ui->lineComputer->addItem(opt.host());
+    }
+
     ui->lineComputer->setFocus();
 }
 
@@ -27,8 +47,8 @@ RdpOptions MainDialog::getRdpOptions() const
     opt.setHost(ui->lineComputer->currentText());
     opt.setUsername(ui->lineUsername->text());
     opt.setPassword(ui->linePassword->text());
-    opt.setFullescreen(ui->slidResolution->value() == m_resolutions.size());
-    if (!opt.fullescreen())
+    opt.setFullscreen(ui->slidResolution->value() == m_resolutions.size());
+    if (!opt.fullscreen())
         opt.setResolution(m_resolutions.at(m_resolutions.size() - 1));
     opt.setUseAllMonitors(ui->checkAllDisplays->isChecked());
 
@@ -46,7 +66,7 @@ RdpOptions MainDialog::getRdpOptions() const
 
     opt.setFullscreenBar(ui->checkFullscreenBar->isChecked());
     int meta = ui->comboMetaKeys->currentIndex();
-    opt.setMetaKeys(meta == 0 || (opt.fullescreen() && meta == 2));
+    opt.setMetaKeys(meta == 0 || (opt.fullscreen() && meta == 2));
     opt.setUseShell(ui->checkShell->isChecked());
     if (opt.useShell())
     {
@@ -56,6 +76,7 @@ RdpOptions MainDialog::getRdpOptions() const
     opt.setExperience((RdpOptions::Experience)ui->comboExperience->currentIndex());
     opt.setBitmapCache(ui->checkCacheBitmap->isChecked());
     opt.setAutoReconnect(ui->checkAutoReconnect->isChecked());
+    opt.setKeymap(ui->comboKeyboard->currentText());
     return opt;
 }
 
@@ -64,13 +85,13 @@ 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())
+    if (opt.fullscreen())
     {
         ui->slidResolution->setValue(ui->slidResolution->maximum());
     }
     else
     {
-
+        ui->slidResolution->setValue(ui->slidResolution->maximum() - 1);
     }
     ui->checkAllDisplays->setChecked(opt.useAllMonitors());
 
@@ -94,12 +115,13 @@ void MainDialog::setRdpOptions(const RdpOptions &opt)
     ui->comboExperience->setCurrentIndex((int)opt.experience());
     ui->checkCacheBitmap->setChecked(opt.bitmapCache());
     ui->checkAutoReconnect->setChecked(opt.autoReconnect());
+    ui->comboKeyboard->setCurrentIndex(ui->comboKeyboard->findText(opt.keymap()));
 }
 
 void MainDialog::on_btnConnect_clicked()
 {
     RdpOptions opt = getRdpOptions();
-
+    RdpOptionsHelper::save(opt);
     RDesktopLauncher launcher;
     launcher.start(opt);
 }
@@ -132,15 +154,20 @@ void MainDialog::on_slidResolution_valueChanged(int value)
 
 void MainDialog::on_btnSaveSession_clicked()
 {
-
+    RdpOptionsHelper::save(getRdpOptions());
 }
 
 void MainDialog::on_btnSaveAsSession_clicked()
 {
-
+    on_btnSaveSession_clicked();
 }
 
 void MainDialog::on_btnOpenSession_clicked()
 {
 
 }
+
+void MainDialog::on_lineComputer_currentIndexChanged(int index)
+{
+    setRdpOptions(m_rdpOptions.at(index));
+}

maindialog.h

@@ -36,10 +36,14 @@ private slots:
 
     void on_btnOpenSession_clicked();
 
+    void on_lineComputer_currentIndexChanged(int index);
+
 private:
     Ui::MainDialog *ui;
 
     QList<QSize> m_resolutions;
+
+    QList<RdpOptions> m_rdpOptions;
 };
 
 #endif // MAINDIALOG_H

maindialog.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>467</width>
-    <height>480</height>
+    <height>557</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -107,49 +107,6 @@
           <string>Paramètres d'ouverture de session</string>
          </property>
          <layout class="QGridLayout" name="gridLayout">
-          <item row="1" column="2">
-           <widget class="QComboBox" name="lineComputer">
-            <property name="editable">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="1">
-           <widget class="QLabel" name="label_3">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="text">
-             <string>Ordinateur:</string>
-            </property>
-            <property name="buddy">
-             <cstring>lineComputer</cstring>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1" colspan="2">
-           <widget class="QLabel" name="label_2">
-            <property name="text">
-             <string>Entrez le nom de l'ordinateur distant:</string>
-            </property>
-            <property name="wordWrap">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="4" column="1" colspan="2">
-           <widget class="QCheckBox" name="checkSaveSession">
-            <property name="text">
-             <string>Me permettre d'enregistrer les informations d'idenfication</string>
-            </property>
-            <property name="checked">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
           <item row="0" column="0" rowspan="2">
            <widget class="QLabel" name="label">
             <property name="sizePolicy">
@@ -169,8 +126,12 @@
             </property>
            </widget>
           </item>
-          <item row="2" column="2">
-           <widget class="QLineEdit" name="lineUsername"/>
+          <item row="1" column="2">
+           <widget class="QComboBox" name="lineComputer">
+            <property name="editable">
+             <bool>true</bool>
+            </property>
+           </widget>
           </item>
           <item row="2" column="1">
            <widget class="QLabel" name="label_4">
@@ -189,6 +150,35 @@
             </property>
            </widget>
           </item>
+          <item row="2" column="2">
+           <widget class="QLineEdit" name="lineUsername"/>
+          </item>
+          <item row="0" column="1" colspan="2">
+           <widget class="QLabel" name="label_2">
+            <property name="text">
+             <string>Entrez le nom de l'ordinateur distant:</string>
+            </property>
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <widget class="QLabel" name="label_3">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="text">
+             <string>Ordinateur:</string>
+            </property>
+            <property name="buddy">
+             <cstring>lineComputer</cstring>
+            </property>
+           </widget>
+          </item>
           <item row="3" column="2">
            <widget class="QLineEdit" name="linePassword">
             <property name="echoMode">
@@ -233,6 +223,9 @@
           </item>
           <item row="1" column="2">
            <widget class="QPushButton" name="btnSaveAsSession">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
             <property name="text">
              <string>Enregistrer sous...</string>
             </property>
@@ -240,6 +233,9 @@
           </item>
           <item row="1" column="3">
            <widget class="QPushButton" name="btnOpenSession">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
             <property name="text">
              <string>Ouvrir...</string>
             </property>
@@ -258,6 +254,63 @@
          </layout>
         </widget>
        </item>
+       <item>
+        <widget class="QGroupBox" name="groupBox_7">
+         <property name="title">
+          <string>Clavier</string>
+         </property>
+         <layout class="QGridLayout" name="gridLayout_10">
+          <item row="0" column="1">
+           <widget class="QLabel" name="label_27">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="text">
+             <string>Choisissez votre disposition de clavier:</string>
+            </property>
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <widget class="QComboBox" name="comboKeyboard">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="sizeAdjustPolicy">
+             <enum>QComboBox::AdjustToContents</enum>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="0" rowspan="2">
+           <widget class="QLabel" name="label_26">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="text">
+             <string/>
+            </property>
+            <property name="pixmap">
+             <pixmap resource="rc.qrc">:/images/icons/Icon_7.ico</pixmap>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
        <item>
         <spacer name="verticalSpacer">
          <property name="orientation">
@@ -985,7 +1038,6 @@
   <tabstop>lineComputer</tabstop>
   <tabstop>lineUsername</tabstop>
   <tabstop>linePassword</tabstop>
-  <tabstop>checkSaveSession</tabstop>
   <tabstop>btnSaveSession</tabstop>
   <tabstop>btnSaveAsSession</tabstop>
   <tabstop>btnOpenSession</tabstop>

rd-launcher.pro

@@ -15,11 +15,13 @@ TEMPLATE = app
 SOURCES += main.cpp\
         maindialog.cpp \
     rdpoptions.cpp \
-    rdesktoplauncher.cpp
+    rdesktoplauncher.cpp \
+    rdpoptionshelper.cpp
 
 HEADERS  += maindialog.h \
     rdpoptions.h \
-    rdesktoplauncher.h
+    rdesktoplauncher.h \
+    rdpoptionshelper.h
 
 FORMS    += maindialog.ui
 

rdesktoplauncher.cpp

@@ -16,7 +16,7 @@ void RDesktopLauncher::start(RdpOptions options)
     args.append(options.password());
     args.append("-a");
     args.append(QString("%1").arg((int)options.colors()));
-    if (!options.fullescreen())
+    if (!options.fullscreen())
     {
         args.append("-g");
         QSize reso = options.resolution();
@@ -42,6 +42,12 @@ void RDesktopLauncher::start(RdpOptions options)
         args.append(options.shellWorkingDir());
     }
 
+    args.append("-k");
+    args.append(options.keymap());
+
+    args.append("-r");
+    args.append("clipboard:PRIMARYCLIPBOARD");
+
     args.append(options.host());
 
     QProcess::startDetached("rdesktop", args);

rdpoptions.cpp

@@ -44,14 +44,14 @@ void RdpOptions::setResolution(const QSize &resolution)
     m_resolution = resolution;
 }
 
-bool RdpOptions::fullescreen() const
+bool RdpOptions::fullscreen() const
 {
-    return m_fullescreen;
+    return m_fullscreen;
 }
 
-void RdpOptions::setFullescreen(bool fullescreen)
+void RdpOptions::setFullscreen(bool fullscreen)
 {
-    m_fullescreen = fullescreen;
+    m_fullscreen = fullscreen;
 }
 
 RdpOptions::Experience RdpOptions::experience() const
@@ -149,6 +149,16 @@ void RdpOptions::setAutoReconnect(bool autoReconnect)
 {
     m_autoReconnect = autoReconnect;
 }
+QString RdpOptions::keymap() const
+{
+    return m_keymap;
+}
+
+void RdpOptions::setKeymap(const QString &keymap)
+{
+    m_keymap = keymap;
+}
+
 
 
 

rdpoptions.h

@@ -40,8 +40,8 @@ public:
     QSize resolution() const;
     void setResolution(const QSize &resolution);
 
-    bool fullescreen() const;
-    void setFullescreen(bool fullescreen);
+    bool fullscreen() const;
+    void setFullscreen(bool fullscreen);
 
     Experience experience() const;
     void setExperience(const Experience &experience);
@@ -73,6 +73,9 @@ public:
     bool autoReconnect() const;
     void setAutoReconnect(bool autoReconnect);
 
+    QString keymap() const;
+    void setKeymap(const QString &keymap);
+
 private:
     QString m_host;
 
@@ -80,7 +83,7 @@ private:
 
     QString m_password;
 
-    bool m_fullescreen;
+    bool m_fullscreen;
 
     QSize m_resolution;
 
@@ -103,6 +106,8 @@ private:
     bool m_bitmapCache;
 
     bool m_autoReconnect;
+
+    QString m_keymap;
 };
 
 #endif // RDPOPTIONS_H

rdpoptionshelper.cpp

@@ -0,0 +1,81 @@
+#include <QSettings>
+#include "rdpoptionshelper.h"
+#include <QList>
+#include <QStringList>
+
+void RdpOptionsHelper::save(const RdpOptions &opt)
+{
+    QString group;
+    if (opt.host().isEmpty())
+        group = RdpOptionsHelper::getDefaultName();
+    else if (opt.username().isEmpty())
+        group = opt.host();
+    else
+        group = opt.username() + "@" + opt.host();
+    QSettings set(QSettings::UserScope, "RdpOptions");
+    set.beginGroup(group);
+    set.setValue("host", opt.host());
+    set.setValue("username", opt.username());
+    set.setValue("password", QByteArray(opt.password().toStdString().c_str()).toBase64());
+    set.setValue("fullscreen", opt.fullscreen());
+    set.setValue("resolution", opt.resolution());
+    set.setValue("useAllMonitors", opt.useAllMonitors());
+    set.setValue("colors", opt.colors());
+    set.setValue("fullscreenBar", opt.fullscreenBar());
+    set.setValue("metaKeys", opt.metaKeys());
+    set.setValue("useShell", opt.useShell());
+    set.setValue("shell", opt.shell());
+    set.setValue("shellWorkingDir", opt.shellWorkingDir());
+    set.setValue("experience", opt.experience());
+    set.setValue("bitmapCache", opt.bitmapCache());
+    set.setValue("autoReconnect", opt.autoReconnect());
+    set.setValue("keymap", opt.keymap());
+    set.endGroup();
+}
+
+RdpOptions RdpOptionsHelper::load(QString group)
+{
+    if (group.isEmpty())
+        group = getDefaultName();
+    QSettings set(QSettings::UserScope, "RdpOptions");
+    set.beginGroup(group);
+    RdpOptions opt;
+    opt.setHost(set.value("host", "").toString());
+    opt.setUsername(set.value("username", "").toString());
+    opt.setPassword(QByteArray::fromBase64(set.value("password", "").toByteArray()));
+    opt.setFullscreen(set.value("fullscreen", true).toBool());
+    opt.setResolution(set.value("resolution", QSize(0, 0)).toSize());
+    opt.setUseAllMonitors(set.value("useAllMonitors", false).toBool());
+    opt.setColors((RdpOptions::Colors)set.value("colors", RdpOptions::HighestQuality).toInt());
+    opt.setFullscreenBar(set.value("fullscreenBar", true).toBool());
+    opt.setMetaKeys(set.value("metaKeys", true).toBool());
+    opt.setUseShell(set.value("useShell", false).toBool());
+    opt.setShell(set.value("shell", "").toString());
+    opt.setShellWorkingDir(set.value("shellWorkingDir", "").toString());
+    opt.setExperience((RdpOptions::Experience)set.value("experience", RdpOptions::Detect).toInt());
+    opt.setBitmapCache(set.value("bitmapCache", true).toBool());
+    opt.setAutoReconnect(set.value("autoReconnect", true).toBool());
+    opt.setKeymap(set.value("keymap", "en_US").toString());
+    set.endGroup();
+    return opt;
+}
+
+QList<RdpOptions> RdpOptionsHelper::loadAll()
+{
+    QSettings set(QSettings::UserScope, "RdpOptions");
+    QList<RdpOptions> opts;
+    opts.append(load(getDefaultName()));
+    QStringList groups = set.childGroups();
+    for (int i = 0; i < groups.size(); ++i)
+    {
+        QString group = groups.at(i);
+        if (group != getDefaultName())
+            opts.append(load(groups.at(i)));
+    }
+    return opts;
+}
+
+QString RdpOptionsHelper::getDefaultName()
+{
+    return "__Default__";
+}

rdpoptionshelper.h

@@ -0,0 +1,18 @@
+#ifndef RDPOPTIONSHELPER_H
+#define RDPOPTIONSHELPER_H
+
+#include "rdpoptions.h"
+
+class RdpOptionsHelper
+{
+public:
+    static void save(const RdpOptions& opt);
+
+    static RdpOptions load(QString group);
+
+    static QList<RdpOptions> loadAll();
+
+    static QString getDefaultName();
+};
+
+#endif // RDPOPTIONSHELPER_H