Skip to content

Enforce lazy loading for FileBrowser #6996

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

Merged
sakertooth merged 1 commit into from
Nov 24, 2023
Merged

Enforce lazy loading for FileBrowser #6996

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
5 changes: 2 additions & 3 deletions include/FileBrowser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ class FileBrowser : public SideBarWidget
*/
FileBrowser( const QString & directories, const QString & filter,
const QString & title, const QPixmap & pm,
QWidget * parent, bool dirs_as_items = false, bool recurse = false,
QWidget * parent, bool dirs_as_items = false,
const QString& userDir = "",
const QString& factoryDir = "");

Expand All @@ -93,7 +93,7 @@ class FileBrowser : public SideBarWidget

private slots:
void reloadTree();
void expandItems( QTreeWidgetItem * item=nullptr, QList<QString> expandedDirs = QList<QString>() );
void expandItems(const QList<QString>& expandedDirs, QTreeWidgetItem* item = nullptr);
void giveFocusToFilter();

private:
Expand All @@ -120,7 +120,6 @@ private slots:
QString m_filter; //!< Filter as used in QDir::match()

bool m_dirsAsItems;
bool m_recurse;

void addContentCheckBox();
QCheckBox* m_showUserContent = nullptr;
Expand Down
17 changes: 7 additions & 10 deletions src/gui/FileBrowser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,14 +102,13 @@ void FileBrowser::addContentCheckBox()

FileBrowser::FileBrowser(const QString & directories, const QString & filter,
const QString & title, const QPixmap & pm,
QWidget * parent, bool dirs_as_items, bool recurse,
QWidget * parent, bool dirs_as_items,
const QString& userDir,
const QString& factoryDir):
SideBarWidget( title, pm, parent ),
m_directories( directories ),
m_filter( filter ),
m_dirsAsItems( dirs_as_items ),
m_recurse( recurse ),
m_userDir(userDir),
m_factoryDir(factoryDir)
{
Expand Down Expand Up @@ -177,7 +176,7 @@ void FileBrowser::saveDirectoriesStates()

void FileBrowser::restoreDirectoriesStates()
{
expandItems(nullptr, m_savedExpandedDirs);
expandItems(m_savedExpandedDirs);
}

void FileBrowser::buildSearchTree()
Expand Down Expand Up @@ -337,23 +336,21 @@ void FileBrowser::reloadTree()



void FileBrowser::expandItems(QTreeWidgetItem* item, QList<QString> expandedDirs)
void FileBrowser::expandItems(const QList<QString>& expandedDirs, QTreeWidgetItem* item)
{
if (expandedDirs.isEmpty()) { return; }

int numChildren = item ? item->childCount() : m_fileBrowserTreeWidget->topLevelItemCount();
for (int i = 0; i < numChildren; ++i)
{
auto it = item ? item->child(i) : m_fileBrowserTreeWidget->topLevelItem(i);
auto d = dynamic_cast<Directory*>(it);
if (d)
{
// Expanding is required when recursive to load in its contents, even if it's collapsed right afterward
if (m_recurse) { d->setExpanded(true); }

d->setExpanded(expandedDirs.contains(d->fullName()));

if (m_recurse && it->childCount())
if (it->childCount() > 0)
{
expandItems(it, expandedDirs);
expandItems(expandedDirs, it);
}
}

Expand Down
8 changes: 4 additions & 4 deletions src/gui/MainWindow.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,24 +115,24 @@ MainWindow::MainWindow() :
"*.mmp *.mmpz *.xml *.mid *.mpt",
tr( "My Projects" ),
embed::getIconPixmap( "project_file" ).transformed( QTransform().rotate( 90 ) ),
splitter, false, true,
splitter, false,
confMgr->userProjectsDir(),
confMgr->factoryProjectsDir()));
sideBar->appendTab(
new FileBrowser(confMgr->userSamplesDir() + "*" + confMgr->factorySamplesDir(), FileItem::defaultFilters(),
tr("My Samples"), embed::getIconPixmap("sample_file").transformed(QTransform().rotate(90)), splitter, false,
true, confMgr->userSamplesDir(), confMgr->factorySamplesDir()));
confMgr->userSamplesDir(), confMgr->factorySamplesDir()));
sideBar->appendTab( new FileBrowser(
confMgr->userPresetsDir() + "*" +
confMgr->factoryPresetsDir(),
"*.xpf *.cs.xml *.xiz *.lv2",
tr( "My Presets" ),
embed::getIconPixmap( "preset_file" ).transformed( QTransform().rotate( 90 ) ),
splitter , false, true,
splitter , false,
confMgr->userPresetsDir(),
confMgr->factoryPresetsDir()));
sideBar->appendTab(new FileBrowser(QDir::homePath(), FileItem::defaultFilters(), tr("My Home"),
embed::getIconPixmap("home").transformed(QTransform().rotate(90)), splitter, false, false));
embed::getIconPixmap("home").transformed(QTransform().rotate(90)), splitter, false));

QStringList root_paths;
QString title = tr( "Root directory" );
Expand Down