dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use a shorter playlist name when songs are added from file view

Browse Source 
Fixes #363
This commit is contained in:
Jonas Kvinge
2020-03-15 01:56:48 +01:00
parent 625343f698
commit 11f5004112
1 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/widgets/fileviewlist.cpp
View File

@@ -24,6 +24,7 @@
#include <QAbstractItemModel> #include <QAbstractItemModel>
#include <QFileInfo> #include <QFileInfo>
#include <QFileSystemModel> #include <QFileSystemModel>
#include <QDir>
#include <QMenu> #include <QMenu>
#include <QUrl> #include <QUrl>
#include <QtEvents> #include <QtEvents>
@@ -83,11 +84,28 @@ MimeData *FileViewList::MimeDataFromSelection() const {
QList<QString> filenames = FilenamesFromSelection(); QList<QString> filenames = FilenamesFromSelection();
// if just one folder selected - use it's path as the new playlist's name // if just one folder selected - use it's path as the new playlist's name
if (filenames.size() == 1 && QFileInfo(filenames.first()).isDir()) { if (filenames.size() == 1 && QFileInfo(filenames.first()).isDir()) {
data->name_for_new_playlist_ = filenames.first(); if (filenames.first().length() > 20) {
// otherwise, use the current root path data->name_for_new_playlist_ = QDir(filenames.first()).dirName();
}
else {
data->name_for_new_playlist_ = filenames.first();
}
} }
// otherwise, use the current root path
else { else {
data->name_for_new_playlist_ = static_cast<QFileSystemModel*>(model())->rootPath(); QString path = static_cast<QFileSystemModel*>(model())->rootPath();
if (path.length() > 20) {
QFileInfo info(path);
if (info.isDir()) {
data->name_for_new_playlist_ = QDir(info.filePath()).dirName();
}
else {
data->name_for_new_playlist_ = info.baseName();
}
}
else {
data->name_for_new_playlist_ = path;
}
} }
return data; return data;
@@ -130,7 +148,6 @@ void FileViewList::MoveToCollectionSlot() {
} }
void FileViewList::CopyToDeviceSlot() { void FileViewList::CopyToDeviceSlot() {
//qLog(Debug) << __PRETTY_FUNCTION__;
emit CopyToDevice(UrlListFromSelection()); emit CopyToDevice(UrlListFromSelection());
} }