Burkhard Lück | 27 May 10:20 2016
Picon

[kmplot] /: Merge remote-tracking branch 'origin/Applications/16.04'

Git commit ba7e0b91cd06aff1809989093752d974e1ee6652 by Burkhard Lück.
Committed on 27/05/2016 at 08:20.
Pushed by lueck into branch 'master'.

Merge remote-tracking branch 'origin/Applications/16.04'

http://commits.kde.org/kmplot/ba7e0b91cd06aff1809989093752d974e1ee6652

Burkhard Lück | 27 May 10:18 2016
Picon

[kmplot/Applications/16.04] /: add missing dbus service to kmplot

Git commit d75eb33b078c967ce7d613e838b70ce6051717a0 by Burkhard Lück.
Committed on 27/05/2016 at 08:18.
Pushed by lueck into branch 'Applications/16.04'.

add missing dbus service to kmplot
REVIEW:128028

M  +1    -0    CMakeLists.txt
M  +1    -1    kmplot/CMakeLists.txt
M  +2    -1    kmplot/main.cpp

http://commits.kde.org/kmplot/d75eb33b078c967ce7d613e838b70ce6051717a0

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 769edae..5ef1290 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
 <at>  <at>  -22,6 +22,7  <at>  <at>  find_package (KF5 REQUIRED
     WidgetsAddons
     DocTools
     KDELibs4Support
+    DBusAddons
 )

 include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
diff --git a/kmplot/CMakeLists.txt b/kmplot/CMakeLists.txt
index 2e11803..fb87d0a 100644
--- a/kmplot/CMakeLists.txt
+++ b/kmplot/CMakeLists.txt
 <at>  <at>  -78,7 +78,7  <at>  <at>  ecm_add_app_icon(kmplot_SRCS ICONS ${ICONS_SRCS})
(Continue reading)

Ben Cooksley | 27 May 10:11 2016
Picon

[sysadmin/dns] zones: Prepare for serenity to be leaving us

Git commit 465ce65b6597651e0a006b62a59a8f391ad4c337 by Ben Cooksley.
Committed on 27/05/2016 at 08:11.
Pushed by bcooksley into branch 'master'.

Prepare for serenity to be leaving us

M  +4    -4    zones/local-kde.org.zone

http://commits.kde.org/sysadmin/dns/465ce65b6597651e0a006b62a59a8f391ad4c337

diff --git a/zones/local-kde.org.zone b/zones/local-kde.org.zone
index da01bf5..3e9f00f 100644
--- a/zones/local-kde.org.zone
+++ b/zones/local-kde.org.zone
 <at>  <at>  -1,6 +1,6  <at>  <at> 
 $TTL 60
  <at>                IN      SOA     ns1.kde.org. sysadmin.kde.org. (
-                2016051401 10800 3600 2419200 86400 )
+                2016052701 10800 3600 2419200 86400 )
                 IN      NS      ns1.kde.org.

 ; These two entries are needed for the conversion from geoscaling to our setup.
 <at>  <at>  -9,14 +9,14  <at>  <at>  anongit		IN	CNAME	eu.git.anonscm
 anonsvn		IN	CNAME   eu.svn.anonscm

 ; Define the servers which are active. 
-;; git.anonscm: serenity,mason
-;; svn.anonscm: serenity
+;; git.anonscm: mason
+;; svn.anonscm: scm
(Continue reading)

Boudewijn Rempt | 27 May 09:52 2016

[krita] libs/ui: Fix theming on OSX

Git commit dae7a71669cfb9ae8dd8c400581aab69db1356a1 by Boudewijn Rempt.
Committed on 27/05/2016 at 07:51.
Pushed by rempt into branch 'master'.

Fix theming on OSX

M  +1    -4    libs/ui/thememanager.cpp

http://commits.kde.org/krita/dae7a71669cfb9ae8dd8c400581aab69db1356a1

diff --git a/libs/ui/thememanager.cpp b/libs/ui/thememanager.cpp
index 2468d8a..2917171 100644
--- a/libs/ui/thememanager.cpp
+++ b/libs/ui/thememanager.cpp
 <at>  <at>  -188,11 +188,8  <at>  <at>  void ThemeManager::slotChangePalette()
     //qDebug() << ">>>>>>>>>>>>>>>>>> going to set palette on app" << theme;
     qApp->setPalette(palette);

-    QColor background = qApp->palette().background().color();
-    bool isLight = background.value() < 100;
-
 #ifdef Q_OS_MAC
-    if (isLight || theme.isEmpty()) {
+    if (theme == "Krita bright" || theme.isEmpty()) {
         qApp->setStyle("Macintosh");
         qApp->style()->polish(qApp);
     } else {

Dominik Haumann | 27 May 09:45 2016
Picon

[ktexteditor/multicursor] src: Merge branch 'master' into multicursor

Git commit 5d45fec22f4055a4065e9a794d5cfb1dcf257db1 by Dominik Haumann.
Committed on 27/05/2016 at 07:45.
Pushed by dhaumann into branch 'multicursor'.

Merge branch 'master' into multicursor

Resolved conflicts:
- src/document/katedocument.cpp
- src/undo/kateundomanager.cpp
- src/undo/kateundomanager.h
- src/view/kateview.cpp

M  +54   -63   src/document/katedocument.cpp
M  +1    -1    src/render/katerenderer.cpp
M  +2    -2    src/swapfile/kateswapfile.cpp
M  +3    -3    src/undo/kateundomanager.cpp
M  +34   -34   src/utils/kateglobal.cpp
M  +165  -146  src/view/kateview.cpp
M  +3    -0    src/view/kateview.h
M  +51   -34   src/view/kateviewhelpers.cpp
M  +2    -2    src/view/kateviewinternal.cpp
M  +2    -2    src/vimode/inputmodemanager.cpp
M  +8    -8    src/vimode/modes/modebase.cpp

http://commits.kde.org/ktexteditor/5d45fec22f4055a4065e9a794d5cfb1dcf257db1

diff --cc src/document/katedocument.cpp
index a53545c,4192647..83e5256
--- a/src/document/katedocument.cpp
+++ b/src/document/katedocument.cpp
(Continue reading)

Ben Cooksley | 27 May 09:41 2016
Picon

[kde-build-metadata] /: Restore Gwenview's dependency on Baloo

Git commit c15958a01e0ec8457d92ab50205d73d7817a9b21 by Ben Cooksley.
Committed on 27/05/2016 at 07:40.
Pushed by bcooksley into branch 'master'.

Restore Gwenview's dependency on Baloo

M  +1    -1    dependency-data

http://commits.kde.org/kde-build-metadata/c15958a01e0ec8457d92ab50205d73d7817a9b21

diff --git a/dependency-data b/dependency-data
index 720d815..4a9ce6c 100644
--- a/dependency-data
+++ b/dependency-data
 <at>  <at>  -152,7 +152,7  <at>  <at>  kde/kdegames/picmi: kde/kdegames/libkdegames
 kde/kdegraphics/ksaneplugin: kde/kdegraphics/libs/libksane
 kde/kdegraphics/kdegraphics-thumbnailers: kde/kdegraphics/libs/libkexiv2
 kde/kdegraphics/kdegraphics-thumbnailers: kde/kdegraphics/libs/libkdcraw
-#kde/kdegraphics/gwenview: frameworks/baloo
+kde/kdegraphics/gwenview: frameworks/baloo
 kde/kdegraphics/gwenview: kde/applications/kde-baseapps
 kde/kdegraphics/gwenview: kde/kdegraphics/libs/libkexiv2
 kde/kdegraphics/gwenview: kde/kdegraphics/libs/libkipi

Dominik Haumann | 27 May 09:32 2016
Picon

[ktexteditor] src/undo: KateUndoManager::setUndoRedoCursorOfLastGroup(): pass Cursor as const reference

Git commit 58b96201af1e3642e936015e72c057dca3933034 by Dominik Haumann.
Committed on 27/05/2016 at 07:32.
Pushed by dhaumann into branch 'master'.

KateUndoManager::setUndoRedoCursorOfLastGroup(): pass Cursor as const reference

M  +2    -2    src/undo/kateundomanager.cpp
M  +2    -2    src/undo/kateundomanager.h

http://commits.kde.org/ktexteditor/58b96201af1e3642e936015e72c057dca3933034

diff --git a/src/undo/kateundomanager.cpp b/src/undo/kateundomanager.cpp
index 05a6e9b..5f5ecec 100644
--- a/src/undo/kateundomanager.cpp
+++ b/src/undo/kateundomanager.cpp
 <at>  <at>  -420,8 +420,8  <at>  <at>  void KateUndoManager::updateLineModifications()
     }
 }

-void KateUndoManager::setUndoRedoCursorsOfLastGroup(const KTextEditor::Cursor undoCursor,
-        const KTextEditor::Cursor redoCursor)
+void KateUndoManager::setUndoRedoCursorsOfLastGroup(const KTextEditor::Cursor &undoCursor,
+                                                    const KTextEditor::Cursor &redoCursor)
 {
     Q_ASSERT(m_editCurrentUndo == 0);
     if (!undoItems.isEmpty()) {
diff --git a/src/undo/kateundomanager.h b/src/undo/kateundomanager.h
index 94a7600..cc7795a 100644
--- a/src/undo/kateundomanager.h
+++ b/src/undo/kateundomanager.h
(Continue reading)

Chusslove Illich | 27 May 09:26 2016
Picon
Picon

l10n-support/templates/summit

SVN commit 1460719 by ilic:

Summit gather.

 M  +116 -102  docmessages/applications/kate.pot  
 M  +17 -3     docmessages/applications/kwrite.pot  
 M  +58 -548   docmessages/extragear-sdk/kdesvn_man-kdesvn.1.pot  
 M  +33 -530   docmessages/extragear-sdk/kdesvn_man-kdesvnaskpass.1.pot  
 M  +860 -860  docmessages/extragear-utils/kdesrc-build.pot  
 M  +45 -38    docmessages/extragear-utils/kdesrc-build_man-kdesrc-build-setup.1.pot  
 M  +188 -181  docmessages/extragear-utils/kdesrc-build_man-kdesrc-build.1.pot  
 M  +43 -43    messages/applications/katesearch.pot  
 M  +8 -8      messages/calligra/calligra.pot  
 M  +71 -71    messages/calligra/kocolorspaces.pot  
 M  +198 -198  messages/calligra/krita.pot  
 M  +41 -60    messages/extragear-edu/labplot2.pot  
 M  +20 -1     messages/extragear-kdevelop/kdevplatform.pot  
 M  +7 -7      messages/extragear-network/kdeconnect-kde.desktop.pot  
 M  +34 -4     messages/extragear-network/kdeconnect-kde.json.pot  
 M  +89 -88    messages/extragear-network/kdeconnect-plugins.pot  
 M  +19 -4     messages/extragear-network/plasma_applet_org.kde.kdeconnect.pot  
 M  +22 -22    messages/extragear-office/kbibtex.pot  
 M  +163 -121  messages/extragear-pim/trojita_common.pot  
 M  +22 -22    messages/frameworks/kxmlgui5.pot  
 M  +10 -10    messages/kde-workspace/libdiscover.pot  
 M  +3 -3      messages/kde-workspace/plasma_applet_org.kde.plasma.digitalclock.pot  
 M  +351 -338  messages/kdemultimedia/kdenlive.pot  
 M  +2 -2      messages/kdepim/kdepim.desktop.pot  
 M  +27 -27    messages/kdepimlibs/akonadicontact5.pot  
 M  +1456 -1459 messages/pim/libmessageviewer.pot  
(Continue reading)

Boudewijn Rempt | 27 May 08:59 2016

[krita] libs/koplugin: BUG:363566 Fix the mimetype for workspace and add one for tasksets

Git commit 853faece7d1979c2ca8a8434cbc9e26699f2b586 by Boudewijn Rempt.
Committed on 27/05/2016 at 06:59.
Pushed by rempt into branch 'master'.

BUG:363566 Fix the mimetype for workspace and add one for tasksets

M  +6    -0    libs/koplugin/KisMimeDatabase.cpp

http://commits.kde.org/krita/853faece7d1979c2ca8a8434cbc9e26699f2b586

diff --git a/libs/koplugin/KisMimeDatabase.cpp b/libs/koplugin/KisMimeDatabase.cpp
index 3420727..72eb8f1 100644
--- a/libs/koplugin/KisMimeDatabase.cpp
+++ b/libs/koplugin/KisMimeDatabase.cpp
 <at>  <at>  -238,9 +238,15  <at>  <at>  void KisMimeDatabase::fillMimeData()

         mimeType.mimeType = "application/x-krita-workspace";
         mimeType.description = i18nc("description of a file type", "Krita Workspace");
+        mimeType.suffixes = QStringList() << "*.kws";
+        s_mimeDatabase << mimeType;
+
+        mimeType.mimeType = "application/x-krita-taskset";
+        mimeType.description = i18nc("description of a file type", "Krita Taskset");
         mimeType.suffixes = QStringList() << "*.kts";
         s_mimeDatabase << mimeType;

+
         mimeType.mimeType = "image/x-krita-raw";
         mimeType.description = i18nc("description of a file type", "Camera Raw Files");
         mimeType.suffixes = QStringList() << "*.nef" << "*.cr2" << "*.sr2" << "*.crw" << "*.pef" << "*.x3f" <<
(Continue reading)

Boudewijn Rempt | 27 May 08:58 2016

[krita] libs/ui: BUG:363565 Don't reset the theme to default

Git commit 2387604848de833d648f25d949ca92273e7a09eb by Boudewijn Rempt.
Committed on 27/05/2016 at 06:56.
Pushed by rempt into branch 'master'.

BUG:363565 Don't reset the theme to default

M  +24   -79   libs/ui/thememanager.cpp
M  +0    -5    libs/ui/thememanager.h

http://commits.kde.org/krita/2387604848de833d648f25d949ca92273e7a09eb

diff --git a/libs/ui/thememanager.cpp b/libs/ui/thememanager.cpp
index 68daa37..2468d8a 100644
--- a/libs/ui/thememanager.cpp
+++ b/libs/ui/thememanager.cpp
 <at>  <at>  -41,6 +41,7  <at>  <at> 
 #include <QMenuBar>
 #include <QStatusBar>
 #include <QDebug>
+#include <QStandardPaths>

 // KDE includes

 <at>  <at>  -73,13 +74,11  <at>  <at>  class ThemeManager::ThemeManagerPriv
 public:

     ThemeManagerPriv()
-        : defaultThemeName(i18nc("default theme name", "Default"))
-        , themeMenuActionGroup(0)
+        : themeMenuActionGroup(0)
(Continue reading)

Gilles Caulier | 27 May 08:55 2016
Picon
Gravatar

[digikam-software-compilation] project: polish

Git commit 364373e3b7e4c21517ea4f69684cf2a5580b52dc by Gilles Caulier.
Committed on 27/05/2016 at 06:46.
Pushed by cgilles into branch 'master'.

polish

M  +6    -4    project/macosx/01-build-macports.sh
M  +0    -1    project/macosx/03-build-digikam.sh
M  +3    -38   project/macosx/common.sh
M  +27   -26   project/mxe/02-build-extralibs.sh

http://commits.kde.org/scratch/mwiesweg/digikam-sc/364373e3b7e4c21517ea4f69684cf2a5580b52dc

diff --git a/project/macosx/01-build-macports.sh b/project/macosx/01-build-macports.sh
index 1c0ce0e..6fe91d7 100755
--- a/project/macosx/01-build-macports.sh
+++ b/project/macosx/01-build-macports.sh
 <at>  <at>  -154,11 +154,13  <at>  <at>  if [[ $CONTINUE_INSTALL == 0 ]]; then
     echo -e "\n\n"

     echo "---------- Configuring MacPorts"
+
     ./configure --prefix="$INSTALL_PREFIX" \
-            --with-applications-dir="$INSTALL_PREFIX/Applications" \
-            --with-no-root-privileges \
-            --with-install-user="$(id -n -u)" \
-            --with-install-group="$(id -n -g)" 
+                --with-applications-dir="$INSTALL_PREFIX/Applications" \
+                --with-no-root-privileges \
+                --with-install-user="$(id -n -u)" \
(Continue reading)


Gmane