Andrej Mernik | 29 Jul 08:39 2014
Picon

branches/stable/l10n-kde4/sl/messages/kdepim-runtime

SVN commit 1394945 by mernik:

Translation update

 M  +34 -32    akonadi_serializer_plugins.po  

--- branches/stable/l10n-kde4/sl/messages/kdepim-runtime/akonadi_serializer_plugins.po #1394944:1394945
 <at>  <at>  -2,13 +2,14  <at>  <at> 
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Andrej Vernekar <andrej.vernekar <at> gmail.com>, 2012.
+# Andrej Mernik <andrejm <at> ubuntu.si>, 2014.
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
 "POT-Creation-Date: 2013-10-29 01:32+0000\n"
-"PO-Revision-Date: 2012-12-26 14:45+0100\n"
-"Last-Translator: Andrej Vernekar <andrej.vernekar <at> gmail.com>\n"
+"PO-Revision-Date: 2014-07-29 08:38+0200\n"
+"Last-Translator: Andrej Mernik <andrejm <at> ubuntu.si>\n"
 "Language-Team: Slovenian <lugos-slo <at> lugos.si>\n"
 "Language: sl\n"
 "MIME-Version: 1.0\n"
 <at>  <at>  -57,17 +58,17  <at>  <at> 
 #: akonadi_serializer_kalarm.cpp:142
 msgctxt " <at> title:column"
 msgid "Changed Alarm"
-msgstr "Spremenjen alarm"
+msgstr "Spremenjeno opozorilo"
(Continue reading)

Andrej Mernik | 29 Jul 08:39 2014
Picon

l10n-kde4/sl/messages/kdepim-runtime

SVN commit 1394944 by mernik:

Translation update

 M  +35 -32    akonadi_serializer_plugins.po  

--- trunk/l10n-kde4/sl/messages/kdepim-runtime/akonadi_serializer_plugins.po #1394943:1394944
 <at>  <at>  -2,13 +2,14  <at>  <at> 
 # This file is distributed under the same license as the PACKAGE package.
 #
 # Andrej Vernekar <andrej.vernekar <at> gmail.com>, 2012.
+# Andrej Mernik <andrejm <at> ubuntu.si>, 2014.
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
 "POT-Creation-Date: 2013-10-29 01:32+0000\n"
-"PO-Revision-Date: 2012-12-26 14:45+0100\n"
-"Last-Translator: Andrej Vernekar <andrej.vernekar <at> gmail.com>\n"
+"PO-Revision-Date: 2014-07-29 08:38+0200\n"
+"Last-Translator: Andrej Mernik <andrejm <at> ubuntu.si>\n"
 "Language-Team: Slovenian <lugos-slo <at> lugos.si>\n"
 "Language: sl\n"
 "MIME-Version: 1.0\n"
 <at>  <at>  -57,17 +58,17  <at>  <at> 
 #: akonadi_serializer_kalarm.cpp:142
 msgctxt " <at> title:column"
 msgid "Changed Alarm"
-msgstr "Spremenjen alarm"
+msgstr "Spremenjeno opozorilo"
(Continue reading)

Alexander Potashev | 29 Jul 08:23 2014
Picon

l10n-kf5/ru/messages/kde-workspace (silent)

SVN commit 1394943 by aspotashev:

SVN_SILENT Russian translation update

 M  +24 -36    desktop_workspace_plasma-desktop.po  
 M  +4 -5      desktop_workspace_plasma-workspace.po  
 M  +4 -2      kcm_search.po  

--- trunk/l10n-kf5/ru/messages/kde-workspace/desktop_workspace_plasma-desktop.po #1394942:1394943
 <at>  <at>  -8,7 +8,7  <at>  <at> 
 # Leonid Kanter <leon <at> asplinux.ru>, 2004, 2005.
 # Nick Shaforostoff <shafff <at> ukr.net>, 2006, 2009, 2010.
 # Andrey Cherepanov <skull <at> kde.ru>, 2005-2009, 2011.
-# Alexander Potashev <aspotashev <at> gmail.com>, 2009, 2010, 2011, 2012.
+# Alexander Potashev <aspotashev <at> gmail.com>, 2009, 2010, 2011, 2012, 2014.
 # Nick Shaforostoff <shaforostoff <at> kde.ru>, 2009, 2011.
 # Rinat Bikov <becase <at> altlinux.org>, 2011.
 # Yuri Efremov <yur.arh <at> gmail.com>, 2011, 2012, 2013.
 <at>  <at>  -19,9 +19,9  <at>  <at> 
 msgstr ""
 "Project-Id-Version: desktop_kdebase\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
-"POT-Creation-Date: 2014-07-28 08:01+0000\n"
-"PO-Revision-Date: 2013-11-12 22:26+0400\n"
-"Last-Translator: Yuri Efremov <yur.arh <at> gmail.com>\n"
+"POT-Creation-Date: 2014-07-17 08:36+0000\n"
+"PO-Revision-Date: 2014-07-29 10:10+0400\n"
+"Last-Translator: Alexander Potashev <aspotashev <at> gmail.com>\n"
 "Language-Team: Russian <kde-russian <at> lists.kde.ru>\n"
 "Language: ru\n"
(Continue reading)

Yuri Chornoivan | 29 Jul 08:17 2014
Picon

[kate] addons: Fix typos

Git commit 25feff85bfcb1860414d4b7a6eb30286345e3671 by Yuri Chornoivan.
Committed on 29/07/2014 at 06:17.
Pushed by yurchor into branch 'master'.

Fix typos

M  +1    -1    addons/filetree/katefiletree.cpp
M  +1    -1    addons/openheader/plugin_kateopenheader.cpp

http://commits.kde.org/kate/25feff85bfcb1860414d4b7a6eb30286345e3671

diff --git a/addons/filetree/katefiletree.cpp b/addons/filetree/katefiletree.cpp
index 544f595..9c0656a 100644
--- a/addons/filetree/katefiletree.cpp
+++ b/addons/filetree/katefiletree.cpp
 <at>  <at>  -569,7 +569,7  <at>  <at>  void KateFileTree::slotDocumentDelete()
   QUrl url = doc->url();

   bool go = (KMessageBox::warningContinueCancel(this,
-              i18n("Do you realy want to delete file \"%1\" from storage?", url.toDisplayString()),
+              i18n("Do you really want to delete file \"%1\" from storage?", url.toDisplayString()),
               i18n("Delete file?"),
               KStandardGuiItem::yes(), KStandardGuiItem::no(), QLatin1String("filetreedeletefile")
             ) == KMessageBox::Continue);
diff --git a/addons/openheader/plugin_kateopenheader.cpp b/addons/openheader/plugin_kateopenheader.cpp
index 2789a51..44bb3d7 100644
--- a/addons/openheader/plugin_kateopenheader.cpp
+++ b/addons/openheader/plugin_kateopenheader.cpp
 <at>  <at>  -223,7 +223,7  <at>  <at>  bool PluginViewKateOpenHeader::help(KTextEditor::View *view, const QString &cmd,
     msg = i18n("<p><b>toggle-header &mdash; switch between header and corresponding c/cpp file</b></p>"
(Continue reading)

Kevin Ottens | 29 Jul 08:05 2014
Picon

[zanshin] src/akonadi: Factor out the artifact deserialization code

Git commit 03a86a206da6acdd33ddd043e9db424f34306658 by Kevin Ottens.
Committed on 29/07/2014 at 05:43.
Pushed by ervin into branch 'master'.

Factor out the artifact deserialization code

Also attach the itemId property which got forgotten earlier. Should
really be moved in the serializer and properly tested.

M  +26   -27   src/akonadi/akonadiartifactqueries.cpp
M  +1    -0    src/akonadi/akonadiartifactqueries.h

http://commits.kde.org/zanshin/03a86a206da6acdd33ddd043e9db424f34306658

diff --git a/src/akonadi/akonadiartifactqueries.cpp b/src/akonadi/akonadiartifactqueries.cpp
index 79ac816..0e6bbe2 100644
--- a/src/akonadi/akonadiartifactqueries.cpp
+++ b/src/akonadi/akonadiartifactqueries.cpp
 <at>  <at>  -93,17 +93,9  <at>  <at>  ArtifactQueries::ArtifactResult::Ptr ArtifactQueries::findInboxTopLevel() const
                     if (!m_serializer->relatedUidFromItem(item).isEmpty())
                         continue;

-                    auto task = m_serializer->createTaskFromItem(item);
-                    if (task) {
-                        provider->append(task);
-                        continue;
-                    }
-
-                    auto note = m_serializer->createNoteFromItem(item);
-                    if (note) {
(Continue reading)

Kevin Ottens | 29 Jul 08:05 2014
Picon

[zanshin] /: Split QueryResult in input implementation and public implementation

Git commit 89d48794f850b918195e9915c635a6e0262e331a by Kevin Ottens.
Committed on 28/07/2014 at 13:10.
Pushed by ervin into branch 'master'.

Split QueryResult in input implementation and public implementation

This split makes clear the parts used by QueryResultProvider and the
ones used by client code of QueryResult. Also opens the door to
converting query results between different output type for a given input
type coming from the provider.

M  +76   -27   src/domain/queryresult.h
M  +24   -18   src/domain/queryresultprovider.h
M  +72   -1    tests/units/domain/queryresulttest.cpp

http://commits.kde.org/zanshin/89d48794f850b918195e9915c635a6e0262e331a

diff --git a/src/domain/queryresult.h b/src/domain/queryresult.h
index 7dc81b7..ba699ab 100644
--- a/src/domain/queryresult.h
+++ b/src/domain/queryresult.h
 <at>  <at>  -25,6 +25,7  <at>  <at> 
 #ifndef DOMAIN_QUERYRESULT_H
 #define DOMAIN_QUERYRESULT_H

+#include <algorithm>
 #include <functional>

 #include <QSharedPointer>
 <at>  <at>  -34,33 +35,17  <at>  <at>  namespace Domain {
(Continue reading)

Kevin Ottens | 29 Jul 08:05 2014
Picon

[zanshin] /: Implement InboxModel::centralListModel

Git commit 660cb682e4d86fce6af2d30ee869acfb6dfd6fde by Kevin Ottens.
Committed on 28/07/2014 at 18:42.
Pushed by ervin into branch 'master'.

Implement InboxModel::centralListModel

M  +84   -1    src/presentation/inboxmodel.cpp
M  +16   -1    src/presentation/inboxmodel.h
M  +9    -3    tests/features/step_definitions/main.cpp
M  +132  -8    tests/units/presentation/inboxmodeltest.cpp

http://commits.kde.org/zanshin/660cb682e4d86fce6af2d30ee869acfb6dfd6fde

diff --git a/src/presentation/inboxmodel.cpp b/src/presentation/inboxmodel.cpp
index 786c86f..19c52ca 100644
--- a/src/presentation/inboxmodel.cpp
+++ b/src/presentation/inboxmodel.cpp
 <at>  <at>  -24,30 +24,48  <at>  <at> 

 #include "inboxmodel.h"

+#include "domain/artifactqueries.h"
 #include "domain/noterepository.h"
+#include "domain/taskqueries.h"
 #include "domain/taskrepository.h"
+
+#include "presentation/querytreemodel.h"
+
 #include "utils/dependencymanager.h"

(Continue reading)

Kevin Ottens | 29 Jul 08:05 2014
Picon

[zanshin] /: Rename InboxModel to InboxPageModel

Git commit 7c59b3e3a473bb2516619b0d3dc4892a072ac734 by Kevin Ottens.
Committed on 29/07/2014 at 05:58.
Pushed by ervin into branch 'master'.

Rename InboxModel to InboxPageModel

M  +2    -2    src/app/main.cpp
M  +1    -1    src/presentation/CMakeLists.txt
R  +10   -10   src/presentation/inboxpagemodel.cpp [from: src/presentation/inboxmodel.cpp - 091% similarity]
R  +7    -7    src/presentation/inboxpagemodel.h [from: src/presentation/inboxmodel.h - 090% similarity]
M  +2    -0    src/widgets/pageview.cpp
M  +2    -2    tests/features/step_definitions/main.cpp
M  +1    -1    tests/units/presentation/CMakeLists.txt
R  +13   -13   tests/units/presentation/inboxpagemodeltest.cpp [from:
tests/units/presentation/inboxmodeltest.cpp - 097% similarity]
M  +2    -0    tests/units/widgets/pageviewtest.cpp

http://commits.kde.org/zanshin/7c59b3e3a473bb2516619b0d3dc4892a072ac734

diff --git a/src/app/main.cpp b/src/app/main.cpp
index 77c5a5c..2697843 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
 <at>  <at>  -23,7 +23,7  <at>  <at> 

 #include <QApplication>

-#include "presentation/inboxmodel.h"
+#include "presentation/inboxpagemodel.h"
 #include "utils/dependencymanager.h"
(Continue reading)

Kevin Ottens | 29 Jul 08:05 2014
Picon

[zanshin] /: Move QueryResult creation in QueryResult itself

Git commit 43cfb4b61dfaa4bc68fa4725572ffa5b33cf32bd by Kevin Ottens.
Committed on 28/07/2014 at 09:10.
Pushed by ervin into branch 'master'.

Move QueryResult creation in QueryResult itself

M  +1    -1    src/akonadi/akonadiartifactqueries.cpp
M  +3    -3    src/akonadi/akonadicontextqueries.cpp
M  +2    -2    src/akonadi/akonadidatasourcequeries.cpp
M  +2    -2    src/akonadi/akonadinotequeries.cpp
M  +5    -5    src/akonadi/akonaditaskqueries.cpp
M  +7    -0    src/domain/queryresult.h
M  +1    -7    src/domain/queryresultprovider.h
M  +8    -8    tests/units/domain/queryresulttest.cpp
M  +8    -8    tests/units/presentation/inboxmodeltest.cpp
M  +6    -6    tests/units/presentation/tasklistmodeltest.cpp
M  +21   -21   tests/units/presentation/tasktreemodeltest.cpp

http://commits.kde.org/zanshin/43cfb4b61dfaa4bc68fa4725572ffa5b33cf32bd

diff --git a/src/akonadi/akonadiartifactqueries.cpp b/src/akonadi/akonadiartifactqueries.cpp
index 9f991d5..79ac816 100644
--- a/src/akonadi/akonadiartifactqueries.cpp
+++ b/src/akonadi/akonadiartifactqueries.cpp
 <at>  <at>  -74,7 +74,7  <at>  <at>  ArtifactQueries::ArtifactResult::Ptr ArtifactQueries::findInboxTopLevel() const
         m_inboxProvider = provider.toWeakRef();
     }

-    ArtifactQueries::ArtifactResult::Ptr result = ArtifactProvider::createResult(provider);
+    ArtifactResult::Ptr result = ArtifactResult::create(provider);
(Continue reading)

Montel Laurent | 29 Jul 08:12 2014
Picon

[kdepimlibs/frameworks] kabc/src: Port

Git commit 6efe6db4decc93401ed3663e7c95080aca65a4cd by Montel Laurent.
Committed on 29/07/2014 at 06:12.
Pushed by mlaurent into branch 'frameworks'.

Port

M  +1    -4    kabc/src/vcarddrag.cpp

http://commits.kde.org/kdepimlibs/6efe6db4decc93401ed3663e7c95080aca65a4cd

diff --git a/kabc/src/vcarddrag.cpp b/kabc/src/vcarddrag.cpp
index 3cc6135..5223265 100644
--- a/kabc/src/vcarddrag.cpp
+++ b/kabc/src/vcarddrag.cpp
 <at>  <at>  -36,18 +36,15  <at>  <at>  static QString findCompatibleMimeType( const QMimeData *md )
     return KABC::Addressee::mimeType();
   }

-#if 0
-  Qt5  Port.
   const QStringList mimeTypeOffers = md->formats();
   Q_FOREACH ( const QString &mimeType, mimeTypeOffers ) {
     const KMimeType::Ptr mimeTypePtr = KMimeType::mimeType( mimeType, KMimeType::ResolveAliases );
-    if ( !mimeTypePtr.isNull() ) {
+    if ( mimeTypePtr ) {
       if ( mimeTypePtr->is( KABC::Addressee::mimeType() ) ) {
         return mimeType;
       }
     }
   }
(Continue reading)

Kevin Ottens | 29 Jul 08:05 2014
Picon

[zanshin] /: Make QueryTreeModel templated

Git commit 241be9188ea295d4a6b8aafc5b9752bb28f32d4b by Kevin Ottens.
Committed on 28/07/2014 at 14:22.
Pushed by ervin into branch 'master'.

Make QueryTreeModel templated

Splitting QueryTreeModel in QueryTreeModelBase (which uses NodeBase)
and QueryTreeModel<T> (which uses Node<T>). This way we have a generic
model we can use to mix queries and create trees from them.

M  +13   -14   src/presentation/querytreemodel.cpp
M  +40   -29   src/presentation/querytreemodel.h
M  +1    -1    tests/manual/tasktreeviewer.cpp
M  +7    -7    tests/units/presentation/querytreemodeltest.cpp

http://commits.kde.org/zanshin/241be9188ea295d4a6b8aafc5b9752bb28f32d4b

diff --git a/src/presentation/querytreemodel.cpp b/src/presentation/querytreemodel.cpp
index 08e223b..9e5ae04 100644
--- a/src/presentation/querytreemodel.cpp
+++ b/src/presentation/querytreemodel.cpp
 <at>  <at>  -33,7 +33,7  <at>  <at> 

 using namespace Presentation;

-QueryTreeNodeBase::QueryTreeNodeBase(QueryTreeNodeBase *parent, QueryTreeModel *model)
+QueryTreeNodeBase::QueryTreeNodeBase(QueryTreeNodeBase *parent, QueryTreeModelBase *model)
     : m_parent(parent),
       m_model(model)
 {
(Continue reading)


Gmane