[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [discover] /: Merge branch 'Plasma/5.6'
From:       Aleix Pol <aleixpol () kde ! org>
Date:       2016-04-18 15:31:42
Message-ID: E1asB9K-0008KX-TL () scm ! kde ! org
[Download RAW message or body]

Git commit 6a2799a06e64aa0cbdb15e1ea240e46924e7ee1e by Aleix Pol.
Committed on 18/04/2016 at 15:23.
Pushed by apol into branch 'master'.

Merge branch 'Plasma/5.6'

M  +4    -1    discover/org.kde.discover.desktop
M  +2    -2    discover/qml/CategoryDisplay.qml
M  +3    -3    libdiscover/ReviewsBackend/Rating.cpp
M  +2    -2    libdiscover/ReviewsBackend/Rating.h
M  +3    -0    libdiscover/backends/AkabeiBackend/akabei-backend.desktop
M  +1    -0    libdiscover/backends/AkabeiBackend/muonakabeinotifier.desktop
M  +3    -0    libdiscover/backends/ApplicationBackend/muonapplicationnotifier.notifyrc
 M  +3    -0    libdiscover/backends/ApplicationBackend/qapt-backend.desktop
M  +3    -0    libdiscover/backends/DummyBackend/dummy-backend.desktop
M  +8    -5    libdiscover/backends/DummyBackend/tests/DummyTest.cpp
M  +3    -0    libdiscover/backends/PackageKitBackend/packagekit-backend.desktop
M  +8    -3    libdiscover/declarative/ApplicationProxyModelHelper.cpp
M  +3    -0    libdiscover/resources/discoverabstractnotifier.notifyrc
M  +2    -0    notifier/plasmoid/metadata.desktop

http://commits.kde.org/discover/6a2799a06e64aa0cbdb15e1ea240e46924e7ee1e

diff --cc libdiscover/ReviewsBackend/Rating.cpp
index 3842b5b,c3fe400..1e7d0d5
--- a/libdiscover/ReviewsBackend/Rating.cpp
+++ b/libdiscover/ReviewsBackend/Rating.cpp
@@@ -97,12 -97,19 +97,12 @@@ double dampenedRating(const QVector<int
  }
  
  Rating::Rating(const QVariantMap &data)
 -    : QObject()
 -{
 -    init(data.value(QStringLiteral("package_name")).toString(),
 -         data.value(QStringLiteral("ratings_total")).toULongLong(), \
data.value(QStringLiteral("ratings_average")).toDouble() * 2, \
                data.value(QStringLiteral("histogram")).toString());
 -}
 -
 -Rating::Rating(const QString& packageName, quint64 ratingCount, int rating, const \
                QString& histogram)
 -    : QObject()
 +    : Rating(data.value(QStringLiteral("package_name")).toString(),
 +         data.value(QStringLiteral("ratings_total")).toULongLong(), \
data.value(QStringLiteral("ratings_average")).toDouble() * 2, \
data.value(QStringLiteral("histogram")).toString())  {
 -    init(packageName, ratingCount, rating, histogram);
  }
  
- Rating::Rating(const QString& packageName, int inst, int vote, int old, int \
/*recent*/) + Rating::Rating(const QString& packageName, int inst, int /*vote*/, int \
/*old*/, int /*recent*/)  : QObject()
      , m_packageName(packageName)
      , m_ratingCount(inst)
diff --cc libdiscover/backends/DummyBackend/tests/DummyTest.cpp
index ac2c318,1c5fab9..d016823
--- a/libdiscover/backends/DummyBackend/tests/DummyTest.cpp
+++ b/libdiscover/backends/DummyBackend/tests/DummyTest.cpp
@@@ -105,6 -104,8 +105,7 @@@ void DummyTest::testFetch(
  void DummyTest::testSort()
  {
      ResourcesProxyModel pm;
 -    pm.setSourceModel(m_model);
+ 
      QCollator c;
      QBENCHMARK_ONCE {
          pm.setSortRole(ResourcesModel::NameRole);
diff --cc libdiscover/declarative/ApplicationProxyModelHelper.cpp
index 3e21a44,35762fb..ed29409
--- a/libdiscover/declarative/ApplicationProxyModelHelper.cpp
+++ b/libdiscover/declarative/ApplicationProxyModelHelper.cpp
@@@ -35,10 -36,14 +36,12 @@@ QHash<int, QByteArray> ApplicationProxy
  
  void ApplicationProxyModelHelper::componentComplete()
  {
 -    setSourceModel(ResourcesModel::global());
 -    
      if(!m_sortRoleString.isEmpty())
          setStringSortRole_hack(m_sortRoleString);
+ 
      setSearch(lastSearch());
      setDynamicSortFilter(true);
+     sortModel();
  }
  
  void ApplicationProxyModelHelper::sortModel()
diff --cc notifier/plasmoid/metadata.desktop
index 3f9805b,5fc6a1b..911cc53
--- a/notifier/plasmoid/metadata.desktop
+++ b/notifier/plasmoid/metadata.desktop
@@@ -65,9 -68,10 +66,10 @@@ Comment[sv]=Hjälper dig hålla systeme
  Comment[uk]=Допомагає підтримувати актуальний \
стан вашої системи  Comment[x-test]=xxHelps you keep your system up \
to datexx  Comment[zh_CN]=帮助您保持系统更新
+ Comment[zh_TW]=協助保持您的系統更新
  Encoding=UTF-8
  
 -Icon=security-high
 +Icon=update-none
  Type=Service
  
  X-KDE-ServiceTypes=Plasma/Applet


[prev in list] [next in list] [prev in thread] [next in thread]