Mirrors/ScreenPlay
Mirrors/ScreenPlay
1
0
Fork 0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-11-07 03:22:33 +01:00
Code Issues Projects Releases Activity

Make LICENSE stuff async

Browse Source
This commit is contained in:
Elias Steurer 2018-08-30 13:08:44 +02:00
parent d32047557c
commit 27b8982444
3 changed files with 44 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ScreenPlay/qml/Settings/SettingsExpander.qml
View File

@ -8,6 +8,15 @@ Rectangle {
state: "off"
clip: true
Component.onCompleted: screenPlaySettings.requestAllLicenses()
Connections {
target: screenPlaySettings
onAllLicenseLoaded: {
txtLegal.text = licenses
}
}
Flickable {
anchors.fill: parent
contentHeight: txtLegal.paintedHeight
@ -29,8 +38,6 @@ Rectangle {
color: "#626262"
renderType: Text.NativeRendering
height: txtLegal.paintedHeight
onHeightChanged: print(height)
text: screenPlaySettings.getAllLicenes()
}
}

9
ScreenPlay/src/settings.cpp
View File

@ -175,9 +175,10 @@ void Settings::writeSingleSettingConfig(QString name, QVariant value)
configTmp.close();
}
QString Settings::getAllLicenes()
void Settings::requestAllLicenses()
{
QtConcurrent::run([this]() {
QString tmp;
QFile file;
QTextStream out(&file);
@ -212,7 +213,8 @@ QString Settings::getAllLicenes()
tmp += out.readAll();
file.close();
return tmp;
emit this->allLicenseLoaded(tmp);
});
}
void Settings::setMuteAll(bool isMuted)
@ -270,7 +272,7 @@ QUrl Settings::getScreenPlayWidgetPath() const
return m_screenPlayWidgetPath;
}
void Settings::setScreenPlayWidgetPath(const QUrl &screenPlayWidgetPath)
void Settings::setScreenPlayWidgetPath(const QUrl& screenPlayWidgetPath)
{
m_screenPlayWidgetPath = screenPlayWidgetPath;
}
@ -311,4 +313,3 @@ void Settings::checkForOtherFullscreenApplication()
// }
}

5
ScreenPlay/src/settings.h
View File

@ -11,6 +11,7 @@
#include <QProcess>
#include <QProcessEnvironment>
#include <QQmlPropertyMap>
#include <QtConcurrent/QtConcurrent>
#include <QSettings>
#include <QSharedPointer>
#include <QStandardPaths>
@ -134,8 +135,8 @@ signals:
void setMainWindowVisible(bool visible);
void activeWallpaperCounterChanged(int activeWallpaperCounter);
void pauseWallpaperWhenIngameChanged(bool pauseWallpaperWhenIngame);
void offlineModeChanged(bool offlineMode);
void allLicenseLoaded(QString licenses);
public slots:
void setMuteAll(bool isMuted);
@ -144,7 +145,7 @@ public slots:
void setGlobalVolume(float volume);
void setGlobalFillMode(QString fillMode);
void writeSingleSettingConfig(QString name, QVariant value);
QString getAllLicenes();
void requestAllLicenses();
bool autostart() const
{