filebrowser: use NF icons

Modals/FileBrowser/FileBrowserGridDelegate.qml

@@ -20,78 +20,68 @@ StyledRect {
     signal itemClicked(int index, string path, string name, bool isDir)
     signal itemSelected(int index, string path, string name, bool isDir)
 
+    function getFileExtension(fileName) {
+        const parts = fileName.split('.')
+        if (parts.length > 1) {
+            return parts[parts.length - 1].toLowerCase()
+        }
+        return ""
+    }
+
+    function determineFileType(fileName) {
+        const ext = getFileExtension(fileName)
+
+        const imageExts = ["png", "jpg", "jpeg", "gif", "bmp", "webp", "svg", "ico"]
+        if (imageExts.includes(ext)) {
+            return "image"
+        }
+
+        const videoExts = ["mp4", "mkv", "avi", "mov", "webm", "flv", "wmv", "m4v"]
+        if (videoExts.includes(ext)) {
+            return "video"
+        }
+
+        const audioExts = ["mp3", "wav", "flac", "ogg", "m4a", "aac", "wma"]
+        if (audioExts.includes(ext)) {
+            return "audio"
+        }
+
+        const codeExts = ["js", "ts", "jsx", "tsx", "py", "go", "rs", "c", "cpp", "h", "java", "kt", "swift", "rb", "php", "html", "css", "scss", "json", "xml", "yaml", "yml", "toml", "sh", "bash", "zsh", "fish", "qml", "vue", "svelte"]
+        if (codeExts.includes(ext)) {
+            return "code"
+        }
+
+        const docExts = ["txt", "md", "pdf", "doc", "docx", "odt", "rtf"]
+        if (docExts.includes(ext)) {
+            return "document"
+        }
+
+        const archiveExts = ["zip", "tar", "gz", "bz2", "xz", "7z", "rar"]
+        if (archiveExts.includes(ext)) {
+            return "archive"
+        }
+
+        if (!ext || fileName.indexOf('.') === -1) {
+            return "binary"
+        }
+
+        return "file"
+    }
+
     function isImageFile(fileName) {
         if (!fileName) {
             return false
         }
-        const ext = fileName.toLowerCase().split('.').pop()
+        return determineFileType(fileName) === "image"
-        return ['jpg', 'jpeg', 'png', 'gif', 'bmp', 'webp', 'svg'].includes(ext)
     }
 
-    function getFileIcon(fileName, isDir) {
+    function getIconForFile(fileName) {
-        if (isDir) {
+        const lowerName = fileName.toLowerCase()
-            return "folder"
+        if (lowerName.startsWith("dockerfile")) {
+            return "docker"
         }
-        if (!fileName) {
+        const ext = fileName.split('.').pop()
-            return "description"
+        return ext || ""
-        }
-        const ext = fileName.toLowerCase().split('.').pop()
-        const iconMap = {
-            "mp3": 'music_note',
-            "wav": 'music_note',
-            "flac": 'music_note',
-            "ogg": 'music_note',
-            "aac": 'music_note',
-            "mp4": 'movie',
-            "mkv": 'movie',
-            "avi": 'movie',
-            "mov": 'movie',
-            "webm": 'movie',
-            "flv": 'movie',
-            "wmv": 'movie',
-            "jpg": 'image',
-            "jpeg": 'image',
-            "png": 'image',
-            "gif": 'image',
-            "bmp": 'image',
-            "webp": 'image',
-            "svg": 'image',
-            "pdf": 'picture_as_pdf',
-            "zip": 'folder_zip',
-            "rar": 'folder_zip',
-            "7z": 'folder_zip',
-            "tar": 'folder_zip',
-            "gz": 'folder_zip',
-            "bz2": 'folder_zip',
-            "xz": 'folder_zip',
-            "txt": 'description',
-            "md": 'description',
-            "doc": 'description',
-            "docx": 'description',
-            "odt": 'description',
-            "rtf": 'description',
-            "sh": 'terminal',
-            "py": 'code',
-            "js": 'code',
-            "ts": 'code',
-            "cpp": 'code',
-            "c": 'code',
-            "h": 'code',
-            "java": 'code',
-            "go": 'code',
-            "rs": 'code',
-            "php": 'code',
-            "rb": 'code',
-            "qml": 'code',
-            "html": 'code',
-            "css": 'code',
-            "json": 'data_object',
-            "xml": 'data_object',
-            "yaml": 'data_object',
-            "yml": 'data_object',
-            "toml": 'data_object'
-        }
-        return iconMap[ext] || 'description'
     }
 
     width: weMode ? 245 : iconSizes[iconSizeIndex] + 16
@@ -179,9 +169,9 @@ StyledRect {
                 }
             }
 
-            DankIcon {
+            DankNFIcon {
                 anchors.centerIn: parent
-                name: getFileIcon(delegateRoot.fileName, delegateRoot.fileIsDir)
+                name: delegateRoot.fileIsDir ? "folder" : getIconForFile(delegateRoot.fileName)
                 size: iconSizes[iconSizeIndex] * 0.45
                 color: delegateRoot.fileIsDir ? Theme.primary : Theme.surfaceText
                 visible: (!delegateRoot.fileIsDir && !isImageFile(delegateRoot.fileName)) || (delegateRoot.fileIsDir && !weMode)

Modals/FileBrowser/FileBrowserListDelegate.qml

@@ -19,78 +19,68 @@ StyledRect {
     signal itemClicked(int index, string path, string name, bool isDir)
     signal itemSelected(int index, string path, string name, bool isDir)
 
+    function getFileExtension(fileName) {
+        const parts = fileName.split('.')
+        if (parts.length > 1) {
+            return parts[parts.length - 1].toLowerCase()
+        }
+        return ""
+    }
+
+    function determineFileType(fileName) {
+        const ext = getFileExtension(fileName)
+
+        const imageExts = ["png", "jpg", "jpeg", "gif", "bmp", "webp", "svg", "ico"]
+        if (imageExts.includes(ext)) {
+            return "image"
+        }
+
+        const videoExts = ["mp4", "mkv", "avi", "mov", "webm", "flv", "wmv", "m4v"]
+        if (videoExts.includes(ext)) {
+            return "video"
+        }
+
+        const audioExts = ["mp3", "wav", "flac", "ogg", "m4a", "aac", "wma"]
+        if (audioExts.includes(ext)) {
+            return "audio"
+        }
+
+        const codeExts = ["js", "ts", "jsx", "tsx", "py", "go", "rs", "c", "cpp", "h", "java", "kt", "swift", "rb", "php", "html", "css", "scss", "json", "xml", "yaml", "yml", "toml", "sh", "bash", "zsh", "fish", "qml", "vue", "svelte"]
+        if (codeExts.includes(ext)) {
+            return "code"
+        }
+
+        const docExts = ["txt", "md", "pdf", "doc", "docx", "odt", "rtf"]
+        if (docExts.includes(ext)) {
+            return "document"
+        }
+
+        const archiveExts = ["zip", "tar", "gz", "bz2", "xz", "7z", "rar"]
+        if (archiveExts.includes(ext)) {
+            return "archive"
+        }
+
+        if (!ext || fileName.indexOf('.') === -1) {
+            return "binary"
+        }
+
+        return "file"
+    }
+
     function isImageFile(fileName) {
         if (!fileName) {
             return false
         }
-        const ext = fileName.toLowerCase().split('.').pop()
+        return determineFileType(fileName) === "image"
-        return ['jpg', 'jpeg', 'png', 'gif', 'bmp', 'webp', 'svg'].includes(ext)
     }
 
-    function getFileIcon(fileName, isDir) {
+    function getIconForFile(fileName) {
-        if (isDir) {
+        const lowerName = fileName.toLowerCase()
-            return "folder"
+        if (lowerName.startsWith("dockerfile")) {
+            return "docker"
         }
-        if (!fileName) {
+        const ext = fileName.split('.').pop()
-            return "description"
+        return ext || ""
-        }
-        const ext = fileName.toLowerCase().split('.').pop()
-        const iconMap = {
-            "mp3": 'music_note',
-            "wav": 'music_note',
-            "flac": 'music_note',
-            "ogg": 'music_note',
-            "aac": 'music_note',
-            "mp4": 'movie',
-            "mkv": 'movie',
-            "avi": 'movie',
-            "mov": 'movie',
-            "webm": 'movie',
-            "flv": 'movie',
-            "wmv": 'movie',
-            "jpg": 'image',
-            "jpeg": 'image',
-            "png": 'image',
-            "gif": 'image',
-            "bmp": 'image',
-            "webp": 'image',
-            "svg": 'image',
-            "pdf": 'picture_as_pdf',
-            "zip": 'folder_zip',
-            "rar": 'folder_zip',
-            "7z": 'folder_zip',
-            "tar": 'folder_zip',
-            "gz": 'folder_zip',
-            "bz2": 'folder_zip',
-            "xz": 'folder_zip',
-            "txt": 'description',
-            "md": 'description',
-            "doc": 'description',
-            "docx": 'description',
-            "odt": 'description',
-            "rtf": 'description',
-            "sh": 'terminal',
-            "py": 'code',
-            "js": 'code',
-            "ts": 'code',
-            "cpp": 'code',
-            "c": 'code',
-            "h": 'code',
-            "java": 'code',
-            "go": 'code',
-            "rs": 'code',
-            "php": 'code',
-            "rb": 'code',
-            "qml": 'code',
-            "html": 'code',
-            "css": 'code',
-            "json": 'data_object',
-            "xml": 'data_object',
-            "yaml": 'data_object',
-            "yml": 'data_object',
-            "toml": 'data_object'
-        }
-        return iconMap[ext] || 'description'
     }
 
     function formatFileSize(size) {
@@ -168,9 +158,9 @@ StyledRect {
                 }
             }
 
-            DankIcon {
+            DankNFIcon {
                 anchors.centerIn: parent
-                name: getFileIcon(listDelegateRoot.fileName, listDelegateRoot.fileIsDir)
+                name: listDelegateRoot.fileIsDir ? "folder" : getIconForFile(listDelegateRoot.fileName)
                 size: Theme.iconSize - 2
                 color: listDelegateRoot.fileIsDir ? Theme.primary : Theme.surfaceText
                 visible: listDelegateRoot.fileIsDir || !isImageFile(listDelegateRoot.fileName)

Widgets/DankNFIcon.qml

@@ -14,6 +14,10 @@ Item {
 
     // This is for file browser, particularly - might want another map later for app IDs
     readonly property var iconMap: ({
+        // --- special types ---
+        "folder":               "\u{F024B}",
+        "file":                 "\u{F0214}",
+
         // --- special filenames (no extension) ---
         "docker":               "\u{F0868}",
         "makefile":             "\u{F09EE}",
@@ -22,6 +26,7 @@ Item {
 
         // --- programming languages ---
         "rs":                   "\u{F1617}",
+        "dart":                 "\u{e798}",
         "go":                   "\u{F07D3}",
         "py":                   "\u{F0320}",
         "js":                   "\u{F031E}",
@@ -72,6 +77,7 @@ Item {
         "rtf":                  "\u{F09EE}",
         "ppt":                  "\u{F09EE}",
         "pptx":                 "\u{F09EE}",
+        "log":                  "\u{F09EE}",
         "xls":                  "\u{F021C}",
         "xlsx":                 "\u{F021C}",
 
@@ -104,7 +110,7 @@ Item {
     })
 
 
-    readonly property string text: iconMap[name] || ""
+    readonly property string text: iconMap[name] || iconMap["file"] || ""
 
     function getIconForFile(fileName) {
         const lowerName = fileName.toLowerCase()