removed the "remove protocol" buttons from where they shouldn't be

This commit is contained in:
vladimir.kuznetsov 2023-10-20 14:10:04 +05:00
parent 338499247d
commit 58ad7dc161
3 changed files with 11 additions and 7 deletions

View file

@ -30,17 +30,13 @@ Switch {
property string hoveredIndicatorBackgroundColor: Qt.rgba(1, 1, 1, 0.08) property string hoveredIndicatorBackgroundColor: Qt.rgba(1, 1, 1, 0.08)
property string defaultIndicatorBackgroundColor: "transparent" property string defaultIndicatorBackgroundColor: "transparent"
implicitWidth: content.implicitWidth + switcher.implicitWidth
implicitHeight: content.implicitHeight
hoverEnabled: enabled ? true : false hoverEnabled: enabled ? true : false
indicator: Rectangle { indicator: Rectangle {
id: switcher id: switcher
anchors.left: content.right anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.leftMargin: 4
implicitWidth: 52 implicitWidth: 52
implicitHeight: 32 implicitHeight: 32
@ -90,11 +86,11 @@ Switch {
contentItem: ColumnLayout { contentItem: ColumnLayout {
id: content id: content
anchors.fill: parent anchors.verticalCenter: parent.verticalCenter
anchors.rightMargin: switcher.implicitWidth
ListItemTitleType { ListItemTitleType {
Layout.fillWidth: true Layout.fillWidth: true
rightPadding: indicator.width
text: root.text text: root.text
color: root.enabled ? root.textColor : root.textDisabledColor color: root.enabled ? root.textColor : root.textDisabledColor
@ -104,6 +100,7 @@ Switch {
id: description id: description
Layout.fillWidth: true Layout.fillWidth: true
rightPadding: indicator.width
color: root.enabled ? root.descriptionTextColor : root.descriptionTextDisabledColor color: root.enabled ? root.descriptionTextColor : root.descriptionTextDisabledColor

View file

@ -5,6 +5,7 @@ import QtQuick.Layouts
import SortFilterProxyModel 0.2 import SortFilterProxyModel 0.2
import PageEnum 1.0 import PageEnum 1.0
import ContainerEnum 1.0
import "./" import "./"
import "../Controls2" import "../Controls2"
@ -252,6 +253,8 @@ PageType {
ColumnLayout { ColumnLayout {
id: checkboxLayout id: checkboxLayout
anchors.fill: parent
CheckBoxType { CheckBoxType {
Layout.fillWidth: true Layout.fillWidth: true
@ -351,6 +354,8 @@ PageType {
Layout.leftMargin: -8 Layout.leftMargin: -8
implicitHeight: 32 implicitHeight: 32
visible: ContainersModel.getCurrentlyProcessedContainerIndex() === ContainerEnum.OpenVpn
defaultColor: "transparent" defaultColor: "transparent"
hoveredColor: Qt.rgba(1, 1, 1, 0.08) hoveredColor: Qt.rgba(1, 1, 1, 0.08)
pressedColor: Qt.rgba(1, 1, 1, 0.12) pressedColor: Qt.rgba(1, 1, 1, 0.12)

View file

@ -169,6 +169,8 @@ PageType {
width: parent.width width: parent.width
visible: ServersModel.isCurrentlyProcessedServerHasWriteAccess()
text: qsTr("Remove ") + ContainersModel.getCurrentlyProcessedContainerName() text: qsTr("Remove ") + ContainersModel.getCurrentlyProcessedContainerName()
textColor: "#EB5757" textColor: "#EB5757"