mirror of
https://github.com/yuezk/GlobalProtect-openconnect.git
synced 2025-04-02 18:31:50 -04:00
Add default value to client os (#86)
* add default value for clientos * update CI * update icon format * change the icon format
This commit is contained in:
parent
84f1480653
commit
e8b2c1606f
5
.github/workflows/pre-release.yml
vendored
5
.github/workflows/pre-release.yml
vendored
@ -1,10 +1,7 @@
|
|||||||
name: Pre Release
|
name: Pre Release
|
||||||
|
|
||||||
on:
|
on:
|
||||||
workflow_run:
|
workflow_dispatch:
|
||||||
workflows: ["Build"]
|
|
||||||
branches: [master]
|
|
||||||
types: [completed]
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
pre-release:
|
pre-release:
|
||||||
|
@ -50,7 +50,7 @@ GPClient::~GPClient()
|
|||||||
void GPClient::setupSettings()
|
void GPClient::setupSettings()
|
||||||
{
|
{
|
||||||
settingsButton = new QPushButton(this);
|
settingsButton = new QPushButton(this);
|
||||||
settingsButton->setIcon(QIcon(":/images/settings_icon.svg"));
|
settingsButton->setIcon(QIcon(":/images/settings_icon.png"));
|
||||||
settingsButton->setFixedSize(QSize(28, 28));
|
settingsButton->setFixedSize(QSize(28, 28));
|
||||||
|
|
||||||
QRect rect = this->geometry();
|
QRect rect = this->geometry();
|
||||||
@ -68,7 +68,7 @@ void GPClient::setupSettings()
|
|||||||
void GPClient::onSettingsButtonClicked()
|
void GPClient::onSettingsButtonClicked()
|
||||||
{
|
{
|
||||||
settingsDialog->setExtraArgs(settings::get("extraArgs", "").toString());
|
settingsDialog->setExtraArgs(settings::get("extraArgs", "").toString());
|
||||||
settingsDialog->setClientos(settings::get("clientos", "").toString());
|
settingsDialog->setClientos(settings::get("clientos", "Linux").toString());
|
||||||
settingsDialog->show();
|
settingsDialog->show();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -278,7 +278,7 @@ void GPClient::doConnect()
|
|||||||
// Login to the portal interface to get the portal config and preferred gateway
|
// Login to the portal interface to get the portal config and preferred gateway
|
||||||
void GPClient::portalLogin()
|
void GPClient::portalLogin()
|
||||||
{
|
{
|
||||||
PortalAuthenticator *portalAuth = new PortalAuthenticator(portal(), settings::get("clientos", "").toString());
|
PortalAuthenticator *portalAuth = new PortalAuthenticator(portal(), settings::get("clientos", "Linux").toString());
|
||||||
|
|
||||||
connect(portalAuth, &PortalAuthenticator::success, this, &GPClient::onPortalSuccess);
|
connect(portalAuth, &PortalAuthenticator::success, this, &GPClient::onPortalSuccess);
|
||||||
// Prelogin failed on the portal interface, try to treat the portal as a gateway interface
|
// Prelogin failed on the portal interface, try to treat the portal as a gateway interface
|
||||||
@ -356,7 +356,7 @@ void GPClient::gatewayLogin()
|
|||||||
PLOGI << "Performing gateway login...";
|
PLOGI << "Performing gateway login...";
|
||||||
|
|
||||||
GatewayAuthenticatorParams params = GatewayAuthenticatorParams::fromPortalConfigResponse(portalConfig);
|
GatewayAuthenticatorParams params = GatewayAuthenticatorParams::fromPortalConfigResponse(portalConfig);
|
||||||
params.setClientos(settings::get("clientos", "").toString());
|
params.setClientos(settings::get("clientos", "Linux").toString());
|
||||||
|
|
||||||
GatewayAuthenticator *gatewayAuth = new GatewayAuthenticator(currentGateway().address(), params);
|
GatewayAuthenticator *gatewayAuth = new GatewayAuthenticator(currentGateway().address(), params);
|
||||||
|
|
||||||
|
@ -6,6 +6,6 @@
|
|||||||
<file>not_connected.png</file>
|
<file>not_connected.png</file>
|
||||||
<file>radio_unselected.png</file>
|
<file>radio_unselected.png</file>
|
||||||
<file>radio_selected.png</file>
|
<file>radio_selected.png</file>
|
||||||
<file>settings_icon.svg</file>
|
<file>settings_icon.png</file>
|
||||||
</qresource>
|
</qresource>
|
||||||
</RCC>
|
</RCC>
|
||||||
|
BIN
GPClient/settings_icon.png
Normal file
BIN
GPClient/settings_icon.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.1 KiB |
@ -1,15 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<!-- Generator: Adobe Illustrator 23.0.3, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
|
|
||||||
<svg version="1.1" id="Icons" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
|
|
||||||
viewBox="0 0 32 32" style="enable-background:new 0 0 32 32;" xml:space="preserve">
|
|
||||||
<g>
|
|
||||||
<path d="M16.5,19.9C16.5,19.9,16.5,19.9,16.5,19.9l3.1-3.1c0,0,0,0,0,0l2.3-2.3c2.2,0.6,4.5,0,6.2-1.6c1.8-1.8,2.3-4.4,1.4-6.8
|
|
||||||
c-0.1-0.3-0.4-0.5-0.7-0.6c-0.3-0.1-0.7,0-0.9,0.3L25.6,8l-1.3-0.3L24,6.4l2.2-2.2c0.2-0.2,0.3-0.6,0.3-0.9
|
|
||||||
c-0.1-0.3-0.3-0.6-0.6-0.7c-2.3-0.9-5-0.4-6.8,1.4c-1.6,1.6-2.2,4-1.6,6.2l-1.6,1.6l-2.6-2.6L11,5.3c-0.1-0.1-0.2-0.3-0.3-0.3
|
|
||||||
L6.8,2.7C6.4,2.4,5.9,2.5,5.5,2.8L2.5,5.9C2.1,6.2,2.1,6.7,2.3,7.1L4.6,11c0.1,0.1,0.2,0.3,0.3,0.3l3.7,2.2l2.6,2.6l-1.2,1.2
|
|
||||||
c-2.2-0.6-4.5,0-6.2,1.6c-1.8,1.8-2.3,4.4-1.4,6.8c0.1,0.3,0.4,0.5,0.7,0.6c0.3,0.1,0.7,0,0.9-0.3L6.4,24l1.3,0.3L8,25.6l-2.2,2.2
|
|
||||||
c-0.2,0.2-0.3,0.6-0.3,0.9c0.1,0.3,0.3,0.6,0.6,0.7c0.8,0.3,1.5,0.4,2.3,0.4c1.6,0,3.3-0.6,4.5-1.9c1.6-1.6,2.2-4,1.6-6.2
|
|
||||||
L16.5,19.9z"/>
|
|
||||||
<path d="M22.5,16.8l-6,6l6.1,6.1c0.8,0.8,1.9,1.3,3,1.3s2.2-0.4,3-1.3c0.8-0.8,1.3-1.9,1.3-3c0-1.1-0.4-2.2-1.3-3L22.5,16.8z"/>
|
|
||||||
</g>
|
|
||||||
</svg>
|
|
Before Width: | Height: | Size: 1.2 KiB |
Loading…
Reference in New Issue
Block a user