kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-09-19 16:31:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove the "Remove folder restriction" button from the Filter Panel as discussed with Sebastian Trüg. This will be replaced by the "From Here" and "Everywhere" buttons later.

Browse source 
svn path=/trunk/KDE/kdebase/apps/; revision=1195690
This commit is contained in:
Peter Penz 2010-11-11 19:19:40 +00:00
parent fb501085e2
commit e251393981
2 changed files with 1 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/panels/filter/filterpanel.cpp
View file

@ -47,7 +47,6 @@ FilterPanel::FilterPanel(QWidget* parent) :
m_initialized(false), m_initialized(false),
m_nepomukEnabled(false), m_nepomukEnabled(false),
m_lastSetUrlStatJob(0), m_lastSetUrlStatJob(0),
m_removeFolderRestrictionButton(0),
m_facetWidget(0), m_facetWidget(0),
m_unfacetedRestQuery() m_unfacetedRestQuery()
{ {
@ -81,11 +80,7 @@ void FilterPanel::showEvent(QShowEvent* event)
if (!m_initialized) { if (!m_initialized) {
QVBoxLayout* layout = new QVBoxLayout(this); QVBoxLayout* layout = new QVBoxLayout(this);
Q_ASSERT(m_removeFolderRestrictionButton == 0); layout->setMargin(0);
m_removeFolderRestrictionButton = new QPushButton(i18n("Remove folder restriction"), this);
connect(m_removeFolderRestrictionButton, SIGNAL(clicked()), SLOT(slotRemoveFolderRestrictionClicked()));
layout->addWidget(m_removeFolderRestrictionButton);
Q_ASSERT(m_facetWidget == 0); Q_ASSERT(m_facetWidget == 0);
m_facetWidget = new Nepomuk::Utils::FacetWidget(this); m_facetWidget = new Nepomuk::Utils::FacetWidget(this);
@ -162,21 +157,11 @@ void FilterPanel::slotQueryTermChanged(const Nepomuk::Query::Term& term)
emit urlActivated(query.toSearchUrl()); emit urlActivated(query.toSearchUrl());
} }
void FilterPanel::slotRemoveFolderRestrictionClicked()
{
Nepomuk::Query::FileQuery query(m_unfacetedRestQuery && m_facetWidget->queryTerm());
query.setIncludeFolders(KUrl::List());
query.setExcludeFolders(KUrl::List());
m_facetWidget->setClientQuery(query);
emit urlActivated(query.toSearchUrl());
}
void FilterPanel::setQuery(const Nepomuk::Query::Query& query) void FilterPanel::setQuery(const Nepomuk::Query::Query& query)
{ {
if (query.isValid()) { if (query.isValid()) {
const bool block = m_facetWidget->blockSignals(true); const bool block = m_facetWidget->blockSignals(true);
m_removeFolderRestrictionButton->setVisible(query.isFileQuery() && !query.toFileQuery().includeFolders().isEmpty());
m_unfacetedRestQuery = m_facetWidget->extractFacetsFromQuery(query); m_unfacetedRestQuery = m_facetWidget->extractFacetsFromQuery(query);
m_facetWidget->setClientQuery(query); m_facetWidget->setClientQuery(query);
setEnabled(true); setEnabled(true);

3
src/panels/filter/filterpanel.h
View file

@ -24,7 +24,6 @@
#include <panels/panel.h> #include <panels/panel.h>
class KJob; class KJob;
class QPushButton;
namespace Nepomuk { namespace Nepomuk {
namespace Utils { namespace Utils {
@ -56,7 +55,6 @@ protected:
private slots: private slots:
void slotSetUrlStatFinished(KJob*); void slotSetUrlStatFinished(KJob*);
void slotQueryTermChanged(const Nepomuk::Query::Term& term); void slotQueryTermChanged(const Nepomuk::Query::Term& term);
void slotRemoveFolderRestrictionClicked();
private: private:
void setQuery(const Nepomuk::Query::Query& query); void setQuery(const Nepomuk::Query::Query& query);
@ -66,7 +64,6 @@ private:
bool m_nepomukEnabled; bool m_nepomukEnabled;
KJob* m_lastSetUrlStatJob; KJob* m_lastSetUrlStatJob;
QPushButton* m_removeFolderRestrictionButton;
Nepomuk::Utils::FacetWidget* m_facetWidget; Nepomuk::Utils::FacetWidget* m_facetWidget;
Nepomuk::Query::Query m_unfacetedRestQuery; Nepomuk::Query::Query m_unfacetedRestQuery;
}; };