Update UI

GPClient/GPClient.pro

@@ -54,3 +54,6 @@ desktop_icon.path = /usr/share/pixmaps/
 desktop_icon.files = com.yuezk.qt.GPClient.svg
 
 INSTALLS += desktop_entry desktop_icon
+
+RESOURCES += \
+    resources.qrc

GPClient/com.yuezk.qt.GPClient.svg

@@ -16,11 +16,11 @@
    viewBox="0 0 96 96"
    style="enable-background:new 0 0 96 96;"
    xml:space="preserve"
-   sodipodi:docname="logo.svg"
+   sodipodi:docname="com.yuezk.qt.GPClient.svg"
    inkscape:version="0.92.4 5da689c313, 2019-01-14"><metadata
    id="metadata14"><rdf:RDF><cc:Work
        rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
    id="defs12" /><sodipodi:namedview
    pagecolor="#ffffff"
    bordercolor="#666666"
@@ -34,9 +34,9 @@
    inkscape:window-height="1006"
    id="namedview10"
    showgrid="false"
-   inkscape:zoom="1.7383042"
+   inkscape:zoom="6.9532168"
-   inkscape:cx="30.139499"
+   inkscape:cx="7.9545315"
-   inkscape:cy="105.664"
+   inkscape:cy="59.062386"
    inkscape:window-x="0"
    inkscape:window-y="0"
    inkscape:window-maximized="1"
@@ -96,4 +96,4 @@
        inkscape:connector-curvature="0"
        id="XMLID_8_"
        class="st5"
-       d="m 50,48.2 c 0,-1 -0.8,-1.8 -1.8,-1.8 -1,0 -1.8,0.8 -1.8,1.8 0,0.7 0.4,1.3 1,1.6 l -1,5.2 H 50 l -1,-5.2 c 0.6,-0.3 1,-0.9 1,-1.6 z" /></g></g></svg>
+       d="m 50.35,48.2 c 0,-1 -0.8,-1.8 -1.8,-1.8 -1,0 -1.8,0.8 -1.8,1.8 0,0.7 0.4,1.3 1,1.6 l -1,5.2 h 3.6 l -1,-5.2 c 0.6,-0.3 1,-0.9 1,-1.6 z" /></g></g></svg>

GPClient/gpclient.cpp

@@ -3,23 +3,26 @@
 #include "samlloginwindow.h"
 
 #include <QDesktopWidget>
+#include <QGraphicsScene>
+#include <QGraphicsView>
+#include <QGraphicsPixmapItem>
+#include <QImage>
+#include <QStyle>
 
 GPClient::GPClient(QWidget *parent)
     : QMainWindow(parent)
     , ui(new Ui::GPClient)
 {
     ui->setupUi(this);
-
     setFixedSize(width(), height());
     moveCenter();
 
+    // Restore portal from the previous settings
     settings = new QSettings("com.yuezk.qt", "GPClient");
     ui->portalInput->setText(settings->value("portal", "").toString());
 
     QObject::connect(this, &GPClient::connectFailed, [this]() {
-        ui->connectButton->setDisabled(false);
+        updateConnectionStatus("not_connected");
-        ui->connectButton->setText("Connect");
-        ui->statusLabel->setText("Not Connected");
     });
 
     // QNetworkAccessManager setup
@@ -38,8 +41,7 @@ GPClient::GPClient(QWidget *parent)
 
     int status = vpn->status();
     if (status != 0) {
-        ui->statusLabel->setText("Connected");
+        updateConnectionStatus("connected");
-        ui->connectButton->setText("Disconnect");
     }
 }
 
@@ -61,15 +63,19 @@ void GPClient::on_connectButton_clicked()
         QString portal = ui->portalInput->text();
         settings->setValue("portal", portal);
         ui->statusLabel->setText("Authenticating...");
-        ui->connectButton->setDisabled(true);
+        updateConnectionStatus("pending");
         samlLogin(portal);
     } else if (btnText == "Cancel") {
         ui->statusLabel->setText("Canceling...");
-        ui->connectButton->setDisabled(true);
+        updateConnectionStatus("pending");
+
+        if (reply->isRunning()) {
+            reply->abort();
+        }
         vpn->disconnect();
     } else {
         ui->statusLabel->setText("Disconnecting...");
-        ui->connectButton->setDisabled(true);
+        updateConnectionStatus("pending");
         vpn->disconnect();
     }
 }
@@ -118,7 +124,6 @@ void GPClient::preloginResultFinished()
         loginWindow->login(samlRequest);
         loginWindow->exec();
     }
-    delete reply;
 }
 
 void GPClient::onLoginSuccess(QJsonObject loginResult)
@@ -141,27 +146,38 @@ void GPClient::onLoginSuccess(QJsonObject loginResult)
     }
 
     QString host = QString("https://%1/%2:%3").arg(loginResult.value("server").toString(), shortpath, cookieName);
-    qDebug() << "Server:" << host << ", User:" << user << "Cookie:" << cookieValue;
+    vpn->connect(host, user, cookieValue);
-    qDebug() << "openconnect --protocol=gp -u" << user << "--passwd-on-stdin" << host;
-
     ui->statusLabel->setText("Connecting...");
+    updateConnectionStatus("pending");
+}
+
+void GPClient::updateConnectionStatus(QString status)
+{
+    if (status == "not_connected") {
+        ui->statusLabel->setText("Not Connected");
+        ui->statusImage->setStyleSheet("image: url(:/images/not_connected.png); padding: 15;");
+        ui->connectButton->setText("Connect");
+        ui->connectButton->setDisabled(false);
+    } else if (status == "pending") {
+        ui->statusImage->setStyleSheet("image: url(:/images/pending.png); padding: 15;");
         ui->connectButton->setText("Cancel");
         ui->connectButton->setDisabled(false);
-    vpn->connect(host, user, cookieValue);
+    } else if (status == "connected") {
+        ui->statusLabel->setText("Connected");
+        ui->statusImage->setStyleSheet("image: url(:/images/connected.png); padding: 15;");
+        ui->connectButton->setText("Disconnect");
+        ui->connectButton->setDisabled(false);
+    }
 }
 
 void GPClient::onVPNConnected()
 {
-    ui->statusLabel->setText("Connected");
+    updateConnectionStatus("connected");
-    ui->connectButton->setText("Disconnect");
-    ui->connectButton->setDisabled(false);
 }
 
 void GPClient::onVPNDisconnected()
 {
-    ui->statusLabel->setText("Not Connected");
+    updateConnectionStatus("not_connected");
-    ui->connectButton->setText("Connect");
-    ui->connectButton->setDisabled(false);
 }
 
 void GPClient::onVPNLogAvailable(QString log)

GPClient/gpclient.h

@@ -41,6 +41,7 @@ private:
     QSettings *settings;
 
     void moveCenter();
+    void updateConnectionStatus(QString status);
     void samlLogin(const QString portal);
 };
 #endif // GPCLIENT_H

GPClient/gpclient.ui

@@ -7,15 +7,18 @@
     <x>0</x>
     <y>0</y>
     <width>260</width>
-    <height>300</height>
+    <height>338</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>GP VPN Client</string>
   </property>
   <property name="windowIcon">
-   <iconset>
+   <iconset resource="resources.qrc">
-    <normaloff>com.yuezk.qt.GPClient.svg</normaloff>com.yuezk.qt.GPClient.svg</iconset>
+    <normaloff>:/images/logo.svg</normaloff>:/images/logo.svg</iconset>
+  </property>
+  <property name="styleSheet">
+   <string notr="true"/>
   </property>
   <property name="iconSize">
    <size>
@@ -47,12 +50,28 @@
      <number>15</number>
     </property>
     <item>
-     <layout class="QVBoxLayout" name="verticalLayout" stretch="0">
+     <layout class="QVBoxLayout" name="verticalLayout" stretch="1,0">
+      <property name="bottomMargin">
+       <number>15</number>
+      </property>
+      <item>
+       <widget class="QLabel" name="statusImage">
+        <property name="styleSheet">
+         <string notr="true">#statusImage {
+	image: url(:/images/not_connected.png);
+	padding: 15
+}</string>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
       <item>
        <widget class="QLabel" name="statusLabel">
         <property name="font">
          <font>
-          <pointsize>18</pointsize>
+          <pointsize>14</pointsize>
           <weight>50</weight>
           <bold>false</bold>
           <underline>false</underline>
@@ -101,6 +120,8 @@
    </layout>
   </widget>
  </widget>
- <resources/>
+ <resources>
+  <include location="resources.qrc"/>
+ </resources>
  <connections/>
 </ui>

GPClient/resources.qrc

@@ -0,0 +1,11 @@
+<RCC>
+    <qresource prefix="/images">
+        <file alias="logo.svg">com.yuezk.qt.GPClient.svg</file>
+        <file>connected.png</file>
+        <file>pending.png</file>
+        <file>not_connected.png</file>
+    </qresource>
+    <qresource prefix="/">
+        <file>styles.css</file>
+    </qresource>
+</RCC>

GPService/systemd/gpservice.service

@@ -6,4 +6,4 @@ Wants=network.target
 [Service]
 Type=dbus
 BusName=com.yuezk.qt.GPService
-ExecStart=/usr/local/bin/gpservice --no-dtls -U nm-openconnect
+ExecStart=/usr/local/bin/gpservice