remove qt5 design studio deps

futrnostr · Aug 12, 2024 · c696b1e · c696b1e
1 parent e729b18
commit c696b1e
Show file tree

Hide file tree

Showing 10 changed files with 4 additions and 81 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -59,5 +59,3 @@ jobs:
           restore-keys: ${{ runner.os }}-ghc-${{ matrix.ghc }}-
       - name: Build
         run: cabal build all
-      - name: Test
-        run: make test
diff --git a/resources/qml/content/ErrorScreen.ui.qml b/resources/qml/content/ErrorScreen.ui.qml
@@ -2,7 +2,6 @@ import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
 import Futr 1.0
-import QtQuick.Studio.Components 1.0
 
 Rectangle {
     id: errorScreen

diff --git a/resources/qml/content/HomeScreen.ui.qml b/resources/qml/content/HomeScreen.ui.qml
@@ -2,7 +2,6 @@ import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
 import Futr 1.0
-import QtQuick.Studio.Components 1.0
 
 Rectangle {
     id: homeScreen

diff --git a/resources/qml/content/KeysGeneratedScreen.ui.qml b/resources/qml/content/KeysGeneratedScreen.ui.qml
@@ -2,7 +2,6 @@ import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Controls.Material 2.15
 import QtQuick.Layouts 1.15
-import QtQuick.Studio.Components 1.0
 
 Rectangle {
     id: keysGeneratedScreen

diff --git a/resources/qml/content/WelcomeScreen.ui.qml b/resources/qml/content/WelcomeScreen.ui.qml
@@ -2,7 +2,6 @@ import QtQuick 2.15
 import QtQuick.Controls 2.15
 import QtQuick.Layouts 1.15
 import Futr 1.0
-import QtQuick.Studio.Components 1.0
 
 Rectangle {
     id: welcomeScreen

diff --git a/resources/qml/imports/Futr/Constants.qml b/resources/qml/imports/Futr/Constants.qml
@@ -5,9 +5,6 @@ QtObject {
     readonly property int width: 1280
     readonly property int height: 720
 
-    property alias fontDirectory: directoryFontLoader.fontDirectory
-    property alias relativeFontDirectory: directoryFontLoader.relativeFontDirectory
-
     readonly property font font: Qt.font({
         family: "Arial",
         pixelSize: Qt.application.font.pixelSize,
@@ -22,8 +19,4 @@ QtObject {
     })
 
     readonly property color backgroundColor: "#c2c2c2"
-
-    property DirectoryFontLoader directoryFontLoader: DirectoryFontLoader {
-        id: directoryFontLoader
-    }
 }
diff --git a/resources/qml/imports/Futr/DirectoryFontLoader.qml b/resources/qml/imports/Futr/DirectoryFontLoader.qml
diff --git a/resources/qml/imports/Futr/qmldir b/resources/qml/imports/Futr/qmldir
@@ -2,5 +2,3 @@ Module Futr
 singleton Constants 1.0 Constants.qml
 EventListSimulator 1.0 EventListSimulator.qml
 EventListModel 1.0 EventListModel.qml
-DirectoryFontLoader 1.0 DirectoryFontLoader.qml
-
diff --git a/src/Main.hs b/src/Main.hs
@@ -51,7 +51,7 @@ createContext modelVar changeKey = do
     let handleError :: ObjRef() -> String -> IO ()
         handleError obj err = do
             model <- takeMVar modelVar
-            putMVar modelVar model { errorMsg = pack err }
+            putMVar modelVar model { errorMsg = "Error: " <> pack err }
             fireSignal changeKey obj
 
     rootClass <- newClass [            
@@ -162,9 +162,9 @@ main = do
     importPath' <- getDataFileName "resources/qml/content"
     importPath'' <- getDataFileName "resources/qml/imports"
 
-    let qtImportPath = "/home/sasa/Qt/qtdesignstudio-2.3.1-community/qt5_design_studio_reduced_version/qml"
+    --let qtImportPath = "/home/sasa/Qt/qtdesignstudio-2.3.1-community/qt5_design_studio_reduced_version/qml"
 
-    setEnv "QML2_IMPORT_PATH" qtImportPath
+    --setEnv "QML2_IMPORT_PATH" qtImportPath
     setEnv "QT_QUICK_CONTROLS_STYLE" "Material"
     -- QT_QUICK_CONTROLS_CONF: "qtquickcontrols2.conf"
     setEnv "QT_AUTO_SCREEN_SCALE_FACTOR" "1"
@@ -178,6 +178,6 @@ main = do
     runEngineLoop defaultEngineConfig 
         { initialDocument = fileDocument path
         , contextObject = Just $ anyObjRef ctx
-        , importPaths = [importPath, importPath', importPath'', qtImportPath]
+        , importPaths = [importPath, importPath', importPath'']
         --, pluginPaths = ["/home/sasa/Qt/qtdesignstudio-2.3.1-community/qt5_design_studio_reduced_version/plugins"]
         }
diff --git a/resources/Event.hs → src/Nostr/Event.hs b/resources/Event.hs → src/Nostr/Event.hs