[rkward-cvs] rkward/rkward rkward.cpp,1.85,1.86

[Thomas Friedrichsmeier]

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

Modified Files:
	rkward.cpp 
Log Message:
Finish restructuring plugin-hierarchy creation. Allow to select several .pluginmap files in Settings->Configure RKWard. Some fixes and cleanups

Index: rkward.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rkward.cpp,v
retrieving revision 1.85
retrieving revision 1.86
diff -C2 -d -r1.85 -r1.86
*** rkward.cpp	9 Sep 2005 13:02:57 -0000	1.85
--- rkward.cpp	11 Sep 2005 18:53:04 -0000	1.86
***************
*** 220,228 ****
  	
  	RKGlobals::componentMap ()->clear ();
! 	if (!(QFileInfo (RKSettingsModulePlugins::pluginMap ()).isReadable ())) {
! 		KMessageBox::information (0, i18n ("Plugins are needed: you may manage these throught \"Settings->Configure RKWard\".\n"), i18n ("No pluginmap found"));
  	}
! 	RKGlobals::componentMap ()->addPluginMap (RKSettingsModulePlugins::pluginMap ());
! 	
  	slotStatusMsg(i18n("Ready."));
  }
--- 220,234 ----
  	
  	RKGlobals::componentMap ()->clear ();
! 
! 	QStringList list = RKSettingsModulePlugins::pluginMaps ();
! 	int counter = 0;
! 	for (QStringList::const_iterator it = RKSettingsModulePlugins::pluginMaps ().begin (); it != RKSettingsModulePlugins::pluginMaps ().end (); ++it) {
! 		counter += RKGlobals::componentMap ()->addPluginMap ((*it));
  	}
! 
! 	if (counter < 1) {
! 		KMessageBox::information (0, i18n ("Plugins are needed: you may manage these through \"Settings->Configure RKWard\".\n"), i18n ("No (valid) plugins found"));
! 	}
! 
  	slotStatusMsg(i18n("Ready."));
  }