[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdebase/apps/plasma/applets/folderview
From: Darío Andrés Rodríguez <andresbajotierra () gmail ! co
Date: 2010-02-01 22:31:45
Message-ID: 1265063505.745734.27968.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 1083788 by darioandres:
- Fix several krazy2-reported issue
- Fixed some compilation warnings
M +1 -2 dirlister.cpp
M +1 -1 folderview.cpp
M +2 -2 folderviewDisplayConfig.ui
M +1 -1 folderviewFilterConfig.ui
M +1 -1 folderviewLocationConfig.ui
M +2 -1 iconview.cpp
M +1 -1 popupview.cpp
M +2 -1 previewpluginsmodel.cpp
M +5 -4 tooltipwidget.cpp
--- trunk/KDE/kdebase/apps/plasma/applets/folderview/dirlister.cpp #1083787:1083788
@@ -17,10 +17,9 @@
* Boston, MA 02110-1301, USA.
*/
-#include <KIO/Job>
-
#include "dirlister.h"
+#include <KIO/Job>
DirLister::DirLister(QObject *parent)
: KDirLister(parent)
--- trunk/KDE/kdebase/apps/plasma/applets/folderview/folderview.cpp #1083787:1083788
@@ -641,7 +641,7 @@
cg.writeEntry("previewPlugins", m_previewPlugins);
m_previewGenerator->setEnabledPlugins(m_previewPlugins);
- //Chaning the preview plugins will also need a reload to work, so we need to \
preserve + //Changing the preview plugins will also need a reload to work, so \
we need to preserve //the icons position
needReload = true;
preserveIconPositions = true;
--- trunk/KDE/kdebase/apps/plasma/applets/folderview/folderviewDisplayConfig.ui \
#1083787:1083788 @@ -135,7 +135,7 @@
</widget>
</item>
<item row="3" column="2">
- <widget class="QComboBox" name="flowCombo">
+ <widget class="KComboBox" name="flowCombo">
<property name="whatsThis">
<string>Use this control to choose if you want the icons to be arranged top to \
bottom starting on the left side of the view, or arranged left to right starting at \
the top of the view.</string> </property>
@@ -155,7 +155,7 @@
</widget>
</item>
<item row="4" column="2">
- <widget class="QComboBox" name="sortCombo">
+ <widget class="KComboBox" name="sortCombo">
<property name="whatsThis">
<string>Use this control to choose the criteria by which the icons will be \
sorted in the view.</string> </property>
--- trunk/KDE/kdebase/apps/plasma/applets/folderview/folderviewFilterConfig.ui \
#1083787:1083788 @@ -24,7 +24,7 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
- <widget class="QComboBox" name="filterType">
+ <widget class="KComboBox" name="filterType">
<property name="toolTip">
<string><!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" \
"http://www.w3.org/TR/REC-html40/strict.dtd"> \
<html><head><meta name="qrichtext" content="1" \
/><style type="text/css">
--- trunk/KDE/kdebase/apps/plasma/applets/folderview/folderviewLocationConfig.ui \
#1083787:1083788 @@ -43,7 +43,7 @@
</spacer>
</item>
<item>
- <widget class="QComboBox" name="placesCombo" />
+ <widget class="KComboBox" name="placesCombo" />
</item>
</layout>
</item>
--- trunk/KDE/kdebase/apps/plasma/applets/folderview/iconview.cpp #1083787:1083788
@@ -2095,7 +2095,8 @@
// Unfortunately QImageReader::supportedImageFormats() returns some formats \
in upper case
// and others in lower case, but all the important ones are in lower case.
const QByteArray suffix = \
QFileInfo(urls.first().fileName()).suffix().toLower().toUtf8();
- if (mimeName.startsWith("image/") || \
QImageReader::supportedImageFormats().contains(suffix)) { + if \
(mimeName.startsWith(QLatin1String("image/")) || + \
QImageReader::supportedImageFormats().contains(suffix)) {
QAction *action = new QAction(i18n("Set as &Wallpaper"), actions);
action->setData("internal:folderview:set-as-wallpaper");
action->setIcon(KIcon("preferences-desktop-wallpaper"));
--- trunk/KDE/kdebase/apps/plasma/applets/folderview/popupview.cpp #1083787:1083788
@@ -506,7 +506,7 @@
}
KFileItem rootItem = m_model->itemForIndex(QModelIndex());
- //The root item is invalid (non-existant)
+ //The root item is invalid (non-existent)
if (rootItem.isNull()) {
return;
}
--- trunk/KDE/kdebase/apps/plasma/applets/folderview/previewpluginsmodel.cpp \
#1083787:1083788 @@ -17,9 +17,10 @@
* Boston, MA 02110-1301, USA.
*/
-#include <QStringList>
#include "previewpluginsmodel.h"
+#include <QStringList>
+
static bool lessThan(const KService::Ptr &a, const KService::Ptr &b)
{
return QString::localeAwareCompare(a->name(), b->name()) < 0;
--- trunk/KDE/kdebase/apps/plasma/applets/folderview/tooltipwidget.cpp \
#1083787:1083788 @@ -91,7 +91,8 @@
QString ToolTipWidget::metaInfo() const
{
const QString mimetype = m_item.mimetype();
- if (!mimetype.startsWith("audio/") && !mimetype.startsWith("image/") &&
+ if (!mimetype.startsWith(QLatin1String("audio/")) &&
+ !mimetype.startsWith(QLatin1String("image/")) &&
!m_item.mimeTypePtr()->is("application/vnd.oasis.opendocument.text"))
{
return QString();
@@ -100,7 +101,7 @@
KFileMetaInfo info = m_item.metaInfo(true, KFileMetaInfo::TechnicalInfo | \
KFileMetaInfo::ContentInfo); QString text;
- if (mimetype.startsWith("audio/")) {
+ if (mimetype.startsWith(QLatin1String("audio/"))) {
const QString artist = \
info.item("http://freedesktop.org/standards/xesam/1.0/core#artist").value().toString();
const QString title = \
info.item("http://freedesktop.org/standards/xesam/1.0/core#title").value().toString();
const QString album = \
info.item("http://freedesktop.org/standards/xesam/1.0/core#album").value().toString();
@@ -118,7 +119,7 @@
}
text += "</table>";
}
- } else if (mimetype.startsWith("image/")) {
+ } else if (mimetype.startsWith(QLatin1String("image/"))) {
int width = \
info.item("http://freedesktop.org/standards/xesam/1.0/core#width").value().toInt();
int height = \
info.item("http://freedesktop.org/standards/xesam/1.0/core#height").value().toInt();
const QString camera = \
info.item("http://freedesktop.org/standards/xesam/1.0/core#cameraModel").value().toString();
@@ -167,7 +168,7 @@
// Convert the APEX value to the F number
const qreal fnumber = std::sqrt(std::pow(2, convertToReal(aperture)));
aperture = QString("f/") + QString::number(fnumber, 'f', 1);
- if (aperture.endsWith(".0")) {
+ if (aperture.endsWith(QLatin1String(".0"))) {
aperture = aperture.left(aperture.length() - 2);
}
text += QString("<tr><td>") + i18nc("On a camera", "Aperture:") +
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic