Fixup with new api

Author: neochapay

src/CMakeLists.txt

@@ -1,23 +1,24 @@
+set(PROJECT glacier-filemuncher)
+
 set(SRC main.cpp
 	filetools.cpp
 	txtfilereader.cpp)
 
 set(HEADERS filetools.h
 	txtfilereader.h)
 
-add_executable(glacier-filemuncher ${SRC} ${HEADERS})
+qt_add_resources(RESOURCES qml/${PROJECT}.qrc)
+
+add_executable(${PROJECT} ${SRC} ${HEADERS} ${RESOURCES}
+    qml/glacier-filemuncher.qrc)
 
-target_link_libraries(glacier-filemuncher
+target_link_libraries(${PROJECT}
 	Qt6::Gui
 	Qt6::Qml
 	Qt6::Quick
 	Glacier::App)
 
-install(TARGETS glacier-filemuncher RUNTIME
+install(TARGETS ${PROJECT} RUNTIME
 	DESTINATION ${CMAKE_INSTALL_BINDIR})
-install(DIRECTORY qml
-	DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/glacier-filemuncher
-	PATTERN "api" EXCLUDE)
 install(DIRECTORY qml/api/
-	DESTINATION ${QT_INSTALL_QML}/org/nemomobile/filemuncher/
-)
+	DESTINATION ${QT_INSTALL_QML}/org/nemomobile/filemuncher/)

src/qml/DetailViewSheet.qml

@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2012 Robin Burchell <robin+nemo@viroteck.net>
- * Copyright (C) 2017 Chupligin Sergey <neochapay@gmail.com>
+ * Copyright (C) 2017-2025 Chupligin Sergey <neochapay@gmail.com>
  *
  * You may use this file under the terms of the BSD license as follows:
  *
@@ -31,6 +31,7 @@
  */
 
 import QtQuick
+import Nemo
 import Nemo.Controls
 
 Page {

src/qml/DirectoryPage.qml

@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2012 Robin Burchell <robin+nemo@viroteck.net>
- * Copyright (C) 2017-2020 Chupligin Sergey <neochapay@gmail.com>
+ * Copyright (C) 2017-2025 Chupligin Sergey <neochapay@gmail.com>
  *
  * You may use this file under the terms of the BSD license as follows:
  *
@@ -32,6 +32,7 @@
 
 import QtQuick
 
+import Nemo
 import Nemo.Controls
 import Nemo.Dialogs
 
@@ -55,11 +56,7 @@ Page {
             ToolButton {
                 iconSource: "image://theme/refresh"
                 onClicked: dirModel.refresh()
-            }/*,
-            ToolButton {
-                iconSource: "image://theme/bars"
-                onClicked: (pageMenu.status == DialogStatus.Closed) ? pageMenu.open() : pageMenu.close()
-            }*/
+            }
         ]
         drawerLevels: [
             Button {
@@ -167,7 +164,9 @@ Page {
                 if (component.status == Component.Ready) {
                     // TODO: error handling
                     var detailsSheet = component.createObject(page, {"model": model});
-                    pageStack.push(detailsSheet)
+                    if(detailsSheet != null) {
+                        pageStack.push(detailsSheet)
+                    }
                 }
 
                 console.log(component.errorString())

src/qml/FilePickerSheet.qml

@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2012 Robin Burchell <robin+nemo@viroteck.net>
- * Copyright (C) 2017 Chupligin Sergey <neochapay@gmail.com>
+ * Copyright (C) 2017-2025 Chupligin Sergey <neochapay@gmail.com>
  *
  * You may use this file under the terms of the BSD license as follows:
  *
@@ -31,6 +31,7 @@
  */
 
 import QtQuick
+import Nemo
 import Nemo.Controls
 
 Sheet {

src/qml/InputSheet.qml

@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2012 Arto Jalkanen <ajalkane@gmail.com>
- * Copyright (C) 2017 Chupligin Sergey <neochapay@gmail.com>
+ * Copyright (C) 2017-2025 Chupligin Sergey <neochapay@gmail.com>
  *
  * You may use this file under the terms of the BSD license as follows:
  *
@@ -31,6 +31,7 @@
  */
 
 import QtQuick
+import Nemo
 import Nemo.Controls
 
 Page {

src/qml/TextViewPage.qml

@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2020 Chupligin Sergey <neochapay@gmail.com>
+ * Copyright (C) 2020-2025 Chupligin Sergey <neochapay@gmail.com>
  *
  * You may use this file under the terms of the BSD license as follows:
  *
@@ -30,6 +30,7 @@
  */
 
 import QtQuick
+import Nemo
 import Nemo.Controls
 import org.nemomobile.glacier.filemuncher
 

src/qml/api/FileListDelegate.qml

@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2012 Robin Burchell <robin+nemo@viroteck.net>
- * Copyright (C) 2017 Chupligin Sergey <neochapay@gmail.com>
+ * Copyright (C) 2017-2025 Chupligin Sergey <neochapay@gmail.com>
  *
  * You may use this file under the terms of the BSD license as follows:
  *
@@ -31,6 +31,7 @@
  */
 
 import QtQuick
+import Nemo
 import Nemo.Controls
 
 ListViewItemWithActions {
@@ -59,11 +60,10 @@ ListViewItemWithActions {
         }
     ]
 
-    Text {
+    Label {
         id: fileSize
         color: Theme.textColor
         visible: model.isFile
-        font: Theme.fontFamily
         text: model.fileSize
         anchors{
             right: parent.right

src/qml/api/FilePermissionIndicator.qml

@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2012 Petri M. Gerdt <petri.gerdt@gmail.com>
- * Copyright (C) 2017 Chupligin Sergey <neochapay@gmail.com>
+ * Copyright (C) 2017-2025 Chupligin Sergey <neochapay@gmail.com>
  *
  * You may use this file under the terms of the BSD license as follows:
  *
@@ -31,6 +31,7 @@
  */
 
 import QtQuick
+import Nemo
 import Nemo.Controls
 
 Rectangle {

src/qml/glacier-filemuncher.qml

@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2012 Robin Burchell <robin+nemo@viroteck.net>
- * Copyright (C) 2018 Chupligin Sergey <neochapay@gmail.com>
+ * Copyright (C) 2018-2025 Chupligin Sergey <neochapay@gmail.com>
  *
  * You may use this file under the terms of the BSD license as follows:
  *
@@ -31,6 +31,7 @@
  */
 
 import QtQuick
+import Nemo
 import Nemo.Controls
 //import Nemo.Thumbnailer
 

src/qml/glacier-filemuncher.qrc

@@ -0,0 +1,10 @@
+<RCC>
+    <qresource prefix="/">
+        <file>DetailViewSheet.qml</file>
+        <file>DirectoryPage.qml</file>
+        <file>FilePickerSheet.qml</file>
+        <file>glacier-filemuncher.qml</file>
+        <file>InputSheet.qml</file>
+        <file>TextViewPage.qml</file>
+    </qresource>
+</RCC>