diff --git a/resources.qrc b/resources.qrc index 7222e8c9f..c3c3a76cf 100644 --- a/resources.qrc +++ b/resources.qrc @@ -55,7 +55,6 @@ src/gui/tray/EnforcedPlainTextLabel.qml theme/Style/Style.qml theme/Style/qmldir - src/gui/filedetails/NCRadioButton.qml src/gui/tray/ListItemLineAndSubline.qml src/gui/tray/TrayFoldersMenuButton.qml src/gui/tray/TrayFolderListItem.qml diff --git a/src/gui/filedetails/NCRadioButton.qml b/src/gui/filedetails/NCRadioButton.qml deleted file mode 100644 index 9fa27bdf0..000000000 --- a/src/gui/filedetails/NCRadioButton.qml +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (C) by Oleksandr Zolotov - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY - * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * for more details. - */ - -import QtQuick 2.15 -import QtQuick.Controls 2.15 -import Style 1.0 - -RadioButton { - id: root - - property int indicatorItemWidth: Style.radioButtonIndicatorSize - property int indicatorItemHeight: Style.radioButtonIndicatorSize - property int radius: Style.radioButtonCustomRadius - - // TODO: the current style does not support customization of this control - indicator: Rectangle { - implicitWidth: root.indicatorItemWidth - implicitHeight: root.indicatorItemHeight - anchors.verticalCenter: parent.verticalCenter - anchors.left: parent.left - anchors.leftMargin: Style.radioButtonCustomMarginLeftOuter - radius: root.radius - color: palette.base - border.color: palette.dark - border.width: Style.normalBorderWidth - - Rectangle { - anchors.fill: parent - visible: root.checked - color: palette.buttonText - radius: root.radius - anchors.margins: Style.radioButtonCustomMarginLeftInner - } - } -} diff --git a/src/gui/filedetails/ShareDetailsPage.qml b/src/gui/filedetails/ShareDetailsPage.qml index e98858e77..0e719ae23 100644 --- a/src/gui/filedetails/ShareDetailsPage.qml +++ b/src/gui/filedetails/ShareDetailsPage.qml @@ -346,43 +346,37 @@ Page { id: permissionModeRadioButtonsGroup } - NCRadioButton { + RadioButton { readonly property int permissionMode: ShareModel.ModeViewOnly Layout.fillWidth: true ButtonGroup.group: permissionModeRadioButtonsGroup enabled: !root.isSharePermissionChangeInProgress checked: root.currentPermissionMode === permissionMode text: qsTr("View only") - indicatorItemWidth: scrollContentsColumn.indicatorItemWidth - indicatorItemHeight: scrollContentsColumn.indicatorItemWidth spacing: scrollContentsColumn.indicatorSpacing padding: scrollContentsColumn.itemPadding onClicked: root.permissionModeChanged(permissionMode) } - NCRadioButton { + RadioButton { readonly property int permissionMode: ShareModel.ModeUploadAndEditing Layout.fillWidth: true ButtonGroup.group: permissionModeRadioButtonsGroup enabled: !root.isSharePermissionChangeInProgress checked: root.currentPermissionMode === permissionMode text: qsTr("Allow upload and editing") - indicatorItemWidth: scrollContentsColumn.indicatorItemWidth - indicatorItemHeight: scrollContentsColumn.indicatorItemWidth spacing: scrollContentsColumn.indicatorSpacing padding: scrollContentsColumn.itemPadding onClicked: root.permissionModeChanged(permissionMode) } - NCRadioButton { + RadioButton { readonly property int permissionMode: ShareModel.ModeFileDropOnly Layout.fillWidth: true ButtonGroup.group: permissionModeRadioButtonsGroup enabled: !root.isSharePermissionChangeInProgress checked: root.currentPermissionMode === permissionMode text: qsTr("File drop (upload only)") - indicatorItemWidth: scrollContentsColumn.indicatorItemWidth - indicatorItemHeight: scrollContentsColumn.indicatorItemWidth spacing: scrollContentsColumn.indicatorSpacing padding: scrollContentsColumn.itemPadding onClicked: root.permissionModeChanged(permissionMode)