|
|
652846 |
diff -up kde-workspace-4.8.3/krunner/ksystemactivitydialog.cpp.webkit kde-workspace-4.8.3/krunner/ksystemactivitydialog.cpp
|
|
|
652846 |
--- kde-workspace-4.8.3/krunner/ksystemactivitydialog.cpp.webkit 2012-05-07 15:38:33.380747874 +0200
|
|
|
652846 |
+++ kde-workspace-4.8.3/krunner/ksystemactivitydialog.cpp 2012-05-07 15:38:48.108759698 +0200
|
|
|
652846 |
@@ -41,7 +41,6 @@ KSystemActivityDialog::KSystemActivityDi
|
|
|
652846 |
setWindowIcon(KIcon(QLatin1String( "utilities-system-monitor" )));
|
|
|
652846 |
setButtons(0);
|
|
|
652846 |
setMainWidget(&m_processList);
|
|
|
652846 |
- m_processList.setScriptingEnabled(true);
|
|
|
652846 |
setSizeGripEnabled(true);
|
|
|
652846 |
(void)minimumSizeHint(); //Force the dialog to be laid out now
|
|
|
652846 |
layout()->setContentsMargins(0,0,0,0);
|
|
|
652846 |
diff -up kde-workspace-4.8.3/ksysguard/gui/SensorDisplayLib/ProcessController.cpp.webkit kde-workspace-4.8.3/ksysguard/gui/SensorDisplayLib/ProcessController.cpp
|
|
|
652846 |
--- kde-workspace-4.8.3/ksysguard/gui/SensorDisplayLib/ProcessController.cpp.webkit 2012-05-07 15:34:25.472580194 +0200
|
|
|
652846 |
+++ kde-workspace-4.8.3/ksysguard/gui/SensorDisplayLib/ProcessController.cpp 2012-05-07 15:34:30.485583409 +0200
|
|
|
652846 |
@@ -147,7 +147,6 @@ bool ProcessController::addSensor(const
|
|
|
652846 |
mProcessList = new KSysGuardProcessList(this, hostName);
|
|
|
652846 |
mProcessList->setUpdateIntervalMSecs(0); //we will call updateList() manually
|
|
|
652846 |
mProcessList->setContentsMargins(0,0,0,0);
|
|
|
652846 |
- mProcessList->setScriptingEnabled(true);
|
|
|
652846 |
addActions(mProcessList->actions());
|
|
|
652846 |
connect(mProcessList, SIGNAL(updated()), this, SIGNAL(updated()));
|
|
|
652846 |
connect(mProcessList, SIGNAL(processListChanged()), this, SIGNAL(processListChanged()));
|
|
|
652846 |
diff -up kde-workspace-4.8.3/libs/ksysguard/CMakeLists.txt.webkit kde-workspace-4.8.3/libs/ksysguard/CMakeLists.txt
|
|
|
652846 |
--- kde-workspace-4.8.3/libs/ksysguard/CMakeLists.txt.webkit 2012-04-29 23:05:49.239145354 +0200
|
|
|
652846 |
+++ kde-workspace-4.8.3/libs/ksysguard/CMakeLists.txt 2012-05-07 15:21:28.103104008 +0200
|
|
|
652846 |
@@ -21,6 +21,3 @@ add_subdirectory( processui )
|
|
|
652846 |
add_subdirectory( signalplotter )
|
|
|
652846 |
add_subdirectory( ksgrd )
|
|
|
652846 |
add_subdirectory( tests )
|
|
|
652846 |
-
|
|
|
652846 |
-install(DIRECTORY scripts/ DESTINATION ${DATA_INSTALL_DIR}/ksysguard/scripts)
|
|
|
652846 |
-
|
|
|
652846 |
diff -up kde-workspace-4.8.3/libs/ksysguard/processui/CMakeLists.txt.webkit kde-workspace-4.8.3/libs/ksysguard/processui/CMakeLists.txt
|
|
|
652846 |
--- kde-workspace-4.8.3/libs/ksysguard/processui/CMakeLists.txt.webkit 2012-04-29 23:05:49.242145324 +0200
|
|
|
652846 |
+++ kde-workspace-4.8.3/libs/ksysguard/processui/CMakeLists.txt 2012-05-07 15:21:28.104104008 +0200
|
|
|
652846 |
@@ -12,7 +12,6 @@ set(processui_LIB_SRCS
|
|
|
652846 |
ProcessModel.cpp
|
|
|
652846 |
ReniceDlg.cpp
|
|
|
652846 |
KTextEditVT.cpp
|
|
|
652846 |
- scripting.cpp
|
|
|
652846 |
)
|
|
|
652846 |
|
|
|
652846 |
kde4_add_ui_files( processui_LIB_SRCS
|
|
|
652846 |
@@ -27,7 +26,7 @@ if(X11_XRes_FOUND)
|
|
|
652846 |
include_directories(${X11_XRes_INCLUDE_PATH})
|
|
|
652846 |
endif(X11_XRes_FOUND)
|
|
|
652846 |
|
|
|
652846 |
-target_link_libraries(processui ${KDE4_KDEUI_LIBS} ${QT_QTSCRIPT_LIBRARY} ${QT_QTWEBKIT_LIBRARY} processcore)
|
|
|
652846 |
+target_link_libraries(processui ${KDE4_KDEUI_LIBS} processcore)
|
|
|
652846 |
target_link_libraries(processui LINK_INTERFACE_LIBRARIES ${KDE4_KDEUI_LIBS} processcore)
|
|
|
652846 |
|
|
|
652846 |
|
|
|
652846 |
diff -up kde-workspace-4.8.3/libs/ksysguard/processui/ksysguardprocesslist.cpp.webkit kde-workspace-4.8.3/libs/ksysguard/processui/ksysguardprocesslist.cpp
|
|
|
652846 |
--- kde-workspace-4.8.3/libs/ksysguard/processui/ksysguardprocesslist.cpp.webkit 2012-04-29 23:05:49.245145296 +0200
|
|
|
652846 |
+++ kde-workspace-4.8.3/libs/ksysguard/processui/ksysguardprocesslist.cpp 2012-05-07 15:21:28.104104008 +0200
|
|
|
652846 |
@@ -894,9 +894,6 @@ void KSysGuardProcessList::hideEvent ( Q
|
|
|
652846 |
//Stop updating the process list if we are hidden
|
|
|
652846 |
if(d->mUpdateTimer)
|
|
|
652846 |
d->mUpdateTimer->stop();
|
|
|
652846 |
- //stop any scripts running, to save on memory
|
|
|
652846 |
- if(d->mScripting)
|
|
|
652846 |
- d->mScripting->stopAllScripts();
|
|
|
652846 |
QWidget::hideEvent(event);
|
|
|
652846 |
}
|
|
|
652846 |
|
|
|
652846 |
@@ -1419,16 +1416,3 @@ bool KSysGuardProcessList::scriptingEnab
|
|
|
652846 |
{
|
|
|
652846 |
return !!d->mScripting;
|
|
|
652846 |
}
|
|
|
652846 |
-void KSysGuardProcessList::setScriptingEnabled(bool enabled)
|
|
|
652846 |
-{
|
|
|
652846 |
- if(!!d->mScripting == enabled)
|
|
|
652846 |
- return; //Nothing changed
|
|
|
652846 |
- if(!enabled) {
|
|
|
652846 |
- delete d->mScripting;
|
|
|
652846 |
- d->mScripting = NULL;
|
|
|
652846 |
- } else {
|
|
|
652846 |
- d->mScripting = new Scripting(this);
|
|
|
652846 |
- d->mScripting->hide();
|
|
|
652846 |
- }
|
|
|
652846 |
-
|
|
|
652846 |
-}
|
|
|
652846 |
diff -up kde-workspace-4.8.3/libs/ksysguard/processui/ksysguardprocesslist.h.webkit kde-workspace-4.8.3/libs/ksysguard/processui/ksysguardprocesslist.h
|
|
|
652846 |
--- kde-workspace-4.8.3/libs/ksysguard/processui/ksysguardprocesslist.h.webkit 2012-04-29 23:05:49.245145296 +0200
|
|
|
652846 |
+++ kde-workspace-4.8.3/libs/ksysguard/processui/ksysguardprocesslist.h 2012-05-07 15:21:28.105104008 +0200
|
|
|
652846 |
@@ -52,7 +52,6 @@ class KDE_EXPORT KSysGuardProcessList :
|
|
|
652846 |
Q_PROPERTY( int updateIntervalMSecs READ updateIntervalMSecs WRITE setUpdateIntervalMSecs )
|
|
|
652846 |
Q_PROPERTY( ProcessModel::Units units READ units WRITE setUnits )
|
|
|
652846 |
Q_PROPERTY( bool killButtonVisible READ isKillButtonVisible WRITE setKillButtonVisible )
|
|
|
652846 |
- Q_PROPERTY( bool scriptingEnabled READ scriptingEnabled WRITE setScriptingEnabled )
|
|
|
652846 |
Q_ENUMS( ProcessFilter::State )
|
|
|
652846 |
Q_ENUMS( ProcessModel::Units )
|
|
|
652846 |
|
|
|
652846 |
@@ -112,10 +111,6 @@ class KDE_EXPORT KSysGuardProcessList :
|
|
|
652846 |
*
|
|
|
652846 |
* Default is false. */
|
|
|
652846 |
bool scriptingEnabled() const;
|
|
|
652846 |
- /** Set whether scripting support is enabled.
|
|
|
652846 |
- *
|
|
|
652846 |
- * Default is false. */
|
|
|
652846 |
- void setScriptingEnabled(bool enabled);
|
|
|
652846 |
|
|
|
652846 |
Q_SIGNALS:
|
|
|
652846 |
/** Emitted when the display has been updated */
|