Aleix Pol | 25 Apr 10:26 2014
Picon

[ktp-desktop-applets/frameworks] contactlist/org.kde.ktp-contactlist: New name for the ContactList plasmoid

Git commit 2cfdca33b83e685d2848596a1816bb57af7bcb03 by Aleix Pol.
Committed on 25/04/2014 at 08:25.
Pushed by apol into branch 'frameworks'.

New name for the ContactList plasmoid

During the sprint, we decided that the ContactList plasmoid would
unify presence in it, changed it to "Instant Messaging".

REVIEW: 117607

M  +2    -2    contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake

http://commits.kde.org/telepathy-contact-applet/2cfdca33b83e685d2848596a1816bb57af7bcb03

diff --git a/contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake b/contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake
index 502812e..24aa531 100644
--- a/contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake
+++ b/contactlist/org.kde.ktp-contactlist/metadata.desktop.cmake
 <at>  <at>  -1,5 +1,5  <at>  <at> 
 [Desktop Entry]
-Name=Instant Messaging Contact List
+Name=Instant Messaging
 Name[bs]=Lista za instant poruke
 Name[ca]=Llista de contactes de missatgeria instantània
 Name[ca <at> valencia]=Llista de contactes de missatgeria instantània
 <at>  <at>  -43,7 +43,7  <at>  <at>  Name[wa]=Djivêye des soçons del messaedjreye sol moumint
 Name[x-test]=xxInstant Messaging Contact Listxx
 Name[zh_CN]=即时通讯联系人列表
 Name[zh_TW]=即時通訊聯絡人清單
(Continue reading)

Dmitry Kazakov | 25 Apr 10:25 2014
Picon

[calligra/krita-testing-kazakov] krita/ui/canvas: Fix RGBA/BGRA problem in color converter when using OCIO

Git commit 1d24eb014c20e3d1029524e2cc675e8acb6b21a6 by Dmitry Kazakov.
Committed on 25/04/2014 at 08:25.
Pushed by dkazakov into branch 'krita-testing-kazakov'.

Fix RGBA/BGRA problem in color converter when using OCIO

M  +79   -29   krita/ui/canvas/kis_display_color_converter.cpp

http://commits.kde.org/calligra/1d24eb014c20e3d1029524e2cc675e8acb6b21a6

diff --git a/krita/ui/canvas/kis_display_color_converter.cpp b/krita/ui/canvas/kis_display_color_converter.cpp
index b87eaf7..0f7acca 100644
--- a/krita/ui/canvas/kis_display_color_converter.cpp
+++ b/krita/ui/canvas/kis_display_color_converter.cpp
 <at>  <at>  -78,6 +78,14  <at>  <at>  struct KisDisplayColorConverter::Private

     void setCurrentNode(KisNodeSP node);
     bool useOcio() const;
+
+    bool finalIsRgba() const;
+
+    template <bool flipToBgra>
+    QColor floatArrayToQColor(const float *p);
+
+    template <bool flipToBgra>
+    QImage convertToQImageDirect(KisPaintDeviceSP device);
 };

 KisDisplayColorConverter::KisDisplayColorConverter(KisCanvas2 *parentCanvas)
 <at>  <at>  -263,6 +271,31  <at>  <at>  KisDisplayColorConverter::conversionFlags()
(Continue reading)

Patrick von Reth | 25 Apr 10:24 2014
Picon

[emerge/emerge2] /: adopt kdesetting.bat and kdeenv.bat for the new settings, needs some cleanup

Git commit 786966f0db4c33bfe52634ea7f94a1717a6aec7d by Patrick von Reth.
Committed on 25/04/2014 at 08:24.
Pushed by vonreth into branch 'emerge2'.

adopt kdesetting.bat and kdeenv.bat for the new settings, needs some cleanup

M  +1    -1    bin/EmergeBase.py
M  +1    -4    bin/portage.py
M  +24   -11   bin/subst.py
M  +42   -157  kdeenv.bat
M  +1    -1    kdeenv.ps1
M  +1    -283  kdesettings-example.bat

http://commits.kde.org/emerge/786966f0db4c33bfe52634ea7f94a1717a6aec7d

diff --git a/bin/EmergeBase.py b/bin/EmergeBase.py
index 9c29724..0aaf18c 100644
--- a/bin/EmergeBase.py
+++ b/bin/EmergeBase.py
 <at>  <at>  -222,7 +222,7  <at>  <at>  class EmergeBase(object):
         Default is to optionally append build type subdirectory"""

         utils.debug( "EmergeBase.packageDestinationDir called", 2 )
-        dstpath = os.getenv( "EMERGE_PKGDSTDIR" )
+        dstpath = emergeSettings.get("General","EMERGE_PKGDSTDIR", "None" )
         if not dstpath:
             dstpath = os.path.join( self.rootdir, "tmp" )

diff --git a/bin/portage.py b/bin/portage.py
index b58af2a..e15b687 100644
(Continue reading)

Patrick von Reth | 25 Apr 10:24 2014
Picon

[emerge/emerge2] /: fixed subst script

Git commit 6b366a51cd0e719975020c10c28ca5e56e00ac2f by Patrick von Reth.
Committed on 25/04/2014 at 07:24.
Pushed by vonreth into branch 'emerge2'.

fixed subst script

M  +1    -0    bin/emerge_config.py
M  +5    -1    bin/subst.py
M  +1    -2    kdeenv.ps1

http://commits.kde.org/emerge/6b366a51cd0e719975020c10c28ca5e56e00ac2f

diff --git a/bin/emerge_config.py b/bin/emerge_config.py
index 26812cd..45f65f8 100644
--- a/bin/emerge_config.py
+++ b/bin/emerge_config.py
 <at>  <at>  -1,4 +1,5  <at>  <at> 
 # -*- coding: utf-8 -*-
+# central instance for managing settings regarding emerge
 # copyright:
 # Patrick von Reth <vonreth [AT] kde [DOT] org>

diff --git a/bin/subst.py b/bin/subst.py
index 5b0148b..663e362 100644
--- a/bin/subst.py
+++ b/bin/subst.py
 <at>  <at>  -1,3 +1,7  <at>  <at> 
+# -*- coding: utf-8 -*-
+# Helper script for substitution of paths, independent of cmd or powershell
+# copyright:
(Continue reading)

Montel Laurent | 25 Apr 09:46 2014
Picon

[kdepim/frameworks] /: Minor

Git commit c06b2055e8ddba2908406837456d6e6a11191324 by Montel Laurent.
Committed on 25/04/2014 at 07:45.
Pushed by mlaurent into branch 'frameworks'.

Minor

M  +1    -2    grantleetheme/CMakeLists.txt
M  +0    -1    messageviewer/CMakeLists.txt

http://commits.kde.org/kdepim/c06b2055e8ddba2908406837456d6e6a11191324

diff --git a/grantleetheme/CMakeLists.txt b/grantleetheme/CMakeLists.txt
index 3f65d29..bf14e62 100644
--- a/grantleetheme/CMakeLists.txt
+++ b/grantleetheme/CMakeLists.txt
 <at>  <at>  -13,8 +13,7  <at>  <at>  kconfig_add_kcfg_files(libgrantleetheme_SRCS

 add_library(grantleetheme ${LIBRARY_TYPE} ${libgrantleetheme_SRCS})

-target_link_libraries(grantleetheme    KF5::NewStuff KF5::KDELibs4Support
-)
+target_link_libraries(grantleetheme    KF5::NewStuff KF5::KDELibs4Support)

 set_target_properties(grantleetheme PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
 install(TARGETS grantleetheme ${INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/messageviewer/CMakeLists.txt b/messageviewer/CMakeLists.txt
index f4fbc59..2a030b5 100644
--- a/messageviewer/CMakeLists.txt
+++ b/messageviewer/CMakeLists.txt
 <at>  <at>  -201,7 +201,6  <at>  <at>  target_link_libraries(messageviewer messagecore kdepim kpgp kleo
(Continue reading)

Martin Gräßlin | 25 Apr 10:08 2014
Picon

[kwin] kcmkwin/kwincompositing: [kwincompositing-kcm] Fix the reinit signal invocation

Git commit b92f4a6991c5a385533155ab5113dceaa2e1f290 by Martin Gräßlin.
Committed on 23/04/2014 at 06:43.
Pushed by graesslin into branch 'master'.

[kwincompositing-kcm] Fix the reinit signal invocation

REVIEW: 117700

M  +1    -1    kcmkwin/kwincompositing/compositing.cpp

http://commits.kde.org/kwin/b92f4a6991c5a385533155ab5113dceaa2e1f290

diff --git a/kcmkwin/kwincompositing/compositing.cpp b/kcmkwin/kwincompositing/compositing.cpp
index b4a9f67..9431003 100644
--- a/kcmkwin/kwincompositing/compositing.cpp
+++ b/kcmkwin/kwincompositing/compositing.cpp
 <at>  <at>  -330,7 +330,7  <at>  <at>  void Compositing::save()
         QDBusMessage message = QDBusMessage::createSignal(QStringLiteral("/Compositor"),
                                                           QStringLiteral("org.kde.kwin.Compositing"),
                                                           QStringLiteral("reinit"));
-        QDBusConnection::sessionBus().asyncCall(message);
+        QDBusConnection::sessionBus().send(message);
         m_changed = false;
     }
 }

Montel Laurent | 25 Apr 09:46 2014
Picon

[kdepim/frameworks] calendarviews: Make it compile

Git commit 1493f51b55f71f34a5e96978cc23057902a3d8d3 by Montel Laurent.
Committed on 25/04/2014 at 06:23.
Pushed by mlaurent into branch 'frameworks'.

Make it compile

M  +2    -1    calendarviews/month/monthgraphicsitems.cpp
M  +1    -0    calendarviews/month/monthitem.cpp
M  +1    -0    calendarviews/month/monthscene.cpp
M  +2    -0    calendarviews/month/monthview.cpp
M  +3    -2    calendarviews/multiagenda/multiagendaview.cpp
M  +2    -0    calendarviews/timeline/timelineitem.cpp
M  +1    -1    calendarviews/timeline/timelineitem.h
M  +2    -0    calendarviews/timeline/timelineview.cpp
M  +1    -1    calendarviews/timeline/timelineview.h
M  +2    -0    calendarviews/timeline/timelineview_p.cpp
M  +2    -2    calendarviews/timeline/timelineview_p.h
M  +2    -0    calendarviews/timespent/timespentview.cpp
M  +2    -1    calendarviews/todo/incidencetreemodel.cpp
M  +1    -1    calendarviews/todo/incidencetreemodel.h
M  +1    -1    calendarviews/todo/incidencetreemodel_p.h
M  +5    -0    calendarviews/todo/todomodel.cpp
M  +2    -2    calendarviews/todo/todomodel.h
M  +1    -1    calendarviews/todo/todomodel_p.h
M  +5    -4    calendarviews/todo/todoview.cpp
M  +1    -0    calendarviews/whatsnext/whatsnextview.cpp

http://commits.kde.org/kdepim/1493f51b55f71f34a5e96978cc23057902a3d8d3

diff --git a/calendarviews/month/monthgraphicsitems.cpp b/calendarviews/month/monthgraphicsitems.cpp
(Continue reading)

Montel Laurent | 25 Apr 09:46 2014
Picon

[kdepim/frameworks] /: Check grantlee version too

Git commit 3042abae5ba41652a240851e85270f1944492031 by Montel Laurent.
Committed on 25/04/2014 at 07:44.
Pushed by mlaurent into branch 'frameworks'.

Check grantlee version too

M  +3    -0    CMakeLists.txt

http://commits.kde.org/kdepim/3042abae5ba41652a240851e85270f1944492031

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b8bf709..9593e2e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
 <at>  <at>  -63,6 +63,9  <at>  <at>  option(KDEPIM_NO_WEBKIT "Do not use WebKit in the kdepim applications" FALSE)

 
 find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED Widgets Test WebKitWidgets Sql)
+#Need to use volatile_qt5_port branch from grantlee
+find_package(Grantlee "1.0" CONFIG REQUIRED)
+
 find_package(KF5Akonadi CONFIG REQUIRED)
 find_package(KF5KDELibs4Support ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5Wallet ${KF5_VERSION} CONFIG REQUIRED)

Montel Laurent | 25 Apr 09:46 2014
Picon

[kdepim/frameworks] /: Adapt CMakeLists.txt

Git commit 75f0abe478c040e91e5d9b75e6f9b6886f684ff3 by Montel Laurent.
Committed on 25/04/2014 at 06:23.
Pushed by mlaurent into branch 'frameworks'.

Adapt CMakeLists.txt

M  +3    -3    CMakeLists.txt
M  +6    -6    kaddressbookgrantlee/CMakeLists.txt
M  +0    -4    mailcommon/CMakeLists.txt
M  +0    -3    mailcommon/util/mailutil.cpp

http://commits.kde.org/kdepim/75f0abe478c040e91e5d9b75e6f9b6886f684ff3

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 55a39f2..385faf8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
 <at>  <at>  -164,9 +164,9  <at>  <at>  include (kleopatra/ConfigureChecks.cmake)
   #add_subdirectory(messageviewer)
   #add_subdirectory(messagecomposer)
   add_subdirectory(pimcommon)
-  #add_subdirectory(mailcommon) # TODO: does this make sense?!?
+  add_subdirectory(mailcommon) # TODO: does this make sense?!?
   #add_subdirectory(kmail)
-  #add_subdirectory(grantleeeditor)
+  add_subdirectory(grantleeeditor)
   if(KDEPIM_BUILD_MOBILE)
     add_subdirectory(mobile)
   endif()
 <at>  <at>  -185,7 +185,7  <at>  <at>  include (kleopatra/ConfigureChecks.cmake)
(Continue reading)

Montel Laurent | 25 Apr 09:46 2014
Picon

[kdepim/frameworks] blogilo/src: MAke it compile

Git commit 5aadae8781b6a4bf2d333edde7b1cdb903d706c6 by Montel Laurent.
Committed on 25/04/2014 at 07:23.
Pushed by mlaurent into branch 'frameworks'.

MAke it compile

M  +1    -1    blogilo/src/CMakeLists.txt
M  +2    -1    blogilo/src/blogsettings.cpp
M  +1    -0    blogilo/src/composer/bilbobrowser.cpp
M  +2    -0    blogilo/src/composer/blogilocomposereditor.cpp
M  +6    -4    blogilo/src/composer/htmleditor.cpp
M  +1    -1    blogilo/src/configuredialog.h
M  +1    -0    blogilo/src/configurestorageservicewidget.cpp
M  +1    -0    blogilo/src/dbman.cpp
M  +1    -0    blogilo/src/sendtoblogdialog.cpp
M  +4    -1    blogilo/src/uploadmediadialog.cpp

http://commits.kde.org/kdepim/5aadae8781b6a4bf2d333edde7b1cdb903d706c6

diff --git a/blogilo/src/CMakeLists.txt b/blogilo/src/CMakeLists.txt
index 374126f..2413aa2 100644
--- a/blogilo/src/CMakeLists.txt
+++ b/blogilo/src/CMakeLists.txt
 <at>  <at>  -55,7 +55,7  <at>  <at>  kconfig_add_kcfg_files( blogilo_SRCS settings.kcfgc)
 kde4_add_app_icon(blogilo_SRCS "${CMAKE_CURRENT_SOURCE_DIR}/../icons/hi*-app-blogilo.png")
 add_executable( blogilo ${blogilo_SRCS})

-target_link_libraries( blogilo kdepim  KF5::KDEWebKit KF5::TextEditor  KF5::WebKit KF5::Blog
composereditorng  pimcommon KF5::Wallet Qt5::Sql)
+target_link_libraries( blogilo kdepim  KF5::TextEditor  KF5::WebKit KF5::Blog composereditorng 
(Continue reading)

Montel Laurent | 25 Apr 09:46 2014
Picon

[kdepim/frameworks] akregator: Fix some compile error

Git commit dcbb6b87c95ec9909bd922c567676383eb1e357d by Montel Laurent.
Committed on 25/04/2014 at 07:34.
Pushed by mlaurent into branch 'frameworks'.

Fix some compile error

M  +15   -15   akregator/configuration/CMakeLists.txt
M  +2    -5    akregator/export/CMakeLists.txt
M  +4    -4    akregator/interfaces/CMakeLists.txt
M  +3    -3    akregator/plugins/mk4storage/CMakeLists.txt
M  +1    -1    akregator/plugins/mk4storage/storagemk4impl.cpp
M  +9    -9    akregator/plugins/onlinesync/CMakeLists.txt
M  +6    -6    akregator/plugins/sharemicroblog/CMakeLists.txt
M  +13   -13   akregator/src/CMakeLists.txt
M  +1    -1    akregator/src/aboutdata.cpp
M  +2    -2    akregator/src/aboutdata.h
M  +1    -0    akregator/src/feediconmanager.cpp
M  +1    -2    akregator/src/trayicon.cpp

http://commits.kde.org/kdepim/dcbb6b87c95ec9909bd922c567676383eb1e357d

diff --git a/akregator/configuration/CMakeLists.txt b/akregator/configuration/CMakeLists.txt
index 85ef085..33ff813 100644
--- a/akregator/configuration/CMakeLists.txt
+++ b/akregator/configuration/CMakeLists.txt
 <at>  <at>  -8,12 +8,12  <at>  <at>  include_directories(

 set(kcm_akrgeneralconfig_SRCS akregator_config_general.cpp)

-kde4_add_ui_files(kcm_akrgeneralconfig_SRCS settings_general.ui)
(Continue reading)


Gmane