[rkward-cvs] rkward/rkward helpdlg.ui,1.2,1.3 khelpdlg.cpp,1.3,1.4 khelpdlg.h,1.2,1.3 rkconsole.cpp,1.1,1.2 rkconsole.h,1.1,1.2 rkward.cpp,1.61,1.62

[Pierre]

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

Modified Files:
	helpdlg.ui khelpdlg.cpp khelpdlg.h rkconsole.cpp rkconsole.h 
	rkward.cpp 
Log Message:
Small things mainly.

Index: rkconsole.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rkconsole.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** rkconsole.cpp	13 Mar 2005 16:46:08 -0000	1.1
--- rkconsole.cpp	17 Mar 2005 07:37:42 -0000	1.2
***************
*** 70,74 ****
  	}
  	else if (e->key () == Qt::Key_Home){
! 		cursorAtTheEnd ();
  		return;
  	}
--- 70,74 ----
  	}
  	else if (e->key () == Qt::Key_Home){
! 		cursorAtTheBegining ();
  		return;
  	}
***************
*** 192,193 ****
--- 192,203 ----
  	}
  }
+ 
+ 
+ /*!
+     \fn RKConsole::cursorAtTheBegining()
+     Puts the cursor at the begining of the last line.
+  */
+ void RKConsole::cursorAtTheBegining()
+ {
+ 	setCursorPosition (paragraphs () - 1, prefix.length ());
+ }

Index: rkconsole.h
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rkconsole.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** rkconsole.h	13 Mar 2005 16:46:09 -0000	1.1
--- rkconsole.h	17 Mar 2005 07:37:42 -0000	1.2
***************
*** 22,25 ****
--- 22,26 ----
  
  /**
+ \brief Provides an R-like console.
  This class provides a console, which is very similar to the classic R console. It is mainly used by RKwatch to allow
  the user to enter commands manualy. It is basically just a modified QTextEdit.
***************
*** 70,73 ****
--- 71,75 ----
      void commandsListUp();
      void commandsListDown();
+     void cursorAtTheBegining();
  };
  

Index: helpdlg.ui
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/helpdlg.ui,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** helpdlg.ui	27 Feb 2005 10:38:56 -0000	1.2
--- helpdlg.ui	17 Mar 2005 07:37:42 -0000	1.3
***************
*** 266,275 ****
          <slot>slotResultsListDblClicked(QListViewItem*,const QPoint&,int)</slot>
      </connection>
-     <connection>
-         <sender>packagesList</sender>
-         <signal>activated(int)</signal>
-         <receiver>helpDlg</receiver>
-         <slot>slotPackagesListActivated(int)</slot>
-     </connection>
  </connections>
  <includes>
--- 266,269 ----
***************
*** 279,283 ****
      <slot>slotFindButtonClicked()</slot>
      <slot>slotResultsListDblClicked( QListViewItem *, const QPoint &, int )</slot>
-     <slot>slotPackagesListActivated(int)</slot>
  </slots>
  <layoutdefaults spacing="6" margin="11"/>
--- 273,276 ----

Index: rkward.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rkward.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** rkward.cpp	13 Mar 2005 10:12:29 -0000	1.61
--- rkward.cpp	17 Mar 2005 07:37:42 -0000	1.62
***************
*** 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);
  	
  	
***************
*** 1120,1127 ****
  void RKwardApp::slotFunctionReference()
  {
! 	if (! activeWindow()->inherits("RKCommandEditorWindow"))
! 		return;
! 	((RKCommandEditorWindow*) activeWindow())->showHelp();
! 	
  }
  
--- 1120,1129 ----
  void RKwardApp::slotFunctionReference()
  {
! 	//if (! activeWindow()->inherits("RKCommandEditorWindow"))
! 	//	return;
! 	//((RKCommandEditorWindow*) activeWindow())->showHelp();
! 	helpDlg = new KHelpDlg(0);
! 	helpDlg->setIcon(SmallIcon("help"));
! 	addToolWindow(helpDlg,KDockWidget::DockBottom, getMainDockWidget(), 10);
  }
  

Index: khelpdlg.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/khelpdlg.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** khelpdlg.cpp	13 Mar 2005 10:12:29 -0000	1.3
--- khelpdlg.cpp	17 Mar 2005 07:37:42 -0000	1.4
***************
*** 16,19 ****
--- 16,23 ----
   ***************************************************************************/
  
+  // To be removed :
+ #include <kmessagebox.h>
+  
+  
  #include <klocale.h>
  #include "kurl.h"
***************
*** 22,25 ****
--- 26,30 ----
  #include <qcombobox.h>
  #include <qlistview.h>
+ #include <qtimer.h>
  
  #include "rbackend/rinterface.h"
***************
*** 40,44 ****
  {
  	resultsList->clear();
- 	// HACK : I should'nt have to do that.
  	resultsList->removeColumn(0);
  	
--- 45,48 ----
***************
*** 48,52 ****
  	packagesList->insertItem (i18n("All"));
  	
! 	RKGlobals::rInterface ()->issueCommand (".rk.get.installed.packages ()", RCommand::App | RCommand::Sync | RCommand::GetStringVector, "", this, GET_INSTALLED_PACKAGES, chain);
  }
  
--- 52,64 ----
  	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("")");
! 	
  }
  
***************
*** 151,152 ****
--- 163,177 ----
  #include "khelpdlg.moc"
  
+ 
+ 
+ 
+ 
+ /*!
+     \fn KHelpDlg::slotTimerDone ()
+     
+     We use a timer to load the package list after a little while. We souln't have to do this.
+  */
+ void KHelpDlg::slotTimerDone ()
+ {
+     //RKGlobals::rInterface ()->issueCommand (".rk.get.installed.packages ()", RCommand::App | RCommand::Sync | RCommand::GetStringVector, "", this, GET_INSTALLED_PACKAGES, chain);
+ }

Index: khelpdlg.h
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/khelpdlg.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** khelpdlg.h	27 Feb 2005 10:38:56 -0000	1.2
--- khelpdlg.h	17 Mar 2005 07:37:42 -0000	1.3
***************
*** 48,51 ****
--- 48,53 ----
  private:
      RCommandChain *chain;
+ private slots:
+     void slotTimerDone ();
  };