Skip to content

feat(filesystem_browser) Misc fixes and improvements #343

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kenmcgaugh wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

feat(filesystem_browser) Misc fixes and improvements #343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions include/xstudio/ui/qml/helper_ui.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -678,8 +678,10 @@ class HELPER_QML_EXPORT Helpers : public QObject {
return result;
}

Q_INVOKABLE [[nodiscard]] QUrl QUrlFromPosixPath(const QString &path) const {
return QUrlFromUri(utility::posix_path_to_uri(path.toStdString()));
Q_INVOKABLE [[nodiscard]] QUrl QUrlFromPosixPath(const QString &path,
const bool abspath = false,
const bool remap = true) const {
return QUrlFromUri(utility::posix_path_to_uri(path.toStdString(), abspath, remap));
}

Q_INVOKABLE [[nodiscard]] QString fileFromURL(const QUrl &url) const {
Expand Down
22 changes: 17 additions & 5 deletions src/plugin/utility/filesystem_browser/FileSystemBrowser/xstudio/FSDirectoryTreeBody.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,14 @@ Item {
// Properties to communicate with parent
property var currentPath: "/"
property string baseRootPath: "/"


Connections {
target: root
function onTreeBaseRootPathChanged() {
baseRootPath = stripTrailingPathSeparator(treeBaseRootPath)
}
}

signal sendCommand(var cmd)
//onSendCommand: (cmd) => console.log("DirectoryTree: Sending command: " + JSON.stringify(cmd))

Expand Down Expand Up @@ -57,6 +64,9 @@ Item {
pendingExpandPath = currentPath;
isSyncing = true;
syncToPath();

if (!currentPath.startsWith(baseRootPath))
baseRootPath = "/"
}
}

Expand Down Expand Up @@ -230,9 +240,11 @@ Item {
}

treeModel.setProperty(index, "isLoading", true);

// Request subdirs
sendCommand({"action": "get_subdirs", "path": node.path});

// Request subdirs, but after a delay to allow any "change_path" command to complete
callbackTimer.setTimeout(function() { return function() {
sendCommand({"action": "get_subdirs", "path": node.path})
}}(), 200);
}

function collapseNode(index) {
Expand Down Expand Up @@ -355,7 +367,7 @@ Item {
menuItemPosition: 2
menuPath: ""
onActivated: {
helpers.showURIS([helpers.QUrlFromPosixPath(treeContextMenu.path)])
helpers.showURIS([helpers.QUrlFromPosixPath(treeContextMenu.path, false, false)])
}
menuModelName: treeContextMenu.menu_model_name
}
Expand Down
12 changes: 8 additions & 4 deletions src/plugin/utility/filesystem_browser/FileSystemBrowser/xstudio/FSFileContextMenu.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,15 @@ XsPopupMenu {
menuPath: ""
menuItemPosition: 5
onActivated: {
if (itemPath) {
helpers.showURIS([helpers.QUrlFromPosixPath(itemPath)])
} else if (selectedItemsPaths.length > 0) {
helpers.showURIS([helpers.QUrlFromPosixPath(selectedItemsPaths[0])])
let path = itemPath ? itemPath : selectedItemsPaths[0]
// extract first frame if it is a sequence
const match = path.match(/(\{:([0-9]+)d\})\.[^=]+(=(\d+)[,-][0-9,-]+)$/)
if (match) {
let pad = parseInt(match[2], 10)
path = path.replace(match[1], match[4].padStart(pad, "0"))
path = path.replace(match[3], "")
}
helpers.showURIS([helpers.QUrlFromPosixPath(path, false, false)])
}
menuModelName: fileContextMenu.menu_model_name
}
Expand Down
2 changes: 2 additions & 0 deletions src/plugin/utility/filesystem_browser/FileSystemBrowser/xstudio/FSPathInput.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,8 @@ RowLayout {
hoverEnabled: true
onClicked: {
sendCommand({"action": "change_path", "path": modelData.path})
if (modelData.isPinned)
treeBaseRootPath = modelData.path
pathPopup.close()
}
}
Expand Down
2 changes: 2 additions & 0 deletions src/plugin/utility/filesystem_browser/FileSystemBrowser/xstudio/FSThumbGroup.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,11 @@ Item {
XsText {
anchors.verticalCenter: parent.verticalCenter
anchors.left: folderIcon.right; anchors.leftMargin: 10
anchors.right: parent.right; anchors.rightMargin: 10
text: path + " (" + total_file_count + ")"
font.bold: true
elide: Text.ElideLeft
horizontalAlignment: Text.AlignLeft
font.pixelSize: 14
}
}
Expand Down
20 changes: 12 additions & 8 deletions src/plugin/utility/filesystem_browser/FileSystemBrowser/xstudio/FileSystemBrowser.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ Item {
// uri requires triple slash before drive letter on Windows, since this is the root.
property var thumbSrcRoot: Qt.platform.os === "windows" ? "image://thumbnail/file:///" : "image://thumbnail/file://"

property string treeBaseRootPath: "/"

onVisibleChanged: {
if (!visible)
sendCommand({"action": "stop_scan"})
Expand Down Expand Up @@ -179,13 +181,15 @@ Item {
let idx = scanResultsModel.index(j, 0, selectedItems[i])
if (scanResultsModel.get(idx, "is_folder")) continue;
else {
v.push(helpers.QUrlFromPosixPath(scanResultsModel.get(idx, "path")))
v2.push(scanResultsModel.get(idx, "path"))
let path = scanResultsModel.get(idx, "path")
v.push(helpers.QUrlFromPosixPath(path))
v2.push(path)
}
}
} else {
v.push(helpers.QUrlFromPosixPath(scanResultsModel.get(selectedItems[i], "path")))
v2.push(scanResultsModel.get(selectedItems[i], "path"))
let path = scanResultsModel.get(selectedItems[i], "path")
v.push(helpers.QUrlFromPosixPath(path))
v2.push(path)
}
}
selectedItemsUrls = v
Expand Down Expand Up @@ -683,7 +687,7 @@ Item {

onReleased: (mouse)=> {

if (underMouseIndex != -1 && mouse.button === Qt.LeftButton && mouse.modifiers == Qt.NoModifier) {
if (underMouseIndex != undefined && mouse.button === Qt.LeftButton && mouse.modifiers == Qt.NoModifier) {
selectedItems = []
selectItem(underMouseIndex, 0)

Expand All @@ -700,7 +704,7 @@ Item {
}

onDoubleClicked: (mouse) => {
if (mouse.button === Qt.LeftButton && underMouseIndex != -1) {
if (mouse.button === Qt.LeftButton && underMouseIndex != undefined) {

if (scanResultsModel.get(underMouseIndex, "is_folder")) {
sendCommand({"action": "change_path", "path": scanResultsModel.get(underMouseIndex, "path")});
Expand All @@ -712,7 +716,7 @@ Item {

onClicked: (mouse) => {

if (mouse.button === Qt.RightButton && underMouseIndex != -1) {
if (mouse.button === Qt.RightButton && underMouseIndex != undefined) {
if (!selectedItems.includes(underMouseIndex)) {
selectedItems = [underMouseIndex]
}
Expand All @@ -735,7 +739,7 @@ Item {
target: null

onActiveChanged: {
if (active && underMouseIndex != -1) {
if (active && underMouseIndex != undefined) {
dragProxy.grabToImage(function(result) {
let d = root.selectedItemsPaths.map(p => encodeURIComponent(p))
dragProxy.Drag.mimeData = {"text/plain": d.join("\n")}
Expand Down
Loading