Skip to content

Add gSlapper video wallpaper support with thumbnail generation #425

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add gSlapper video wallpaper support with thumbnail generation #425

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
64 changes: 52 additions & 12 deletions Modals/FileBrowser/FileBrowserModal.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,14 @@ DankModal {
return ['jpg', 'jpeg', 'png', 'gif', 'bmp', 'webp', 'svg'].includes(ext)
}

function isVideoFile(fileName) {
if (!fileName) {
return false
}
const ext = fileName.toLowerCase().split('.').pop()
return ['mp4', 'mkv', 'webm', 'avi', 'mov'].includes(ext)
}

function getLastPath() {
const lastPath = browserType === "wallpaper" ? SessionData.wallpaperLastPath : browserType === "profile" ? SessionData.profileLastPath : ""
return (lastPath && lastPath !== "") ? lastPath : homeDir
Expand Down Expand Up @@ -201,6 +209,11 @@ DankModal {
selectedFilePath = ""
selectedFileName = ""
selectedFileIsDir = false

// Preload thumbnails for video files in new directory
if (browserType === "wallpaper") {
ThumbnailService.preloadThumbnails(currentPath)
}
}
onSelectedIndexChanged: {
if (selectedIndex >= 0 && folderModel && selectedIndex < folderModel.count) {
Expand Down Expand Up @@ -667,7 +680,10 @@ DankModal {
if (weMode && delegateRoot.fileIsDir) {
return "file://" + delegateRoot.filePath + "/preview" + weExtensions[weExtIndex]
}
return (!delegateRoot.fileIsDir && isImageFile(delegateRoot.fileName)) ? ("file://" + delegateRoot.filePath) : ""
if (!delegateRoot.fileIsDir && (isImageFile(delegateRoot.fileName) || isVideoFile(delegateRoot.fileName))) {
return ThumbnailService.getThumbnail(delegateRoot.filePath)
}
return ""
}
onStatusChanged: {
if (weMode && delegateRoot.fileIsDir && status === Image.Error) {
Expand All @@ -680,24 +696,38 @@ DankModal {
}
}
fillMode: Image.PreserveAspectCrop
visible: (!delegateRoot.fileIsDir && isImageFile(delegateRoot.fileName)) || (weMode && delegateRoot.fileIsDir)
visible: (!delegateRoot.fileIsDir && (isImageFile(delegateRoot.fileName) || isVideoFile(delegateRoot.fileName))) || (weMode && delegateRoot.fileIsDir)
maxCacheSize: weMode ? 225 : 80
}

DankIcon {
anchors.centerIn: parent
name: "description"
size: Theme.iconSizeLarge
color: Theme.primary
visible: !delegateRoot.fileIsDir && !isImageFile(delegateRoot.fileName)
Rectangle {
anchors.fill: parent
color: "black"
opacity: 0.3
visible: delegateRoot.fileIsDir && !weMode
}

DankIcon {
anchors.centerIn: parent
name: "folder"
name: delegateRoot.fileIsDir ? "folder" : isVideoFile(delegateRoot.fileName) ? "movie" : "description"
size: Theme.iconSizeLarge
color: Theme.primary
visible: delegateRoot.fileIsDir && !weMode
visible: (delegateRoot.fileIsDir && !weMode) || (!delegateRoot.fileIsDir && !isImageFile(delegateRoot.fileName) && !isVideoFile(delegateRoot.fileName))
}

// Video overlay for video files
Rectangle {
anchors.fill: parent
color: "#80000000"
visible: !delegateRoot.fileIsDir && isVideoFile(delegateRoot.fileName) && parent.status !== Image.Ready
radius: Theme.cornerRadiusSmall

DankIcon {
anchors.centerIn: parent
name: "play_circle"
size: Theme.iconSizeLarge
color: "white"
}
}
}

Expand Down Expand Up @@ -731,7 +761,12 @@ DankModal {
} else if (delegateRoot.fileIsDir) {
navigateTo(delegateRoot.filePath)
} else {
fileSelected(delegateRoot.filePath)
// For video files, automatically prefix with "gs:" for gSlapper support
var selectedPath = delegateRoot.filePath
if (isVideoFile(delegateRoot.fileName) && browserType === "wallpaper") {
selectedPath = "gs:" + selectedPath
}
fileSelected(selectedPath)
fileBrowserModal.close()
}
}
Expand All @@ -751,7 +786,12 @@ DankModal {
} else if (delegateRoot.fileIsDir) {
navigateTo(delegateRoot.filePath)
} else {
fileSelected(delegateRoot.filePath)
// For video files, automatically prefix with "gs:" for gSlapper support
var selectedPath = delegateRoot.filePath
if (isVideoFile(delegateRoot.fileName) && browserType === "wallpaper") {
selectedPath = "gs:" + selectedPath
}
fileSelected(selectedPath)
fileBrowserModal.close()
}
}
Expand Down
2 changes: 1 addition & 1 deletion Modules/Settings/PersonalizationTab.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1384,7 +1384,7 @@ Item {
browserTitle: "Select Wallpaper"
browserIcon: "wallpaper"
browserType: "wallpaper"
fileExtensions: ["*.jpg", "*.jpeg", "*.png", "*.bmp", "*.gif", "*.webp"]
fileExtensions: ["*.jpg", "*.jpeg", "*.png", "*.bmp", "*.gif", "*.webp", "*.mp4", "*.mkv", "*.webm", "*.avi", "*.mov"]
onFileSelected: path => {
if (SessionData.perMonitorWallpaper) {
SessionData.setMonitorWallpaper(selectedMonitorName, path)
Expand Down
Loading