[rkward-cvs] rkward/rkward/dialogs rkloadlibsdialog.cpp,1.8,1.9
Daniele Medri
danielemedri at users.sourceforge.net
Tue Nov 30 10:56:42 UTC 2004
Update of /cvsroot/rkward/rkward/rkward/dialogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10827/rkward/dialogs
Modified Files:
rkloadlibsdialog.cpp
Log Message:
Changes in labels
Index: rkloadlibsdialog.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/dialogs/rkloadlibsdialog.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** rkloadlibsdialog.cpp 29 Nov 2004 23:54:04 -0000 1.8
--- rkloadlibsdialog.cpp 30 Nov 2004 10:56:40 -0000 1.9
***************
*** 55,59 ****
layout->addWidget (new InstallPackagesWidget (this, page));
! error_dialog = new RKErrorDialog (i18n ("The R-backend has reported errors handling one or more packages.\nA transcript of the error message(s) is shown below."), i18n ("Error handling packages"), false);
num_child_widgets = 3;
--- 55,59 ----
layout->addWidget (new InstallPackagesWidget (this, page));
! error_dialog = new RKErrorDialog (i18n ("The R-backend has reported errors handling packages.\nA transcript of the errors are shown below."), i18n ("Error handling packages"), false);
num_child_widgets = 3;
***************
*** 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;
}
--- 142,146 ----
RKGlobals::rInterface ()->issueCommand (command, chain);
! if (RKCancelDialog::showCancelDialog (i18n ("Fetch list"), i18n ("Please, stand by while downloading list of packages."), this, this, SIGNAL (downloadComplete ()), command) == QDialog::Rejected) return false;
return true;
}
***************
*** 167,175 ****
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 ();
};
if ((!proc->normalExit ()) || (proc->exitStatus ())) {
! KMessageBox::error (this, i18n ("There was an error while trying to install the library. Please check the output on stderr. Sorry, there is no better error-handling so far..."), i18n ("Error installing library"));
}
delete proc;
--- 167,175 ----
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 ();
};
if ((!proc->normalExit ()) || (proc->exitStatus ())) {
! KMessageBox::error (this, i18n ("There was an error installing the packages. Please, check the output on stderr. Sorry, there is no better error-handling so far..."), i18n ("Error installing packages"));
}
delete proc;
***************
*** 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);
--- 192,196 ----
QVBoxLayout *mvbox = new QVBoxLayout (this, 0, KDialog::spacingHint ());
! QLabel *label = new QLabel (i18n ("No safeguards against removing essential packages. For example, unloading \"rkward\" package this application will no longer run properly. Please, be careful about the packages you unload."), this);
label->setAlignment (Qt::AlignAuto | Qt::AlignVCenter | Qt::ExpandTabs | Qt::WordBreak);
mvbox->addWidget (label);
***************
*** 322,326 ****
void LoadUnloadWidget::doLoadUnload () {
RK_TRACE (DIALOGS);
! // load libs previously not loaded
QListViewItem *loaded = loaded_view->firstChild ();
while (loaded) {
--- 322,326 ----
void LoadUnloadWidget::doLoadUnload () {
RK_TRACE (DIALOGS);
! // load packages previously not loaded
QListViewItem *loaded = loaded_view->firstChild ();
while (loaded) {
***************
*** 331,335 ****
}
! // detach libs previously attached
for (QStringList::Iterator it = prev_packages.begin (); it != prev_packages.end (); ++it) {
bool found = false;
--- 331,335 ----
}
! // detach packages previously attached
for (QStringList::Iterator it = prev_packages.begin (); it != prev_packages.end (); ++it) {
bool found = false;
***************
*** 370,374 ****
QVBoxLayout *mvbox = new QVBoxLayout (this, 0, KDialog::spacingHint ());
! QLabel *label = new QLabel (i18n ("Packages for which a more recent version exists on CRAN. Click the 'Fetch list' button to determine the list of packages that can be updated. Note that this requires a working network connection to CRAN."), this);
label->setAlignment (Qt::AlignAuto | Qt::AlignVCenter | Qt::ExpandTabs | Qt::WordBreak);
mvbox->addWidget (label);
--- 370,374 ----
QVBoxLayout *mvbox = new QVBoxLayout (this, 0, KDialog::spacingHint ());
! QLabel *label = new QLabel (i18n ("Local packages could be updated with their latest versions from CRAN (Comprehensive R Archive Network). This feature require a working network connection to Internet."), this);
label->setAlignment (Qt::AlignAuto | Qt::AlignVCenter | Qt::ExpandTabs | Qt::WordBreak);
mvbox->addWidget (label);
***************
*** 379,384 ****
updateable_view->addColumn (i18n ("Name"));
updateable_view->addColumn (i18n ("Location"));
! updateable_view->addColumn (i18n ("Current Version"));
! updateable_view->addColumn (i18n ("New Version"));
updateable_view->setSelectionMode (QListView::Extended);
hbox->addWidget (updateable_view);
--- 379,384 ----
updateable_view->addColumn (i18n ("Name"));
updateable_view->addColumn (i18n ("Location"));
! updateable_view->addColumn (i18n ("Local"));
! updateable_view->addColumn (i18n ("Online"));
updateable_view->setSelectionMode (QListView::Extended);
hbox->addWidget (updateable_view);
***************
*** 391,395 ****
update_all_button = new QPushButton (i18n ("Update All"), this);
connect (update_selected_button, SIGNAL (clicked ()), this, SLOT (updateAllButtonClicked ()));
! become_root_box = new QCheckBox (i18n ("Become root for installation"), this);
become_root_box->setChecked (true);
buttonvbox->addWidget (get_list_button);
--- 391,395 ----
update_all_button = new QPushButton (i18n ("Update All"), this);
connect (update_selected_button, SIGNAL (clicked ()), this, SLOT (updateAllButtonClicked ()));
! become_root_box = new QCheckBox (i18n ("As \"root\" user"), this);
become_root_box->setChecked (true);
buttonvbox->addWidget (get_list_button);
***************
*** 404,408 ****
update_all_button->setEnabled (false);
updateable_view->setEnabled (false);
! placeholder = new QListViewItem (updateable_view, i18n ("<<Click 'Fetch list' to find out which packages can be updated>>"));
connect (dialog, SIGNAL (okClicked ()), this, SLOT (ok ()));
--- 404,409 ----
update_all_button->setEnabled (false);
updateable_view->setEnabled (false);
! //placeholder = new QListViewItem (updateable_view, i18n ("[Click \"Fetch list\" for updates]"));
! placeholder = new QListViewItem (updateable_view, "...");
connect (dialog, SIGNAL (okClicked ()), this, SLOT (ok ()));
***************
*** 434,438 ****
update_all_button->setEnabled (true);
} else {
! placeholder = new QListViewItem (updateable_view, i18n ("<<No updates available>>"));
}
} else {
--- 435,439 ----
update_all_button->setEnabled (true);
} else {
! placeholder = new QListViewItem (updateable_view, i18n ("[No updates available]"));
}
} else {
***************
*** 475,479 ****
get_list_button->setEnabled (false);
! RKCancelDialog::showCancelDialog (i18n ("Downloading package list ..."), i18n ("Please stand by while downloading the list of packages from CRAN."), this, this, SIGNAL (actionDone ()), command);
}
--- 476,480 ----
get_list_button->setEnabled (false);
! RKCancelDialog::showCancelDialog (i18n ("Fetch list"), i18n ("Please, stand by while downloading the list of packages."), this, this, SIGNAL (actionDone ()), command);
}
***************
*** 498,505 ****
QVBoxLayout *mvbox = new QVBoxLayout (this, 0, KDialog::spacingHint ());
! QLabel *label = new QLabel (i18n ("Packages available on CRAN. Click the 'Fetch list' button to determine the list of packages that can be downloaded. Note that this requires a working network connection to CRAN."), this);
label->setAlignment (Qt::AlignAuto | Qt::AlignVCenter | Qt::ExpandTabs | Qt::WordBreak);
mvbox->addWidget (label);
-
QHBoxLayout *hbox = new QHBoxLayout (mvbox, KDialog::spacingHint ());
--- 499,505 ----
QVBoxLayout *mvbox = new QVBoxLayout (this, 0, KDialog::spacingHint ());
! QLabel *label = new QLabel (i18n ("Many packages are available on CRAN (Comprehensive R Archive Network) and you could fetch the list with a working network connection to Internet."), this);
label->setAlignment (Qt::AlignAuto | Qt::AlignVCenter | Qt::ExpandTabs | Qt::WordBreak);
mvbox->addWidget (label);
QHBoxLayout *hbox = new QHBoxLayout (mvbox, KDialog::spacingHint ());
***************
*** 515,519 ****
install_selected_button = new QPushButton (i18n ("Install Selected"), this);
connect (install_selected_button, SIGNAL (clicked ()), this, SLOT (installSelectedButtonClicked ()));
! become_root_box = new QCheckBox (i18n ("Become root for installation"), this);
become_root_box->setChecked (true);
buttonvbox->addWidget (get_list_button);
--- 515,519 ----
install_selected_button = new QPushButton (i18n ("Install Selected"), this);
connect (install_selected_button, SIGNAL (clicked ()), this, SLOT (installSelectedButtonClicked ()));
! become_root_box = new QCheckBox (i18n ("As \"root\" user"), this);
become_root_box->setChecked (true);
buttonvbox->addWidget (get_list_button);
***************
*** 526,530 ****
install_selected_button->setEnabled (false);
installable_view->setEnabled (false);
! placeholder = new QListViewItem (installable_view, i18n ("<<Click 'Fetch list' to find out which packages are availabe on CRAN>>"));
connect (dialog, SIGNAL (okClicked ()), this, SLOT (ok ()));
--- 526,531 ----
install_selected_button->setEnabled (false);
installable_view->setEnabled (false);
! //placeholder = new QListViewItem (installable_view, i18n ("[Click \"Fetch list\" to see available packages]"));
! placeholder = new QListViewItem (installable_view, "...");
connect (dialog, SIGNAL (okClicked ()), this, SLOT (ok ()));
***************
*** 555,559 ****
install_selected_button->setEnabled (true);
} else {
! placeholder = new QListViewItem (installable_view, i18n ("<<No packages available>>"));
}
} else {
--- 556,560 ----
install_selected_button->setEnabled (true);
} else {
! placeholder = new QListViewItem (installable_view, i18n ("[No packages available]"));
}
} else {
***************
*** 587,591 ****
get_list_button->setEnabled (false);
! RKCancelDialog::showCancelDialog (i18n ("Downloading package list ..."), i18n ("Please stand by while downloading the list of packages from CRAN."), this, this, SIGNAL (actionDone ()), command);
}
--- 588,592 ----
get_list_button->setEnabled (false);
! RKCancelDialog::showCancelDialog (i18n ("Fetch list"), i18n ("Please, stand by while downloading packages from CRAN."), this, this, SIGNAL (actionDone ()), command);
}
More information about the rkward-tracker
mailing list