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

Merge branch 'dev' into feature/amnezia-wireguard-client-impl

Browse source
This commit is contained in:
pokamest 2023-10-11 19:40:40 +01:00
commit ce9a23e021
3 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
client/server_scripts/install_docker.sh
View file

@ -5,9 +5,9 @@ else echo "Packet manager not found"; exit 1; fi;\
echo "Dist: $dist, Packet manager: $pm, Docker pkg: $docker_pkg";\ echo "Dist: $dist, Packet manager: $pm, Docker pkg: $docker_pkg";\
if [ "$dist" = "debian" ]; then export DEBIAN_FRONTEND=noninteractive; fi;\ if [ "$dist" = "debian" ]; then export DEBIAN_FRONTEND=noninteractive; fi;\
if ! command -v sudo > /dev/null 2>&1; then $pm update -yq; $pm install -yq sudo; fi;\ if ! command -v sudo > /dev/null 2>&1; then $pm update -yq; $pm install -yq sudo; fi;\
if ! command -v fuser > /dev/null 2>&1; then $pm install -yq psmisc; fi;\ if ! command -v fuser > /dev/null 2>&1; then sudo $pm install -yq psmisc; fi;\
if ! command -v lsof > /dev/null 2>&1; then $pm install -yq lsof; fi;\ if ! command -v lsof > /dev/null 2>&1; then sudo $pm install -yq lsof; fi;\
if ! command -v docker > /dev/null 2>&1; then $pm update -yq; $pm install -yq $docker_pkg;\ if ! command -v docker > /dev/null 2>&1; then sudo $pm update -yq; sudo $pm install -yq $docker_pkg;\
if [ "$dist" = "fedora" ] || [ "$dist" = "debian" ]; then sudo systemctl enable docker && sudo systemctl start docker; fi;\ if [ "$dist" = "fedora" ] || [ "$dist" = "debian" ]; then sudo systemctl enable docker && sudo systemctl start docker; fi;\
fi;\ fi;\
if [ "$dist" = "debian" ]; then \ if [ "$dist" = "debian" ]; then \
@ -17,4 +17,3 @@ if [ "$dist" = "debian" ]; then \
fi;\ fi;\
if ! command -v sudo > /dev/null 2>&1; then echo "Failed to install Docker";exit 1;fi;\ if ! command -v sudo > /dev/null 2>&1; then echo "Failed to install Docker";exit 1;fi;\
docker --version docker --version

4
client/ui/qml/Controls2/TopCloseButtonType.qml
View file

@ -5,6 +5,8 @@ import QtQuick.Shapes
Popup { Popup {
id: root id: root
property alias buttonWidth: button.implicitWidth
modal: false modal: false
closePolicy: Popup.NoAutoClose closePolicy: Popup.NoAutoClose
padding: 4 padding: 4
@ -20,6 +22,8 @@ Popup {
} }
ImageButtonType { ImageButtonType {
id: button
image: "qrc:/images/svg/close_black_24dp.svg" image: "qrc:/images/svg/close_black_24dp.svg"
imageColor: "#D7D8DB" imageColor: "#D7D8DB"

7
client/ui/qml/Pages2/PageStart.qml
View file

@ -136,6 +136,11 @@ PageType {
ServersModel.currentlyProcessedIndex = ServersModel.defaultIndex ServersModel.currentlyProcessedIndex = ServersModel.defaultIndex
tabBarStackView.push(pagePath, { "objectName" : pagePath }) tabBarStackView.push(pagePath, { "objectName" : pagePath })
} }
onWidthChanged: {
topCloseButton.x = tabBarStackView.x + tabBarStackView.width -
topCloseButton.buttonWidth - topCloseButton.rightPadding
}
} }
TabBar { TabBar {
@ -231,7 +236,7 @@ PageType {
TopCloseButtonType { TopCloseButtonType {
id: topCloseButton id: topCloseButton
x: tabBarStackView.width - topCloseButton.width x: tabBarStackView.width - topCloseButton.buttonWidth - topCloseButton.rightPadding
z: 1 z: 1
} }