AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'bugfix/split-tunneling' of https://github.com/amnezia-vpn/amnezia-client into bugfix/split-tunneling

Browse source
This commit is contained in:
Mykola Baibuz 2023-10-16 12:05:50 -04:00
commit 2a0166bb26
6 changed files with 25 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

1
client/ui/models/sites_model.cpp
View file

@ -111,6 +111,7 @@ void SitesModel::toggleSplitTunneling(bool enabled)
} else {
m_settings->setRouteMode(Settings::RouteMode::VpnAllSites);
}
m_isSplitTunnelingEnabled = enabled;
}
QVector<QPair<QString, QString> > SitesModel::getCurrentSites()

2
client/ui/qml/Pages2/PageSettingsConnection.qml
View file

@ -125,7 +125,7 @@ PageType {
}
DividerType {
visible: !GC.isMobile()
visible: false//!GC.isMobile()
}
}
}

4
client/ui/qml/Pages2/PageSettingsSplitTunneling.qml
View file

@ -116,7 +116,7 @@ PageType {
drawerHeight: 0.4375
enabled: switcher.checked && root.pageEnabled
enabled: root.pageEnabled
headerText: qsTr("Mode")
@ -158,7 +158,7 @@ PageType {
anchors.topMargin: 16
contentHeight: col.implicitHeight + addSiteButton.implicitHeight + addSiteButton.anchors.bottomMargin + addSiteButton.anchors.topMargin
enabled: switcher.checked && root.pageEnabled
enabled: root.pageEnabled
Column {
id: col