hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Adds "Show Hidden Content" checkbox (#7309)

Browse Source 
* Adds "Show Hidden Content Dialogue"

* Update FileBrowser.cpp

* Automatically rearrange layout to fit check boxes

* check if files are hidden in a cross platform manner

* put the hidden files checkbox below the user and factory check boxes at all times

* removed layout rearrangement code

* moved checkbox code to FileBrowser

* Removed unused include

* Cleanup in FileBrowser

Move the method `addContentCheckBox` to the other private methods.
Remove the method parameters because it can use the members.

Remove the conditional when adding the "Hidden content" checkbox because
it was always true.

---------

Co-authored-by: Michael Gregorius <michael.gregorius.git@arcor.de>
This commit is contained in:
Andrew Wiltshire
2024-06-30 21:23:19 +01:00
committed by GitHub
parent edf6bf8dfe
commit fb5268ebae
2 changed files with 61 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/FileBrowser.h
View File

@@ -90,7 +90,7 @@ public:
};
return s_excludedPaths;
}
static QDir::Filters dirFilters() { return QDir::AllDirs | QDir::Files | QDir::NoDotAndDotDot; }
static QDir::Filters dirFilters() { return QDir::AllDirs | QDir::Files | QDir::NoDotAndDotDot | QDir::Hidden; }
static QDir::SortFlags sortFlags() { return QDir::LocaleAware | QDir::DirsFirst | QDir::Name | QDir::IgnoreCase; }
private slots:
@@ -111,6 +111,8 @@ private:
void onSearch(const QString& filter);
void displaySearch(bool on);
void addContentCheckBox();
FileBrowserTreeWidget * m_fileBrowserTreeWidget;
FileBrowserTreeWidget * m_searchTreeWidget;
@@ -124,9 +126,13 @@ private:
bool m_dirsAsItems;
void addContentCheckBox();
QCheckBox* m_showUserContent = nullptr;
QCheckBox* m_showFactoryContent = nullptr;
QCheckBox* m_showHiddenContent = nullptr;
QBoxLayout *filterWidgetLayout = nullptr;
QBoxLayout *hiddenWidgetLayout = nullptr;
QBoxLayout *outerLayout = nullptr;
QString m_userDir;
QString m_factoryDir;
QList<QString> m_savedExpandedDirs;

83
src/gui/FileBrowser.cpp
View File

@@ -78,31 +78,6 @@ enum TreeWidgetItemTypes
} ;
void FileBrowser::addContentCheckBox()
{
auto filterWidget = new QWidget(contentParent());
filterWidget->setFixedHeight(15);
auto filterWidgetLayout = new QHBoxLayout(filterWidget);
filterWidgetLayout->setContentsMargins(0, 0, 0, 0);
filterWidgetLayout->setSpacing(0);
auto configCheckBox = [this, &filterWidgetLayout](QCheckBox* box)
{
box->setCheckState(Qt::Checked);
connect(box, SIGNAL(stateChanged(int)), this, SLOT(reloadTree()));
filterWidgetLayout->addWidget(box);
};
m_showUserContent = new QCheckBox(tr("User content"));
configCheckBox(m_showUserContent);
m_showFactoryContent = new QCheckBox(tr("Factory content"));
configCheckBox(m_showFactoryContent);
addContentWidget(filterWidget);
};
FileBrowser::FileBrowser(const QString & directories, const QString & filter,
const QString & title, const QPixmap & pm,
QWidget * parent, bool dirs_as_items,
@@ -117,10 +92,7 @@ FileBrowser::FileBrowser(const QString & directories, const QString & filter,
{
setWindowTitle( tr( "Browser" ) );
if (!userDir.isEmpty() && !factoryDir.isEmpty())
{
addContentCheckBox();
}
addContentCheckBox();
auto searchWidget = new QWidget(contentParent());
searchWidget->setFixedHeight( 24 );
@@ -168,6 +140,54 @@ FileBrowser::FileBrowser(const QString & directories, const QString & filter,
show();
}
void FileBrowser::addContentCheckBox()
{
// user dir and factory dir checkboxes will display individually depending on whether they are empty.
const bool user_checkbox = !m_userDir.isEmpty();
const bool factory = !m_factoryDir.isEmpty();
auto filterWidget = new QWidget(contentParent());
outerLayout = new QBoxLayout(QBoxLayout::Direction::TopToBottom, filterWidget);
outerLayout->setSpacing(0);
if (user_checkbox || factory){
filterWidgetLayout = new QBoxLayout(QBoxLayout::Direction::LeftToRight);
filterWidgetLayout->setContentsMargins(0, 0, 0, 0);
filterWidgetLayout->setSpacing(0);
outerLayout->addLayout(filterWidgetLayout);
}
hiddenWidgetLayout = new QBoxLayout(QBoxLayout::Direction::LeftToRight);
hiddenWidgetLayout->setContentsMargins(0, 0, 0, 0);
hiddenWidgetLayout->setSpacing(0);
outerLayout->addLayout(hiddenWidgetLayout);
auto configCheckBox = [this](QBoxLayout* boxLayout, QCheckBox* box, Qt::CheckState checkState)
{
box->setCheckState(checkState);
connect(box, SIGNAL(stateChanged(int)), this, SLOT(reloadTree()));
boxLayout->addWidget(box);
};
if (user_checkbox) {
m_showUserContent = new QCheckBox(tr("User content"));
configCheckBox(filterWidgetLayout, m_showUserContent, Qt::Checked);
}
if (factory) {
m_showFactoryContent = new QCheckBox(tr("Factory content"));
configCheckBox(filterWidgetLayout, m_showFactoryContent, Qt::Checked);
}
m_showHiddenContent = new QCheckBox(tr("Hidden content"));
configCheckBox(hiddenWidgetLayout, m_showHiddenContent, Qt::Unchecked);
addContentWidget(filterWidget);
}
void FileBrowser::saveDirectoriesStates()
{
m_savedExpandedDirs = m_fileBrowserTreeWidget->expandedDirs();
@@ -391,12 +411,15 @@ void FileBrowser::addItems(const QString & path )
QDir cdir(path);
if (!cdir.isReadable()) { return; }
QFileInfoList entries = cdir.entryInfoList(
m_filter.split(' '), dirFilters(), QDir::LocaleAware | QDir::DirsFirst | QDir::Name | QDir::IgnoreCase);
m_filter.split(' '),
dirFilters(),
QDir::LocaleAware | QDir::DirsFirst | QDir::Name | QDir::IgnoreCase);
for (const auto& entry : entries)
{
if (FileBrowser::excludedPaths().contains(entry.absoluteFilePath())) { continue; }
QString fileName = entry.fileName();
if (entry.isHidden() && m_showHiddenContent && !m_showHiddenContent->isChecked()) continue;
if (entry.isDir())
{
// Merge dir's together