[rkward-cvs] rkward/rkward/settings rksettingsmoduleplugins.cpp,1.13,1.14

[Thomas Friedrichsmeier]

Update of /cvsroot/rkward/rkward/rkward/settings
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20093/rkward/settings

Modified Files:
	rksettingsmoduleplugins.cpp 
Log Message:
Allow inclusion of .pluginmap files in .pluginmap files

Index: rksettingsmoduleplugins.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/settings/rksettingsmoduleplugins.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** rksettingsmoduleplugins.cpp	26 Oct 2005 19:21:40 -0000	1.13
--- rksettingsmoduleplugins.cpp	26 Mar 2006 17:26:20 -0000	1.14
***************
*** 22,25 ****
--- 22,26 ----
  #include <kstandarddirs.h>
  #include <kfiledialog.h>
+ #include <kmessagebox.h>
  
  #include <qlayout.h>
***************
*** 115,119 ****
  	plugin_maps = config->readListEntry ("Plugin Maps");
  	if (!plugin_maps.count ()) {
! 		QString dummy = KGlobal::dirs()->findResourceDir("data", "rkward/standard_plugins.pluginmap");
  		if (dummy.isEmpty ()) {
  			// try our luck with a relative path
--- 116,120 ----
  	plugin_maps = config->readListEntry ("Plugin Maps");
  	if (!plugin_maps.count ()) {
! 		QString dummy = KGlobal::dirs()->findResourceDir ("data", "rkward/all.pluginmap");
  		if (dummy.isEmpty ()) {
  			// try our luck with a relative path
***************
*** 122,127 ****
  			dummy.append ("rkward");
  		}
! 		plugin_maps.append (dummy + "/standard_plugins.pluginmap");
  	}
  	interface_pref = static_cast<PluginPrefs> (config->readNumEntry ("Interface Preferences", static_cast<int> (PreferWizard)));
  }
--- 123,149 ----
  			dummy.append ("rkward");
  		}
! 		plugin_maps.append (dummy + "/all.pluginmap");
! 	}
! // TODO: this code is only needed for transition from rkward 0.3.4 to rkward 0.3.5. Remove some version later!
! // BEGIN
! 	bool fix=false;
! 	for (QStringList::const_iterator it = plugin_maps.constBegin (); it != plugin_maps.constEnd (); ++it) {
! 		if ((*it).contains ("standard_plugins.pluginmap")) {
! 			fix = (KMessageBox::questionYesNo (0, i18n ("You appear to have an old configuration for the plugin-paths. The default configuration was changed between rkward 0.3.4 and rkward 0.3.5. Should the configuration be set to the new default (recommended)?"), i18n ("Configuration change"), KStdGuiItem::yes (), KStdGuiItem::no (), "pluginmap_upgrade") == KMessageBox::Yes);
! 		}
  	}
+ 	if (fix) {
+ 		plugin_maps.clear ();
+ 		QString dummy = KGlobal::dirs()->findResourceDir ("data", "rkward/all.pluginmap");
+ 		if (dummy.isEmpty ()) {
+ 			// try our luck with a relative path
+ 			dummy = "plugins";
+ 		} else {
+ 			dummy.append ("rkward");
+ 		}
+ 		plugin_maps.append (dummy + "/all.pluginmap");
+ 	}
+ // END
+ 
  	interface_pref = static_cast<PluginPrefs> (config->readNumEntry ("Interface Preferences", static_cast<int> (PreferWizard)));
  }