[rkward-cvs] rkward/rkward khelpdlg.cpp,1.2,1.3 rkward.cpp,1.60,1.61

[Pierre]

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

Modified Files:
	khelpdlg.cpp rkward.cpp 
Log Message:
Hides problem with help dock

Index: rkward.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rkward.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** rkward.cpp	27 Feb 2005 16:21:44 -0000	1.60
--- rkward.cpp	13 Mar 2005 10:12:29 -0000	1.61
***************
*** 160,165 ****
  	output->hide ();*/
  
!     QString dummy = "Before you start bashing at it: please note that this is merely a technology preview release. You might acutally be able to use it for some very simple tasks, but chances are it's of hardly any practical value so far. It does not do much good. It might do some very bad things (don't let it touch valuable data!). It's lacking in many respects. If you would like to help improve it, or simply get in contact, visit:\nhttp://rkward.sourceforge.net\nAll comments are welcome.";
! 	KMessageBox::information (this, dummy, "Before you complain...", "state_of_rkward");
  	
  	startR ();
--- 160,165 ----
  	output->hide ();*/
  
!     QString dummy = i18n("Before you start bashing at it: please note that this is merely a technology preview release. You might acutally be able to use it for some very simple tasks, but chances are it's of hardly any practical value so far. It does not do much good. It might do some very bad things (don't let it touch valuable data!). It's lacking in many respects. If you would like to help improve it, or simply get in contact, visit:\nhttp://rkward.sourceforge.net\nAll comments are welcome.");
! 	KMessageBox::information (this, dummy, i18n("Before you complain..."), "state_of_rkward");
  	
  	startR ();
***************
*** 202,208 ****
  	
  	
! 	helpDlg = new KHelpDlg(0);
  	helpDlg->setIcon(SmallIcon("help"));
! 	addToolWindow(helpDlg,KDockWidget::DockBottom, getMainDockWidget(), 10);
  	
  	
--- 202,208 ----
  	
  	
! 	/*helpDlg = new KHelpDlg(0);
  	helpDlg->setIcon(SmallIcon("help"));
! 	addToolWindow(helpDlg,KDockWidget::DockBottom, getMainDockWidget(), 10);*/
  	
  	
***************
*** 578,581 ****
--- 578,582 ----
  		RKGlobals::editorManager ()->editObject (object, true);
  	}
+ 	
  }
  

Index: khelpdlg.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/khelpdlg.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** khelpdlg.cpp	27 Feb 2005 10:38:56 -0000	1.2
--- khelpdlg.cpp	13 Mar 2005 10:12:29 -0000	1.3
***************
*** 24,27 ****
--- 24,28 ----
  
  #include "rbackend/rinterface.h"
+ #include "rbackend/rcommandreceiver.h"
  #include "debug.h"
  #include "rkglobals.h"
***************
*** 29,32 ****
--- 30,34 ----
  
  #include "khelpdlg.h"
+ #include <kmessagebox.h>
  
  #define GET_HELP_URL 1
***************
*** 45,48 ****
--- 47,52 ----
  	resultsList->addColumn (i18n ("Package"));
  	packagesList->insertItem (i18n("All"));
+ 	
+ 	RKGlobals::rInterface ()->issueCommand (".rk.get.installed.packages ()", RCommand::App | RCommand::Sync | RCommand::GetStringVector, "", this, GET_INSTALLED_PACKAGES, chain);
  }
  
***************
*** 53,56 ****
--- 57,64 ----
  void KHelpDlg::slotFindButtonClicked()
  {
+ 	if (field->currentText().isEmpty()) {
+ 		return;
+ 	}
+ 
  	QString agrep = "FALSE";
  	if(fuzzyCheckBox->isChecked ()==TRUE){
***************
*** 80,84 ****
  	s.append(package);
  	s.append(")");
! 
  	RKGlobals::rInterface ()->issueCommand (s, RCommand::App | RCommand::Sync | RCommand::GetStringVector, "", this, HELP_SEARCH, chain);
  	
--- 88,92 ----
  	s.append(package);
  	s.append(")");
! 	
  	RKGlobals::rInterface ()->issueCommand (s, RCommand::App | RCommand::Sync | RCommand::GetStringVector, "", this, HELP_SEARCH, chain);
  	
***************
*** 88,91 ****
--- 96,106 ----
  void KHelpDlg::slotResultsListDblClicked( QListViewItem * item, const QPoint &, int )
  {
+ 	if (item == NULL) {
+ 		return;
+ 	}
+ 	if (item->text(0).isEmpty()) {
+ 		return;
+ 	}
+ 	
  	chain=0;
  	QString s="help(\"";
***************
*** 100,104 ****
  void KHelpDlg::slotPackageListActivated()
  {
! 	RKGlobals::rInterface ()->issueCommand (".rk.get.installed.packages ()", RCommand::App | RCommand::Sync | RCommand::GetStringVector, "", this, GET_INSTALLED_PACKAGES, chain);
  }
  
--- 115,119 ----
  void KHelpDlg::slotPackageListActivated()
  {
! 
  }
  
***************
*** 122,126 ****
  		}
  	} else if (command->getFlags () == GET_INSTALLED_PACKAGES) {
- 		// FIXME : the following causes RKWard to crash (?).
  		RK_ASSERT ((command->stringVectorLength () % 4) == 0);
  		int count = (command->stringVectorLength () / 4);
--- 137,140 ----