diff --git a/main.cpp b/main.cpp index ca4b7d4..65bfcf2 100644 --- a/main.cpp +++ b/main.cpp @@ -28,7 +28,7 @@ int main(int argc, char *argv[]) { - QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps, true); + // QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps, true); QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling, true); QGuiApplication app(argc, argv); diff --git a/qml/main.qml b/qml/main.qml index 704dc06..f744149 100644 --- a/qml/main.qml +++ b/qml/main.qml @@ -2,6 +2,7 @@ import QtQuick 2.12 import QtQuick.Controls 2.5 import QtQuick.Layouts 1.3 import Cutefish.Calculator 1.0 +import Qt.labs.platform 1.0 import FishUI 1.0 as FishUI FishUI.Window { @@ -16,6 +17,27 @@ FishUI.Window { : Qt.rgba(240 / 255, 238 / 255, 241 / 255, 1.0) background.opacity: rootWindow.compositing ? 0.95 : 1.0 + MenuBar { + id: menuBar + + Menu { + id: helpMenu + title: qsTr("&Help") + + MenuItem { + text: qsTr("About") + onTriggered: aboutDialog.show() + } + } + } + + FishUI.AboutDialog { + id: aboutDialog + name: rootWindow.title + description: qsTr("A simple calculator") + iconSource: "image://icontheme/cutefish-calculator" + } + FishUI.WindowBlur { view: rootWindow geometry: Qt.rect(rootWindow.x, rootWindow.y, rootWindow.width, rootWindow.height) @@ -49,7 +71,7 @@ FishUI.Window { z: -1 anchors.fill: parent color: FishUI.Theme.secondBackgroundColor - opacity: 0.8 + opacity: 0.9 } onPressed: zone.appendToTextField(text)