date:20161014

[kde-baseapps] konqueror: Refactoring preloading: no need for a kded module anymore.

2016-10-14 Thread David Faure

Git commit ba86787c35dee59091959b86bce16f823c14661f by David Faure.
Committed on 14/10/2016 at 17:31.
Pushed by dfaure into branch 'master'.

Refactoring preloading: no need for a kded module anymore.

The DBus service name org.kde.konqueror.preloaded indicates
which process can be used to quickly open a new window.
The first konqueror instance ensures that a --preload process runs
and as soon as the preloaded window is used, another --preload process
is started to handle the next request. To make even the very first
one fast, one can set the "start preload instance on startup" checkbox.

GUI: performance config dialog: the max instances count spinbox is gone,
and "always ensure one preload instance exists" is on by default, to make
the above actually work out of the box.

M  +2-1konqueror/CMakeLists.txt
M  +6-27   konqueror/client/kfmclient.cpp
R  +0-0konqueror/konqy_preload.desktop [from: 
konqueror/preloader/konqy_preload.desktop - 100% similarity]
D  +0-31   konqueror/preloader/CMakeLists.txt
D  +0-151  konqueror/preloader/configure.in.in
D  +0-163  konqueror/preloader/konqy_preloader.desktop
D  +0-26   konqueror/preloader/org.kde.konqueror.Preloader.xml
D  +0-151  konqueror/preloader/preloader.cc
D  +0-59   konqueror/preloader/preloader.h
M  +8-37   konqueror/settings/performance/konqueror.cpp
M  +0-2konqueror/settings/performance/konqueror.h
M  +1-49   konqueror/settings/performance/konqueror_ui.ui
M  +1-0konqueror/src/CMakeLists.txt
M  +1-9konqueror/src/KonquerorAdaptor.cpp
M  +0-6konqueror/src/KonquerorAdaptor.h
M  +16   -33   konqueror/src/konqmain.cpp
M  +7-200  konqueror/src/konqmainwindow.cpp
M  +0-13   konqueror/src/konqmainwindow.h
M  +1-0konqueror/src/konqmainwindowfactory.cpp
M  +53   -24   konqueror/src/konqpreloadinghandler.cpp
M  +6-9konqueror/src/konqpreloadinghandler.h
M  +2-13   konqueror/src/konqueror.kcfg
M  +0-9konqueror/src/org.kde.Konqueror.Main.xml

http://commits.kde.org/kde-baseapps/ba86787c35dee59091959b86bce16f823c14661f

diff --git a/konqueror/CMakeLists.txt b/konqueror/CMakeLists.txt
index 2ac04e8..a14aeb8 100644
--- a/konqueror/CMakeLists.txt
+++ b/konqueror/CMakeLists.txt
@@ -46,7 +46,6 @@ add_subdirectory( autotests )
 add_subdirectory( about )
 add_subdirectory( pics )
 #add_subdirectory( sidebar )
-add_subdirectory( preloader )
 add_subdirectory( settings )
 add_subdirectory( plugins )
 
@@ -61,6 +60,8 @@ install(FILES konqueror.appdata.xml DESTINATION 
${KDE_INSTALL_DATAROOTDIR}/appda
 # This is why konqueror.desktop is installed into services.
 install( FILES konqueror.desktop  DESTINATION  ${KDE_INSTALL_KSERVICES5DIR} )
 
+install(FILES konqy_preload.desktop DESTINATION ${KDE_INSTALL_AUTOSTARTDIR})
+
 # TODO Remove the if/endif lines if Konqueror is split.
 if ("${CMAKE_SOURCE_DIR}" STREQUAL "${Konqueror_SOURCE_DIR}")
   feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
diff --git a/konqueror/client/kfmclient.cpp b/konqueror/client/kfmclient.cpp
index 5706f87..00ed669 100644
--- a/konqueror/client/kfmclient.cpp
+++ b/konqueror/client/kfmclient.cpp
@@ -164,21 +164,8 @@ static void needDBus()
 }
 }
 
-static QString getPreloadedKonqy()
-{
-KConfig konqCfg(QLatin1String("konquerorrc"));
-const KConfigGroup reusingGroup(, "Reusing");
-if (reusingGroup.readEntry("MaxPreloadCount", 1) == 0) {
-return QString();
-}
-needDBus();
-QDBusInterface ref("org.kde.kded5", "/modules/konqy_preloader", 
"org.kde.konqueror.Preloader", QDBusConnection::sessionBus());
-QDBusReply reply = ref.call("getPreloadedKonqy", currentScreen());
-if (reply.isValid()) {
-return reply;
-}
-return QString();
-}
+// keep in sync with konqpreloadinghandler.cpp
+static const char s_preloadDBusName[] = "org.kde.konqueror.preloaded";
 
 static QUrl filteredUrl(KCmdLineArgs *args)
 {
@@ -274,20 +261,13 @@ bool ClientApp::createNewWindow(const QUrl , bool 
newTab, bool tempFile, con
 }
 }
 
-QString appId = getPreloadedKonqy();
-if (!appId.isEmpty()) {
-qDebug() << "ClientApp::createNewWindow using existing konqueror" << 
appId;
-org::kde::Konqueror::Main konq(appId, "/KonqMain", dbus);
-konq.createNewWindow(url.url(), mimetype, startup_id_str, tempFile);
+const QString appId = QString::fromLatin1(s_preloadDBusName);
+org::kde::Konqueror::Main konq(appId, "/KonqMain", dbus);
+QDBusReply reply = konq.createNewWindow(url.url(), 
mimetype, startup_id_str, tempFile);
+if (reply.isValid()) {
 sendASNChange();
 } else {
 QString error;
-/* Well, we can't pass a mimetype through startServiceByDesktopPath !
-if ( KToolInvocation::startServiceByDesktopPath( 
QLatin1String("konqueror.desktop"),
-  url.url(),  ) > 0 )
-{
-kError() << "Couldn't start konqueror from

[labplot/frameworks] /: fixed merge conflicts

2016-10-14 Thread Stefan Gerlach

Git commit 8f78e6e92f3ca7831486a5b9f9e89dc603f7c790 by Stefan Gerlach.
Committed on 14/10/2016 at 16:02.
Pushed by sgerlach into branch 'frameworks'.

fixed merge conflicts

M  +1-1CMakeLists.txt
M  +1-0INSTALL
M  +33   -10   doc/index.docbook
M  +7-2src/CMakeLists.txt
M  +5-0src/backend/core/Project.cpp
M  +4-3src/backend/gsl/ExpressionParser.cpp
M  +324  -334  src/backend/worksheet/Worksheet.cpp
M  +14   -0src/backend/worksheet/plots/cartesian/CartesianPlot.cpp
M  +64   -207  src/backend/worksheet/plots/cartesian/XYCurve.cpp
M  +27   -75   src/backend/worksheet/plots/cartesian/XYDataReductionCurve.cpp
M  +20   -38   src/backend/worksheet/plots/cartesian/XYDifferentiationCurve.cpp
M  +6-20   src/backend/worksheet/plots/cartesian/XYEquationCurve.cpp
M  +118  -154  src/backend/worksheet/plots/cartesian/XYFitCurve.cpp
M  +28   -71   src/backend/worksheet/plots/cartesian/XYFourierFilterCurve.cpp
M  +22   -57   src/backend/worksheet/plots/cartesian/XYFourierTransformCurve.cpp
M  +30   -80   src/backend/worksheet/plots/cartesian/XYInterpolationCurve.cpp
M  +26   -73   src/backend/worksheet/plots/cartesian/XYSmoothCurve.cpp
M  +35   -3src/commonfrontend/worksheet/WorksheetView.cpp
M  +3-0src/commonfrontend/worksheet/WorksheetView.h
M  +37   -40   src/kdefrontend/GuiObserver.cpp
M  +1-1src/kdefrontend/HistoryDialog.cpp
M  +15   -19   src/kdefrontend/MainWin.cpp
M  +2-0src/kdefrontend/MainWin.h
M  +1-0src/kdefrontend/SettingsDialog.cpp
M  +45   -0src/kdefrontend/SettingsGeneralPage.cpp
M  +3-2src/kdefrontend/datasources/ImportFileDialog.cpp
M  +449  -455  src/kdefrontend/dockwidgets/XYCurveDock.cpp
M  +56   -2src/kdefrontend/dockwidgets/XYDataReductionCurveDock.cpp
M  +49   -1src/kdefrontend/dockwidgets/XYDifferentiationCurveDock.cpp
M  +91   -20   src/kdefrontend/dockwidgets/XYFitCurveDock.cpp
M  +51   -0src/kdefrontend/dockwidgets/XYFourierFilterCurveDock.cpp
M  +53   -2src/kdefrontend/dockwidgets/XYFourierTransformCurveDock.cpp
M  +49   -0src/kdefrontend/dockwidgets/XYInterpolationCurveDock.cpp
M  +49   -0src/kdefrontend/dockwidgets/XYSmoothCurveDock.cpp
M  +20   -5src/tools/TeXRenderer.cpp

http://commits.kde.org/labplot/8f78e6e92f3ca7831486a5b9f9e89dc603f7c790

diff --cc CMakeLists.txt
index e7c6cb6,2d0c80e..98c901d
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -4,19 -4,17 +4,19 @@@ cmake_minimum_required(VERSION 2.8.12
  find_package(ECM 1.3.0 REQUIRED NO_MODULE)
  set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
  
 -find_package(Qt4 REQUIRED)
 -find_package(KDE4 REQUIRED)
 +find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Widgets Svg 
Concurrent)
 +find_package(KF5 REQUIRED COMPONENTS I18n KDELibs4Support NewStuff)
  
 +include(FeatureSummary)
  include(ECMInstallIcons)
  include(KDEInstallDirs)
 -include(KDE4Defaults)
 +include(KDECompilerSettings)
 +include(KDECMakeSettings)
  
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wundef -Wpointer-arith 
-Wcast-align -Wunreachable-code -Wunused -fno-omit-frame-pointer 
-fstack-protector -fno-exceptions")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O2 -Wall -Wextra -Wundef 
-Wpointer-arith -Wcast-align -Wunreachable-code -Wunused 
-fno-omit-frame-pointer -fstack-protector -fno-exceptions")
  
 -add_definitions (${QT_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS} 
${KDE4_DEFINITIONS})
 -include_directories (${QDBUS_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR} 
${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
 +add_definitions (${QT_DEFINITIONS} ${QT_QTDBUS_DEFINITIONS})
 +include_directories (${QDBUS_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR} 
${CMAKE_BINARY_DIR})
  set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
  add_definitions (-DLVERSION=\"2.3.0\")
  # add_definitions (-DLDEBUG='1')
diff --cc doc/index.docbook
index 700ef48,ce2dda7..e87a291
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@@ -96,12 -89,8 +96,12 @@@ Features
  Cartesian plots, created either from imported or manually 
created data sets or via mathematical equation
  Definition of mathematical formulas is supported by 
syntax-highlighting and completion and by the list of thematicaly grouped 
mathematical and physical constants and functions
  Investigation of plotted data is supported by many zooming 
and navigation features
- Several analysis functions and methods for data reduction, 
differentiation, interpolation, smoothing, (nonlinear) fitting, Fourier filter 
and Fourier transform
+ Several analysis functions and methods for data reduction, 
differentiation, integration, interpolation, smoothing, (nonlinear) fitting, 
Fourier filter and Fourier transform
  Linear and non-linear fits to data, several fit-models are 
predefined and custom models with arbitrary number of parameters can be 
provided
 +Supports many CAS backends like Maxima, Python, KAlgebra, 
Sage
 +Nice Worksheet view for evaluating 
expressions
 +Easy plugin based

Re: Review Request 129165: Proofread + update KDpg docbook to kf5

2016-10-14 Thread Rolf Eike Beer


---
This is an automatically generated e-mail. To reply, visit:
https://git.reviewboard.kde.org/r/129165/#review13
---


Ship it!




Ship It!

- Rolf Eike Beer


On Okt. 12, 2016, 8:18 nachm., Burkhard Lück wrote:
> 
> ---
> This is an automatically generated e-mail. To reply, visit:
> https://git.reviewboard.kde.org/r/129165/
> ---
> 
> (Updated Okt. 12, 2016, 8:18 nachm.)
> 
> 
> Review request for Documentation, KDE Utils and Rolf Eike Beer.
> 
> 
> Repository: kgpg
> 
> 
> Description
> ---
> 
> remove package + kappname, not used in kf5 anymore
> 
> 
> Diffs
> -
> 
>   doc/index.docbook 518f5fe 
> 
> Diff: https://git.reviewboard.kde.org/r/129165/diff/
> 
> 
> Testing
> ---
> 
> passes checkXML5
> 
> 
> Thanks,
> 
> Burkhard Lück
> 
>

[kde-baseapps] konqueror: Refactoring preloading: no need for a kded module anymore.

[labplot/frameworks] /: fixed merge conflicts

Re: Review Request 129165: Proofread + update KDpg docbook to kf5

3 matches

Site Navigation

Mail list logo

Footer information