From 894cb9eff39b6685cbabee8cfd7c359801f83c83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Tinkl?= Date: Tue, 4 Apr 2023 16:05:50 +0200 Subject: [PATCH] =?UTF-8?q?fix:=20Remove=20syncing=20header=20from=20?= =?UTF-8?q?=E2=80=98Notifications=20and=20Sounds=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #9683 --- ui/app/AppLayouts/Profile/ProfileLayout.qml | 1 - .../Profile/views/NotificationsView.qml | 47 +------------------ 2 files changed, 2 insertions(+), 46 deletions(-) diff --git a/ui/app/AppLayouts/Profile/ProfileLayout.qml b/ui/app/AppLayouts/Profile/ProfileLayout.qml index aa5ac9d37c..8ab6fa290d 100644 --- a/ui/app/AppLayouts/Profile/ProfileLayout.qml +++ b/ui/app/AppLayouts/Profile/ProfileLayout.qml @@ -210,7 +210,6 @@ StatusSectionLayout { implicitHeight: parent.height notificationsStore: root.store.notificationsStore - devicesStore: root.store.devicesStore sectionTitle: root.store.getNameForSubsection(Constants.settingsSubsection.notifications) contentWidth: d.contentWidth } diff --git a/ui/app/AppLayouts/Profile/views/NotificationsView.qml b/ui/app/AppLayouts/Profile/views/NotificationsView.qml index d84fc2d2b8..82f9cfd781 100644 --- a/ui/app/AppLayouts/Profile/views/NotificationsView.qml +++ b/ui/app/AppLayouts/Profile/views/NotificationsView.qml @@ -19,8 +19,8 @@ import "../popups" SettingsContentBase { id: root + property NotificationsStore notificationsStore - property DevicesStore devicesStore content: ColumnLayout { id: contentColumn @@ -164,7 +164,7 @@ SettingsContentBase { Rectangle { Layout.preferredWidth: root.contentWidth implicitHeight: col1.height + 2 * Style.current.padding - visible: Qt.platform.os == "osx" + visible: Qt.platform.os == Constants.mac radius: Constants.settingsSection.radius color: Theme.palette.primaryColor3 @@ -197,46 +197,6 @@ SettingsContentBase { } } - Rectangle { - Layout.preferredWidth: root.contentWidth - implicitHeight: row1.height + 2 * Style.current.padding - radius: Constants.settingsSection.radius - color: Theme.palette.pinColor2 - - RowLayout { - id: row1 - anchors.margins: Style.current.padding - anchors.left: parent.left - anchors.right: parent.right - anchors.verticalCenter: parent.verticalCenter - visible: root.devicesStore.devicesModel.count > 0 - - StatusBaseText { - Layout.fillWidth: true - text: qsTr("Sync your devices to share notifications preferences") - font.pixelSize: Constants.settingsSection.infoFontSize - lineHeight: Constants.settingsSection.infoLineHeight - lineHeightMode: Text.FixedHeight - color: Theme.palette.pinColor1 - } - - StatusBaseText { - text: qsTr("Syncing >") - font.pixelSize: Constants.settingsSection.infoFontSize - lineHeight: Constants.settingsSection.infoLineHeight - lineHeightMode: Text.FixedHeight - color: Theme.palette.pinColor1 - MouseArea { - anchors.fill: parent - cursorShape: Qt.PointingHandCursor - onClicked: { - root.devicesStore.syncAll() - } - } - } - } - } - StatusListItem { Layout.preferredWidth: root.contentWidth title: qsTr("Allow Notification Bubbles") @@ -545,7 +505,4 @@ SettingsContentBase { delegate: exemptionDelegateComponent } } - //} - // } - //} }