[rkward-cvs] rkward/rkward/dialogs rkloadlibsdialog.cpp,1.6,1.7

[Daniele Medri]

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

Modified Files:
	rkloadlibsdialog.cpp 
Log Message:
Confusion on terms: sometime appear "Libraries", sometime "Packages".
After few changes and browsing r-project site, I believe in "Packages".


Index: rkloadlibsdialog.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/dialogs/rkloadlibsdialog.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** rkloadlibsdialog.cpp	29 Nov 2004 23:38:37 -0000	1.6
--- rkloadlibsdialog.cpp	29 Nov 2004 23:52:06 -0000	1.7
***************
*** 43,47 ****
  	RKLoadLibsDialog::chain = chain;
  	
! 	QFrame *page = addPage (i18n ("Local libraries"));
  	QVBoxLayout *layout = new QVBoxLayout (page, 0, KDialog::spacingHint ());
  	layout->addWidget (new LoadUnloadWidget (this, page));
--- 43,47 ----
  	RKLoadLibsDialog::chain = chain;
  	
! 	QFrame *page = addPage (i18n ("Local packages"));
  	QVBoxLayout *layout = new QVBoxLayout (page, 0, KDialog::spacingHint ());
  	layout->addWidget (new LoadUnloadWidget (this, page));
***************
*** 142,146 ****
  	RKGlobals::rInterface ()->issueCommand (command, chain);
  	
! 	if (RKCancelDialog::showCancelDialog (i18n ("Downloading libraries..."), i18n ("Please stand by while downloading libraries."), this, this, SIGNAL (downloadComplete ()), command) == QDialog::Rejected) return false;
  	return true;
  }
--- 142,146 ----
  	RKGlobals::rInterface ()->issueCommand (command, chain);
  	
! 	if (RKCancelDialog::showCancelDialog (i18n ("Downloading packages..."), i18n ("Please stand by while downloading packages."), this, this, SIGNAL (downloadComplete ()), command) == QDialog::Rejected) return false;
  	return true;
  }
***************
*** 167,171 ****
  	proc->start ();
  	connect (proc, SIGNAL (processExited (KProcess *)), this, SLOT (processExited (KProcess *)));
! 	if (RKCancelDialog::showCancelDialog (i18n ("Installing libraries..."), i18n ("Please stand by while installing libraries."), this, this, SIGNAL (installationComplete ())) == QDialog::Rejected) {
  		proc->kill ();
  	};
--- 167,171 ----
  	proc->start ();
  	connect (proc, SIGNAL (processExited (KProcess *)), this, SLOT (processExited (KProcess *)));
! 	if (RKCancelDialog::showCancelDialog (i18n ("Installing packages..."), i18n ("Please stand by while installing packages."), this, this, SIGNAL (installationComplete ())) == QDialog::Rejected) {
  		proc->kill ();
  	};
***************
*** 192,196 ****
  	
  	QVBoxLayout *mvbox = new QVBoxLayout (this, 0, KDialog::spacingHint ());
! 	QLabel *label = new QLabel (i18n ("Warning! There are no safeguards against removing essential library so far. If you remove e.g. library rkward, RKWard will no longer function properly (including this very dialog). So please be careful about the libraries you remove."), this);
  	label->setAlignment (Qt::AlignAuto | Qt::AlignVCenter | Qt::ExpandTabs | Qt::WordBreak);
  	mvbox->addWidget (label);
--- 192,196 ----
  	
  	QVBoxLayout *mvbox = new QVBoxLayout (this, 0, KDialog::spacingHint ());
! 	QLabel *label = new QLabel (i18n ("Warning! There are no safeguards against removing essential library so far. If you remove e.g. library rkward, RKWard will no longer function properly (including this very dialog). So please be careful about the packages you remove."), this);
  	label->setAlignment (Qt::AlignAuto | Qt::AlignVCenter | Qt::ExpandTabs | Qt::WordBreak);
  	mvbox->addWidget (label);
***************
*** 201,205 ****
  	QVBoxLayout *loadedvbox = new QVBoxLayout (hbox, KDialog::spacingHint ());
  	
! 	label = new QLabel (i18n ("Installed libraries"), this);
  	installed_view = new QListView (this);
  	installed_view->addColumn (i18n ("Name"));
--- 201,205 ----
  	QVBoxLayout *loadedvbox = new QVBoxLayout (hbox, KDialog::spacingHint ());
  	
! 	label = new QLabel (i18n ("Installed packages"), this);
  	installed_view = new QListView (this);
  	installed_view->addColumn (i18n ("Name"));
***************
*** 220,224 ****
  	buttonvbox->addStretch (2);
  	
! 	label = new QLabel (i18n ("Loaded libraries"), this);
  	loaded_view = new QListView (this);
  	loaded_view->addColumn (i18n ("Name"));
--- 220,224 ----
  	buttonvbox->addStretch (2);
  	
! 	label = new QLabel (i18n ("Loaded packages"), this);
  	loaded_view = new QListView (this);
  	loaded_view->addColumn (i18n ("Name"));