diff --git a/src/Glyph.qml b/src/Glyph.qml index dc33af44..2fa6c02d 100644 --- a/src/Glyph.qml +++ b/src/Glyph.qml @@ -52,6 +52,8 @@ Item { // for this name is built. Any other name, "file" among them, is a page. readonly property string path: { switch (name) { + case "home": return "M3 11l9-7 9 7M5 9.5V20h5v-6h4v6h5V9.5" + case "desktop": return box(3, 4, 18, 12, r) + "M8 20h8M12 16v4" case "documents": return page() + "M9 12h6M9 16h6" case "downloads": return "M12 4v11M7 10l5 5 5-5M4 20h16" case "pictures": return box(3, 5, 18, 14, r) + "M3 16l5-5 4 4 3-3 6 6" + circle(16, 9, 1.5) diff --git a/src/Sidebar.qml b/src/Sidebar.qml index 9826bd11..42f09d1f 100644 --- a/src/Sidebar.qml +++ b/src/Sidebar.qml @@ -3,7 +3,8 @@ import QtQuick.Controls import QtQuick.Layouts import "Format.js" as Format -// Home's folders, pinned folders, views, drives and plugins' sections. The one holding the current folder stays lit while you +// Places (Home, its standard folders, Recents and Trash), pinned folders, +// drives and plugins' sections, the way Nautilus lays them out. The one holding the current folder stays lit while you // dig into it, so you always know which root you're under. Rectangle { id: sidebar @@ -32,10 +33,10 @@ Rectangle { // Each plugin section's rows, then the row for its view. function sectionRows(section) { return section.view ? section.rows.concat([section.view]) : section.rows } readonly property var pluginRows: plugins.sections.reduce((all, section) => all.concat(sectionRows(section)), []) - readonly property var rows: [].concat(places.places, places.pinned, places.views, places.devices, pluginRows) - readonly property int pinnedAt: places.places.length - readonly property int viewsAt: pinnedAt + places.pinned.length - readonly property int devicesAt: viewsAt + places.views.length + readonly property var rows: [].concat(places.places, places.views, places.pinned, places.devices, pluginRows) + readonly property int viewsAt: places.places.length + readonly property int pinnedAt: viewsAt + places.views.length + readonly property int devicesAt: pinnedAt + places.pinned.length readonly property int pluginsAt: devicesAt + places.devices.length // Where a plugin section's rows start in `rows`. function sectionAt(index) { @@ -89,7 +90,7 @@ Rectangle { // A pinned folder is unpinned, a plugin's item taken off the sidebar. Keys.onDeletePressed: { const row = rows[cursor] - if (cursor >= pinnedAt && cursor < viewsAt) + if (cursor >= pinnedAt && cursor < devicesAt) places.unpin(row.path) else if (row && row.forgettable) plugins.forget(row.plugin, row.id) @@ -97,24 +98,72 @@ Rectangle { // Rows taken away under the keyboard leave it on the last one. onRowsChanged: cursor = Math.max(0, Math.min(cursor, rows.length - 1)) - // Alt+⏎ (or the Menu key) on a drive opens its menu beside it; the - // files' menu stands aside for it. + // Alt+⏎ (or the Menu key) on a drive, place or pin opens its menu + // beside it; the files' menu stands aside for it. readonly property var keyedDrive: activeFocus && cursor >= devicesAt && cursor < pluginsAt ? driveRows.itemAt(cursor - devicesAt) : null + readonly property var keyedPlace: !activeFocus ? null + : cursor < viewsAt ? placeRows.itemAt(cursor) + : cursor >= pinnedAt && cursor < devicesAt ? pinRows.itemAt(cursor - pinnedAt) + : null function menuKey(event) { return ((event.key === Qt.Key_Return || event.key === Qt.Key_Enter) && (event.modifiers & Qt.AltModifier)) || event.key === Qt.Key_Menu || (event.key === Qt.Key_F10 && (event.modifiers & Qt.ShiftModifier)) } - Keys.onShortcutOverride: (event) => event.accepted = menuKey(event) && keyedDrive !== null + Keys.onShortcutOverride: (event) => event.accepted = menuKey(event) && (keyedDrive !== null || keyedPlace !== null) // Return has its own handler, which Keys calls before this one. Keys.onPressed: (event) => event.accepted = openDriveMenu(event) function openDriveMenu(event) { - if (!menuKey(event) || !keyedDrive) + if (!menuKey(event)) + return false + if (keyedDrive) + driveMenu.show(keyedDrive.modelData, keyedDrive) + else if (keyedPlace) + placeMenu.show(keyedPlace.modelData, keyedPlace) + else return false - driveMenu.show(keyedDrive.modelData, keyedDrive) return true } + // Right-click on a folder in Places or Pinned. + FolioMenu { + id: placeMenu + property string path + property bool pinned: false + // Opens at the pointer, or (from the keyboard) beside the row. + function show(row, near) { + path = row.path + pinned = places.isPinned(row.path) + if (near) + popup(near, Math.min(near.width / 2, 120), near.height / 2) + else + popup() + } + FolioMenuItem { + text: qsTr("Open") + onTriggered: sidebar.target.navigate(placeMenu.path) + } + FolioMenuItem { + text: qsTr("Open Terminal Here") + onTriggered: fileOps.openTerminal(placeMenu.path) + } + FolioMenuItem { + text: qsTr("Copy Path") + onTriggered: fileOps.yank([placeMenu.path]) + } + MenuLine { shown: placeMenu.pinned } + FolioMenuItem { + shown: placeMenu.pinned + text: qsTr("Unpin") + onTriggered: places.unpin(placeMenu.path) + } + } + + // A pin being dragged to a new place among the pins: where it was, and + // the pin it's over. + property int pinFrom: -1 + property int pinTo: -1 + DriveMenu { id: driveMenu onOpenRequested: (path) => { sidebar.target.navigate(path); sidebar.finished() } @@ -125,7 +174,7 @@ Rectangle { readonly property string activePath: { let best = "" const here = sidebar.target.path - for (const list of [places.places, places.pinned, places.views, places.devices, + for (const list of [places.places, places.views, places.pinned, places.devices, plugins.sections.filter(section => section.view).map(section => section.view)]) { for (const p of list) { if (p.path !== "/" && (here === p.path || here.startsWith(p.path + "/")) && p.path.length > best.length) @@ -274,17 +323,9 @@ Rectangle { width: sidebar.width - 24 spacing: 1 - // The section's label is home itself: click it to go there. - SectionLabel { - Layout.topMargin: 0 - text: qsTr("Home") - color: sidebar.target.path === places.home ? theme.accent - : homeHover.hovered ? theme.foreground : theme.secondaryForeground - Accessible.role: Accessible.Button - HoverHandler { id: homeHover; cursorShape: Qt.PointingHandCursor } - TapHandler { onTapped: sidebar.target.navigate(places.home) } - } + // Places: Home and its standard folders, then Recents and Trash. Repeater { + id: placeRows model: places.places PlaceRow { required property var modelData @@ -293,10 +334,29 @@ Rectangle { onDropHoverChanged: sidebar.dropHovers += dropHover ? 1 : -1 keyed: sidebar.activeFocus && sidebar.cursor === 0 + index onKeyedChanged: if (keyed) sidebar.reveal(this) - text: modelData.name + text: modelData.icon === "home" ? qsTr("Home") : modelData.name + glyph: modelData.icon + active: sidebar.activePath === modelData.path + onClicked: sidebar.target.navigate(modelData.path) + TapHandler { + acceptedButtons: Qt.RightButton + onTapped: placeMenu.show(parent.modelData, null) + } + } + } + Repeater { + model: places.views + PlaceRow { + required property var modelData + required property int index + dropTrashes: modelData.icon === "trash" + onDropHoverChanged: sidebar.dropHovers += dropHover ? 1 : -1 + text: modelData.icon === "trash" ? qsTr("Trash") : qsTr("Recents") glyph: modelData.icon active: sidebar.activePath === modelData.path onClicked: sidebar.target.navigate(modelData.path) + keyed: sidebar.activeFocus && sidebar.cursor === sidebar.viewsAt + index + onKeyedChanged: if (keyed) sidebar.reveal(this) } } @@ -305,6 +365,7 @@ Rectangle { // empty) as the place to drop it. SectionLabel { text: qsTr("Pinned"); visible: places.pinned.length > 0 || sidebar.dragging } Repeater { + id: pinRows model: places.pinned PlaceRow { id: pinRow @@ -318,6 +379,46 @@ Rectangle { glyph: modelData.icon active: sidebar.activePath === modelData.path onClicked: sidebar.target.navigate(modelData.path) + TapHandler { + acceptedButtons: Qt.RightButton + onTapped: placeMenu.show(pinRow.modelData, null) + } + // Dragged up or down, the pin moves among the pins. + readonly property int pinIndex: index + opacity: sidebar.pinFrom === index ? 0.5 : 1 + DragHandler { + id: pinDrag + target: null + xAxis.enabled: false + onActiveChanged: { + if (active) { + sidebar.pinFrom = pinRow.index + sidebar.pinTo = pinRow.index + } else { + if (sidebar.pinFrom >= 0 && sidebar.pinTo >= 0 && sidebar.pinTo !== sidebar.pinFrom) + places.movePin(pinRow.modelData.path, sidebar.pinTo) + sidebar.pinFrom = -1 + sidebar.pinTo = -1 + } + } + onCentroidChanged: { + if (!active) + return + const at = pinRow.mapToItem(column, centroid.position.x, centroid.position.y) + const over = column.childAt(column.width / 2, at.y) + if (over && over.pinIndex !== undefined) + sidebar.pinTo = over.pinIndex + } + } + // Where the dragged pin will land: a line above or below. + Rectangle { + visible: sidebar.pinFrom >= 0 && sidebar.pinTo === pinRow.index && sidebar.pinFrom !== pinRow.index + anchors.left: parent.left + anchors.right: parent.right + y: sidebar.pinFrom > pinRow.index ? 0 : parent.height - height + height: 2 + color: theme.accent + } // The name ends short of the unpin button while it shows: // hovered, or on the keyboard's row, where Delete does // the same. @@ -364,24 +465,6 @@ Rectangle { } } - // Views: lists that aren't a folder of their own. - SectionLabel { text: qsTr("Views") } - Repeater { - model: places.views - PlaceRow { - required property var modelData - required property int index - dropTrashes: modelData.icon === "trash" - onDropHoverChanged: sidebar.dropHovers += dropHover ? 1 : -1 - text: modelData.icon === "trash" ? qsTr("Trash") : qsTr("Recents") - glyph: modelData.icon - active: sidebar.activePath === modelData.path - onClicked: sidebar.target.navigate(modelData.path) - keyed: sidebar.activeFocus && sidebar.cursor === sidebar.viewsAt + index - onKeyedChanged: if (keyed) sidebar.reveal(this) - } - } - // Each drive says how much is free under its name, where there's // room for it, and while it's hovered or has the keyboard its icon // becomes the button that ejects it. Right-clicked, it has a menu diff --git a/src/i18n/ar.json b/src/i18n/ar.json index 91ac4d32..88704c19 100644 --- a/src/i18n/ar.json +++ b/src/i18n/ar.json @@ -574,7 +574,6 @@ "Untitled Folder": "مجلد بلا عنوان", "Untitled Folder %1": "مجلد بلا عنوان %1", "User": "المستخدم", - "Views": "طرق العرض", "Works almost anywhere, old cameras and car stereos too, but no file can be over 4 GB.": "يعمل في كل مكان تقريبًا، حتى مع الكاميرات القديمة وأجهزة ستيريو السيارات، لكن لا يمكن أن يتجاوز حجم أي ملف 4 غيغابايت.", "Works with Mac, Windows and Linux, and holds big files.": "يعمل مع Mac وWindows وLinux، ويستوعب الملفات الكبيرة.", "You don't have permission to open this folder.": "ليست لديك صلاحية فتح هذا المجلد.", diff --git a/src/i18n/bg.json b/src/i18n/bg.json index 250e1e12..54ca6edc 100644 --- a/src/i18n/bg.json +++ b/src/i18n/bg.json @@ -438,7 +438,6 @@ "Untitled Folder": "Папка без име", "Untitled Folder %1": "Папка без име %1", "User": "Потребител", - "Views": "Изгледи", "Works almost anywhere, old cameras and car stereos too, but no file can be over 4 GB.": "Работи почти навсякъде, включително със стари фотоапарати и автомобилни уредби, но нито един файл не може да е по-голям от 4 ГБ.", "Works with Mac, Windows and Linux, and holds big files.": "Работи с Mac, Windows и Linux и побира големи файлове.", "You don't have permission to open this folder.": "Нямаш разрешение да отвориш тази папка.", diff --git a/src/i18n/bn.json b/src/i18n/bn.json index 13ce402f..c3bc6c6c 100644 --- a/src/i18n/bn.json +++ b/src/i18n/bn.json @@ -438,7 +438,6 @@ "Untitled Folder": "শিরোনামহীন ফোল্ডার", "Untitled Folder %1": "শিরোনামহীন ফোল্ডার %1", "User": "ব্যবহারকারী", - "Views": "ভিউ", "Works almost anywhere, old cameras and car stereos too, but no file can be over 4 GB.": "প্রায় সব জায়গায় চলে, পুরনো ক্যামেরা ও গাড়ির স্টেরিওতেও, কিন্তু কোনো ফাইল 4 GB-এর বেশি হতে পারবে না।", "Works with Mac, Windows and Linux, and holds big files.": "Mac, Windows ও Linux-এ চলে, আর বড় ফাইল রাখা যায়।", "You don't have permission to open this folder.": "এই ফোল্ডারটি খোলার অনুমতি আপনার নেই।", diff --git a/src/i18n/ca.json b/src/i18n/ca.json index f595ada5..16e85855 100644 --- a/src/i18n/ca.json +++ b/src/i18n/ca.json @@ -472,7 +472,6 @@ "Untitled Folder": "Carpeta sense títol", "Untitled Folder %1": "Carpeta sense títol %1", "User": "Usuari", - "Views": "Vistes", "Works almost anywhere, old cameras and car stereos too, but no file can be over 4 GB.": "Funciona gairebé a tot arreu, fins i tot en càmeres antigues i equips de música de cotxe, però cap fitxer pot superar els 4 GB.", "Works with Mac, Windows and Linux, and holds big files.": "Funciona amb Mac, Windows i Linux, i admet fitxers grans.", "You don't have permission to open this folder.": "No tens permís per obrir aquesta carpeta.", diff --git a/src/i18n/cs.json b/src/i18n/cs.json index b1e5ce0b..b1163178 100644 --- a/src/i18n/cs.json +++ b/src/i18n/cs.json @@ -472,7 +472,6 @@ "Untitled Folder": "Složka bez názvu", "Untitled Folder %1": "Složka bez názvu %1", "User": "Uživatel", - "Views": "Zobrazení", "Works almost anywhere, old cameras and car stereos too, but no file can be over 4 GB.": "Funguje téměř všude, i ve starých fotoaparátech a autorádiích, ale žádný soubor nesmí přesáhnout 4 GB.", "Works with Mac, Windows and Linux, and holds big files.": "Funguje na Macu, ve Windows i v Linuxu a pojme i velké soubory.", "You don't have permission to open this folder.": "Nemáte oprávnění k otevření této složky.", diff --git a/src/i18n/da.json b/src/i18n/da.json index b688f7f2..0fd06aa9 100644 --- a/src/i18n/da.json +++ b/src/i18n/da.json @@ -438,7 +438,6 @@ "Untitled Folder": "Unavngiven mappe", "Untitled Folder %1": "Unavngiven mappe %1", "User": "Bruger", - "Views": "Visninger", "Works almost anywhere, old cameras and car stereos too, but no file can be over 4 GB.": "Virker næsten overalt, også med gamle kameraer og bilradioer, men ingen fil må være over 4 GB.", "Works with Mac, Windows and Linux, and holds big files.": "Virker med Mac, Windows og Linux og kan rumme store filer.", "You don't have permission to open this folder.": "Du har ikke tilladelse til at åbne denne mappe.", diff --git a/src/i18n/de.json b/src/i18n/de.json index 55c937d5..4ff90f69 100644 --- a/src/i18n/de.json +++ b/src/i18n/de.json @@ -438,7 +438,6 @@ "Untitled Folder": "Unbenannter Ordner", "Untitled Folder %1": "Unbenannter Ordner %1", "User": "Benutzer", - "Views": "Ansichten", "Works almost anywhere, old cameras and car stereos too, but no file can be over 4 GB.": "Funktioniert fast überall, auch mit alten Kameras und Autoradios, aber keine Datei darf größer als 4 GB sein.", "Works with Mac, Windows and Linux, and holds big files.": "Funktioniert mit Mac, Windows und Linux und kann große Dateien speichern.", "You don't have permission to open this folder.": "Sie haben keine Berechtigung, diesen Ordner zu öffnen.", diff --git a/src/i18n/el.json b/src/i18n/el.json index 9a712a83..febd1f76 100644 --- a/src/i18n/el.json +++ b/src/i18n/el.json @@ -438,7 +438,6 @@ "Untitled Folder": "Φάκελος χωρίς τίτλο", "Untitled Folder %1": "Φάκελος χωρίς τίτλο %1", "User": "Χρήστης", - "Views": "Προβολές", "Works almost anywhere, old cameras and car stereos too, but no file can be over 4 GB.": "Λειτουργεί σχεδόν παντού, και σε παλιές φωτογραφικές μηχανές και ηχοσυστήματα αυτοκινήτου, αλλά κανένα αρχείο δεν μπορεί να ξεπερνά τα 4 GB.", "Works with Mac, Windows and Linux, and holds big files.": "Λειτουργεί με Mac, Windows και Linux και χωρά μεγάλα αρχεία.", "You don't have permission to open this folder.": "Δεν έχετε δικαίωμα να ανοίξετε αυτόν τον φάκελο.", diff --git a/src/i18n/en.json b/src/i18n/en.json index 369dbda5..42546d3f 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -438,7 +438,6 @@ "Untitled Folder": "Untitled Folder", "Untitled Folder %1": "Untitled Folder %1", "User": "User", - "Views": "Views", "Works almost anywhere, old cameras and car stereos too, but no file can be over 4 GB.": "Works almost anywhere, old cameras and car stereos too, but no file can be over 4 GB.", "Works with Mac, Windows and Linux, and holds big files.": "Works with Mac, Windows and Linux, and holds big files.", "You don't have permission to open this folder.": "You don't have permission to open this folder.", diff --git a/src/i18n/es-MX.json b/src/i18n/es-MX.json index 5cae8261..02cdd92d 100644 --- a/src/i18n/es-MX.json +++ b/src/i18n/es-MX.json @@ -472,7 +472,6 @@ "Untitled Folder": "Carpeta sin título", "Untitled Folder %1": "Carpeta sin título %1", "User": "Usuario", - "Views": "Vistas", "Works almost anywhere, old cameras and car stereos too, but no file can be over 4 GB.": "Funciona en casi cualquier lugar, incluso en cámaras viejas y autoestéreos, pero ningún archivo puede superar los 4 GB.", "Works with Mac, Windows and Linux, and holds big files.": "Funciona con Mac, Windows y Linux, y admite archivos grandes.", "You don't have permission to open this folder.": "No tienes permiso para abrir esta carpeta.", diff --git a/src/i18n/et.json b/src/i18n/et.json index 211349ee..37dd1111 100644 --- a/src/i18n/et.json +++ b/src/i18n/et.json @@ -438,7 +438,6 @@ "Untitled Folder": "Nimetu kaust", "Untitled Folder %1": "Nimetu kaust %1", "User": "Kasutaja", - "Views": "Vaated", "Works almost anywhere, old cameras and car stereos too, but no file can be over 4 GB.": "Töötab peaaegu kõikjal, ka vanades kaamerates ja autostereodes, kuid ükski fail ei tohi olla üle 4 GB.", "Works with Mac, Windows and Linux, and holds big files.": "Töötab Maci, Windowsi ja Linuxiga ning mahutab suuri faile.", "You don't have permission to open this folder.": "Sul ei ole õigust seda kausta avada.", diff --git a/src/i18n/fa.json b/src/i18n/fa.json index fe32f03e..de73dead 100644 --- a/src/i18n/fa.json +++ b/src/i18n/fa.json @@ -438,7 +438,6 @@ "Untitled Folder": "پوشهٔ بدون عنوان", "Untitled Folder %1": "پوشهٔ بدون عنوان %1", "User": "کاربر", - "Views": "نماها", "Works almost anywhere, old cameras and car stereos too, but no file can be over 4 GB.": "تقریباً همه‌جا کار می‌کند، حتی در دوربین‌های قدیمی و ضبط‌های خودرو، اما هیچ پرونده‌ای نمی‌تواند بزرگ‌تر از ۴ گیگابایت باشد.", "Works with Mac, Windows and Linux, and holds big files.": "با Mac، Windows و Linux کار می‌کند و پرونده‌های بزرگ را نگه می‌دارد.", "You don't have permission to open this folder.": "اجازهٔ باز کردن این پوشه را ندارید.", diff --git a/src/i18n/fi.json b/src/i18n/fi.json index af61c7d5..9cf9f42e 100644 --- a/src/i18n/fi.json +++ b/src/i18n/fi.json @@ -438,7 +438,6 @@ "Untitled Folder": "Nimetön kansio", "Untitled Folder %1": "Nimetön kansio %1", "User": "Käyttäjä", - "Views": "Näkymät", "Works almost anywhere, old cameras and car stereos too, but no file can be over 4 GB.": "Toimii lähes kaikkialla, myös vanhoissa kameroissa ja autostereoissa, mutta yksikään tiedosto ei voi olla yli 4 Gt.", "Works with Mac, Windows and Linux, and holds big files.": "Toimii Macin, Windowsin ja Linuxin kanssa, ja siihen mahtuu suuria tiedostoja.", "You don't have permission to open this folder.": "Sinulla ei ole oikeutta avata tätä kansiota.", diff --git a/src/i18n/fil.json b/src/i18n/fil.json index 4c3c26d3..2e5f855c 100644 --- a/src/i18n/fil.json +++ b/src/i18n/fil.json @@ -438,7 +438,6 @@ "Untitled Folder": "Folder na Walang Pamagat", "Untitled Folder %1": "Folder na Walang Pamagat %1", "User": "Gumagamit", - "Views": "Mga View", "Works almost anywhere, old cameras and car stereos too, but no file can be over 4 GB.": "Gumagana halos kahit saan, pati sa mga lumang camera at car stereo, pero hindi maaaring lumampas sa 4 GB ang isang file.", "Works with Mac, Windows and Linux, and holds big files.": "Gumagana sa Mac, Windows at Linux, at kasya rito ang malalaking file.", "You don't have permission to open this folder.": "Wala kang pahintulot na buksan ang folder na ito.", diff --git a/src/i18n/fr.json b/src/i18n/fr.json index b098406d..0ec60d6e 100644 --- a/src/i18n/fr.json +++ b/src/i18n/fr.json @@ -472,7 +472,6 @@ "Untitled Folder": "Dossier sans titre", "Untitled Folder %1": "Dossier sans titre %1", "User": "Utilisateur", - "Views": "Affichage", "Works almost anywhere, old cameras and car stereos too, but no file can be over 4 GB.": "Fonctionne presque partout, même avec les anciens appareils photo et autoradios, mais aucun fichier ne peut dépasser 4 Go.", "Works with Mac, Windows and Linux, and holds big files.": "Fonctionne avec Mac, Windows et Linux, et accepte les gros fichiers.", "You don't have permission to open this folder.": "Vous n’avez pas la permission d’ouvrir ce dossier.", diff --git a/src/i18n/ga.json b/src/i18n/ga.json index 126e988f..688e309f 100644 --- a/src/i18n/ga.json +++ b/src/i18n/ga.json @@ -540,7 +540,6 @@ "Untitled Folder": "Fillteán Gan Teideal", "Untitled Folder %1": "Fillteán Gan Teideal %1", "User": "Úsáideoir", - "Views": "Amhairc", "Works almost anywhere, old cameras and car stereos too, but no file can be over 4 GB.": "Oibríonn beagnach i ngach áit, sean-cheamaraí agus steiréónna cairr san áireamh, ach ní féidir le comhad ar bith a bheith níos mó ná 4 GB.", "Works with Mac, Windows and Linux, and holds big files.": "Oibríonn le Mac, Windows agus Linux, agus glacann sé le comhaid mhóra.", "You don't have permission to open this folder.": "Níl cead agat an fillteán seo a oscailt.", diff --git a/src/i18n/he.json b/src/i18n/he.json index 729ec73d..b2caa691 100644 --- a/src/i18n/he.json +++ b/src/i18n/he.json @@ -472,7 +472,6 @@ "Untitled Folder": "תיקייה ללא שם", "Untitled Folder %1": "תיקייה ללא שם %1", "User": "משתמש", - "Views": "תצוגות", "Works almost anywhere, old cameras and car stereos too, but no file can be over 4 GB.": "עובד כמעט בכל מקום, גם עם מצלמות ישנות ומערכות שמע לרכב, אבל שום קובץ לא יכול להיות גדול מ־4 GB.", "Works with Mac, Windows and Linux, and holds big files.": "עובד עם Mac, Windows ו־Linux, ויכול להכיל קבצים גדולים.", "You don't have permission to open this folder.": "אין לך הרשאה לפתוח את התיקייה הזו.", diff --git a/src/i18n/hi.json b/src/i18n/hi.json index e56d1eea..45574c93 100644 --- a/src/i18n/hi.json +++ b/src/i18n/hi.json @@ -438,7 +438,6 @@ "Untitled Folder": "बिना नाम का फ़ोल्डर", "Untitled Folder %1": "बिना नाम का फ़ोल्डर %1", "User": "उपयोगकर्ता", - "Views": "दृश्य", "Works almost anywhere, old cameras and car stereos too, but no file can be over 4 GB.": "लगभग हर जगह चलता है, पुराने कैमरे और कार स्टीरियो पर भी, लेकिन कोई फ़ाइल 4 GB से बड़ी नहीं हो सकती।", "Works with Mac, Windows and Linux, and holds big files.": "Mac, Windows और Linux के साथ चलता है, और बड़ी फ़ाइलें रख सकता है।", "You don't have permission to open this folder.": "आपको यह फ़ोल्डर खोलने की अनुमति नहीं है।", diff --git a/src/i18n/hr.json b/src/i18n/hr.json index c4cc0e11..f0d51722 100644 --- a/src/i18n/hr.json +++ b/src/i18n/hr.json @@ -472,7 +472,6 @@ "Untitled Folder": "Neimenovana mapa", "Untitled Folder %1": "Neimenovana mapa %1", "User": "Korisnik", - "Views": "Prikazi", "Works almost anywhere, old cameras and car stereos too, but no file can be over 4 GB.": "Radi gotovo svugdje, i na starim fotoaparatima i autoradijima, ali nijedna datoteka ne može biti veća od 4 GB.", "Works with Mac, Windows and Linux, and holds big files.": "Radi s Macom, Windowsima i Linuxom i prima velike datoteke.", "You don't have permission to open this folder.": "Nemaš dopuštenje za otvaranje ove mape.", diff --git a/src/i18n/hu.json b/src/i18n/hu.json index 7825c6a9..1d254088 100644 --- a/src/i18n/hu.json +++ b/src/i18n/hu.json @@ -438,7 +438,6 @@ "Untitled Folder": "Névtelen mappa", "Untitled Folder %1": "Névtelen mappa %1", "User": "Felhasználó", - "Views": "Nézetek", "Works almost anywhere, old cameras and car stereos too, but no file can be over 4 GB.": "Szinte mindenhol működik, régi fényképezőgépeken és autós hifikben is, de egyetlen fájl sem lehet 4 GB-nál nagyobb.", "Works with Mac, Windows and Linux, and holds big files.": "Működik Mac, Windows és Linux rendszeren is, és nagy fájlok tárolására is alkalmas.", "You don't have permission to open this folder.": "Nincs jogosultsága a mappa megnyitásához.", diff --git a/src/i18n/id.json b/src/i18n/id.json index bdd406d7..8688ed46 100644 --- a/src/i18n/id.json +++ b/src/i18n/id.json @@ -404,7 +404,6 @@ "Untitled Folder": "Folder Tanpa Nama", "Untitled Folder %1": "Folder Tanpa Nama %1", "User": "Pengguna", - "Views": "Tampilan", "Works almost anywhere, old cameras and car stereos too, but no file can be over 4 GB.": "Berfungsi hampir di mana saja, termasuk kamera lama dan stereo mobil, tetapi berkas tidak boleh lebih dari 4 GB.", "Works with Mac, Windows and Linux, and holds big files.": "Berfungsi di Mac, Windows, dan Linux, serta dapat menampung berkas besar.", "You don't have permission to open this folder.": "Anda tidak memiliki izin untuk membuka folder ini.", diff --git a/src/i18n/is.json b/src/i18n/is.json index 9818e2c7..d88bcc3b 100644 --- a/src/i18n/is.json +++ b/src/i18n/is.json @@ -438,7 +438,6 @@ "Untitled Folder": "Ónefnd mappa", "Untitled Folder %1": "Ónefnd mappa %1", "User": "Notandi", - "Views": "Sýnir", "Works almost anywhere, old cameras and car stereos too, but no file can be over 4 GB.": "Virkar nánast alls staðar, líka í gömlum myndavélum og bílastæriótækjum, en engin skrá má vera yfir 4 GB.", "Works with Mac, Windows and Linux, and holds big files.": "Virkar með Mac, Windows og Linux og geymir stórar skrár.", "You don't have permission to open this folder.": "Þú hefur ekki heimild til að opna þessa möppu.", diff --git a/src/i18n/it.json b/src/i18n/it.json index 99dbeb2c..fa9e7ad5 100644 --- a/src/i18n/it.json +++ b/src/i18n/it.json @@ -472,7 +472,6 @@ "Untitled Folder": "Cartella senza nome", "Untitled Folder %1": "Cartella senza nome %1", "User": "Utente", - "Views": "Viste", "Works almost anywhere, old cameras and car stereos too, but no file can be over 4 GB.": "Funziona quasi ovunque, anche con vecchie fotocamere e autoradio, ma nessun file può superare i 4 GB.", "Works with Mac, Windows and Linux, and holds big files.": "Funziona con Mac, Windows e Linux e supporta file di grandi dimensioni.", "You don't have permission to open this folder.": "Non hai i permessi per aprire questa cartella.", diff --git a/src/i18n/ja.json b/src/i18n/ja.json index d072cb85..60a33077 100644 --- a/src/i18n/ja.json +++ b/src/i18n/ja.json @@ -404,7 +404,6 @@ "Untitled Folder": "無題のフォルダー", "Untitled Folder %1": "無題のフォルダー %1", "User": "ユーザー", - "Views": "表示", "Works almost anywhere, old cameras and car stereos too, but no file can be over 4 GB.": "古いカメラやカーオーディオなど、ほぼどこでも使えますが、4 GB を超えるファイルは保存できません。", "Works with Mac, Windows and Linux, and holds big files.": "Mac、Windows、Linux で使えて、大きなファイルも保存できます。", "You don't have permission to open this folder.": "このフォルダーを開く権限がありません。", diff --git a/src/i18n/ko.json b/src/i18n/ko.json index a45688d1..0b6d2ba9 100644 --- a/src/i18n/ko.json +++ b/src/i18n/ko.json @@ -404,7 +404,6 @@ "Untitled Folder": "제목 없는 폴더", "Untitled Folder %1": "제목 없는 폴더 %1", "User": "사용자", - "Views": "보기", "Works almost anywhere, old cameras and car stereos too, but no file can be over 4 GB.": "오래된 카메라나 차량용 오디오 등 거의 모든 기기에서 사용할 수 있지만, 파일 하나가 4 GB를 초과할 수 없습니다.", "Works with Mac, Windows and Linux, and holds big files.": "Mac, Windows, Linux에서 사용할 수 있고 큰 파일도 저장할 수 있습니다.", "You don't have permission to open this folder.": "이 폴더를 열 권한이 없습니다.", diff --git a/src/i18n/lt.json b/src/i18n/lt.json index e09f05b7..9d095d5a 100644 --- a/src/i18n/lt.json +++ b/src/i18n/lt.json @@ -472,7 +472,6 @@ "Untitled Folder": "Nepavadintas aplankas", "Untitled Folder %1": "Nepavadintas aplankas %1", "User": "Naudotojas", - "Views": "Rodiniai", "Works almost anywhere, old cameras and car stereos too, but no file can be over 4 GB.": "Veikia beveik visur, taip pat su senais fotoaparatais ir automobilių grotuvais, bet failas negali būti didesnis nei 4 GB.", "Works with Mac, Windows and Linux, and holds big files.": "Veikia su Mac, Windows ir Linux, talpina didelius failus.", "You don't have permission to open this folder.": "Neturite leidimo atidaryti šio aplanko.", diff --git a/src/i18n/lv.json b/src/i18n/lv.json index 003e2733..cc5aa3f2 100644 --- a/src/i18n/lv.json +++ b/src/i18n/lv.json @@ -472,7 +472,6 @@ "Untitled Folder": "Mape bez nosaukuma", "Untitled Folder %1": "Mape bez nosaukuma %1", "User": "Lietotājs", - "Views": "Skati", "Works almost anywhere, old cameras and car stereos too, but no file can be over 4 GB.": "Darbojas gandrīz jebkur, arī vecās kamerās un auto stereoiekārtās, bet neviens fails nedrīkst pārsniegt 4 GB.", "Works with Mac, Windows and Linux, and holds big files.": "Darbojas ar Mac, Windows un Linux, un tajā ietilpst lieli faili.", "You don't have permission to open this folder.": "Jums nav atļaujas atvērt šo mapi.", diff --git a/src/i18n/ms.json b/src/i18n/ms.json index c2cbf210..8a570606 100644 --- a/src/i18n/ms.json +++ b/src/i18n/ms.json @@ -404,7 +404,6 @@ "Untitled Folder": "Folder Tanpa Tajuk", "Untitled Folder %1": "Folder Tanpa Tajuk %1", "User": "Pengguna", - "Views": "Paparan", "Works almost anywhere, old cameras and car stereos too, but no file can be over 4 GB.": "Berfungsi hampir di mana-mana, termasuk kamera lama dan stereo kereta, tetapi tiada fail boleh melebihi 4 GB.", "Works with Mac, Windows and Linux, and holds big files.": "Berfungsi dengan Mac, Windows dan Linux, serta boleh menyimpan fail besar.", "You don't have permission to open this folder.": "Anda tidak mempunyai kebenaran untuk membuka folder ini.", diff --git a/src/i18n/nl.json b/src/i18n/nl.json index 2e448595..b902e55c 100644 --- a/src/i18n/nl.json +++ b/src/i18n/nl.json @@ -438,7 +438,6 @@ "Untitled Folder": "Naamloze map", "Untitled Folder %1": "Naamloze map %1", "User": "Gebruiker", - "Views": "Weergaven", "Works almost anywhere, old cameras and car stereos too, but no file can be over 4 GB.": "Werkt bijna overal, ook met oude camera's en autoradio's, maar geen enkel bestand mag groter zijn dan 4 GB.", "Works with Mac, Windows and Linux, and holds big files.": "Werkt met Mac, Windows en Linux en ondersteunt grote bestanden.", "You don't have permission to open this folder.": "U hebt geen toestemming om deze map te openen.", diff --git a/src/i18n/no.json b/src/i18n/no.json index a284a069..45575121 100644 --- a/src/i18n/no.json +++ b/src/i18n/no.json @@ -438,7 +438,6 @@ "Untitled Folder": "Mappe uten navn", "Untitled Folder %1": "Mappe uten navn %1", "User": "Bruker", - "Views": "Visninger", "Works almost anywhere, old cameras and car stereos too, but no file can be over 4 GB.": "Fungerer nesten overalt, også med gamle kameraer og bilstereoer, men ingen fil kan være over 4 GB.", "Works with Mac, Windows and Linux, and holds big files.": "Fungerer med Mac, Windows og Linux, og rommer store filer.", "You don't have permission to open this folder.": "Du har ikke tillatelse til å åpne denne mappen.", diff --git a/src/i18n/pl.json b/src/i18n/pl.json index bbb9fe3f..7133036d 100644 --- a/src/i18n/pl.json +++ b/src/i18n/pl.json @@ -506,7 +506,6 @@ "Untitled Folder": "Folder bez nazwy", "Untitled Folder %1": "Folder bez nazwy %1", "User": "Użytkownik", - "Views": "Widoki", "Works almost anywhere, old cameras and car stereos too, but no file can be over 4 GB.": "Działa niemal wszędzie, także ze starymi aparatami i radiami samochodowymi, ale żaden plik nie może przekraczać 4 GB.", "Works with Mac, Windows and Linux, and holds big files.": "Działa z komputerami Mac, systemami Windows i Linux i obsługuje duże pliki.", "You don't have permission to open this folder.": "Nie masz uprawnień do otwarcia tego folderu.", diff --git a/src/i18n/pt-BR.json b/src/i18n/pt-BR.json index 33dcaaba..4a7949fd 100644 --- a/src/i18n/pt-BR.json +++ b/src/i18n/pt-BR.json @@ -472,7 +472,6 @@ "Untitled Folder": "Pasta sem título", "Untitled Folder %1": "Pasta sem título %1", "User": "Usuário", - "Views": "Visualizações", "Works almost anywhere, old cameras and car stereos too, but no file can be over 4 GB.": "Funciona em quase qualquer lugar, inclusive em câmeras antigas e rádios de carro, mas nenhum arquivo pode passar de 4 GB.", "Works with Mac, Windows and Linux, and holds big files.": "Funciona com Mac, Windows e Linux e aceita arquivos grandes.", "You don't have permission to open this folder.": "Você não tem permissão para abrir esta pasta.", diff --git a/src/i18n/pt.json b/src/i18n/pt.json index 57098f9c..38ca655d 100644 --- a/src/i18n/pt.json +++ b/src/i18n/pt.json @@ -472,7 +472,6 @@ "Untitled Folder": "Pasta sem título", "Untitled Folder %1": "Pasta sem título %1", "User": "Utilizador", - "Views": "Vistas", "Works almost anywhere, old cameras and car stereos too, but no file can be over 4 GB.": "Funciona em quase todo o lado, também em câmaras antigas e autorrádios, mas nenhum ficheiro pode ter mais de 4 GB.", "Works with Mac, Windows and Linux, and holds big files.": "Funciona com Mac, Windows e Linux e suporta ficheiros grandes.", "You don't have permission to open this folder.": "Não tem permissão para abrir esta pasta.", diff --git a/src/i18n/ro.json b/src/i18n/ro.json index af60ef55..5db9830a 100644 --- a/src/i18n/ro.json +++ b/src/i18n/ro.json @@ -472,7 +472,6 @@ "Untitled Folder": "Dosar fără titlu", "Untitled Folder %1": "Dosar fără titlu %1", "User": "Utilizator", - "Views": "Vizualizări", "Works almost anywhere, old cameras and car stereos too, but no file can be over 4 GB.": "Funcționează aproape oriunde, și pe camere vechi și pe sisteme audio auto, dar niciun fișier nu poate depăși 4 GB.", "Works with Mac, Windows and Linux, and holds big files.": "Funcționează pe Mac, Windows și Linux și acceptă fișiere mari.", "You don't have permission to open this folder.": "Nu ai permisiunea să deschizi acest dosar.", diff --git a/src/i18n/ru.json b/src/i18n/ru.json index 3cce9360..cbfb93ac 100644 --- a/src/i18n/ru.json +++ b/src/i18n/ru.json @@ -506,7 +506,6 @@ "Untitled Folder": "Новая папка", "Untitled Folder %1": "Новая папка %1", "User": "Пользователь", - "Views": "Отображение", "Works almost anywhere, old cameras and car stereos too, but no file can be over 4 GB.": "Работает практически везде, даже со старыми камерами и автомобильными магнитолами, но ни один файл не может быть больше 4 ГБ.", "Works with Mac, Windows and Linux, and holds big files.": "Работает с Mac, Windows и Linux и вмещает большие файлы.", "You don't have permission to open this folder.": "У вас нет разрешения открыть эту папку.", diff --git a/src/i18n/si.json b/src/i18n/si.json index 0886ca9f..c5b1022a 100644 --- a/src/i18n/si.json +++ b/src/i18n/si.json @@ -438,7 +438,6 @@ "Untitled Folder": "නම් නොකළ ෆෝල්ඩරය", "Untitled Folder %1": "නම් නොකළ ෆෝල්ඩරය %1", "User": "පරිශීලක", - "Views": "දසුන්", "Works almost anywhere, old cameras and car stereos too, but no file can be over 4 GB.": "පැරණි කැමරා සහ කාර් ස්ටීරියෝවල ඇතුළුව සෑම තැනකම පාහේ ක්‍රියා කරයි, නමුත් කිසිම ගොනුවක් 4 GB ට වඩා වැඩි විය නොහැක.", "Works with Mac, Windows and Linux, and holds big files.": "Mac, Windows සහ Linux සමඟ ක්‍රියා කරන අතර, විශාල ගොනු ද රඳවා ගත හැක.", "You don't have permission to open this folder.": "මෙම ෆෝල්ඩරය විවෘත කිරීමට ඔබට අවසර නැත.", diff --git a/src/i18n/sk.json b/src/i18n/sk.json index a0535aa5..903b15a6 100644 --- a/src/i18n/sk.json +++ b/src/i18n/sk.json @@ -472,7 +472,6 @@ "Untitled Folder": "Nepomenovaný priečinok", "Untitled Folder %1": "Nepomenovaný priečinok %1", "User": "Používateľ", - "Views": "Zobrazenia", "Works almost anywhere, old cameras and car stereos too, but no file can be over 4 GB.": "Funguje takmer všade, aj so starými fotoaparátmi a autorádiami, ale žiaden súbor nemôže mať viac ako 4 GB.", "Works with Mac, Windows and Linux, and holds big files.": "Funguje s Macom, Windowsom aj Linuxom a pojme aj veľké súbory.", "You don't have permission to open this folder.": "Nemáte povolenie na otvorenie tohto priečinka.", diff --git a/src/i18n/sl.json b/src/i18n/sl.json index a978dab6..bf3c007f 100644 --- a/src/i18n/sl.json +++ b/src/i18n/sl.json @@ -506,7 +506,6 @@ "Untitled Folder": "Neimenovana mapa", "Untitled Folder %1": "Neimenovana mapa %1", "User": "Uporabnik", - "Views": "Pogledi", "Works almost anywhere, old cameras and car stereos too, but no file can be over 4 GB.": "Deluje skoraj povsod, tudi s starimi fotoaparati in avtoradii, vendar nobena datoteka ne sme presegati 4 GB.", "Works with Mac, Windows and Linux, and holds big files.": "Deluje z Mac, Windows in Linux ter podpira velike datoteke.", "You don't have permission to open this folder.": "Nimate dovoljenja za odpiranje te mape.", diff --git a/src/i18n/sr.json b/src/i18n/sr.json index d1ce881b..28fae2ba 100644 --- a/src/i18n/sr.json +++ b/src/i18n/sr.json @@ -472,7 +472,6 @@ "Untitled Folder": "Неименована фасцикла", "Untitled Folder %1": "Неименована фасцикла %1", "User": "Корисник", - "Views": "Прикази", "Works almost anywhere, old cameras and car stereos too, but no file can be over 4 GB.": "Ради скоро свуда, чак и на старим фотоапаратима и ауто-радијима, али ниједна датотека не може бити већа од 4 ГБ.", "Works with Mac, Windows and Linux, and holds big files.": "Ради на Mac, Windows и Linux системима и прима велике датотеке.", "You don't have permission to open this folder.": "Немаш дозволу да отвориш ову фасциклу.", diff --git a/src/i18n/sv.json b/src/i18n/sv.json index 2234e4d2..59213e24 100644 --- a/src/i18n/sv.json +++ b/src/i18n/sv.json @@ -438,7 +438,6 @@ "Untitled Folder": "Namnlös mapp", "Untitled Folder %1": "Namnlös mapp %1", "User": "Användare", - "Views": "Vyer", "Works almost anywhere, old cameras and car stereos too, but no file can be over 4 GB.": "Fungerar nästan överallt, även med gamla kameror och bilstereor, men ingen fil kan vara större än 4 GB.", "Works with Mac, Windows and Linux, and holds big files.": "Fungerar med Mac, Windows och Linux och rymmer stora filer.", "You don't have permission to open this folder.": "Du har inte behörighet att öppna den här mappen.", diff --git a/src/i18n/sw.json b/src/i18n/sw.json index bd8fc668..4491fa33 100644 --- a/src/i18n/sw.json +++ b/src/i18n/sw.json @@ -438,7 +438,6 @@ "Untitled Folder": "Folda isiyo na jina", "Untitled Folder %1": "Folda isiyo na jina %1", "User": "Mtumiaji", - "Views": "Mionekano", "Works almost anywhere, old cameras and car stereos too, but no file can be over 4 GB.": "Inafanya kazi karibu popote, hata kwenye kamera za zamani na stereo za gari, lakini faili yoyote haiwezi kuzidi 4 GB.", "Works with Mac, Windows and Linux, and holds big files.": "Inafanya kazi na Mac, Windows na Linux, na inaweza kubeba faili kubwa.", "You don't have permission to open this folder.": "Huna ruhusa ya kufungua folda hii.", diff --git a/src/i18n/ta.json b/src/i18n/ta.json index 137065f4..2cad4e6a 100644 --- a/src/i18n/ta.json +++ b/src/i18n/ta.json @@ -438,7 +438,6 @@ "Untitled Folder": "பெயரிடப்படாத கோப்புறை", "Untitled Folder %1": "பெயரிடப்படாத கோப்புறை %1", "User": "பயனர்", - "Views": "காட்சிகள்", "Works almost anywhere, old cameras and car stereos too, but no file can be over 4 GB.": "பழைய கேமராக்கள், கார் ஸ்டீரியோக்கள் உட்பட ஏறக்குறைய எங்கும் வேலை செய்யும், ஆனால் எந்தக் கோப்பும் 4 GB க்கு மேல் இருக்க முடியாது.", "Works with Mac, Windows and Linux, and holds big files.": "Mac, Windows மற்றும் Linux உடன் வேலை செய்யும், பெரிய கோப்புகளையும் வைத்திருக்கும்.", "You don't have permission to open this folder.": "இந்தக் கோப்புறையைத் திறக்க உனக்கு அனுமதி இல்லை.", diff --git a/src/i18n/th.json b/src/i18n/th.json index edd85bbf..a23abd7d 100644 --- a/src/i18n/th.json +++ b/src/i18n/th.json @@ -404,7 +404,6 @@ "Untitled Folder": "โฟลเดอร์ไม่มีชื่อ", "Untitled Folder %1": "โฟลเดอร์ไม่มีชื่อ %1", "User": "ผู้ใช้", - "Views": "มุมมอง", "Works almost anywhere, old cameras and car stereos too, but no file can be over 4 GB.": "ใช้ได้แทบทุกที่ รวมถึงกล้องรุ่นเก่าและเครื่องเสียงรถยนต์ แต่ไฟล์ต้องมีขนาดไม่เกิน 4 GB", "Works with Mac, Windows and Linux, and holds big files.": "ใช้ได้กับ Mac, Windows และ Linux และเก็บไฟล์ขนาดใหญ่ได้", "You don't have permission to open this folder.": "คุณไม่มีสิทธิ์เปิดโฟลเดอร์นี้", diff --git a/src/i18n/tr.json b/src/i18n/tr.json index 6b190b70..0e3cd21a 100644 --- a/src/i18n/tr.json +++ b/src/i18n/tr.json @@ -438,7 +438,6 @@ "Untitled Folder": "Adsız Klasör", "Untitled Folder %1": "Adsız Klasör %1", "User": "Kullanıcı", - "Views": "Görünümler", "Works almost anywhere, old cameras and car stereos too, but no file can be over 4 GB.": "Eski kameralar ve otomobil teypleri dahil neredeyse her yerde çalışır, ancak hiçbir dosya 4 GB'tan büyük olamaz.", "Works with Mac, Windows and Linux, and holds big files.": "Mac, Windows ve Linux ile çalışır ve büyük dosyalar barındırabilir.", "You don't have permission to open this folder.": "Bu klasörü açma izniniz yok.", diff --git a/src/i18n/uk.json b/src/i18n/uk.json index f702aff5..4a48bbca 100644 --- a/src/i18n/uk.json +++ b/src/i18n/uk.json @@ -506,7 +506,6 @@ "Untitled Folder": "Тека без назви", "Untitled Folder %1": "Тека без назви %1", "User": "Користувач", - "Views": "Подання", "Works almost anywhere, old cameras and car stereos too, but no file can be over 4 GB.": "Працює майже всюди, навіть у старих камерах і автомагнітолах, але жоден файл не може перевищувати 4 ГБ.", "Works with Mac, Windows and Linux, and holds big files.": "Працює з Mac, Windows і Linux та вміщує великі файли.", "You don't have permission to open this folder.": "У вас немає дозволу відкрити цю теку.", diff --git a/src/i18n/ur.json b/src/i18n/ur.json index 21a092be..df36396e 100644 --- a/src/i18n/ur.json +++ b/src/i18n/ur.json @@ -438,7 +438,6 @@ "Untitled Folder": "بے نام فولڈر", "Untitled Folder %1": "بے نام فولڈر %1", "User": "صارف", - "Views": "مناظر", "Works almost anywhere, old cameras and car stereos too, but no file can be over 4 GB.": "تقریباً ہر جگہ کام کرتا ہے، پرانے کیمروں اور کار اسٹیریوز پر بھی، لیکن کوئی فائل 4 GB سے بڑی نہیں ہو سکتی۔", "Works with Mac, Windows and Linux, and holds big files.": "Mac، Windows اور Linux کے ساتھ کام کرتا ہے، اور بڑی فائلیں رکھ سکتا ہے۔", "You don't have permission to open this folder.": "آپ کو اس فولڈر کو کھولنے کی اجازت نہیں ہے۔", diff --git a/src/i18n/uz.json b/src/i18n/uz.json index 6c73fd2f..11417f10 100644 --- a/src/i18n/uz.json +++ b/src/i18n/uz.json @@ -438,7 +438,6 @@ "Untitled Folder": "Nomsiz papka", "Untitled Folder %1": "Nomsiz papka %1", "User": "Foydalanuvchi", - "Views": "Koʻrinishlar", "Works almost anywhere, old cameras and car stereos too, but no file can be over 4 GB.": "Deyarli hamma joyda ishlaydi, eski kameralar va avtomobil magnitolalarida ham, lekin hech bir fayl 4 GB dan katta boʻla olmaydi.", "Works with Mac, Windows and Linux, and holds big files.": "Mac, Windows va Linux bilan ishlaydi va katta fayllarni sigʻdira oladi.", "You don't have permission to open this folder.": "Bu papkani ochishga ruxsatingiz yoʻq.", diff --git a/src/i18n/vi.json b/src/i18n/vi.json index 1441c0dc..c2a4c641 100644 --- a/src/i18n/vi.json +++ b/src/i18n/vi.json @@ -404,7 +404,6 @@ "Untitled Folder": "Thư mục chưa đặt tên", "Untitled Folder %1": "Thư mục chưa đặt tên %1", "User": "Người dùng", - "Views": "Chế độ xem", "Works almost anywhere, old cameras and car stereos too, but no file can be over 4 GB.": "Dùng được ở hầu hết mọi nơi, kể cả máy ảnh cũ và dàn âm thanh trên ô tô, nhưng mỗi tệp không được quá 4 GB.", "Works with Mac, Windows and Linux, and holds big files.": "Dùng được với Mac, Windows và Linux, và chứa được các tệp lớn.", "You don't have permission to open this folder.": "Bạn không có quyền mở thư mục này.", diff --git a/src/i18n/zh-CN.json b/src/i18n/zh-CN.json index c8d8398d..0ec00834 100644 --- a/src/i18n/zh-CN.json +++ b/src/i18n/zh-CN.json @@ -404,7 +404,6 @@ "Untitled Folder": "未命名文件夹", "Untitled Folder %1": "未命名文件夹 %1", "User": "用户", - "Views": "视图", "Works almost anywhere, old cameras and car stereos too, but no file can be over 4 GB.": "几乎随处可用,老式相机和车载音响也能用,但单个文件不能超过 4 GB。", "Works with Mac, Windows and Linux, and holds big files.": "兼容 Mac、Windows 和 Linux,可存放大文件。", "You don't have permission to open this folder.": "您没有权限打开此文件夹。", diff --git a/src/i18n/zh-TW.json b/src/i18n/zh-TW.json index c6226ae9..0ef195f8 100644 --- a/src/i18n/zh-TW.json +++ b/src/i18n/zh-TW.json @@ -404,7 +404,6 @@ "Untitled Folder": "未命名資料夾", "Untitled Folder %1": "未命名資料夾 %1", "User": "使用者", - "Views": "檢視", "Works almost anywhere, old cameras and car stereos too, but no file can be over 4 GB.": "幾乎在任何地方都能使用,舊相機和汽車音響也行,但單一檔案不能超過 4 GB。", "Works with Mac, Windows and Linux, and holds big files.": "可在 Mac、Windows 和 Linux 上使用,也能存放大型檔案。", "You don't have permission to open this folder.": "您沒有權限開啟此資料夾。", diff --git a/src/places.cpp b/src/places.cpp index 8e130c95..b1aea9d9 100644 --- a/src/places.cpp +++ b/src/places.cpp @@ -13,7 +13,9 @@ #include #include #include +#include #include +#include #include // GIO's headers use `signals` as a struct member, which Qt defines as a @@ -24,22 +26,14 @@ namespace { -// Home's own folders, all but the hidden ones (as refreshPlaces lists them), -// are already under Home. -bool listedUnderHome(const QString &path, const QString &home) { - const QString clean = QDir::cleanPath(home); - const QFileInfo info(path); - return path == clean || (info.absolutePath() == clean && !info.isHidden()); -} - // Omarchy's own folder reads as the name it goes by. QString displayName(const QString &name) { return name == "omarchy" ? QStringLiteral("Omarchy") : name; } // Reads bookmark lines ("file:///path Label") into pinned entries, leaving -// out folders already listed under Home and missing folders. -QVariantList parseBookmarks(const QStringList &lines, const QString &home) { +// out folders the Places section already lists and missing folders. +QVariantList parseBookmarks(const QStringList &lines, const QStringList &listed) { QVariantList pinned; QStringList seen; for (const QString &raw : lines) { @@ -54,9 +48,9 @@ QVariantList parseBookmarks(const QStringList &lines, const QString &home) { if (!url.isLocalFile()) continue; const QString path = QDir::cleanPath(url.toLocalFile()); - // Home's visible folders are already under Home; Omarchy also seeds - // a few of those as bookmarks for the file dialogs. - if (listedUnderHome(path, home) || seen.contains(path) || !QFileInfo(path).isDir()) + // Home and its standard folders are already in Places; Omarchy also + // seeds a few of those as bookmarks for the file dialogs. + if (listed.contains(path) || seen.contains(path) || !QFileInfo(path).isDir()) continue; seen << path; pinned << QVariantMap{{"name", label.isEmpty() ? displayName(QFileInfo(path).fileName()) : label}, @@ -146,32 +140,28 @@ QString Places::userDirectory(int location, const QString &fallback) const { return m_home + "/" + fallback; } -// The sidebar's Home section is every folder in home but the hidden ones, -// the way they appear in the home folder itself, so whatever someone keeps -// at the top of their home (Work, omarchy, Dropbox) is one click away -// without pinning it. +// The sidebar's Places, as Nautilus has them: Home and its standard +// folders (wherever user-dirs points, and only those that exist), then +// Recents and Trash. Everything else in home is a click into Home away, or +// pinned. void Places::refreshPlaces() { QVariantList places; - auto add = [&](const QString &name, const QString &path, const QString &icon) { - places << QVariantMap{{"name", name}, {"path", path}, {"icon", icon}}; - }; - // The XDG folders keep their own glyphs, wherever user-dirs points. - const QHash icons{ - {userDirectory(QStandardPaths::DocumentsLocation, "Documents"), "documents"}, - {userDirectory(QStandardPaths::DownloadLocation, "Downloads"), "downloads"}, - {userDirectory(QStandardPaths::PicturesLocation, "Pictures"), "pictures"}, - {userDirectory(QStandardPaths::MusicLocation, "Music"), "music"}, - {userDirectory(QStandardPaths::MoviesLocation, "Videos"), "videos"}, + places << QVariantMap{{"name", "Home"}, {"path", QDir::cleanPath(m_home)}, {"icon", "home"}}; + const QList> standard{ + {QStandardPaths::DesktopLocation, "Desktop", "desktop"}, + {QStandardPaths::DocumentsLocation, "Documents", "documents"}, + {QStandardPaths::DownloadLocation, "Downloads", "downloads"}, + {QStandardPaths::MusicLocation, "Music", "music"}, + {QStandardPaths::PicturesLocation, "Pictures", "pictures"}, + {QStandardPaths::MoviesLocation, "Videos", "videos"}, }; - - QStringList names = QDir(m_home).entryList(QDir::Dirs | QDir::NoDotAndDotDot, QDir::NoSort); - QCollator collator; - collator.setNumericMode(true); - collator.setCaseSensitivity(Qt::CaseInsensitive); - std::sort(names.begin(), names.end(), [&](const QString &a, const QString &b) { return collator.compare(a, b) < 0; }); - for (const QString &name : names) { - const QString path = m_home + "/" + name; - add(displayName(name), path, icons.value(path, "folder")); + QStringList seen{QDir::cleanPath(m_home)}; + for (const auto &[location, fallback, icon] : standard) { + const QString path = QDir::cleanPath(userDirectory(location, fallback)); + if (seen.contains(path) || !QFileInfo(path).isDir()) + continue; + seen << path; + places << QVariantMap{{"name", displayName(QFileInfo(path).fileName())}, {"path", path}, {"icon", icon}}; } m_places = places; @@ -182,6 +172,13 @@ void Places::refreshPlaces() { QVariantMap{{"path", QDir::cleanPath(FileOps::homeTrash() + "/files")}, {"icon", "trash"}}}; } +QStringList Places::listedPaths() const { + QStringList paths; + for (const QVariant &p : m_places) + paths << p.toMap().value("path").toString(); + return paths; +} + QString Places::bookmarksPath() const { // Tests use a temporary home, whose bookmarks live inside it. const QString config = m_realHome ? QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) @@ -210,7 +207,7 @@ bool Places::writeBookmarkLines(const QStringList &lines) { } void Places::refreshPinned() { - m_pinned = parseBookmarks(readBookmarkLines(), m_home); + m_pinned = parseBookmarks(readBookmarkLines(), listedPaths()); } bool Places::isPinned(const QString &path) const { @@ -226,7 +223,7 @@ QString Places::pin(const QString &path) { const QFileInfo info(clean); if (!info.isDir()) return tr("Only folders can be pinned."); - if (listedUnderHome(clean, m_home)) + if (listedPaths().contains(clean)) return tr("%1 is already under Home.").arg(displayName(info.fileName())); if (isPinned(clean)) return {}; @@ -253,6 +250,46 @@ void Places::unpin(const QString &path) { } } +void Places::movePin(const QString &path, int to) { + QStringList order; + for (const QVariant &p : m_pinned) + order << p.toMap().value("path").toString(); + const int from = order.indexOf(QDir::cleanPath(path)); + to = std::clamp(to, 0, int(order.size()) - 1); + if (from < 0 || from == to) + return; + order.move(from, to); + // Each pin's line, and the places they take in the file: the pins are + // put back into the same places in their new order, so remote bookmarks + // and Omarchy's seeded ones stay where they were. A pin's later copies + // go, or the next read would take the order from them. + QStringList lines = readBookmarkLines(); + QList lineSlots, copies; + QHash lineOf; + for (int i = 0; i < lines.size(); ++i) { + const QUrl url(lines[i].trimmed().section(' ', 0, 0)); + const QString p = url.isLocalFile() ? QDir::cleanPath(url.toLocalFile()) : QString(); + if (!order.contains(p)) + continue; + if (lineOf.contains(p)) { + copies << i; + } else { + lineOf.insert(p, lines[i]); + lineSlots << i; + } + } + if (lineSlots.size() != order.size()) + return; + for (int i = 0; i < lineSlots.size(); ++i) + lines[lineSlots[i]] = lineOf.value(order[i]); + for (auto it = copies.crbegin(); it != copies.crend(); ++it) + lines.removeAt(*it); + if (writeBookmarkLines(lines)) { + refreshPinned(); + emit changed(); + } +} + QVariantList Places::physicalDrives(const QList &mounts, const QString &systemDevice) { static const QStringList pseudo{"tmpfs", "devtmpfs", "squashfs", "overlay", "ramfs", "fuse.portal", "fuse.gvfsd-fuse", "efivarfs", "autofs"}; @@ -359,3 +396,4 @@ void Places::eject(const QString &path) { g_mount_unmount_with_operation(mount, G_MOUNT_UNMOUNT_NONE, nullptr, nullptr, released, context); g_object_unref(mount); } + diff --git a/src/places.h b/src/places.h index 077d11ce..03e619fe 100644 --- a/src/places.h +++ b/src/places.h @@ -43,6 +43,9 @@ class Places : public QObject { // Whatever shows a folder on the drive mounted at `root` leaves it, // before the drive is let go of or changed. Q_INVOKABLE void leave(const QString &root); + // Moves the pinned folder at `path` to place `to` among the pins, + // keeping every other bookmark line where it was. + Q_INVOKABLE void movePin(const QString &path, int to); struct Mount { QString root; @@ -76,6 +79,8 @@ class Places : public QObject { // gone away) can take its time answering, or never answer. static QList readMounts(); void mountsRead(); + // The paths the Places section lists, which pins leave out. + QStringList listedPaths() const; void refreshPinned(); QString bookmarksPath() const; QStringList readBookmarkLines() const; diff --git a/tests/folio_tests.cpp b/tests/folio_tests.cpp index e5278791..261ad592 100644 --- a/tests/folio_tests.cpp +++ b/tests/folio_tests.cpp @@ -3293,27 +3293,55 @@ private slots: QCOMPARE(backend.title(), QString("Trash")); } - void placesListEveryFolderInHome() + void placesListHomeAndItsStandardFolders() { + // As Nautilus has them: Home, then the standard folders that exist, + // never every folder in home. QTemporaryDir home; - for (const char *dir : {"Work", "Documents", "omarchy", ".config", "project10", "project9"}) + for (const char *dir : {"Work", "Downloads", "Documents", "omarchy", ".config", "Music"}) QDir(home.path()).mkpath(dir); - write(home.filePath("notes.txt"), "not a folder"); auto names = [](const Places &p) { QStringList list; for (const auto &v : p.places()) list << v.toMap().value("name").toString(); return list; }; - QCOMPARE(names(Places(home.path())), - QStringList({"Documents", "Omarchy", "project9", "project10", "Work"})); + const Places places(home.path()); + QCOMPARE(names(places), QStringList({"Home", "Documents", "Downloads", "Music"})); + QCOMPARE(places.places().at(0).toMap().value("icon").toString(), QString("home")); + QCOMPARE(places.places().at(0).toMap().value("path").toString(), QDir::cleanPath(home.path())); + QCOMPARE(places.places().at(2).toMap().value("icon").toString(), QString("downloads")); + } - // The XDG folders have glyphs of their own; Dropbox's mark comes - // from its plugin. - QDir(home.path()).mkpath("Dropbox"); - const Places withDropbox(home.path()); - QCOMPARE(names(withDropbox).at(1), QString("Dropbox")); - QCOMPARE(withDropbox.places().at(1).toMap().value("icon").toString(), QString("folder")); - QCOMPARE(withDropbox.places().at(0).toMap().value("icon").toString(), QString("documents")); + void placesReorderPins() + { + QTemporaryDir home; + for (const char *dir : {"a", "b", "c"}) + QDir(home.path()).mkpath(dir); + const QString bookmarks = home.filePath(".config/gtk-3.0/bookmarks"); + QDir().mkpath(QFileInfo(bookmarks).absolutePath()); + auto line = [&](const char *dir) { return QUrl::fromLocalFile(home.filePath(dir)).toEncoded(); }; + write(bookmarks, line("a") + "\nsftp://studio/srv Studio\n" + line("b") + " Bee\n" + line("c") + "\n"); + Places places(home.path()); + places.movePin(home.filePath("c"), 0); + QStringList order; + for (const auto &p : places.pinned()) order << QFileInfo(p.toMap().value("path").toString()).fileName(); + QCOMPARE(order, QStringList({"c", "a", "b"})); + // Labels and the remote bookmark stay with their lines and place. + QFile file(bookmarks); + QVERIFY(file.open(QIODevice::ReadOnly)); + QCOMPARE(file.readAll(), line("c") + "\nsftp://studio/srv Studio\n" + line("a") + "\n" + line("b") + " Bee\n"); + file.close(); + + // A folder bookmarked twice is pinned once; moving it drops the + // later copy, which would otherwise put it back where it was. + write(bookmarks, line("a") + "\n" + line("a") + "\n" + line("b") + "\n" + line("c") + "\n"); + places.refresh(); + places.movePin(home.filePath("a"), 2); + order.clear(); + for (const auto &p : places.pinned()) order << QFileInfo(p.toMap().value("path").toString()).fileName(); + QCOMPARE(order, QStringList({"b", "c", "a"})); + QVERIFY(file.open(QIODevice::ReadOnly)); + QCOMPARE(file.readAll(), line("b") + "\n" + line("c") + "\n" + line("a") + "\n"); } void placesPinFoldersAsGtkBookmarks() @@ -3336,7 +3364,7 @@ private slots: QCOMPARE(places.pin(home.filePath("Work/folio")), QString()); QVERIFY(places.isPinned(home.filePath("Work/folio"))); QCOMPARE(places.pinned().size(), 2); - QVERIFY(!places.pin(home.filePath("Downloads")).isEmpty()); // already under Home + QVERIFY(!places.pin(home.filePath("Downloads")).isEmpty()); // already in Places // Hidden folders in home aren't listed under Home, so they can be // pinned. QCOMPARE(places.pin(home.filePath(".config")), QString());