remove host; share rootfs over tsclient; reload hosts on save/remove

.gitignore

@@ -62,3 +62,5 @@ Makefile*
 *.qmlproject.user
 *.qmlproject.user.*
 
+
+rd-launcher

maindialog.cpp

@@ -17,23 +17,15 @@ MainDialog::MainDialog(QWidget *parent) :
     QStringList layouts;
     for (int l = QLocale::Abkhazian; l <= QLocale::Shambala; ++l)
     {
-        QString name = QLocale((QLocale::Language)l).name();
+        QString name = QLocale((QLocale::Language)l).name().replace("_", "-").toLower();
         if (!layouts.contains(name))
             layouts.append(name);
     }
     layouts.sort();
     ui->comboKeyboard->addItems(layouts);
-    ui->comboKeyboard->setCurrentIndex(ui->comboKeyboard->findText("en_US"));
+    ui->comboKeyboard->lineEdit()->setText("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();
+    loadAll();
 }
 
 MainDialog::~MainDialog()
@@ -115,7 +107,21 @@ 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()));
+    ui->comboKeyboard->lineEdit()->setText(opt.keymap());
+}
+
+void MainDialog::loadAll()
+{
+    m_rdpOptions = RdpOptionsHelper::loadAll();
+    ui->lineComputer->clear();
+    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();
 }
 
 void MainDialog::on_btnConnect_clicked()
@@ -155,6 +161,7 @@ void MainDialog::on_slidResolution_valueChanged(int value)
 void MainDialog::on_btnSaveSession_clicked()
 {
     RdpOptionsHelper::save(getRdpOptions());
+    loadAll();
 }
 
 void MainDialog::on_btnSaveAsSession_clicked()
@@ -169,5 +176,14 @@ void MainDialog::on_btnOpenSession_clicked()
 
 void MainDialog::on_lineComputer_currentIndexChanged(int index)
 {
-    setRdpOptions(m_rdpOptions.at(index));
+    if (index >= 0 && index < m_rdpOptions.size())
+    {
+        setRdpOptions(m_rdpOptions.at(index));
+    }
+}
+
+void MainDialog::on_btnRemoveSession_clicked()
+{
+    RdpOptionsHelper::remove(getRdpOptions());
+    loadAll();
 }

maindialog.h

@@ -21,6 +21,8 @@ public:
 public slots:
     void setRdpOptions(const RdpOptions& opt);
 
+    void loadAll();
+
 private slots:
     void on_btnConnect_clicked();
 
@@ -38,6 +40,8 @@ private slots:
 
     void on_lineComputer_currentIndexChanged(int index);
 
+    void on_btnRemoveSession_clicked();
+
 private:
     Ui::MainDialog *ui;
 

maindialog.ui

@@ -241,7 +241,14 @@
             </property>
            </widget>
           </item>
-          <item row="0" column="1" colspan="3">
+          <item row="1" column="4">
+           <widget class="QPushButton" name="btnRemoveSession">
+            <property name="text">
+             <string>Supprimer</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1" colspan="4">
            <widget class="QLabel" name="label_7">
             <property name="text">
              <string>Enregistrer les paramètres de connexion actuels dans un fichier RDP ou ouvrez une connexion enregistrée.</string>
@@ -284,6 +291,9 @@
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
+            <property name="editable">
+             <bool>true</bool>
+            </property>
             <property name="sizeAdjustPolicy">
              <enum>QComboBox::AdjustToContents</enum>
             </property>

rdesktoplauncher.cpp

@@ -48,6 +48,12 @@ void RDesktopLauncher::start(RdpOptions options)
     args.append("-r");
     args.append("clipboard:PRIMARYCLIPBOARD");
 
+    args.append("-r");
+    args.append("disk:rootfs=/");
+
+    args.append("-r");
+    args.append("sound:local:alsa");
+
     args.append(options.host());
 
     QProcess::startDetached("rdesktop", args);

rdpoptionshelper.cpp

@@ -5,13 +5,7 @@
 
 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();
+    QString group = getGroupName(opt);
     QSettings set(QSettings::UserScope, "RdpOptions");
     set.beginGroup(group);
     set.setValue("host", opt.host());
@@ -60,6 +54,13 @@ RdpOptions RdpOptionsHelper::load(QString group)
     return opt;
 }
 
+void RdpOptionsHelper::remove(const RdpOptions &opt)
+{
+    QString group = getGroupName(opt);
+    QSettings set(QSettings::UserScope, "RdpOptions");
+    set.remove(group);
+}
+
 QList<RdpOptions> RdpOptionsHelper::loadAll()
 {
     QSettings set(QSettings::UserScope, "RdpOptions");
@@ -79,3 +80,13 @@ QString RdpOptionsHelper::getDefaultName()
 {
     return "__Default__";
 }
+
+QString RdpOptionsHelper::getGroupName(const RdpOptions &opt)
+{
+    if (opt.host().isEmpty())
+        return RdpOptionsHelper::getDefaultName();
+    else if (opt.username().isEmpty())
+        return opt.host();
+    else
+        return opt.username() + "@" + opt.host();
+}

rdpoptionshelper.h

@@ -10,9 +10,13 @@ public:
 
     static RdpOptions load(QString group);
 
+    static void remove(const RdpOptions& opt);
+
     static QList<RdpOptions> loadAll();
 
     static QString getDefaultName();
+
+    static QString getGroupName(const RdpOptions& opt);
 };
 
 #endif // RDPOPTIONSHELPER_H