marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-26 14:23:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

mobileshell: Remove compile time QtFeedback dependency, and make it optional

Browse source
This commit is contained in:
Devin Lin 2022-11-11 11:56:40 -05:00
parent c6802da477
commit df65a0e0f2
13 changed files with 53 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -46,7 +46,6 @@ find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG REQUIRED
Core
Qml
Quick
Feedback
)
if (QT_MAJOR_VERSION STREQUAL "5")
if (QUICK_COMPILER)

1
README.md
View file

@ -40,7 +40,6 @@ Dependencies:
* Plasma Nano
* Kirigami
* Kirigami Addons
* Qt Feedback
To start the phone homescreen in a window, run:
```

1
components/mobileshell/CMakeLists.txt
View file

@ -38,7 +38,6 @@ target_link_libraries(mobileshellplugin
Qt::Qml
Qt::Gui
Qt::Quick
Qt::Feedback
KF5::ConfigWidgets # for KStandardAction
KF5::KIOGui
KF5::Plasma

1
components/mobileshell/mobileshellplugin.cpp
View file

@ -72,6 +72,7 @@ void MobileShellPlugin::registerTypes(const char *uri)
qmlRegisterType(resolvePath("components/ExtendedAbstractButton.qml"), uri, 1, 0, "ExtendedAbstractButton");
qmlRegisterType(resolvePath("components/Flickable.qml"), uri, 1, 0, "Flickable");
qmlRegisterType(resolvePath("components/GridView.qml"), uri, 1, 0, "GridView");
qmlRegisterType(resolvePath("components/HapticsEffectLoader.qml"), uri, 1, 0, "HapticsEffectLoader");
qmlRegisterType(resolvePath("components/ListView.qml"), uri, 1, 0, "ListView");
qmlRegisterType(resolvePath("components/StartupFeedback.qml"), uri, 1, 0, "StartupFeedback");
qmlRegisterType(resolvePath("components/VelocityCalculator.qml"), uri, 1, 0, "VelocityCalculator");

8
components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsFullDelegate.qml
View file

@ -55,13 +55,17 @@ QuickSettingsDelegate {
}
}
MobileShell.HapticsEffectLoader {
id: haptics
}
contentItem: MouseArea {
id: mouseArea
onPressed: MobileShell.ShellUtil.buttonVibrate()
onPressed: haptics.buttonVibrate()
onClicked: root.delegateClick()
onPressAndHold: {
MobileShell.ShellUtil.buttonVibrate();
haptics.buttonVibrate();
root.delegatePressAndHold();
}

8
components/mobileshell/qml/actiondrawer/quicksettings/QuickSettingsMinimizedDelegate.qml
View file

@ -52,13 +52,17 @@ QuickSettingsDelegate {
}
}
MobileShell.HapticsEffectLoader {
id: haptics
}
contentItem: MouseArea {
id: mouseArea
onPressed: MobileShell.ShellUtil.buttonVibrate();
onPressed: haptics.buttonVibrate();
onClicked: root.delegateClick()
onPressAndHold: {
MobileShell.ShellUtil.buttonVibrate();
haptics.buttonVibrate();
root.delegatePressAndHold();
}

20
components/mobileshell/qml/components/HapticsEffectLoader.qml Normal file
View file

@ -0,0 +1,20 @@
// SPDX-FileCopyrightText: 2022 Devin Lin <devin@kde.org>
// SPDX-License-Identifier: GPL-2.0-or-later
import QtQuick 2.15
import org.kde.plasma.private.mobileshell 1.0 as MobileShell
Loader {
source: "qrc:/HapticsEffectWrapper.qml"
property bool valid: item !== null
function buttonVibrate() {
if (valid && MobileShell.MobileShellSettings.vibrationsEnabled) {
item.intensity = MobileShell.MobileShellSettings.vibrationIntensity;
item.duration = MobileShell.MobileShellSettings.vibrationDuration;
item.start();
}
}
}

7
components/mobileshell/qml/components/HapticsEffectWrapper.qml Normal file
View file

@ -0,0 +1,7 @@
// SPDX-FileCopyrightText: 2022 Devin Lin <devin@kde.org>
// SPDX-License-Identifier: GPL-2.0-or-later
import QtFeedback 5.0
HapticsEffect {}

6
components/mobileshell/qml/navigationpanel/NavigationPanel.qml
View file

@ -61,12 +61,16 @@ Item {
property NavigationPanelButton activeButton
MobileShell.HapticsEffectLoader {
id: haptics
}
onPressed: {
startMouseX = oldMouseX = mouse.y;
startMouseY = oldMouseY = mouse.y;
activeButton = icons.childAt(mouse.x, mouse.y);
if (activeButton && activeButton.enabled) {
MobileShell.ShellUtil.buttonVibrate();
haptics.buttonVibrate();
}
}

2
components/mobileshell/resources.qrc
View file

@ -24,6 +24,8 @@
<file>qml/components/ExtendedAbstractButton.qml</file>
<file>qml/components/Flickable.qml</file>
<file>qml/components/GridView.qml</file>
<file>qml/components/HapticsEffectLoader.qml</file>
<file>qml/components/HapticsEffectWrapper.qml</file>
<file>qml/components/ListView.qml</file>
<file>qml/components/MarqueeLabel.qml</file>
<file>qml/components/StartupFeedback.qml</file>

10
components/mobileshell/shellutil.cpp
View file

@ -28,7 +28,6 @@ ShellUtil::ShellUtil(QObject *parent)
: QObject{parent}
, m_localeConfig{KSharedConfig::openConfig(QStringLiteral("kdeglobals"), KConfig::SimpleConfig)}
, m_launchingApp{nullptr}
, m_hapticsEffect{std::make_unique<QFeedbackHapticsEffect>()}
{
m_localeConfigWatcher = KConfigWatcher::create(m_localeConfig);
@ -133,12 +132,3 @@ void ShellUtil::clearLaunchingApp()
m_launchingApp = nullptr;
Q_EMIT isLaunchingAppChanged();
}
void ShellUtil::buttonVibrate()
{
if (MobileShellSettings::self()->vibrationsEnabled()) {
m_hapticsEffect->setDuration(MobileShellSettings::self()->vibrationDuration());
m_hapticsEffect->setIntensity(MobileShellSettings::self()->vibrationIntensity());
m_hapticsEffect->start();
}
}

8
components/mobileshell/shellutil.h
View file

@ -7,7 +7,6 @@
#pragma once
#include <QFeedbackHapticsEffect>
#include <QObject>
#include <QQuickItem>
@ -82,11 +81,6 @@ public:
*/
Q_INVOKABLE void clearLaunchingApp();
/**
* Initiates a vibration event, meant for a button.
*/
Q_INVOKABLE void buttonVibrate();
Q_SIGNALS:
void isSystem24HourFormatChanged();
void isLaunchingAppChanged();
@ -99,6 +93,4 @@ private:
KIO::ApplicationLauncherJob *m_launchingApp;
QVector<qint64> m_launchingAppPids;
std::unique_ptr<QFeedbackHapticsEffect> m_hapticsEffect;
};

8
look-and-feel/contents/lockscreen/Keypad.qml
View file

@ -54,6 +54,10 @@ Rectangle {
}
}
MobileShell.HapticsEffectLoader {
id: haptics
}
RectangularGlow {
anchors.topMargin: 1
anchors.fill: passwordBar
@ -147,7 +151,7 @@ Rectangle {
onPressedChanged: {
if (pressed) {
MobileShell.ShellUtil.buttonVibrate();
haptics.buttonVibrate();
}
}
@ -162,7 +166,7 @@ Rectangle {
}
onPressAndHold: {
if (modelData === "R") {
MobileShell.ShellUtil.buttonVibrate();
haptics.buttonVibrate();
passwordBar.clear();
}
}