[rkward-cvs] rkward/rkward rkward.cpp,1.51,1.52
Daniele Medri
danielemedri at users.sourceforge.net
Wed Nov 17 09:05:21 UTC 2004
Update of /cvsroot/rkward/rkward/rkward
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20326
Modified Files:
rkward.cpp
Log Message:
Rewiew on some labels
Index: rkward.cpp
===================================================================
RCS file: /cvsroot/rkward/rkward/rkward/rkward.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -C2 -d -r1.51 -r1.52
*** rkward.cpp 3 Nov 2004 14:53:42 -0000 1.51
--- rkward.cpp 17 Nov 2004 09:05:17 -0000 1.52
***************
*** 111,115 ****
RKGlobals::manager = new RKEditorManager ();
! KMdiChildView * editorManagerView = createWrapper(RKGlobals::editorManager (), i18n( "Object Editor"), i18n( "R Object Editor"));
editorManagerView->setIcon(SmallIcon("spreadsheet"));
addWindow( editorManagerView );
--- 111,115 ----
RKGlobals::manager = new RKEditorManager ();
! KMdiChildView * editorManagerView = createWrapper(RKGlobals::editorManager (), i18n( "Editor"), i18n( "Editor"));
editorManagerView->setIcon(SmallIcon("spreadsheet"));
addWindow( editorManagerView );
***************
*** 187,195 ****
//It's necessary to give a different name to all tool windows, or they won't be properly displayed
! object_browser->setName("object browser");
object_browser->setIcon(SmallIcon("view_tree"));
! addToolWindow(object_browser,KDockWidget::DockLeft, getMainDockWidget(), 30 , i18n ("This is a list of the objects present in the R workspace.") , i18n ("Object browser"));
! RKGlobals::rInterface ()->watch->setName("R console");
RKGlobals::rInterface ()->watch->setIcon(SmallIcon("konsole"));
addToolWindow(RKGlobals::rInterface ()->watch,KDockWidget::DockBottom, getMainDockWidget(), 10);
--- 187,195 ----
//It's necessary to give a different name to all tool windows, or they won't be properly displayed
! object_browser->setName("workspace");
object_browser->setIcon(SmallIcon("view_tree"));
! addToolWindow(object_browser,KDockWidget::DockLeft, getMainDockWidget(), 30 , i18n ("Existing objects in your workspace.") , i18n ("Workspace"));
! RKGlobals::rInterface ()->watch->setName("Console");
RKGlobals::rInterface ()->watch->setIcon(SmallIcon("konsole"));
addToolWindow(RKGlobals::rInterface ()->watch,KDockWidget::DockBottom, getMainDockWidget(), 10);
***************
*** 209,213 ****
if (!initPluginDir (RKSettingsModulePlugins::pluginDir (), 0)) {
! KMessageBox::information (0, i18n ("Could not find any plugins!\nRKWard is pretty useless without plugins, so you should use Settings->Plugins to import some.\n"), i18n ("No plugins found"));
}
--- 209,213 ----
if (!initPluginDir (RKSettingsModulePlugins::pluginDir (), 0)) {
! KMessageBox::information (0, i18n ("Plugins are needed: you may manage these throught \"Settings->Configure RKWard\".\n"), i18n ("No plugins found"));
}
***************
*** 323,327 ****
fileSaveWorkspaceAs = KStdAction::saveAs(this, SLOT(slotFileSaveWorkspaceAs()), actionCollection(), "file_save_asx");
fileSaveWorkspaceAs->setText (i18n ("Save Workspace As"));
! file_load_libs = new KAction (i18n ("Load R Libraries"), 0, 0, this, SLOT (slotFileLoadLibs ()), actionCollection (), "file_load_libs");
close_editor = KStdAction::close (this, SLOT(slotCloseEditor ()), actionCollection(), "editor_close");
close_editor->setText (i18n ("Close current editor"));
--- 323,327 ----
fileSaveWorkspaceAs = KStdAction::saveAs(this, SLOT(slotFileSaveWorkspaceAs()), actionCollection(), "file_save_asx");
fileSaveWorkspaceAs->setText (i18n ("Save Workspace As"));
! file_load_libs = new KAction (i18n ("Libraries"), 0, 0, this, SLOT (slotFileLoadLibs ()), actionCollection (), "file_load_libs");
close_editor = KStdAction::close (this, SLOT(slotCloseEditor ()), actionCollection(), "editor_close");
close_editor->setText (i18n ("Close current editor"));
***************
*** 344,350 ****
viewToolBar = KStdAction::showToolbar(this, SLOT(slotViewToolBar()), actionCollection());
viewStatusBar = KStdAction::showStatusbar(this, SLOT(slotViewStatusBar()), actionCollection());
! showRKWatch = new KToggleAction (i18n ("Show R Console-Window"), 0, 0, this, SLOT(slotShowRKWatch ()), actionCollection(), "windows_rkwatch");
! showRKOutput = new KToggleAction (i18n ("Show Output-Window"), 0, 0, this, SLOT(slotShowRKOutput ()), actionCollection(), "windows_rkoutput");
! showRObjectBrowser = new KToggleAction (i18n ("Show Object Browser-Window"), 0, 0, this, SLOT(slotShowRObjectBrowser ()), actionCollection(), "windows_robjectbrowser");
runAll = new KAction (i18n ("Run All"), 0, 0, this, SLOT (slotRunAll ()), actionCollection (), "run_all");
--- 344,350 ----
viewToolBar = KStdAction::showToolbar(this, SLOT(slotViewToolBar()), actionCollection());
viewStatusBar = KStdAction::showStatusbar(this, SLOT(slotViewStatusBar()), actionCollection());
! showRKWatch = new KToggleAction (i18n ("Console"), 0, 0, this, SLOT(slotShowRKWatch ()), actionCollection(), "windows_rkwatch");
! showRKOutput = new KToggleAction (i18n ("Output"), 0, 0, this, SLOT(slotShowRKOutput ()), actionCollection(), "windows_rkoutput");
! showRObjectBrowser = new KToggleAction (i18n ("Workspace"), 0, 0, this, SLOT(slotShowRObjectBrowser ()), actionCollection(), "windows_robjectbrowser");
runAll = new KAction (i18n ("Run All"), 0, 0, this, SLOT (slotRunAll ()), actionCollection (), "run_all");
***************
*** 355,359 ****
interruptCommand->setIcon("stop");
! configure = new KAction (i18n ("Configure Settings"), 0, 0, this, SLOT(slotConfigure ()), actionCollection(), "configure");
new_data_frame->setStatusText (i18n ("Creates a new empty data.frame and opens it for editing"));
--- 355,359 ----
interruptCommand->setIcon("stop");
! configure = new KAction (i18n ("Configure RKWard"), 0, 0, this, SLOT(slotConfigure ()), actionCollection(), "configure");
new_data_frame->setStatusText (i18n ("Creates a new empty data.frame and opens it for editing"));
***************
*** 392,396 ****
// TODO: add your own items you need for displaying current application status.
statusBar()->insertItem(i18n("Ready."), ID_STATUS_MSG);
! statusBar()->insertItem(i18n("starting R-processor"), ID_R_STATUS_MSG);
}
--- 392,396 ----
// TODO: add your own items you need for displaying current application status.
statusBar()->insertItem(i18n("Ready."), ID_STATUS_MSG);
! statusBar()->insertItem(i18n("starting R engine"), ID_R_STATUS_MSG);
}
***************
*** 561,565 ****
bool ok;
! QString name = KInputDialog::getText (i18n ("Create new data.frame"), i18n ("Enter name for the new object"), "my.data", &ok, this);
if (ok) {
--- 561,565 ----
bool ok;
! QString name = KInputDialog::getText (i18n ("New dataset"), i18n ("Enter name for the new dataset"), "my.data", &ok, this);
if (ok) {
***************
*** 759,763 ****
{
RK_TRACE (APP);
! slotStatusMsg(i18n("Toggle the statusbar..."));
///////////////////////////////////////////////////////////////////
//turn Statusbar on or off
--- 759,763 ----
{
RK_TRACE (APP);
! slotStatusMsg(i18n("Toggling statusbar..."));
///////////////////////////////////////////////////////////////////
//turn Statusbar on or off
***************
*** 821,827 ****
RK_TRACE (APP);
if (busy) {
! statusBar()->changeItem(i18n("R-process busy"), ID_R_STATUS_MSG);
} else {
! statusBar ()->changeItem (i18n ("R-process idle"), ID_R_STATUS_MSG);
}
}
--- 821,827 ----
RK_TRACE (APP);
if (busy) {
! statusBar()->changeItem(i18n("R engine busy"), ID_R_STATUS_MSG);
} else {
! statusBar ()->changeItem (i18n ("R engine idle"), ID_R_STATUS_MSG);
}
}
***************
*** 844,848 ****
{
KMessageBox::messageBox(this,KMessageBox::Information,
! "The file you specified is not a local file","Cannot open file");
return;
}
--- 844,848 ----
{
KMessageBox::messageBox(this,KMessageBox::Information,
! "You specified a file that is not on local system","Cannot open file");
return;
}
More information about the rkward-tracker
mailing list