diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index aa6c14b..a19eb21 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -1,10 +1,7 @@ name: Pre Release on: - workflow_run: - workflows: ["Build"] - branches: [master] - types: [completed] + workflow_dispatch: jobs: pre-release: diff --git a/GPClient/gpclient.cpp b/GPClient/gpclient.cpp index 18dc4ce..966f4bf 100644 --- a/GPClient/gpclient.cpp +++ b/GPClient/gpclient.cpp @@ -50,7 +50,7 @@ GPClient::~GPClient() void GPClient::setupSettings() { settingsButton = new QPushButton(this); - settingsButton->setIcon(QIcon(":/images/settings_icon.svg")); + settingsButton->setIcon(QIcon(":/images/settings_icon.png")); settingsButton->setFixedSize(QSize(28, 28)); QRect rect = this->geometry(); @@ -68,7 +68,7 @@ void GPClient::setupSettings() void GPClient::onSettingsButtonClicked() { settingsDialog->setExtraArgs(settings::get("extraArgs", "").toString()); - settingsDialog->setClientos(settings::get("clientos", "").toString()); + settingsDialog->setClientos(settings::get("clientos", "Linux").toString()); settingsDialog->show(); } @@ -278,7 +278,7 @@ void GPClient::doConnect() // Login to the portal interface to get the portal config and preferred gateway 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); // 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..."; 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); diff --git a/GPClient/resources.qrc b/GPClient/resources.qrc index f6ee3f6..a04e163 100644 --- a/GPClient/resources.qrc +++ b/GPClient/resources.qrc @@ -6,6 +6,6 @@ not_connected.png radio_unselected.png radio_selected.png - settings_icon.svg + settings_icon.png diff --git a/GPClient/settings_icon.png b/GPClient/settings_icon.png new file mode 100644 index 0000000..619a882 Binary files /dev/null and b/GPClient/settings_icon.png differ diff --git a/GPClient/settings_icon.svg b/GPClient/settings_icon.svg deleted file mode 100644 index 7a6140a..0000000 --- a/GPClient/settings_icon.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - -