[rkward-cvs] rkward/rkward khelpdlg.cpp,1.4,1.5 khelpdlg.h,1.3,1.4 rkconsole.cpp,1.2,1.3 rkward.cpp,1.62,1.63

Thu Mar 24 07:34:36 UTC 2005

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

Modified Files:
	khelpdlg.cpp khelpdlg.h rkconsole.cpp rkward.cpp 
Log Message:
A few modifications. The help dock should work, now.

Index: rkconsole.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rkconsole.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** rkconsole.cpp	17 Mar 2005 07:37:42 -0000	1.2
--- rkconsole.cpp	24 Mar 2005 07:34:32 -0000	1.3
***************
*** 36,39 ****
--- 36,41 ----
  	flush();

+ 	commandsList.append (new QString(""));
+ 	
  	commandsList.setAutoDelete( TRUE );

***************
*** 51,54 ****
--- 53,57 ----
  	getCursorPosition (&para, &pos);

+ 	
  	if (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return) {
  		submitCommand ();

Index: rkward.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rkward.cpp,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** rkward.cpp	17 Mar 2005 07:37:42 -0000	1.62
--- rkward.cpp	24 Mar 2005 07:34:32 -0000	1.63
***************
*** 796,822 ****
  void RKwardApp::slotShowRKWatch () {
  	RK_TRACE (APP);
! 	RKGlobals::rInterface ()->watch->setShown (showRKWatch->isChecked ());
  }

  void RKwardApp::slotShowRKOutput () {
  	RK_TRACE (APP);
! 	output->setShown (showRKOutput->isChecked ());
  }

  void RKwardApp::slotShowRObjectBrowser () {
  	RK_TRACE (APP);
! 	object_browser->setShown (showRObjectBrowser->isChecked ());
  }

  void RKwardApp::slotToggleWindowClosed () {
  	RK_TRACE (APP);
! 	showRKWatch->setChecked (RKGlobals::rInterface ()->watch->isShown ());
  	showRKOutput->setChecked (output->isShown ());
! 	showRObjectBrowser->setChecked (object_browser->isShown ());
  }

  void RKwardApp::newOutput () {
  	RK_TRACE (APP);
! 	output->checkNewInput ();
  	if (RKSettingsModuleOutput::autoShow ()) {
  		output->show ();
--- 796,822 ----
  void RKwardApp::slotShowRKWatch () {
  	RK_TRACE (APP);
! 	//RKGlobals::rInterface ()->watch->setShown (showRKWatch->isChecked ());
  }

  void RKwardApp::slotShowRKOutput () {
  	RK_TRACE (APP);
! 	//output->setShown (showRKOutput->isChecked ());
  }

  void RKwardApp::slotShowRObjectBrowser () {
  	RK_TRACE (APP);
! 	//object_browser->setShown (showRObjectBrowser->isChecked ());
  }

  void RKwardApp::slotToggleWindowClosed () {
  	RK_TRACE (APP);
! 	/*showRKWatch->setChecked (RKGlobals::rInterface ()->watch->isShown ());
  	showRKOutput->setChecked (output->isShown ());
! 	showRObjectBrowser->setChecked (object_browser->isShown ());*/
  }

  void RKwardApp::newOutput () {
  	RK_TRACE (APP);
! 	/*output->checkNewInput ();
  	if (RKSettingsModuleOutput::autoShow ()) {
  		output->show ();
***************
*** 825,829 ****
  			output->raise ();
  		}
! 	}
  }

--- 825,829 ----
  			output->raise ();
  		}
! 	}*/
  }

Index: khelpdlg.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/khelpdlg.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** khelpdlg.cpp	17 Mar 2005 07:37:42 -0000	1.4
--- khelpdlg.cpp	24 Mar 2005 07:34:32 -0000	1.5
***************
*** 51,63 ****
  	resultsList->addColumn (i18n ("Package"));
  	packagesList->insertItem (i18n("All"));

! 	// HACK: apparantly, we have to wait a little bit before we lauch an R command. So we wait half a second.
          QTimer *timer = new QTimer (this);
          connect(timer, SIGNAL(timeout ()), this, SLOT(slotTimerDone ()));
!         timer->start(2000, TRUE); // 0.5 seconds single-shot timer

  	// HACK again: it looks like we need to issue a command here?!
! 	RKGlobals::rInterface ()->issueCommand ("cat("")");

  }
--- 51,70 ----
  	resultsList->addColumn (i18n ("Package"));
  	packagesList->insertItem (i18n("All"));
+ 
+ 	connect(field, SIGNAL(keyPressEvent (QKeyEvent * e)), this, SLOT(slotFieldKeyPressEvent (QKeyEvent * e)));

! 	
! 	// HACK: apparantly, we have to wait a little bit before we lauch an R command. So we wait 3 seconds.
          QTimer *timer = new QTimer (this);
          connect(timer, SIGNAL(timeout ()), this, SLOT(slotTimerDone ()));
!         //timer->start(1000, TRUE); // 3 seconds single-shot timer

  	// HACK again: it looks like we need to issue a command here?!
! 	//RKGlobals::rInterface ()->issueCommand ("cat("")");
! 
! 	RKGlobals::rInterface ()->issueCommand (".rk.get.installed.packages ()", RCommand::App | RCommand::Sync | RCommand::GetStringVector, "", this, GET_INSTALLED_PACKAGES, 0);
! 
! 

  }
***************
*** 69,76 ****
  void KHelpDlg::slotFindButtonClicked()
  {
  	if (field->currentText().isEmpty()) {
  		return;
  	}
! 
  	QString agrep = "FALSE";
  	if(fuzzyCheckBox->isChecked ()==TRUE){
--- 76,84 ----
  void KHelpDlg::slotFindButtonClicked()
  {
+ 
  	if (field->currentText().isEmpty()) {
  		return;
  	}
! 	
  	QString agrep = "FALSE";
  	if(fuzzyCheckBox->isChecked ()==TRUE){
***************
*** 91,107 ****

! 	QString s = ".rk.get.search.results(\"";
! 	s.append(field->currentText());
! 	s.append("\",agrep=");
! 	s.append(agrep);
! 	s.append(", ignore.case=");
! 	s.append(ignoreCase);
! 	s.append(", package=");
! 	s.append(package);
! 	s.append(")");
! 	
! 	RKGlobals::rInterface ()->issueCommand (s, RCommand::App | RCommand::Sync | RCommand::GetStringVector, "", this, HELP_SEARCH, chain);

  	field->insertItem(field->currentText());
  }

--- 99,111 ----

! 	QString s = ".rk.get.search.results(\"" +field->currentText() +"\",agrep=" 
! 		+ agrep +", ignore.case=" + ignoreCase + ", package=" + package +")";
! 		
! 	qDebug("Find button launching command: "+ s);

+ 	RKGlobals::rInterface ()->issueCommand (s, RCommand::App | RCommand::Sync | RCommand::GetStringVector, "", this, HELP_SEARCH, 0);
  	field->insertItem(field->currentText());
+ 	
+ 	
  }

***************
*** 122,126 ****
  	s.append("\")");

! 	RKGlobals::rInterface ()->issueCommand (s, RCommand::App | RCommand::Sync | RCommand::GetStringVector, "", this, GET_HELP_URL, chain);
  }

--- 126,130 ----
  	s.append("\")");

! 	RKGlobals::rInterface ()->issueCommand (s, RCommand::App | RCommand::Sync | RCommand::GetStringVector, "", this, GET_HELP_URL, 0);
  }

***************
*** 174,177 ****
  void KHelpDlg::slotTimerDone ()
  {
!     //RKGlobals::rInterface ()->issueCommand (".rk.get.installed.packages ()", RCommand::App | RCommand::Sync | RCommand::GetStringVector, "", this, GET_INSTALLED_PACKAGES, chain);
  }
--- 178,199 ----
  void KHelpDlg::slotTimerDone ()
  {
!     RKGlobals::rInterface ()->issueCommand (".rk.get.installed.packages ()", RCommand::App | RCommand::Sync | RCommand::GetStringVector, "", this, GET_INSTALLED_PACKAGES, 0);
! }
! 
! 
! /*!
!     \fn KHelpDlg::slotFieldKeyPressEvent ( QKeyEvent * e )
!     
!     We intercept enter.
!  */
! void KHelpDlg::slotFieldKeyPressEvent ( QKeyEvent * e )
! {
! 
! 	
! 	if (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return) {
! 		slotFindButtonClicked ();
! 		return;
! 	}
! 	
! 	//QComboBox::keyPressEvent( e );
  }

Index: khelpdlg.h
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/khelpdlg.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** khelpdlg.h	17 Mar 2005 07:37:42 -0000	1.3
--- khelpdlg.h	24 Mar 2005 07:34:32 -0000	1.4
***************
*** 33,36 ****
--- 33,37 ----
      ~KHelpDlg();
      void rCommandDone (RCommand *command);
+     
    /*$PUBLIC_FUNCTIONS$*/

***************
*** 43,47 ****
  protected:
    /*$PROTECTED_FUNCTIONS$*/
! 
  protected slots:
    /*$PROTECTED_SLOTS$*/
--- 44,48 ----
  protected:
    /*$PROTECTED_FUNCTIONS$*/
!   void slotFieldKeyPressEvent ( QKeyEvent * e );
  protected slots:
    /*$PROTECTED_SLOTS$*/