aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikko Syrjä <mikko@3d-system.fi>2019-03-28 00:03:23 +0200
committerMikko Syrjä <mikko@3d-system.fi>2019-03-28 00:03:23 +0200
commite6cfc6e12ad735378ca7e1e7658f71e011822371 (patch)
treeb9915770dc44a889dbbdd36a0aa8f33830bc075f
parentbd869b5f3b7a9568127c3447b1ca6e66823c5a9c (diff)
downloadsymedit-e6cfc6e12ad735378ca7e1e7658f71e011822371.tar.gz
symedit-e6cfc6e12ad735378ca7e1e7658f71e011822371.zip
Labs branch with MessageDialog.
-rw-r--r--main.cpp5
-rw-r--r--main.qml12
-rw-r--r--symedit.pro2
3 files changed, 15 insertions, 4 deletions
diff --git a/main.cpp b/main.cpp
index 1cd4b49..ff2a60a 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,5 +1,6 @@
#include <QQmlContext>
-#include <QGuiApplication>
+//#include <QGuiApplication>
+#include <QtWidgets/QApplication>
#include <QQmlApplicationEngine>
#include <QCommandLineParser>
#include <QSettings>
@@ -16,7 +17,7 @@ int main(int argc, char *argv[])
QCoreApplication::setApplicationVersion("1.0");
QSettings::setDefaultFormat(QSettings::IniFormat);
- QGuiApplication app(argc, argv);
+ QApplication app(argc, argv);
// set base language translators
QLocale locale;
diff --git a/main.qml b/main.qml
index edad4e7..32ab644 100644
--- a/main.qml
+++ b/main.qml
@@ -3,6 +3,8 @@ import QtQuick.Controls 1.4
import QtQuick.Layouts 1.0
import QtQuick.Dialogs 1.2
+import Qt.labs.platform 1.1 as Labs
+
ApplicationWindow
{
property int mousex: 0
@@ -326,7 +328,7 @@ ApplicationWindow
editor.update()
}
}
-
+/*
Dialog
{
id: aboutdialog
@@ -339,6 +341,14 @@ ApplicationWindow
}
standardButtons: StandardButton.Ok
}
+*/
+ Labs.MessageDialog
+ {
+ id: aboutdialog
+ title: qsTrId("id_dialog_about")
+ text: qsTrId("id_dialog_about_text") + "\n\n© 2019 Mikko Syrjä"
+ buttons: Labs.MessageDialog.Ok
+ }
onXChanged: { manager.setGeometry(Qt.point(x, y), Qt.size(width, height)) }
onYChanged: { manager.setGeometry(Qt.point(x, y), Qt.size(width, height)) }
diff --git a/symedit.pro b/symedit.pro
index eb4f653..130fbff 100644
--- a/symedit.pro
+++ b/symedit.pro
@@ -1,4 +1,4 @@
-QT += quick
+QT += quick widgets
CONFIG += c++11
# The following define makes your compiler emit warnings if you use