Code Review
/
apps
/
mixer.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Reworked the way qml create sliders
[apps/mixer.git]
/
app
/
main.cpp
diff --git
a/app/main.cpp
b/app/main.cpp
index
c0d4b5b
..
255b39d
100644
(file)
--- a/
app/main.cpp
+++ b/
app/main.cpp
@@
-20,6
+20,7
@@
#include <QtCore/QCommandLineParser>
#include <QtCore/QUrlQuery>
#include <QtCore/QDir>
#include <QtCore/QCommandLineParser>
#include <QtCore/QUrlQuery>
#include <QtCore/QDir>
+#include <QtCore/QList>
#include <QtCore/QStandardPaths>
#include <QtCore/QThread>
#include <QtGui/QGuiApplication>
#include <QtCore/QStandardPaths>
#include <QtCore/QThread>
#include <QtGui/QGuiApplication>
@@
-36,7
+37,8
@@
#else
#include <QScreen>
#endif
#else
#include <QScreen>
#endif
-#include "mixer.h"
+#include "mixer.hpp"
+#include "audiorole.hpp"
int main(int argc, char *argv[])
{
int main(int argc, char *argv[])
{
@@
-82,7
+84,7
@@
int main(int argc, char *argv[])
exit(EXIT_FAILURE);
}
AGLScreenInfo screenInfo(qwm->get_scale_factor());
exit(EXIT_FAILURE);
}
AGLScreenInfo screenInfo(qwm->get_scale_factor());
- engine.rootContext()->setContextProperty(QStringLiteral("sc
reenInfo"), &screenInfo
);
+ engine.rootContext()->setContextProperty(QStringLiteral("sc
ale_factor"), screenInfo.scale_factor()
);
// Request a surface as described in layers.json windowmanager’s file
if (qwm->requestSurface(graphic_role) != 0) {
exit(EXIT_FAILURE);
// Request a surface as described in layers.json windowmanager’s file
if (qwm->requestSurface(graphic_role) != 0) {
exit(EXIT_FAILURE);
@@
-101,8
+103,9
@@
int main(int argc, char *argv[])
qDebug("Surface %s got tapShortcut\n", graphic_role.toStdString().c_str());
qwm->activateWindow(graphic_role);
});
qDebug("Surface %s got tapShortcut\n", graphic_role.toStdString().c_str());
qwm->activateWindow(graphic_role);
});
+#else
+ engine.rootContext()->setContextProperty(QStringLiteral("scale_factor"), 1.0);
#endif
#endif
-
engine.load(QUrl(QStringLiteral("qrc:/Mixer.qml")));
// Find the instantiated model QObject and connect the signals/slots
engine.load(QUrl(QStringLiteral("qrc:/Mixer.qml")));
// Find the instantiated model QObject and connect the signals/slots