Mirrors/ScreenPlay
Mirrors/ScreenPlay
1
0
Fork 0
mirror of https://gitlab.com/kelteseth/ScreenPlay.git synced 2024-09-18 16:32:33 +02:00
Code Issues Projects Releases Activity

Fix merge mistakes

Browse Source
This commit is contained in:
kelteseth 2018-03-12 12:30:07 +01:00
parent b196c45734
commit 8b5b16a761
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ScreenPlayWindow/src/SPWmainwindow.cpp
View File

@ -1,5 +1,6 @@
#include "SPWmainwindow.h"
#ifdef Q_OS_WIN
BOOL WINAPI SearchForWorkerWindow(HWND hwnd, LPARAM lparam)
{
// 0xXXXXXXX "" WorkerW
@ -17,6 +18,7 @@ MainWindow::MainWindow(int i, QString projectPath, QString id, QScreen* parent)
: QWindow(parent)
{
#ifdef Q_OS_WIN
setOpacity(0);
m_projectPath = projectPath;
m_appID = id;
@ -115,7 +117,7 @@ MainWindow::MainWindow(int i, QString projectPath, QString id, QScreen* parent)
emit playVideo(tmpPath);
} else if (m_project.value("type") == "scene") {
return;
} else if(m_project.value("type") == "qmlScene") {
} else if (m_project.value("type") == "qmlScene") {
QString tmpPath = m_projectPath.toString() + "/" + m_projectFile;
emit playQmlScene(tmpPath);
}
@ -126,6 +128,7 @@ void MainWindow::init()
{
setOpacity(0);
#ifdef Q_OS_WIN
m_quickRenderer.data()->show();
ShowWindow(m_worker_hwnd, SW_SHOWDEFAULT);
ShowWindow(m_hwnd, SW_SHOWDEFAULT);
#endif

13
ScreenPlayWindow/src/SPWmainwindow.h
View File

@ -1,8 +1,6 @@
#pragma once
#ifdef Q_OS_WIN
#include <qt_windows.h>
#endif
#include <QApplication>
#include <QDir>
#include <QEasingCurve>
@ -17,7 +15,10 @@
#include <QWindow>
#include <QtQuick/QQuickView>
#include <QtQuick/QQuickWindow>
#include <QtGlobal>
#ifdef Q_OS_WIN
#include <qt_windows.h>
#endif
class MainWindow : public QWindow {
Q_OBJECT
@ -40,7 +41,6 @@ public:
return m_isVideo;
}
QString name() const
{
return m_appID;
@ -68,8 +68,6 @@ public slots:
emit isVideoChanged(m_isVideo);
}
void setname(QString appID)
{
if (m_appID == appID)
@ -85,7 +83,6 @@ signals:
void projectConfigChanged(QString projectConfig);
void isVideoChanged(bool isVideo);
void nameChanged(QString appID);
private: