Mirrors/ScreenPlay
Mirrors/ScreenPlay
1
0
Fork 0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-25 12:13:00 +01:00
Code Issues Projects Releases Activity

Formatting (1.000 commit :)

Browse Source
This commit is contained in:
Elias Steurer 2020-02-08 13:36:49 +01:00
parent 36938b8a18
commit 9731b61583
3 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
ScreenPlay/main.qml
View File

@ -12,6 +12,7 @@ import "qml/Monitors"
import "qml/Common"
import "qml/Installed"
import "qml/Navigation"
import "qml/Workshop"
ApplicationWindow {
id: window
@ -25,11 +26,11 @@ ApplicationWindow {
minimumWidth: 1050
Component.onCompleted: {
if(!ScreenPlay.settings.silentStart){
if (!ScreenPlay.settings.silentStart) {
window.show()
ScreenPlay.setTrackerSendEvent("navigation","Installed");
ScreenPlay.setTrackerSendEvent("navigation", "Installed")
} else {
ScreenPlay.setTrackerSendEvent("navigation","Silent");
ScreenPlay.setTrackerSendEvent("navigation", "Silent")
}
}
@ -113,19 +114,19 @@ ApplicationWindow {
visible: true
iconSource: "qrc:/assets/icons/favicon.ico"
tooltip: qsTr("ScreenPlay - Double click to change you settings.")
onActivated:{
switch(reason){
onActivated: {
switch (reason) {
case SystemTrayIcon.Unknown:
break;
break
case SystemTrayIcon.Context:
break;
break
case SystemTrayIcon.DoubleClick:
window.show()
break;
break
case SystemTrayIcon.Trigger:
break;
break
case SystemTrayIcon.MiddleClick:
break;
break
}
}
@ -144,11 +145,13 @@ ApplicationWindow {
if (miMuteAll.isMuted) {
isMuted = false
miMuteAll.text = qsTr("Mute all")
ScreenPlay.screenPlayManager.setAllWallpaperValue("muted", "true")
ScreenPlay.screenPlayManager.setAllWallpaperValue(
"muted", "true")
} else {
isMuted = true
miMuteAll.text = qsTr("Unmute all")
ScreenPlay.screenPlayManager.setAllWallpaperValue("muted", "false")
ScreenPlay.screenPlayManager.setAllWallpaperValue(
"muted", "false")
}
}
}
@ -160,11 +163,13 @@ ApplicationWindow {
if (miStopAll.isPlaying) {
isPlaying = false
miStopAll.text = qsTr("Pause all")
ScreenPlay.screenPlayManager.setAllWallpaperValue("isPlaying", "true")
ScreenPlay.screenPlayManager.setAllWallpaperValue(
"isPlaying", "true")
} else {
isPlaying = true
miStopAll.text = qsTr("Play all")
ScreenPlay.screenPlayManager.setAllWallpaperValue("isPlaying", "false")
ScreenPlay.screenPlayManager.setAllWallpaperValue(
"isPlaying", "false")
}
}
}
@ -228,7 +233,6 @@ ApplicationWindow {
target: pageLoader.item
ignoreUnknownSignals: true
onSetSidebarActive: {
if (active) {
sidebar.state = "active"

6
ScreenPlay/src/settings.h
View File

@ -25,12 +25,14 @@
#include <QtConcurrent/QtConcurrent>
#include <QtGlobal>
#include "globalvariables.h"
#include "util.h"
#include <memory>
#include <optional>
#include "globalvariables.h"
#include "util.h"
#include "nlohmann/json.hpp"
#ifdef Q_OS_WIN
#include <qt_windows.h>
#endif

2
ScreenPlayWidget/src/widgetwindow.cpp
View File

@ -22,7 +22,7 @@ WidgetWindow::WidgetWindow(const QString projectPath, const QString appid, const
m_window.setFlags(flags | Qt::FramelessWindowHint | Qt::NoDropShadowWindowHint | Qt::BypassWindowManagerHint | Qt::SplashScreen);
m_window.setColor(Qt::transparent);
qmlRegisterSingletonInstance<WidgetWindow>("ScreenPlayWidget",1,0,"Widget",this);
qmlRegisterSingletonInstance<WidgetWindow>("ScreenPlayWidget", 1, 0, "Widget", this);
#ifdef Q_OS_WIN
m_hwnd = reinterpret_cast<HWND>(m_window.winId());