[rkward-cvs] SF.net SVN: rkward:[3866] trunk/rkward
tfry at users.sourceforge.net
tfry at users.sourceforge.net
Fri Sep 30 08:13:32 UTC 2011
Revision: 3866
http://rkward.svn.sourceforge.net/rkward/?rev=3866&view=rev
Author: tfry
Date: 2011-09-30 08:13:32 +0000 (Fri, 30 Sep 2011)
Log Message:
-----------
Remove GHNS support
Modified Paths:
--------------
trunk/rkward/ChangeLog
trunk/rkward/rkward/CMakeLists.txt
trunk/rkward/rkward/settings/CMakeLists.txt
trunk/rkward/rkward/settings/rksettingsmoduleplugins.cpp
trunk/rkward/rkward/settings/rksettingsmoduleplugins.h
Removed Paths:
-------------
trunk/rkward/rkward/settings/rkward.knsrc
Modified: trunk/rkward/ChangeLog
===================================================================
--- trunk/rkward/ChangeLog 2011-09-30 07:47:56 UTC (rev 3865)
+++ trunk/rkward/ChangeLog 2011-09-30 08:13:32 UTC (rev 3866)
@@ -5,6 +5,7 @@
- The file filter for R script files is now configurable, and includes *.Rhistory, by default
- More obvious coloring of variable entry fields requiring user input in plugins
- Default size of the code display in plugin dialogs has been increased
+- Removed support for downloading plugins using GHNS
- Added support for RKWard plugins shipped inside R packages
- Fixed: PDFs and many other types of documents linked from help pages would not be opened, correctly
- Added support R 2.14.x
Modified: trunk/rkward/rkward/CMakeLists.txt
===================================================================
--- trunk/rkward/rkward/CMakeLists.txt 2011-09-30 07:47:56 UTC (rev 3865)
+++ trunk/rkward/rkward/CMakeLists.txt 2011-09-30 08:13:32 UTC (rev 3866)
@@ -52,8 +52,7 @@
@ONLY)
ADD_DEPENDENCIES(rkward.frontend ${RKWARD_WRAPPER_SCRIPT})
-GET_DIRECTORY_PROPERTY(KNS_LIBS DIRECTORY settings DEFINITION KNS_LIBS)
-TARGET_LINK_LIBRARIES(rkward.frontend ${KDE4_KDECORE_LIBS} windows ${RKWARD_ADDLIBS} agents dialogs plugin settings dataeditor core scriptbackends rbackend misc ktexteditor ${KDE4_KHTML_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KROSSCORE_LIBS} ${KNS_LIBS} ${QT_QTSCRIPT_LIBRARY} ${QT_QTNETWORK_LIBRARY})
+TARGET_LINK_LIBRARIES(rkward.frontend ${KDE4_KDECORE_LIBS} windows ${RKWARD_ADDLIBS} agents dialogs plugin settings dataeditor core scriptbackends rbackend misc ktexteditor ${KDE4_KHTML_LIBS} ${KDE4_KFILE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KROSSCORE_LIBS} ${QT_QTSCRIPT_LIBRARY} ${QT_QTNETWORK_LIBRARY})
########### install files ###############
Modified: trunk/rkward/rkward/settings/CMakeLists.txt
===================================================================
--- trunk/rkward/rkward/settings/CMakeLists.txt 2011-09-30 07:47:56 UTC (rev 3865)
+++ trunk/rkward/rkward/settings/CMakeLists.txt 2011-09-30 08:13:32 UTC (rev 3866)
@@ -21,15 +21,3 @@
QT4_AUTOMOC(${settings_STAT_SRCS})
ADD_LIBRARY(settings STATIC ${settings_STAT_SRCS})
-
-# NOTE: KNewStuff3 does not exist prior to KDE 4.4, and is buggy, at least up to KDE 4.5.x (does not properly list uninstalled files).
-# Check again, when it becomes usable, and insert the proper version check, below.
-#MACRO_ENSURE_VERSION("4.6.0" ${KDE_VERSION} RKWARD_USE_KNS3)
-IF(RKWARD_USE_KNS3)
- ADD_DEFINITIONS(-DRKWARD_USE_KNS3)
- SET(KNS_LIBS ${KDE4_KNEWSTUFF3_LIBS})
-ELSE(RKWARD_USE_KNS3)
- SET(KNS_LIBS ${KDE4_KNEWSTUFF2_LIBS})
-ENDIF(RKWARD_USE_KNS3)
-
-INSTALL(FILES rkward.knsrc DESTINATION ${CONFIG_INSTALL_DIR})
Modified: trunk/rkward/rkward/settings/rksettingsmoduleplugins.cpp
===================================================================
--- trunk/rkward/rkward/settings/rksettingsmoduleplugins.cpp 2011-09-30 07:47:56 UTC (rev 3865)
+++ trunk/rkward/rkward/settings/rksettingsmoduleplugins.cpp 2011-09-30 08:13:32 UTC (rev 3866)
@@ -22,11 +22,6 @@
#include <kmessagebox.h>
#include <khbox.h>
#include <kdeversion.h>
-#ifdef RKWARD_USE_KNS3
-# include <knewstuff3/downloaddialog.h>
-#else
-# include <knewstuff2/engine.h>
-#endif
#include <ktar.h>
#include <kzip.h>
#include <kio/deletejob.h>
@@ -118,11 +113,6 @@
connect (map_choser, SIGNAL (listChanged ()), this, SLOT (settingChanged ()));
main_vbox->addWidget (map_choser);
- main_vbox->addSpacing (2*RKGlobals::spacingHint ());
- button = new QPushButton (i18n ("Install or uninstall add-on plugin packs"), this);
- main_vbox->addWidget (button);
- connect (button, SIGNAL (clicked()), this, SLOT (downloadPlugins()));
-
main_vbox->addStretch ();
}
@@ -243,46 +233,6 @@
}
}
-void RKSettingsModulePlugins::downloadPlugins () {
- RK_TRACE (SETTINGS);
-
- QStringList oldmaps = plugin_maps;
-
-#ifdef RKWARD_USE_KNS3
- KNS3::DownloadDialog dialog ("rkward.knsrc", 0);
- dialog.exec ();
- KNS3::Entry::List list = dialog.changedEntries ();
-#else
- KNS::Engine engine (0);
- if (!engine.init ("rkward.knsrc")) return;
- KNS::Entry::List list = engine.downloadDialogModal (this);
-#endif
-
- for (int i = 0; i < list.size (); ++i) {
-#ifdef RKWARD_USE_KNS3
- QStringList installed_files = list[i].installedFiles ();
- QStringList uninstalled_files = list[i].uninstalledFiles ();
-#else
- QStringList installed_files = list[i]->installedFiles ();
- QStringList uninstalled_files = list[i]->uninstalledFiles ();
-#endif
- foreach (const QString inst, installed_files) {
- installPluginPack (inst);
- }
- foreach (const QString inst, uninstalled_files) {
- uninstallPluginPack (inst);
- }
- }
-
- // new pluginmaps were already added in installPluginPack. Now let's check, whether there any to be removed:
- fixPluginMapLists ();
-
- if (plugin_maps != oldmaps) {
- map_choser->setValues (plugin_maps);
- change ();
- }
-}
-
void RKSettingsModulePlugins::installPluginPack (const QString &archive_file) {
RK_TRACE (SETTINGS);
Modified: trunk/rkward/rkward/settings/rksettingsmoduleplugins.h
===================================================================
--- trunk/rkward/rkward/settings/rksettingsmoduleplugins.h 2011-09-30 07:47:56 UTC (rev 3865)
+++ trunk/rkward/rkward/settings/rksettingsmoduleplugins.h 2011-09-30 08:13:32 UTC (rev 3866)
@@ -60,8 +60,6 @@
public slots:
void settingChanged ();
void browseRequest (QStringList* strings);
- /** Invoke the plugin download dialog. */
- void downloadPlugins ();
private:
MultiStringSelector *map_choser;
QButtonGroup *button_group;
@@ -76,6 +74,7 @@
static bool show_code;
static int code_size;
+/* TODO: These are currently unused (leftovers of GHNS-based plugin installation), but might still be of interest */
static void installPluginPack (const QString &archive_file);
static void uninstallPluginPack (const QString &archive_file);
static QString baseNameOfPluginPack (const QString &archive_file);
Deleted: trunk/rkward/rkward/settings/rkward.knsrc
===================================================================
--- trunk/rkward/rkward/settings/rkward.knsrc 2011-09-30 07:47:56 UTC (rev 3865)
+++ trunk/rkward/rkward/settings/rkward.knsrc 2011-09-30 08:13:32 UTC (rev 3866)
@@ -1,9 +0,0 @@
-[KNewStuff2]
-ProvidersUrl=http://R.reaktanz.de/GHNS/reaktanz-provider.xml
-Uncompress=never
-TargetDir=rkward/plugins/
-
-[KNewStuff3]
-ProvidersUrl=http://R.reaktanz.de/GHNS/reaktanz-provider.xml
-Uncompress=never
-TargetDir=rkward/plugins/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the rkward-tracker
mailing list