feat: save selected serial port

Author: Fishwaldo

ozwadmin-main/startup.cpp

@@ -8,6 +8,7 @@
 #include "startup.h"
 #include "ui_startup.h"
 #include "ozwcore.h"
+#include "util.h"
 
 Startup::Startup(QWidget *parent) :
     QDialog(parent),
@@ -20,13 +21,17 @@ Startup::Startup(QWidget *parent) :
     ui->remoteport->setMaximumWidth(w+8);
     QObject::connect(ui->startlocal, &QPushButton::clicked, this, &Startup::localPressed);
     QObject::connect(ui->startremote, &QPushButton::clicked, this, &Startup::remotePressed);
+    QString selected;
     foreach(QSerialPortInfo spinfo, QSerialPortInfo::availablePorts()) {
 #if defined(Q_OS_MACOS)
         if (spinfo.portName().startsWith("tty", Qt::CaseInsensitive))
             continue;
 #endif
-        ui->serialport->addItem(spinfo.systemLocation());
+        ui->serialport->addItem(spinfo.portName(), spinfo.systemLocation());
+        if (QSettings().value("connection/serialport") == spinfo.systemLocation())
+            selected = spinfo.portName();
     }
+    ui->serialport->setCurrentText(selected);
     //ui->enableserver->setChecked(QSettings().value("connection/startserver", true).toBool());
     ui->enableserver->setChecked(true);
     QUrl server = QUrl::fromUserInput(QSettings().value("connection/remotehost", "ws://localhost:1983").toString());
@@ -42,7 +47,7 @@ Startup::~Startup()
 
 void Startup::localPressed() {
 
-	this->m_serialPort = ui->serialport->currentText();
+	this->m_serialPort = ui->serialport->currentData().toString();
 	this->m_remote = false;
     this->m_startServer = ui->enableserver->isChecked();
 	this->setResult(DialogCode::Accepted);

ozwadmin-main/util.cpp

@@ -86,4 +86,5 @@ QString SockErrorToString(QAbstractSocket::SocketError error)
     case QAbstractSocket::UnknownSocketError:
       return QObject::tr("Unknown Socket Error");
   }
+  return QObject::tr("Unknown Socket Error");
 }

scripts/Dockerfile

@@ -3,7 +3,7 @@ FROM ubuntu:xenial
 WORKDIR /opt
 
 RUN apt update && apt-get install -y software-properties-common && add-apt-repository ppa:beineri/opt-qt-5.12.8-xenial && \
-apt update && apt-get install -y qt512-meta-minimal qt512remoteobjects rapidjson-dev git g++ cmake make pkgconf bash python wget joe mc libunwind-dev libcurl4-openssl-dev qt512svg qt512websockets mesa-common-dev libgl1-mesa-dev fuse  appstream && \
+apt update && apt-get install -y qt512-meta-minimal qt512remoteobjects rapidjson-dev git g++ cmake make pkgconf bash python wget joe mc libunwind-dev libcurl4-openssl-dev qt512svg qt512websockets mesa-common-dev libgl1-mesa-dev fuse appstream qt512serialport && \
 wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage && \
 wget https://github.com/linuxdeploy/linuxdeploy-plugin-qt/releases/download/continuous/linuxdeploy-plugin-qt-x86_64.AppImage && \
 chmod +x linuxdeploy*.AppImage