chris/lumina
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

adjusting settings and slide_model.rs

Browse source 
These are trying to get more code written in Rust rather than c++. Not
there yet, but I need to sync these to another machine.
This commit is contained in:
Chris Cochrun 2023-03-28 06:15:11 -05:00
parent ec95ba0d89
commit 236503e877
10 changed files with 387 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/main.cpp
View file

@ -51,6 +51,7 @@
#include "cxx-qt-gen/service_thing.cxxqt.h"
#include "cxx-qt-gen/file_helper.cxxqt.h"
#include "cxx-qt-gen/slide_obj.cxxqt.h"
#include "cxx-qt-gen/settings.cxxqt.h"
static QWindow *windowFromEngine(QQmlApplicationEngine *engine)
{
@ -111,7 +112,7 @@ int main(int argc, char *argv[])
QCoreApplication::setOrganizationName(QStringLiteral("librepresenter"));
QCoreApplication::setOrganizationDomain(QStringLiteral("tfcconnection.org"));
QCoreApplication::setApplicationName(QStringLiteral("Libre Presenter"));
qSetMessagePattern("[%{type} %{time h:m:s ap}: %{function} in %{file}]: %{message}\n");
// qSetMessagePattern("[%{type} %{time h:m:s ap}: %{function} in %{file}]: %{message}\n");
#ifdef Q_OS_WINDOWS
QIcon::setFallbackThemeName("breeze");
@ -128,8 +129,8 @@ int main(int argc, char *argv[])
qDebug() << QApplication::platformName();
// integrate with commandline argument handling
QCommandLineParser parser;
aboutData.setupCommandLine(&parser);
// QCommandLineParser parser;
// aboutData.setupCommandLine(&parser);
// setup of app specific commandline args
//Need to instantiate our slide
@ -138,6 +139,9 @@ int main(int argc, char *argv[])
// QScopedPointer<QQuickView> preswin(new QQuickView);
QScopedPointer<ServiceItemModel> serviceItemModel(new ServiceItemModel);
QScopedPointer<SlideObj> slideobject(new SlideObj);
Settings *settings = new Settings;
settings->setup();
// preswin->setSource(QUrl(QStringLiteral("qrc:qml/presenter/PresentationWindow.qml")));
QObject::connect(serviceItemModel.get(),
@ -220,10 +224,10 @@ int main(int argc, char *argv[])
window->setIcon(QIcon::fromTheme(QStringLiteral("system-config-display")));
// KWindowSystem::setMainWindow(window);
// KWindowSystem::activateWindow(window);
qDebug() << "00000000000000000000000000000000";
qDebug() << KWindowSystem::isPlatformWayland();
qDebug() << KWindowSystem::windows();
qDebug() << "00000000000000000000000000000000";
// qDebug() << "00000000000000000000000000000000";
// qDebug() << KWindowSystem::isPlatformWayland();
// qDebug() << KWindowSystem::windows();
// qDebug() << "00000000000000000000000000000000";
return app.exec();