diff --git a/interface/resources/qml/images/critical.png b/interface/resources/qml/images/critical.png deleted file mode 100644 index dc9c5aebf4..0000000000 Binary files a/interface/resources/qml/images/critical.png and /dev/null differ diff --git a/interface/resources/qml/images/information.png b/interface/resources/qml/images/information.png deleted file mode 100644 index 0a2eb87d10..0000000000 Binary files a/interface/resources/qml/images/information.png and /dev/null differ diff --git a/interface/resources/qml/images/question.png b/interface/resources/qml/images/question.png deleted file mode 100644 index 2dd92fd791..0000000000 Binary files a/interface/resources/qml/images/question.png and /dev/null differ diff --git a/interface/resources/qml/images/warning.png b/interface/resources/qml/images/warning.png deleted file mode 100644 index cba78f6bea..0000000000 Binary files a/interface/resources/qml/images/warning.png and /dev/null differ diff --git a/libraries/ui/src/MessageDialog.cpp b/libraries/ui/src/MessageDialog.cpp index 89d6b69384..7d226fb774 100644 --- a/libraries/ui/src/MessageDialog.cpp +++ b/libraries/ui/src/MessageDialog.cpp @@ -78,27 +78,6 @@ void MessageDialog::click(StandardButton button) { // FIXME try to do it more like the standard dialog click(StandardButton(button), ButtonRole::NoRole); } -QMessageBox::ButtonRole br; - -QUrl MessageDialog::standardIconSource() { - switch (icon()) { - case Information: - return QUrl("images/information.png"); - break; - case Warning: - return QUrl("images/warning.png"); - break; - case Critical: - return QUrl("images/critical.png"); - break; - case Question: - return QUrl("images/question.png"); - break; - default: - return QUrl(); - break; - } -} MessageDialog::StandardButtons MessageDialog::standardButtons() const { return _buttons; diff --git a/libraries/ui/src/MessageDialog.h b/libraries/ui/src/MessageDialog.h index d700754513..fdae6e6c8d 100644 --- a/libraries/ui/src/MessageDialog.h +++ b/libraries/ui/src/MessageDialog.h @@ -25,7 +25,6 @@ private: Q_PROPERTY(QString informativeText READ informativeText WRITE setInformativeText NOTIFY informativeTextChanged) Q_PROPERTY(QString detailedText READ detailedText WRITE setDetailedText NOTIFY detailedTextChanged) Q_PROPERTY(Icon icon READ icon WRITE setIcon NOTIFY iconChanged) - Q_PROPERTY(QUrl standardIconSource READ standardIconSource NOTIFY iconChanged) Q_PROPERTY(StandardButtons standardButtons READ standardButtons WRITE setStandardButtons NOTIFY standardButtonsChanged) Q_PROPERTY(StandardButton clickedButton READ clickedButton NOTIFY buttonClicked) diff --git a/tests/ui/src/main.cpp b/tests/ui/src/main.cpp index 0f7a66c0cd..2ad2fa639c 100644 --- a/tests/ui/src/main.cpp +++ b/tests/ui/src/main.cpp @@ -26,6 +26,7 @@ #include #include #include +#include #include #include @@ -325,6 +326,16 @@ const char * LOG_FILTER_RULES = R"V0G0N( qt.quick.mouse.debug=false )V0G0N"; +//int main(int argc, char *argv[]) { +// QGuiApplication app(argc, argv); +// QQmlApplicationEngine engine; +// engine.setBaseUrl(QUrl::fromLocalFile(getQmlDir())); +// engine.load(QUrl("Main.qml")); +// return app.exec(); +//} + + + int main(int argc, char** argv) { QGuiApplication app(argc, argv); // QLoggingCategory::setFilterRules(LOG_FILTER_RULES);