[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [plasma-mediacenter] /: fix krazy2 issues
From: Shantanu Tushar <shaan7in () gmail ! com>
Date: 2012-03-31 10:25:09
Message-ID: 20120331102509.018E9A60A9 () git ! kde ! org
[Download RAW message or body]
Git commit 2f91cf7d236297dd9fef1a347f9c1a6281b10781 by Shantanu Tushar.
Committed on 31/03/2012 at 12:24.
Pushed by shantanu into branch 'master'.
fix krazy2 issues
D +0 -315 browsingbackends/localfiles/configbase.ui
M +0 -2 browsingbackends/localfiles/localmusic/CMakeLists.txt
M +0 -2 browsingbackends/localfiles/localpictures/CMakeLists.txt
M +0 -2 browsingbackends/localfiles/localvideos/CMakeLists.txt
M +20 -1 browsingbackends/metadatabackends/metadatamusicbackend/metadatamusiccomponents/CategoriesDelegate.qml
M +20 -1 browsingbackends/metadatabackends/metadatamusicbackend/metadatamusiccomponents/FilteringDelegate.qml
M +1 -1 browsingbackends/metadatabackends/metadatamusicbackend/metadatamusiccomponents/MediaBrowser.qml
M +3 -3 browsingbackends/metadatabackends/metadatamusicbackend/nepomukmusicmodel.cpp
M +1 -1 components/mediacontroller/MediaController.qml
M +1 -1 libs/mediacenter/backendsmodel.h
M +3 -3 libs/mediacenter/mediacenter.cpp
M +1 -1 shells/newshell/main.cpp
M +1 -1 shells/newshell/plasma-mediacenter.desktop
http://commits.kde.org/plasma-mediacenter/2f91cf7d236297dd9fef1a347f9c1a6281b10781
diff --git a/browsingbackends/localfiles/configbase.ui \
b/browsingbackends/localfiles/configbase.ui deleted file mode 100644
index 1cb56ae..0000000
--- a/browsingbackends/localfiles/configbase.ui
+++ /dev/null
@@ -1,315 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>ConfigBase</class>
- <widget class="QWidget" name="ConfigBase">
- <property name="geometry">
- <rect>
- <x>0</x>
- <y>0</y>
- <width>440</width>
- <height>396</height>
- </rect>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout_3">
- <item>
- <widget class="QTabWidget" name="tabWidget">
- <property name="currentIndex">
- <number>0</number>
- </property>
- <widget class="QWidget" name="tab">
- <attribute name="title">
- <string>Semantic desktop</string>
- </attribute>
- <layout class="QVBoxLayout" name="verticalLayout_2">
- <item>
- <widget class="QCheckBox" name="nepomukBox">
- <property name="text">
- <string>Semantic desktop facilities</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="verticalSpacer_2">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Minimum</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>10</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <item>
- <spacer name="horizontalSpacer_3">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QToolButton" name="addFoldersButton">
- <property name="text">
- <string>...</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QToolButton" name="removeFoldersButton">
- <property name="text">
- <string>...</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <widget class="QListWidget" name="watchedFoldersList">
- <property name="editTriggers">
- <set>QAbstractItemView::NoEditTriggers</set>
- </property>
- <property name="selectionBehavior">
- <enum>QAbstractItemView::SelectRows</enum>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- <widget class="QWidget" name="tab2">
- <attribute name="title">
- <string>Classic browser system</string>
- </attribute>
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
- <widget class="QRadioButton" name="showPlace">
- <property name="text">
- <string>Show a place:</string>
- </property>
- </widget>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <spacer name="horizontalSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>25</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QComboBox" name="placesCombo">
- <property name="enabled">
- <bool>false</bool>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <widget class="QRadioButton" name="showCustomFolder">
- <property name="text">
- <string>Specify a folder:</string>
- </property>
- </widget>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_3">
- <property name="spacing">
- <number>0</number>
- </property>
- <item>
- <spacer name="horizontalSpacer_2">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Minimum</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>25</width>
- <height>18</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="KUrlRequester" name="urlRequester">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="clickMessage">
- <string>Type a path or a URL here</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <spacer name="verticalSpacer">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Minimum</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <layout class="QFormLayout" name="formLayout">
- <property name="fieldGrowthPolicy">
- <enum>QFormLayout::ExpandingFieldsGrow</enum>
- </property>
- <item row="0" column="0">
- <widget class="QLabel" name="label_5">
- <property name="text">
- <string>Allow folder navigation:</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QCheckBox" name="folderNavigationCheckBox">
- <property name="text">
- <string/>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- <property name="autoRepeat">
- <bool>false</bool>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- </widget>
- </item>
- </layout>
- </widget>
- <customwidgets>
- <customwidget>
- <class>KUrlRequester</class>
- <extends>QFrame</extends>
- <header>kurlrequester.h</header>
- <container>1</container>
- </customwidget>
- </customwidgets>
- <resources/>
- <connections>
- <connection>
- <sender>showPlace</sender>
- <signal>toggled(bool)</signal>
- <receiver>placesCombo</receiver>
- <slot>setEnabled(bool)</slot>
- <hints>
- <hint type="sourcelabel">
- <x>199</x>
- <y>14</y>
- </hint>
- <hint type="destinationlabel">
- <x>214</x>
- <y>41</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>showCustomFolder</sender>
- <signal>toggled(bool)</signal>
- <receiver>urlRequester</receiver>
- <slot>setEnabled(bool)</slot>
- <hints>
- <hint type="sourcelabel">
- <x>199</x>
- <y>69</y>
- </hint>
- <hint type="destinationlabel">
- <x>212</x>
- <y>97</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>nepomukBox</sender>
- <signal>toggled(bool)</signal>
- <receiver>watchedFoldersList</receiver>
- <slot>setEnabled(bool)</slot>
- <hints>
- <hint type="sourcelabel">
- <x>219</x>
- <y>43</y>
- </hint>
- <hint type="destinationlabel">
- <x>219</x>
- <y>234</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>nepomukBox</sender>
- <signal>toggled(bool)</signal>
- <receiver>addFoldersButton</receiver>
- <slot>setEnabled(bool)</slot>
- <hints>
- <hint type="sourcelabel">
- <x>219</x>
- <y>43</y>
- </hint>
- <hint type="destinationlabel">
- <x>377</x>
- <y>84</y>
- </hint>
- </hints>
- </connection>
- <connection>
- <sender>nepomukBox</sender>
- <signal>toggled(bool)</signal>
- <receiver>removeFoldersButton</receiver>
- <slot>setEnabled(bool)</slot>
- <hints>
- <hint type="sourcelabel">
- <x>219</x>
- <y>43</y>
- </hint>
- <hint type="destinationlabel">
- <x>411</x>
- <y>84</y>
- </hint>
- </hints>
- </connection>
- </connections>
-</ui>
diff --git a/browsingbackends/localfiles/localmusic/CMakeLists.txt \
b/browsingbackends/localfiles/localmusic/CMakeLists.txt index a8641ea..f679bf5 100644
--- a/browsingbackends/localfiles/localmusic/CMakeLists.txt
+++ b/browsingbackends/localfiles/localmusic/CMakeLists.txt
@@ -8,8 +8,6 @@ set(localmusicbackend_SRCS
soprano_add_ontology(localmusicbackend_SRCS \
${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/nie/nfo.trig "NFO" "Vocabulary" "trig") \
soprano_add_ontology(localmusicbackend_SRCS \
${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/nie/nie.trig "NIE" "Vocabulary" "trig")
-kde4_add_ui_files(localmusicbackend_SRCS ../configbase.ui)
-
kde4_add_plugin(pmc_localmusic ${localmusicbackend_SRCS})
target_link_libraries(pmc_localmusic
diff --git a/browsingbackends/localfiles/localpictures/CMakeLists.txt \
b/browsingbackends/localfiles/localpictures/CMakeLists.txt index 7920fb9..64db8f5 \
100644
--- a/browsingbackends/localfiles/localpictures/CMakeLists.txt
+++ b/browsingbackends/localfiles/localpictures/CMakeLists.txt
@@ -7,8 +7,6 @@ set(localpicturesbackend_SRCS
soprano_add_ontology(localpicturesbackend_SRCS \
${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/nie/nfo.trig "NFO" "Vocabulary" "trig") \
soprano_add_ontology(localpicturesbackend_SRCS \
${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/nie/nie.trig "NIE" "Vocabulary" "trig")
-kde4_add_ui_files(localpicturesbackend_SRCS ../configbase.ui)
-
kde4_add_plugin(pmc_localpictures ${localpicturesbackend_SRCS})
target_link_libraries(pmc_localpictures
mediacenterlibs
diff --git a/browsingbackends/localfiles/localvideos/CMakeLists.txt \
b/browsingbackends/localfiles/localvideos/CMakeLists.txt index 58c67fa..9ec1142 \
100644
--- a/browsingbackends/localfiles/localvideos/CMakeLists.txt
+++ b/browsingbackends/localfiles/localvideos/CMakeLists.txt
@@ -9,8 +9,6 @@ set(localvideosbackend_SRCS
soprano_add_ontology(localvideosbackend_SRCS \
${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/nie/nfo.trig "NFO" "Vocabulary" "trig") \
soprano_add_ontology(localvideosbackend_SRCS \
${SHAREDDESKTOPONTOLOGIES_ROOT_DIR}/nie/nie.trig "NIE" "Vocabulary" "trig")
-kde4_add_ui_files(localvideosbackend_SRCS ../configbase.ui)
-
kde4_add_plugin(pmc_localvideos ${localvideosbackend_SRCS})
target_link_libraries(pmc_localvideos
mediacenterlibs
diff --git a/browsingbackends/metadatabackends/metadatamusicbackend/metadatamusiccomponents/CategoriesDelegate.qml \
b/browsingbackends/metadatabackends/metadatamusicbackend/metadatamusiccomponents/CategoriesDelegate.qml
index b34e48e..e8cf713 100644
--- a/browsingbackends/metadatabackends/metadatamusicbackend/metadatamusiccomponents/CategoriesDelegate.qml
+++ b/browsingbackends/metadatabackends/metadatamusicbackend/metadatamusiccomponents/CategoriesDelegate.qml
@@ -1,3 +1,22 @@
+/***************************************************************************
+ * Copyright 2012 Shantanu Tushar <shaan7in@gmail.com> *
+ * *
+ * 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 . *
+ ***************************************************************************/
+
import QtQuick 1.1
import org.kde.plasma.components 0.1 as PlasmaComponents
@@ -6,4 +25,4 @@ PlasmaComponents.Button {
iconSource: decoration
onClicked: backend.setCategory(index)
-}
\ No newline at end of file
+}
diff --git a/browsingbackends/metadatabackends/metadatamusicbackend/metadatamusiccomponents/FilteringDelegate.qml \
b/browsingbackends/metadatabackends/metadatamusicbackend/metadatamusiccomponents/FilteringDelegate.qml
index 4cd43f7..606ab50 100644
--- a/browsingbackends/metadatabackends/metadatamusicbackend/metadatamusiccomponents/FilteringDelegate.qml
+++ b/browsingbackends/metadatabackends/metadatamusicbackend/metadatamusiccomponents/FilteringDelegate.qml
@@ -1,3 +1,22 @@
+/***************************************************************************
+ * Copyright 2012 Shantanu Tushar <shaan7in@gmail.com> *
+ * *
+ * 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 . *
+ ***************************************************************************/
+
import QtQuick 1.1
import org.kde.plasma.components 0.1 as PlasmaComponents
@@ -18,4 +37,4 @@ Rectangle {
onClicked: backend.setSubCategory(index)
}
}
-}
\ No newline at end of file
+}
diff --git a/browsingbackends/metadatabackends/metadatamusicbackend/metadatamusiccomponents/MediaBrowser.qml \
b/browsingbackends/metadatabackends/metadatamusicbackend/metadatamusiccomponents/MediaBrowser.qml
index 64d0bef..74ea381 100644
--- a/browsingbackends/metadatabackends/metadatamusicbackend/metadatamusiccomponents/MediaBrowser.qml
+++ b/browsingbackends/metadatabackends/metadatamusicbackend/metadatamusiccomponents/MediaBrowser.qml
@@ -50,4 +50,4 @@ Row {
spacing: 5
visible: backend.level3Visible
}
-}
\ No newline at end of file
+}
diff --git a/browsingbackends/metadatabackends/metadatamusicbackend/nepomukmusicmodel.cpp \
b/browsingbackends/metadatabackends/metadatamusicbackend/nepomukmusicmodel.cpp index \
94fb0c0..9639bf8 100644
--- a/browsingbackends/metadatabackends/metadatamusicbackend/nepomukmusicmodel.cpp
+++ b/browsingbackends/metadatabackends/metadatamusicbackend/nepomukmusicmodel.cpp
@@ -50,8 +50,8 @@ void NepomukMusicModel::setTerm(Nepomuk::Types::Property term, \
const QString &ic Nepomuk::Query::ComparisonTerm ct(term, Nepomuk::Query::Term());
ct.setInverted(true);
Nepomuk::Query::QueryServiceClient *queryClient = new \
Nepomuk::Query::QueryServiceClient(this);
- connect(queryClient, SIGNAL(newEntries(const QList<Nepomuk::Query::Result> &)),
- this, SLOT(newEntries(const QList<Nepomuk::Query::Result> &)));
+ connect(queryClient, SIGNAL(newEntries(QList<Nepomuk::Query::Result>)),
+ this, SLOT(newEntries(QList<Nepomuk::Query::Result>)));
connect(queryClient, SIGNAL(error(QString)), SLOT(error(QString)));
connect(queryClient, SIGNAL(finishedListing()), this, SLOT(finishedListing()));
myQuery.setTerm(ct);
@@ -102,7 +102,7 @@ QModelIndex NepomukMusicModel::index(int row, int column, const \
QModelIndex& par
void NepomukMusicModel::newEntries(const QList< Nepomuk::Query::Result >& entries)
{
- Q_FOREACH (Nepomuk::Query::Result res, entries) {
+ Q_FOREACH (const Nepomuk::Query::Result &res, entries) {
m_queryResults.append(res);
}
}
diff --git a/components/mediacontroller/MediaController.qml \
b/components/mediacontroller/MediaController.qml index c701548..3d8ccbe 100644
--- a/components/mediacontroller/MediaController.qml
+++ b/components/mediacontroller/MediaController.qml
@@ -40,7 +40,7 @@ PlasmaCore.FrameSvgItem {
id: backwardButton
width: parent.height
height: width
- visible: false //doesn't work, so dont show ;)
+ visible: false //doesn't work, so don't show ;)
iconSource: "media-skip-backward"
diff --git a/libs/mediacenter/backendsmodel.h b/libs/mediacenter/backendsmodel.h
index 6891462..ed253a2 100644
--- a/libs/mediacenter/backendsmodel.h
+++ b/libs/mediacenter/backendsmodel.h
@@ -38,7 +38,7 @@ public:
ModelObjectRole = Qt::UserRole + 1
};
- BackendsModel (QDeclarativeEngine *engine, QObject* parent = 0);
+ explicit BackendsModel (QDeclarativeEngine *engine, QObject* parent = 0);
virtual QVariant data (const QModelIndex& index, int role = Qt::DisplayRole) \
const;
virtual int rowCount (const QModelIndex& parent = QModelIndex()) const;
diff --git a/libs/mediacenter/mediacenter.cpp b/libs/mediacenter/mediacenter.cpp
index e76c40a..a960435 100644
--- a/libs/mediacenter/mediacenter.cpp
+++ b/libs/mediacenter/mediacenter.cpp
@@ -35,11 +35,11 @@ MediaType getType(const QString &media)
QFileInfo info(media);
if (info.exists()) {
KMimeType::Ptr mime = KMimeType::findByPath(media);
- if (mime->name().startsWith("image/")) {
+ if (mime->name().startsWith(QLatin1String("image/"))) {
return Picture;
- } else if (mime->name().startsWith("video/")) {
+ } else if (mime->name().startsWith(QLatin1String("video/"))) {
return Video;
- } else if (mime->name().startsWith("audio/")) {
+ } else if (mime->name().startsWith(QLatin1String("audio/"))) {
return Audio;
} else {
return Invalid;
diff --git a/shells/newshell/main.cpp b/shells/newshell/main.cpp
index 0183935..b2edbe3 100644
--- a/shells/newshell/main.cpp
+++ b/shells/newshell/main.cpp
@@ -38,7 +38,7 @@ int main(int argc, char *argv[])
KAboutData::License_GPL_V2,
ki18n("Copyright (c) 2009-2011"));
aboutData.addAuthor(ki18n("Alessandro Diaferia"),
- ki18n("Mantainer and main developer"),
+ ki18n("Maintainer and main developer"),
"alediaferia@gmail.com",
"http://alediaferia.wordpress.com");
aboutData.addAuthor(ki18n("Sinny Kumari"),
diff --git a/shells/newshell/plasma-mediacenter.desktop \
b/shells/newshell/plasma-mediacenter.desktop index 3c1e649..fc12b7d 100755
--- a/shells/newshell/plasma-mediacenter.desktop
+++ b/shells/newshell/plasma-mediacenter.desktop
@@ -24,4 +24,4 @@ Exec=plasma-mediacenter -graphicssystem raster %u
Terminal=false
Icon=plasma
Type=Application
-Categories=Multimedia
+Categories=Multimedia;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic