Marco Martin | 3 Mar 15:23 2015
Picon

[kdeplasma-addons/mart/comicAppletKF5] applets/comic/package/contents/ui: enable apply button on change

Git commit 7dab0ebd9cd13fb68c97b011e90ff09612334373 by Marco Martin.
Committed on 03/03/2015 at 14:23.
Pushed by mart into branch 'mart/comicAppletKF5'.

enable apply button on change

M  +4    -0    applets/comic/package/contents/ui/configAdvanced.qml
M  +6    -0    applets/comic/package/contents/ui/configAppearance.qml
M  +6    -0    applets/comic/package/contents/ui/configGeneral.qml

http://commits.kde.org/kdeplasma-addons/7dab0ebd9cd13fb68c97b011e90ff09612334373

diff --git a/applets/comic/package/contents/ui/configAdvanced.qml b/applets/comic/package/contents/ui/configAdvanced.qml
index e7e653b..170fe38 100644
--- a/applets/comic/package/contents/ui/configAdvanced.qml
+++ b/applets/comic/package/contents/ui/configAdvanced.qml
 <at>  <at>  -28,6 +28,8  <at>  <at>  Item {
     width: childrenRect.width
     height: childrenRect.height

+    signal configurationChanged
+
     function saveConfig() {
         plasmoid.nativeInterface.showErrorPicture = showErrorPicture.checked;
         plasmoid.nativeInterface.maxComicLimit = maxComicLimit.value;
 <at>  <at>  -61,6 +63,7  <at>  <at>  Item {
                     Layouts.Layout.minimumWidth: units.gridUnit * 8
                     suffix: " "+i18n("strips per comic")
                     stepSize: 1
+                    onValueChanged: root.configurationChanged();
(Continue reading)

Andrea Iacovitti | 3 Mar 15:20 2015
Picon

[kdelibs/KDE/4.14] kdecore/localization: Add &dollar;

Git commit 0dc2ca34ba830dda4da87c3d5db9cc0cb2b206e4 by Andrea Iacovitti.
Committed on 03/03/2015 at 14:17.
Pushed by aiacovitti into branch 'KDE/4.14'.

Add &dollar;
BUG: 344633

M  +597  -571  kdecore/localization/kentities.c
M  +2    -1    kdecore/localization/kentities.gperf

http://commits.kde.org/kdelibs/0dc2ca34ba830dda4da87c3d5db9cc0cb2b206e4

diff --git a/kdecore/localization/kentities.c b/kdecore/localization/kentities.c
index 3f067ab..8c18351 100644
--- a/kdecore/localization/kentities.c
+++ b/kdecore/localization/kentities.c
 <at>  <at>  -1,4 +1,4  <at>  <at> 
-/* ANSI-C code produced by gperf version 3.0.1 */
+/* ANSI-C code produced by gperf version 3.0.3 */
 /* Command-line: gperf -a -L ANSI-C -E -C -c -o -t -k '*' -Nkde_findEntity -D -Hhash_Entity
-Wwordlist_Entity -s 2 kentities.gperf  */

 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
 <at>  <at>  -25,7 +25,7  <at>  <at> 
       && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
       && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
 /* The character set is not based on ISO-646.  */
-#error "gperf generated tables do not work with this execution character set. Please report a bug to <bug-gnu-gperf <at> gnu.org>."
+#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf <at> gnu.org>."
 #endif
(Continue reading)

Allan Anderson | 3 Mar 15:04 2015
Picon

[kmymoney] kmymoney/plugins/csvimport: BUG:343757

Git commit 8706b8724878258f11de713eff2422a2249c2a63 by Allan Anderson.
Committed on 06/02/2015 at 17:43.
Pushed by allananderson into branch 'master'.

BUG:343757
Fix crash when importing CSV investment file

M  +1    -1    kmymoney/plugins/csvimport/csvdialog.cpp
M  +0    -0    kmymoney/plugins/csvimport/csvdialog.h
M  +31   -10   kmymoney/plugins/csvimport/investprocessing.cpp
M  +2    -0    kmymoney/plugins/csvimport/redefinedlg.cpp

http://commits.kde.org/kmymoney/8706b8724878258f11de713eff2422a2249c2a63

diff --git a/kmymoney/plugins/csvimport/csvdialog.cpp b/kmymoney/plugins/csvimport/csvdialog.cpp
old mode 100644
new mode 100755
index 00fcd9d..70a62dc
--- a/kmymoney/plugins/csvimport/csvdialog.cpp
+++ b/kmymoney/plugins/csvimport/csvdialog.cpp
 <at>  <at>  -3779,7 +3779,7  <at>  <at>  bool LinesDatePage::validatePage()
   }

   int symTableRow = -1;
-  if ((m_dlg->m_fileType == "Banking") || (field("symbolCol").toInt() == -1)) {  //  Only check symbols if
that field is set, and not Banking.
+  if ((m_dlg->m_fileType == "Banking") || (field("symbolCol").toInt() == -1)) {  //  Don't check symbols
if field("symbolCol") not set, or if Banking.
     if ((m_dlg->m_pageIntro->ui->checkBoxSkipSetup->isChecked())) {
       if (m_dlg->m_importError) {
(Continue reading)

Allan Anderson | 3 Mar 15:04 2015
Picon

[kmymoney] kmymoney/plugins/csvimport: BUG:343757

Git commit a5cebcd383b6e4a1b30418a296ac0cd879b31395 by Allan Anderson.
Committed on 06/02/2015 at 17:43.
Pushed by allananderson into branch 'master'.

BUG:343757
Fix crash when importing CSV investment file after editing settings.

M  +4    -2    kmymoney/plugins/csvimport/investprocessing.cpp

http://commits.kde.org/kmymoney/a5cebcd383b6e4a1b30418a296ac0cd879b31395

diff --git a/kmymoney/plugins/csvimport/investprocessing.cpp b/kmymoney/plugins/csvimport/investprocessing.cpp
index 590036e..e236c27 100755
--- a/kmymoney/plugins/csvimport/investprocessing.cpp
+++ b/kmymoney/plugins/csvimport/investprocessing.cpp
 <at>  <at>  -711,7 +711,8  <at>  <at>  void InvestProcessing::symbolColumnSelected(int col)
 {
   QString type = "symbol";
   m_symbolColumn = col;
-  if (col < 0) {      //                              it is unset
+  if (col < 0) {
+    //  it is not set so remove any prior settings
     int indx = m_columnTypeList.indexOf(type);
     m_symbolSelected = false;
     if (indx > -1) {
 <at>  <at>  -747,7 +748,8  <at>  <at>  void InvestProcessing::detailColumnSelected(int col)
 {
   QString type = "detail";
   m_detailColumn = col;
-  if (col < 0) {      //                              it is unset
(Continue reading)

Aleix Pol | 3 Mar 14:51 2015
Picon

[ktp-common-internals] KTp/Declarative: --verbosity

Git commit 054a481f2530ffd87fbbfde8c20a9f4f57902d41 by Aleix Pol.
Committed on 03/03/2015 at 13:49.
Pushed by apol into branch 'master'.

--verbosity

Use qCWarning for warnings
Remove debugs as we probably don't want our conversations in
.xsession-errors anyway.

M  +1    -19   KTp/Declarative/messages-model.cpp

http://commits.kde.org/telepathy-common-internals/054a481f2530ffd87fbbfde8c20a9f4f57902d41

diff --git a/KTp/Declarative/messages-model.cpp b/KTp/Declarative/messages-model.cpp
index 61cae16..dc1088c 100644
--- a/KTp/Declarative/messages-model.cpp
+++ b/KTp/Declarative/messages-model.cpp
 <at>  <at>  -67,8 +67,6  <at>  <at>  MessagesModel::MessagesModel(const Tp::AccountPtr &account, QObject *parent) :
         QAbstractListModel(parent),
         d(new MessagesModelPrivate)
 {
-    qCDebug(KTP_DECLARATIVE);
-
     d->account = account;
     d->visible = false;

 <at>  <at>  -129,7 +127,6  <at>  <at>  void MessagesModel::setupChannelSignals(const Tp::TextChannelPtr &channel)
 void MessagesModel::setTextChannel(const Tp::TextChannelPtr &channel)
 {
(Continue reading)

Aleix Pol | 3 Mar 14:47 2015
Picon

[ktp-common-internals] KTp/Declarative: Don't crash if the ConversationsModel has been disabled

Git commit 6a17d395aac68b3afa7056131187d98c0ebb89fd by Aleix Pol.
Committed on 03/03/2015 at 13:41.
Pushed by apol into branch 'master'.

Don't crash if the ConversationsModel has been disabled

If there's no ConversationsModel, then it's not chatting already.

M  +1    -1    KTp/Declarative/pinned-contacts-model.cpp

http://commits.kde.org/telepathy-common-internals/6a17d395aac68b3afa7056131187d98c0ebb89fd

diff --git a/KTp/Declarative/pinned-contacts-model.cpp b/KTp/Declarative/pinned-contacts-model.cpp
index e2bef5a..8ef21a1 100644
--- a/KTp/Declarative/pinned-contacts-model.cpp
+++ b/KTp/Declarative/pinned-contacts-model.cpp
 <at>  <at>  -146,7 +146,7  <at>  <at>  QVariant PinnedContactsModel::data(const QModelIndex &index, int role) const
         case AccountRole:
             return QVariant::fromValue<Tp::AccountPtr>(p->account());
         case AlreadyChattingRole: {
-            if (!p->contact()) {
+            if (!p->contact() || !d->conversations) {
                 return false;
             }
             bool found = false;

Aleix Pol | 3 Mar 14:46 2015
Picon

[ktp-desktop-applets] chat/org.kde.ktp-chat/contents/ui: Clean up the pinned contact button

Git commit 5ea2c285a695c4471ae3bc28e043ac4244f3cb16 by Aleix Pol.
Committed on 03/03/2015 at 13:43.
Pushed by apol into branch 'master'.

Clean up the pinned contact button

Remove the presence icon on the overlay, Breeze theme looks terrible there
as it's not solid.
Use the Tooltip for displaying presence information.

M  +3    -5    chat/org.kde.ktp-chat/contents/ui/FullChatList.qml

http://commits.kde.org/telepathy-contact-applet/5ea2c285a695c4471ae3bc28e043ac4244f3cb16

diff --git a/chat/org.kde.ktp-chat/contents/ui/FullChatList.qml b/chat/org.kde.ktp-chat/contents/ui/FullChatList.qml
index b8763d7..db6d420 100644
--- a/chat/org.kde.ktp-chat/contents/ui/FullChatList.qml
+++ b/chat/org.kde.ktp-chat/contents/ui/FullChatList.qml
 <at>  <at>  -95,11 +95,9  <at>  <at>  Grid {
                 telepathyManager.startChat(account, contact, "org.freedesktop.Telepathy.Client.KTp.chatPlasmoid")
             }
             avatar: decoration
-            overlay: ExtraComponents.QIconItem {
-                    anchors.fill: parent
-                    anchors.margins: parent.width/3
-                    icon: presenceIcon
-                }
+            title: display
+            overlay: PlasmaCore.IconItem { source: "rating" }
+            presenceIcon: model.presenceIcon
(Continue reading)

Lukáš Tinkl | 3 Mar 14:36 2015
Picon

[kwalletmanager/frameworks] /: use ecm_add_app_icon

Git commit b050fc44c1fe40f7f784e71f2f0a91113b4361cf by Lukáš Tinkl.
Committed on 03/03/2015 at 13:35.
Pushed by lukas into branch 'frameworks'.

use ecm_add_app_icon

M  +2    -2    CMakeLists.txt
M  +4    -4    src/manager/CMakeLists.txt

http://commits.kde.org/kwallet/b050fc44c1fe40f7f784e71f2f0a91113b4361cf

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 51b119b..ef0c20d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
 <at>  <at>  -2,7 +2,7  <at>  <at>  project(kwalletmanager5)

 cmake_minimum_required(VERSION 2.8.12)

-find_package(ECM 1.2.0 REQUIRED NO_MODULE)
+find_package(ECM 1.7.0 REQUIRED NO_MODULE)

 set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})

 <at>  <at>  -13,6 +13,7  <at>  <at>  include(KDECMakeSettings)
 include(KDECompilerSettings)
 include(FeatureSummary)
 include(ECMInstallIcons)
+include(ECMAddAppIcon)

(Continue reading)

Axel Rousseau | 3 Mar 14:34 2015

l10n-kde4/eo/messages/extragear-graphics

SVN commit 1416926 by axel584:

komencis labori sur tiu dosiero

 M  +41 -47    digikam.po  

--- trunk/l10n-kde4/eo/messages/extragear-graphics/digikam.po #1416925:1416926
 <at>  <at>  -6,15 +6,15  <at>  <at> 
 "Project-Id-Version: digikam\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org\n"
 "POT-Creation-Date: 2015-02-24 02:11+0000\n"
-"PO-Revision-Date: 2009-11-15 12:06+0100\n"
+"PO-Revision-Date: 2015-03-03 14:36+0100\n"
 "Last-Translator: Axel Rousseau <axel <at> esperanto-jeunes.org>\n"
 "Language-Team: esperanto <kde-i18n-eo <at> kde.org>\n"
-"Language: \n"
+"Language: eo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: pology\n"
+"X-Generator: Poedit 1.7.4\n"

 msgctxt "NAME OF TRANSLATORS"
 msgid "Your names"
 <at>  <at>  -29,10 +29,8  <at>  <at> 
 #: app/views/leftsidebarwidgets.cpp:172 libs/models/albummodel.cpp:48
 #: utilities/kipiiface/kipiimagecollection.cpp:306
 #: utilities/kipiiface/kipiimagecollectionselector.cpp:227
(Continue reading)

Aleix Pol | 3 Mar 14:31 2015
Picon

[kdoctools] src: Fix kdoctools_encode_uri() cmake macro call

Git commit 05ca8f40ffaf4113a72e0a75e16836964a230f9d by Aleix Pol.
Committed on 03/03/2015 at 13:28.
Pushed by apol into branch 'master'.

Fix kdoctools_encode_uri() cmake macro call

It takes a variable reference rather than a value, so it can provide
some output.

REVIEW: 122788

M  +1    -1    src/CMakeLists.txt

http://commits.kde.org/kdoctools/05ca8f40ffaf4113a72e0a75e16836964a230f9d

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 468e450..e3868fc 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
 <at>  <at>  -1,7 +1,7  <at>  <at> 
 include_directories( ${LIBXML2_INCLUDE_DIR} ${LIBXSLT_INCLUDE_DIR} )

 include(uriencode)
-kdoctools_encode_uri(${DocBookXML4_DTD_DIR})
+kdoctools_encode_uri(DocBookXML4_DTD_DIR)
 set (_custom_dtd_kdex "customization/dtd/kdedbx45.dtd")
 configure_file(${_custom_dtd_kdex}.cmake ${CMAKE_CURRENT_BINARY_DIR}/${_custom_dtd_kdex} )
 # WARNING: this is due to severe limitations on the windows platform to keep the dtd relocateable

(Continue reading)

Chao Feng | 3 Mar 14:30 2015
Picon

l10n-kf5/zh_CN/messages

SVN commit 1416924 by fengchao:

Fix translation error in tp check.

 M  +3 -3      applications/pate.po  
 M  +1 -1      kde-workspace/desktop_workspace_kdeplasma-addons.po  
 M  +8 -7      kde-workspace/desktop_workspace_muon.po  
 M  +1 -1      kde-workspace/desktop_workspace_oxygen.po  
 M  +2 -2      kde-workspace/desktop_workspace_plasma-desktop.po  
 M  +1 -1      kde-workspace/desktop_workspace_plasma-workspace.po  

--- trunk/l10n-kf5/zh_CN/messages/applications/pate.po #1416923:1416924
 <at>  <at>  -65,7 +65,7  <at>  <at> 
 "<p>Specified version has invalid format for dependency <application>%1</"
 "application>: <icode>%2</icode>. Skipped</p>"
 msgstr ""
-"<p>指定版本的依赖格式不正确 <application>%1</application>: <icode>%2<icode>。"
+"<p>指定版本的依赖格式不正确 <application>%1</application>: <icode>%2</icode>。"
 "已跳过</p>"

 #: src/engine.cpp:557
 <at>  <at>  -122,7 +122,7  <at>  <at> 
 #: src/kate/decorators.py:223
 msgctxt " <at> title:window"
 msgid "Error in action <icode>%1</icode>"
-msgstr "动作 <icode>%1<icode> 出错"
+msgstr "动作 <icode>%1</icode> 出错"

 #: src/kate/decorators.py:310
 msgctxt " <at> info:tooltip"
(Continue reading)


Gmane