[rkward-cvs] rkward/rkward khelpdlg.cpp,1.6,1.7 khelpdlg.h,1.4,1.5 main.cpp,1.11,1.12

[Pierre]

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

Modified Files:
	khelpdlg.cpp khelpdlg.h main.cpp 
Log Message:
Modifs by Adrien + various pre-release stuff

Index: main.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/main.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** main.cpp	24 Mar 2005 20:37:22 -0000	1.11
--- main.cpp	26 Mar 2005 10:32:18 -0000	1.12
***************
*** 30,34 ****
  
  static const char *version =
!        I18N_NOOP("0.3.0");
  
  static const char *description =
--- 30,34 ----
  
  static const char *version =
!        I18N_NOOP("0.3.1");
  
  static const char *description =
***************
*** 50,61 ****
  
  	KAboutData aboutData( "rkward", I18N_NOOP ("RKWard"), version, description, KAboutData::License_GPL, "(c) 2002, 2004", 0, "http://rkward.sf.net", "");
! 	aboutData.addAuthor ("Thomas Friedrichsmeier", "Project leader", "");
! 	aboutData.addAuthor ("Pierre Ecochard", "Contributor", "");
! 	aboutData.addAuthor ("Adrien d'Hardemare", "Contributor", "");
! 	aboutData.addAuthor ("Daniele Medri", "Contributor", "");
! 	aboutData.addCredit ("David Sibai", "Several valuable comments, hints and patches", "");
! 	aboutData.addCredit ("Daniele Medri", "RKWard logo, many suggestions", "");
! 	aboutData.addCredit ("Philippe Grosjean", "Several helpful comments and discussions", "");
! 	aboutData.addCredit ("Many more people on rkward-devel at lists.sourceforge.net", "Sorry, I forgot to list you. Please contact me to get added", "");
  	KCmdLineArgs::init( argc, argv, &aboutData );
  	KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.
--- 50,60 ----
  
  	KAboutData aboutData( "rkward", I18N_NOOP ("RKWard"), version, description, KAboutData::License_GPL, "(c) 2002, 2004", 0, "http://rkward.sf.net", "");
! 	aboutData.addAuthor ("Thomas Friedrichsmeier", i18n("Project leader"), "");
! 	aboutData.addAuthor ("Pierre Ecochard", i18n("Coder since 0.29"), "");
! 	aboutData.addCredit ("Adrien d'Hardemare", i18n("Plugins and patches"), "");
! 	aboutData.addCredit ("Daniele Medri", i18n("RKWard logo, many suggestions, help on wording"), "");
! 	aboutData.addCredit ("David Sibai", i18n("Several valuable comments, hints and patches"), "");
! 	aboutData.addCredit ("Philippe Grosjean", i18n("Several helpful comments and discussions"), "");
! 	aboutData.addCredit (i18n("Many more people on rkward-devel at lists.sourceforge.net"), i18n("Sorry, I forgot to list you. Please contact me to get added"), "");
  	KCmdLineArgs::init( argc, argv, &aboutData );
  	KCmdLineArgs::addCmdLineOptions( options ); // Add our own options.

Index: khelpdlg.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/khelpdlg.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** khelpdlg.cpp	24 Mar 2005 09:02:12 -0000	1.6
--- khelpdlg.cpp	26 Mar 2005 10:32:18 -0000	1.7
***************
*** 54,68 ****
  	fieldsList->insertItem (i18n("Not implemented yet"));
  
! 	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);
--- 54,60 ----
  	fieldsList->insertItem (i18n("Not implemented yet"));
  
! 	connect(this, SIGNAL(keyPressEvent (QKeyEvent * e)), this, SLOT(slotFieldKeyPressEvent (QKeyEvent * e)));
  	
! 
  
  	RKGlobals::rInterface ()->issueCommand (".rk.get.installed.packages ()", RCommand::App | RCommand::Sync | RCommand::GetStringVector, "", this, GET_INSTALLED_PACKAGES, 0);
***************
*** 104,108 ****
  		+ 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);
--- 96,99 ----
***************
*** 173,190 ****
  
  
- /*!
-     \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, 0);
- }
- 
  
  /*!
      \fn KHelpDlg::slotFieldKeyPressEvent ( QKeyEvent * e )
!     
      We intercept enter.
   */
--- 164,171 ----
  
  
  
  /*!
      \fn KHelpDlg::slotFieldKeyPressEvent ( QKeyEvent * e )
! 
      We intercept enter.
   */
***************
*** 193,197 ****
  
  	
! 	if (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return) {
  		slotFindButtonClicked ();
  		return;
--- 174,178 ----
  
  	
! 	if ( (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return) && field->hasFocus ()) {
  		slotFindButtonClicked ();
  		return;

Index: khelpdlg.h
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/khelpdlg.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** khelpdlg.h	24 Mar 2005 07:34:32 -0000	1.4
--- khelpdlg.h	26 Mar 2005 10:32:18 -0000	1.5
***************
*** 49,54 ****
  private:
      RCommandChain *chain;
- private slots:
-     void slotTimerDone ();
  };
  
--- 49,52 ----