hotfix - fonts and removed about menu

cirquit · Aug 1, 2019 · 4ce756b · 4ce756b
1 parent da2fb9b
commit 4ce756b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/trdrop/qml/OptionsWindow.qml b/trdrop/qml/OptionsWindow.qml
@@ -2,7 +2,7 @@ import QtQuick 2.12
 import QtQml.Models 2.1
 import QtQuick.Window 2.12
 import QtQuick.Controls.Material 2.12
-import QtQuick.Controls 2.5
+import QtQuick.Controls 2.12
 import QtQuick.Controls.Styles 1.4
 import QtQuick.Layouts 1.12
 import QtQuick.Dialogs 1.2

diff --git a/trdrop/qml/TrdropMenubar.qml b/trdrop/qml/TrdropMenubar.qml
@@ -27,7 +27,7 @@ MenuBar
         MenuItem
         {
             //shortcut:
-            text: qsTr("Export       Ctrl+E")
+            text: qsTr("Export          Ctrl+E")
             action: Action {
                 shortcut: "Ctrl+E"
                 onTriggered: {
@@ -54,7 +54,7 @@ MenuBar
         title: qsTr("Tools")
         MenuItem
         {
-            text: qsTr("Options       Ctrl+O")
+            text: qsTr("Options          Ctrl+O")
             action: Action {
                 shortcut: "Ctrl+O"
                 onTriggered: {
@@ -65,13 +65,13 @@ MenuBar
             }
         }
     }
-    Menu
-    {
-        title: qsTr("About")
-        MenuItem
-        {
-            text: qsTr("About trdrop")
-            onTriggered: console.log("About trdrop onTriggered")
-        }
-    }
+//    Menu
+//    {
+//        title: qsTr("About")
+//        MenuItem
+//        {
+//            text: qsTr("About trdrop")
+//            onTriggered: console.log("About trdrop onTriggered")
+//        }
+//    }
 }
diff --git a/trdrop/src/main.cpp b/trdrop/src/main.cpp
@@ -37,10 +37,10 @@ int main(int argc, char *argv[])
     QApplication app(argc, argv);
     QQmlApplicationEngine engine;
     QQuickStyle::setStyle("Material");
-    QFontDatabase::addApplicationFont("qrc:/fonts/FjallaOne-Regular.ttf");
+    QFontDatabase::addApplicationFont(":/fonts/FjallaOne-Regular.ttf");
     // TODO evaluate if we need these fonts
-    QFontDatabase::addApplicationFont("qrc:/fonts/materialdesignicons-webfont.ttf");
-    QFontDatabase::addApplicationFont("qrc:/fonts/Rationale-Regular.ttf");
+    QFontDatabase::addApplicationFont(":/fonts/materialdesignicons-webfont.ttf");
+    QFontDatabase::addApplicationFont(":/fonts/Rationale-Regular.ttf");
 
     // TODO add the other fonts?