Verified Commit bf024f95 authored by Bart Ribbers's avatar Bart Ribbers
Browse files

Merge branch 'integraion'

parents e5287417 8da17819
Pipeline #121313 passed with stage
in 59 seconds
......@@ -19,12 +19,12 @@ AbstractIndicator {
id: connectionIcon
icon.name: "kdeconnect"
property var window
property bool mycroftIntegration: plasmoid.nativeInterface.bigLauncherDbusAdapterInterface.mycroftIntegraionActive() ? 1 : 0
property bool mycroftIntegration: plasmoid.nativeInterface.bigLauncherDbusAdapterInterface.mycroftIntegrationActive() ? 1 : 0
Connections {
target: plasmoid.nativeInterface.bigLauncherDbusAdapterInterface
onEnableMycroftIntegraionChanged: {
mycroftIntegration = plasmoid.nativeInterface.bigLauncherDbusAdapterInterface.mycroftIntegraionActive()
onEnableMycroftIntegrationChanged: {
mycroftIntegration = plasmoid.nativeInterface.bigLauncherDbusAdapterInterface.mycroftIntegrationActive()
if(mycroftIntegration) {
mycroftLoader.active = true
} else {
......
......@@ -22,13 +22,13 @@ import org.kde.private.biglauncher 1.0
import org.kde.plasma.private.kicker 0.1 as Kicker
FocusScope {
property bool mycroftIntegration: plasmoid.nativeInterface.bigLauncherDbusAdapterInterface.mycroftIntegraionActive() ? 1 : 0
property bool mycroftIntegration: plasmoid.nativeInterface.bigLauncherDbusAdapterInterface.mycroftIntegrationActive() ? 1 : 0
Connections {
target: plasmoid.nativeInterface.bigLauncherDbusAdapterInterface
onEnableMycroftIntegraionChanged: {
mycroftIntegration = plasmoid.nativeInterface.bigLauncherDbusAdapterInterface.mycroftIntegraionActive()
onEnableMycroftIntegrationChanged: {
mycroftIntegration = plasmoid.nativeInterface.bigLauncherDbusAdapterInterface.mycroftIntegrationActive()
if(mycroftIntegration){
voiceAppsView.visible = voiceAppsView.count > 0 ? 1 : 0
} else {
......
......@@ -24,14 +24,14 @@ Item {
Layout.minimumWidth: Screen.desktopAvailableWidth
Layout.minimumHeight: Screen.desktopAvailableHeight * 0.6
property bool mycroftIntegration: plasmoid.nativeInterface.bigLauncherDbusAdapterInterface.mycroftIntegraionActive() ? 1 : 0
property bool mycroftIntegration: plasmoid.nativeInterface.bigLauncherDbusAdapterInterface.mycroftIntegrationActive() ? 1 : 0
property Item wallpaper
Connections {
target: plasmoid.nativeInterface.bigLauncherDbusAdapterInterface
onEnableMycroftIntegraionChanged: {
mycroftIntegration = plasmoid.nativeInterface.bigLauncherDbusAdapterInterface.mycroftIntegraionActive()
onEnableMycroftIntegrationChanged: {
mycroftIntegration = plasmoid.nativeInterface.bigLauncherDbusAdapterInterface.mycroftIntegrationActive()
if(mycroftIntegration) {
mycroftIndicatorLoader.active = true
mycroftWindowLoader.active = true
......
......@@ -43,10 +43,10 @@ void BigLauncherDbusAdapterInterface::useExpandableTiles(const bool &expandableT
emit useExpandableTilesChanged(expandableTiles);
}
void BigLauncherDbusAdapterInterface::enableMycroftIntegration(const bool &mycroftIntegraion)
void BigLauncherDbusAdapterInterface::enableMycroftIntegration(const bool &mycroftIntegration)
{
Configuration::self().setMycroftEnabled(mycroftIntegraion);
emit enableMycroftIntegraionChanged(mycroftIntegraion);
Configuration::self().setMycroftEnabled(mycroftIntegration);
emit enableMycroftIntegrationChanged(mycroftIntegration);
}
bool BigLauncherDbusAdapterInterface::coloredTilesActive()
......@@ -67,7 +67,7 @@ bool BigLauncherDbusAdapterInterface::expandableTilesActive()
}
}
bool BigLauncherDbusAdapterInterface::mycroftIntegraionActive()
bool BigLauncherDbusAdapterInterface::mycroftIntegrationActive()
{
return Configuration::self().mycroftEnabled();
}
......
......@@ -37,8 +37,8 @@ class BigLauncherDbusAdapterInterface : public QDBusAbstractAdaptor
" <signal name=\"useExpandableTilesChanged\">\n"
" <arg direction=\"out\" type=\"b\" name=\"msgUseExpandableTiles\"/>\n"
" </signal>\n"
" <signal name=\"enableMycroftIntegraionChanged\">\n"
" <arg direction=\"out\" type=\"b\" name=\"msgEnableMycroftIntegraion\"/>\n"
" <signal name=\"enableMycroftIntegrationChanged\">\n"
" <arg direction=\"out\" type=\"b\" name=\"msgEnableMycroftIntegration\"/>\n"
" </signal>\n"
" <method name=\"useColoredTiles\">\n"
" <arg direction=\"in\" type=\"b\" name=\"coloredTiles\"/>\n"
......@@ -55,7 +55,7 @@ class BigLauncherDbusAdapterInterface : public QDBusAbstractAdaptor
" <method name=\"expandableTilesActive\">\n"
" <arg direction=\"out\" type=\"b\"/>\n"
" </method>\n"
" <method name=\"mycroftIntegraionActive\">\n"
" <method name=\"mycroftIntegrationActive\">\n"
" <arg direction=\"out\" type=\"b\"/>\n"
" </method>\n"
" </interface>\n"
......@@ -72,7 +72,7 @@ public Q_SLOTS: // METHODS
void enableMycroftIntegration(const bool &mycroftIntegration);
bool coloredTilesActive();
bool expandableTilesActive();
bool mycroftIntegraionActive();
bool mycroftIntegrationActive();
void setColoredTilesActive(const bool &coloredTilesActive);
void setExpandableTilesActive(const bool &expandableTilesActive);
......@@ -80,7 +80,7 @@ public Q_SLOTS: // METHODS
Q_SIGNALS: // SIGNALS
void useColoredTilesChanged(const bool &msgUseColoredTiles);
void useExpandableTilesChanged(const bool &msgUseExpandableTiles);
void enableMycroftIntegraionChanged(const bool &msgEnableMycroftIntegraion);
void enableMycroftIntegrationChanged(const bool &msgEnableMycroftIntegration);
void coloredTilesActiveRequested();
void expandableTilesActiveRequested();
void enableMycroftIntegrationRequested();
......
......@@ -106,7 +106,7 @@ bool BigscreenSettings::useExpandingTiles() const
bool BigscreenSettings::mycroftIntegrationActive() const
{
QDBusMessage msg = QDBusMessage::createMethodCall("org.kde.biglauncher", "/BigLauncher", "", "mycroftIntegraionActive");
QDBusMessage msg = QDBusMessage::createMethodCall("org.kde.biglauncher", "/BigLauncher", "", "mycroftIntegrationActive");
QDBusMessage response = QDBusConnection::sessionBus().call(msg);
QList<QVariant> responseArg = response.arguments();
return responseArg.at(0).toBool();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment