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

List:       kde-commits
Subject:    [plasmoid-eventlist] src: adapt format option to filter change
From:       Gerd Fleischer <gerdfleischer () web ! de>
Date:       2012-08-31 17:18:29
Message-ID: 20120831171829.40F1BA60A6 () git ! kde ! org
[Download RAW message or body]

Git commit 653a7c763339a6e68373a8bc17850c516ecbce38 by Gerd Fleischer.
Committed on 31/08/2012 at 19:17.
Pushed by geflei into branch 'master'.

adapt format option to filter change

M  +1    -1    src/eventappletformatconfig.ui
M  +2    -2    src/eventitemdelegate.cpp
M  +2    -2    src/eventmodel.cpp
M  +2    -2    src/todoformatconfig.ui

http://commits.kde.org/plasmoid-eventlist/653a7c763339a6e68373a8bc17850c516ecbce38

diff --git a/src/eventappletformatconfig.ui b/src/eventappletformatconfig.ui
index 25b29ad..5a92279 100644
--- a/src/eventappletformatconfig.ui
+++ b/src/eventappletformatconfig.ui
@@ -26,7 +26,7 @@ Substitutions (mostly self-explanatory) are:
 %{summary} - summary, %{description} - description, %{location} - location, \
%{duration} - duration,  %{yearsSince} - years since the first time (useful for \
birthdays),  %{contactName} - name of the address book entry (if any, else empty),
-%{resourceName} - the i18n name of the Akonadi resource,
+%{collectionName} - the i18n name of the Akonadi collection (e.g. calendar),
 %{mainCategory}, %{categories} - the first or all categories,
 %{tab} - a tabulator</string>
         </property>
diff --git a/src/eventitemdelegate.cpp b/src/eventitemdelegate.cpp
index c0454c1..ed2e568 100644
--- a/src/eventitemdelegate.cpp
+++ b/src/eventitemdelegate.cpp
@@ -142,7 +142,7 @@ QHash<QString, QString> \
EventItemDelegate::eventHash(QMap<QString, QVariant> dat  \
dataHash.insert("description", data["description"].toString());  \
dataHash.insert("location", data["location"].toString());  \
                dataHash.insert("yearsSince", data["yearsSince"].toString());
-    dataHash.insert("resourceName", data["resourceName"].toString());
+    dataHash.insert("collectionName", data["collectionName"].toString());
     dataHash.insert("mainCategory", data["mainCategory"].toString());
     dataHash.insert("categories", data["categories"].toStringList().join(", "));
     dataHash.insert("contactName", data["contactName"].toString());
@@ -161,7 +161,7 @@ QHash<QString, QString> EventItemDelegate::todoHash(QMap<QString, \
QVariant> data  dataHash.insert("summary", data["summary"].toString());
     dataHash.insert("description", data["description"].toString());
     dataHash.insert("location", data["location"].toString());
-    dataHash.insert("resourceName", data["resourceName"].toString());
+    dataHash.insert("collectionName", data["collectionName"].toString());
     dataHash.insert("mainCategory", data["mainCategory"].toString());
     dataHash.insert("categories", data["categories"].toStringList().join(", "));
     dataHash.insert("percent", QString::number(data["percent"].toInt()));
diff --git a/src/eventmodel.cpp b/src/eventmodel.cpp
index 3a85ae1..54b436f 100644
--- a/src/eventmodel.cpp
+++ b/src/eventmodel.cpp
@@ -487,7 +487,7 @@ QMap<QString, QVariant> EventModel::eventDetails(const \
                Akonadi::Item &item, KCal
     Akonadi::Collection itemCollection = \
                m_collections.value(item.storageCollectionId());
     m_usedCollections.insert(itemCollection.name(), \
QString::number(itemCollection.id()));  values["resource"] = \
                itemCollection.resource();
-    values["resourceName"] = itemCollection.name();
+    values["collectionName"] = itemCollection.name();
     values["collectionId"] = QString::number(itemCollection.id());
     values["uid"] = event->uid();
     values["itemid"] = item.id();
@@ -540,7 +540,7 @@ QMap<QString, QVariant> EventModel::todoDetails(const \
                Akonadi::Item &item, KCalC
     Akonadi::Collection itemCollection = \
                m_collections.value(item.storageCollectionId());
     m_usedCollections.insert(itemCollection.name(), \
QString::number(itemCollection.id()));  values["resource"] = \
                itemCollection.resource();
-    values["resourceName"] = itemCollection.name();
+    values["collectionName"] = itemCollection.name();
     values["collectionId"] = QString::number(itemCollection.id());
     values["uid"] = todo->uid();
     values["itemid"] = item.id();
diff --git a/src/todoformatconfig.ui b/src/todoformatconfig.ui
index c7733cf..f09dfef 100644
--- a/src/todoformatconfig.ui
+++ b/src/todoformatconfig.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>599</width>
+    <width>709</width>
     <height>508</height>
    </rect>
   </property>
@@ -24,7 +24,7 @@
 Substitutions (again mostly self-explanatory) are:
 %{dueDate}, %{dueTime} - due date and time, %{startDate}, %{startTime} - start date \
and time,  %{summary} - summary, %{description} - description, %{percent} - finished \
                percent, %{location} - location,
-%{resourceName} - the i18n name of the Akonadi resource,
+%{collectionName} - the i18n name of the Akonadi collection (e.g. calendar),
 %{mainCategory}, %{categories} - the first or all categories,
 %{tab} - a tabulator</string>
         </property>


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