From 831251d0f3bd960449e31d7a82baec1bba131e15 Mon Sep 17 00:00:00 2001 From: Frank Reininghaus Date: Thu, 27 Sep 2012 08:11:53 +0200 Subject: Add a new config option for the icon size in the Places Panel To change the icon size in the Places Panel to, e.g., 60 pixels, add the following lines to $KDEHOME/share/config/dolphinrc : [PlacesPanel] IconSize=60 A value of -1 means that the standard "Small" size should be used (which has been the default before this commit). It is planned to add an "Icon Size" submenu to the context menu of the Places Panel in KDE 4.10, but we cannot do this in the 4.9 branch because of the string freeze. FIXED-IN: 4.9.2 BUG: 301959 --- src/panels/places/dolphin_placespanelsettings.kcfg | 14 ++++++++ .../places/dolphin_placespanelsettings.kcfgc | 4 +++ src/panels/places/placespanel.cpp | 4 +-- src/panels/places/placesview.cpp | 35 ++++++++++++++++++++ src/panels/places/placesview.h | 38 ++++++++++++++++++++++ 5 files changed, 93 insertions(+), 2 deletions(-) create mode 100644 src/panels/places/dolphin_placespanelsettings.kcfg create mode 100644 src/panels/places/dolphin_placespanelsettings.kcfgc create mode 100644 src/panels/places/placesview.cpp create mode 100644 src/panels/places/placesview.h (limited to 'src/panels') diff --git a/src/panels/places/dolphin_placespanelsettings.kcfg b/src/panels/places/dolphin_placespanelsettings.kcfg new file mode 100644 index 000000000..b2ef8e574 --- /dev/null +++ b/src/panels/places/dolphin_placespanelsettings.kcfg @@ -0,0 +1,14 @@ + + + + + + + + -1 + + + diff --git a/src/panels/places/dolphin_placespanelsettings.kcfgc b/src/panels/places/dolphin_placespanelsettings.kcfgc new file mode 100644 index 000000000..65a77ec34 --- /dev/null +++ b/src/panels/places/dolphin_placespanelsettings.kcfgc @@ -0,0 +1,4 @@ +File=dolphin_placespanelsettings.kcfg +ClassName=PlacesPanelSettings +Singleton=true +Mutators=true diff --git a/src/panels/places/placespanel.cpp b/src/panels/places/placespanel.cpp index 4b28c8510..a81b99770 100644 --- a/src/panels/places/placespanel.cpp +++ b/src/panels/places/placespanel.cpp @@ -33,7 +33,6 @@ #include #include #include -#include #include #include #include @@ -42,6 +41,7 @@ #include "placesitemlistgroupheader.h" #include "placesitemlistwidget.h" #include "placesitemmodel.h" +#include "placesview.h" #include #include #include @@ -94,7 +94,7 @@ void PlacesPanel::showEvent(QShowEvent* event) connect(m_model, SIGNAL(errorMessage(QString)), this, SIGNAL(errorMessage(QString))); - KStandardItemListView* view = new KStandardItemListView(); + PlacesView* view = new PlacesView(); view->setWidgetCreator(new KItemListWidgetCreator()); view->setGroupHeaderCreator(new KItemListGroupHeaderCreator()); diff --git a/src/panels/places/placesview.cpp b/src/panels/places/placesview.cpp new file mode 100644 index 000000000..dce5083d7 --- /dev/null +++ b/src/panels/places/placesview.cpp @@ -0,0 +1,35 @@ +/*************************************************************************** + * Copyright (C) 2012 by Frank Reininghaus * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * + ***************************************************************************/ + +#include "placesview.h" + +#include "dolphin_placespanelsettings.h" + +PlacesView::PlacesView(QGraphicsWidget* parent) : + KStandardItemListView(parent) +{ + const int iconSize = PlacesPanelSettings::iconSize(); + if (iconSize >= 0) { + KItemListStyleOption option = styleOption(); + option.iconSize = iconSize; + setStyleOption(option); + } +} + +#include "placesview.moc" diff --git a/src/panels/places/placesview.h b/src/panels/places/placesview.h new file mode 100644 index 000000000..87eb3a50b --- /dev/null +++ b/src/panels/places/placesview.h @@ -0,0 +1,38 @@ +/*************************************************************************** + * Copyright (C) 2012 by Frank Reininghaus * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program; if not, write to the * + * Free Software Foundation, Inc., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * + ***************************************************************************/ + +#ifndef PLACESVIEW_H +#define PLACESVIEW_H + +#include + +/** + * @brief View class for the Places Panel. + * + * Reads the icon size from GeneralSettings::placesPanelIconSize(). + */ +class PlacesView : public KStandardItemListView +{ + Q_OBJECT + +public: + explicit PlacesView(QGraphicsWidget* parent = 0); +}; + +#endif -- cgit v1.3 From 9b01d1bcc1ddeffd3f59cee73341ec440ef6f1e0 Mon Sep 17 00:00:00 2001 From: Vishesh Handa Date: Thu, 30 Aug 2012 16:31:34 +0530 Subject: Dolphin Places: Only show file results in Nepomuk Queries Dolphin is a file manager, and shouldn't be concerned with non-file resources like notes, contacts and other stuff. Use FileQuery instead of Query. This also results in a faster queries. With File Queries Nepomuk can perform some internal optimizations. BUG: 306029 REVIEW: 106274 Cherry-picked from 6892d39d292d4f64d808e64c58ef20fa081f0259 --- src/panels/places/placesitemmodel.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/panels') diff --git a/src/panels/places/placesitemmodel.cpp b/src/panels/places/placesitemmodel.cpp index 706092bc7..4770c6b10 100644 --- a/src/panels/places/placesitemmodel.cpp +++ b/src/panels/places/placesitemmodel.cpp @@ -54,7 +54,7 @@ #include #include #include - #include + #include #include #include #include @@ -1172,7 +1172,7 @@ KUrl PlacesItemModel::createSearchUrl(const KUrl& url) #ifdef HAVE_NEPOMUK KUrl PlacesItemModel::searchUrlForTerm(const Nepomuk::Query::Term& term) { - const Nepomuk::Query::Query query(term); + const Nepomuk::Query::FileQuery query(term); return query.toSearchUrl(); } #endif -- cgit v1.3