[rkward-cvs] SF.net SVN: rkward: [1132] branches/release_branch_0.4.5/rkward
tfry at users.sourceforge.net
tfry at users.sourceforge.net
Fri Jan 12 13:07:29 UTC 2007
Revision: 1132
http://svn.sourceforge.net/rkward/?rev=1132&view=rev
Author: tfry
Date: 2007-01-12 05:07:29 -0800 (Fri, 12 Jan 2007)
Log Message:
-----------
Merge 1126, 1127, 1129, 1130 from trunk
Modified Paths:
--------------
branches/release_branch_0.4.5/rkward/TODO
branches/release_branch_0.4.5/rkward/rkward/plugins/distributions/plot_binomial_distribution.php
branches/release_branch_0.4.5/rkward/rkward/plugins/distributions/plot_chi_squared_distribution.php
branches/release_branch_0.4.5/rkward/rkward/plugins/distributions/plot_f_distribution.php
branches/release_branch_0.4.5/rkward/rkward/plugins/distributions/plot_normal_distribution.php
branches/release_branch_0.4.5/rkward/rkward/plugins/distributions/plot_poisson_distribution.php
branches/release_branch_0.4.5/rkward/rkward/plugins/distributions/plot_t_distribution.php
branches/release_branch_0.4.5/rkward/rkward/plugins/plots/box_plot.php
branches/release_branch_0.4.5/rkward/rkward/plugins/plots/density_plot.php
branches/release_branch_0.4.5/rkward/rkward/plugins/plots/ecdf_plot.php
branches/release_branch_0.4.5/rkward/rkward/plugins/plots/histogram.php
branches/release_branch_0.4.5/rkward/rkward/plugins/plots/stripchart_plot.php
branches/release_branch_0.4.5/rkward/rkward/rkconsolepart.rc
branches/release_branch_0.4.5/rkward/rkward/windows/rkcommandeditorwindowpart.cpp
branches/release_branch_0.4.5/rkward/rkward/windows/rkcommandlogpart.rc
branches/release_branch_0.4.5/rkward/rkward/windows/rkhtmlwindow.cpp
Modified: branches/release_branch_0.4.5/rkward/TODO
===================================================================
--- branches/release_branch_0.4.5/rkward/TODO 2007-01-12 12:31:31 UTC (rev 1131)
+++ branches/release_branch_0.4.5/rkward/TODO 2007-01-12 13:07:29 UTC (rev 1132)
@@ -49,6 +49,7 @@
- Rework package management dialog
- the UI should probably be simplified somehow. But how? All in a single list with "filter"? Ask for ideas/look at other apps
- this will be very hard to do with the current Qt. We'd really need several checkboxes *within* a QListViewItem. Tackle this when/after porting to Qt4
+ - add option to remove packages
- RObjectListView
- use better icons to mark up the different base types
- double click action should be configurable: View, Edit, insert name into current script, insert name into console, nothing
@@ -77,7 +78,6 @@
- David's usability items
- use RKGlobals::marginHint (), RKGlobals::spacingHint () everywhere
- from Ralf:
- - another nifty feature would be - if F8 would work also in the console/log.
- show first few values of vectors/scalars in tool-tip in workspace browser
- Debugging functionality
- ideally the whole thing: setting breakpoints, etc.
@@ -137,6 +137,9 @@
- How to do this nicely UI wise?
- RKCancelDialog / RKErrorDialog:
- remove these classes. Port to use RKProgressControl instead
+ - RThread:
+ - Detection of commands that run for a suspiciously long time
+ - Show "do you want to cancel ..." option after configurable amount of time
- use R_DirtyImage to determine, whether workspace needs to be saved
- in REmbedInternal, add extractTemporaryStrings (), for strings that do not have to be copied
- Object editing / modification tracking:
Modified: branches/release_branch_0.4.5/rkward/rkward/plugins/distributions/plot_binomial_distribution.php
===================================================================
--- branches/release_branch_0.4.5/rkward/rkward/plugins/distributions/plot_binomial_distribution.php 2007-01-12 12:31:31 UTC (rev 1131)
+++ branches/release_branch_0.4.5/rkward/rkward/plugins/distributions/plot_binomial_distribution.php 2007-01-12 13:07:29 UTC (rev 1132)
@@ -31,7 +31,7 @@
?>rk.header ("Plot binomial <? echo ($label); ?>", list ("Lowest quantile", "<? echo ($min); ?>", "Largest quantile", "<? echo ($min + ($nq * $space)); ?>", "Quantile spacing", "<? echo ($space); ?>", "Number of trials", "<? echo ($size); ?>", "Probability of success on each trial", "<? echo ($prob); ?>", "Function", "<? getRK ("function"); ?>", "Scaling", "<? echo ($log_label); ?>"));
rk.graph.on ()
-plot (<? getRK ("function"); ?> (seq (<? echo ($min); ?>, <? echo ($min + ($nq * $space)); ?>, by=<? echo ($space); ?>) , size=<? echo ($size); ?>, prob=<? echo ($prob); echo ($log); ?>))
+try (plot (<? getRK ("function"); ?> (seq (<? echo ($min); ?>, <? echo ($min + ($nq * $space)); ?>, by=<? echo ($space); ?>) , size=<? echo ($size); ?>, prob=<? echo ($prob); echo ($log); ?>)))
rk.graph.off ()
<?
}
Modified: branches/release_branch_0.4.5/rkward/rkward/plugins/distributions/plot_chi_squared_distribution.php
===================================================================
--- branches/release_branch_0.4.5/rkward/rkward/plugins/distributions/plot_chi_squared_distribution.php 2007-01-12 12:31:31 UTC (rev 1131)
+++ branches/release_branch_0.4.5/rkward/rkward/plugins/distributions/plot_chi_squared_distribution.php 2007-01-12 13:07:29 UTC (rev 1132)
@@ -9,7 +9,7 @@
?>rk.header ("Plot density <? getRK ("function"); ?>", list ("Number of Observations", "<? getRK ("n"); ?>", "Minimum", "<? getRK ("min"); ?>", "Maximum", "<? getRK ("max"); ?>", "Degrees of freedom", "<? getRK ("df"); ?>", "Function", "<? getRK ("function"); ?>"));
rk.graph.on ()
-plot (<? getRK ("function"); ?> (seq(<? getRK ("min"); ?> ,<? getRK ("max"); ?>, length= <? getRK ("n"); ?>) , df = <? getRK ("df"); ?>), xlab=expression(chi^2))
+try (plot (<? getRK ("function"); ?> (seq(<? getRK ("min"); ?> ,<? getRK ("max"); ?>, length= <? getRK ("n"); ?>) , df = <? getRK ("df"); ?>), xlab=expression(chi^2)))
rk.graph.off ()
<?
}
Modified: branches/release_branch_0.4.5/rkward/rkward/plugins/distributions/plot_f_distribution.php
===================================================================
--- branches/release_branch_0.4.5/rkward/rkward/plugins/distributions/plot_f_distribution.php 2007-01-12 12:31:31 UTC (rev 1131)
+++ branches/release_branch_0.4.5/rkward/rkward/plugins/distributions/plot_f_distribution.php 2007-01-12 13:07:29 UTC (rev 1132)
@@ -9,7 +9,7 @@
?>rk.header ("Plot density <? getRK ("function"); ?>", list ("Number of Observations", "<? getRK ("n"); ?>", "Minimum", "<? getRK ("min"); ?>", "Maximum", "<? getRK ("max"); ?>", "Numerator degrees of freedom", "<? getRK ("df1"); ?>", "Denominator degrees of freedom", "<? getRK ("df2"); ?>", "Function", "<? getRK ("function"); ?>"));
rk.graph.on ()
-plot (<? getRK ("function"); ?> (seq(<? getRK ("min"); ?> ,<? getRK ("max"); ?>, length= <? getRK ("n"); ?>) , df1 = <? getRK ("df1"); ?>, df2 = <? getRK ("df2"); ?>))
+try (plot (<? getRK ("function"); ?> (seq(<? getRK ("min"); ?> ,<? getRK ("max"); ?>, length= <? getRK ("n"); ?>) , df1 = <? getRK ("df1"); ?>, df2 = <? getRK ("df2"); ?>)))
rk.graph.off ()
<?
}
Modified: branches/release_branch_0.4.5/rkward/rkward/plugins/distributions/plot_normal_distribution.php
===================================================================
--- branches/release_branch_0.4.5/rkward/rkward/plugins/distributions/plot_normal_distribution.php 2007-01-12 12:31:31 UTC (rev 1131)
+++ branches/release_branch_0.4.5/rkward/rkward/plugins/distributions/plot_normal_distribution.php 2007-01-12 13:07:29 UTC (rev 1132)
@@ -9,7 +9,7 @@
?>rk.header ("Plot density <? getRK ("function"); ?>", list ("Number of Observations", "<? getRK ("n"); ?>", "Minimum", "<? getRK ("min"); ?>", "Maximum", "<? getRK ("max"); ?>", "Mean", "<? getRK ("mean"); ?>", "Standard Deviation", "<? getRK ("sd"); ?>", "Function", "<? getRK ("function"); ?>"));
rk.graph.on ()
-plot (<? getRK ("function"); ?> (seq(<? getRK ("min"); ?> ,<? getRK ("max"); ?>, length= <? getRK ("n"); ?>) , mean = <? getRK ("mean"); ?>, sd = <? getRK ("sd"); ?>))
+try (plot (<? getRK ("function"); ?> (seq(<? getRK ("min"); ?> ,<? getRK ("max"); ?>, length= <? getRK ("n"); ?>) , mean = <? getRK ("mean"); ?>, sd = <? getRK ("sd"); ?>)))
rk.graph.off ()
<?
}
Modified: branches/release_branch_0.4.5/rkward/rkward/plugins/distributions/plot_poisson_distribution.php
===================================================================
--- branches/release_branch_0.4.5/rkward/rkward/plugins/distributions/plot_poisson_distribution.php 2007-01-12 12:31:31 UTC (rev 1131)
+++ branches/release_branch_0.4.5/rkward/rkward/plugins/distributions/plot_poisson_distribution.php 2007-01-12 13:07:29 UTC (rev 1132)
@@ -9,7 +9,7 @@
?>rk.header ("Plot density <? getRK ("function"); ?>", list ("Minimum", "<? getRK ("min"); ?>", "Maximum", "<? getRK ("max"); ?>", "Mean", "<? getRK ("mean"); ?>", "Function", "<? getRK ("function"); ?>"));
rk.graph.on ()
-plot (<? getRK ("function"); ?> (<? getRK ("min"); ?> : <? getRK ("max"); ?>, lambda = <? getRK ("mean"); ?>))
+try (plot (<? getRK ("function"); ?> (<? getRK ("min"); ?> : <? getRK ("max"); ?>, lambda = <? getRK ("mean"); ?>)))
rk.graph.off ()
<?
}
Modified: branches/release_branch_0.4.5/rkward/rkward/plugins/distributions/plot_t_distribution.php
===================================================================
--- branches/release_branch_0.4.5/rkward/rkward/plugins/distributions/plot_t_distribution.php 2007-01-12 12:31:31 UTC (rev 1131)
+++ branches/release_branch_0.4.5/rkward/rkward/plugins/distributions/plot_t_distribution.php 2007-01-12 13:07:29 UTC (rev 1132)
@@ -9,7 +9,7 @@
?>rk.header ("Plot density <? getRK ("function"); ?>", list ("Number of Observations", "<? getRK ("n"); ?>", "Minimum", "<? getRK ("min"); ?>", "Maximum", "<? getRK ("max"); ?>", "Degrees of freedom", "<? getRK ("df"); ?>", "Function", "<? getRK ("function"); ?>"));
rk.graph.on ()
-plot (<? getRK ("function"); ?> (seq(<? getRK ("min"); ?> ,<? getRK ("max"); ?>, length= <? getRK ("n"); ?>) , df = <? getRK ("df"); ?>))
+try (plot (<? getRK ("function"); ?> (seq(<? getRK ("min"); ?> ,<? getRK ("max"); ?>, length= <? getRK ("n"); ?>) , df = <? getRK ("df"); ?>)))
rk.graph.off ()
<?
}
Modified: branches/release_branch_0.4.5/rkward/rkward/plugins/plots/box_plot.php
===================================================================
--- branches/release_branch_0.4.5/rkward/rkward/plugins/plots/box_plot.php 2007-01-12 12:31:31 UTC (rev 1131)
+++ branches/release_branch_0.4.5/rkward/rkward/plugins/plots/box_plot.php 2007-01-12 13:07:29 UTC (rev 1132)
@@ -10,7 +10,7 @@
?>
rk.header ("Boxplot", list ("Variable(s)", rk.get.description (<?echo ($xvarsstring); ?>, paste.sep=", ")))
rk.graph.on()
-boxplot (list (<? echo ($xvarsstring); ?>), notch = <? getRK ("notch") ?>, outline = <? getRK("outline")?>, horizontal = <? getRK("orientation") ?><? getRK ("plotoptions.code.printout"); ?>)
+try (boxplot (list (<? echo ($xvarsstring); ?>), notch = <? getRK ("notch") ?>, outline = <? getRK("outline")?>, horizontal = <? getRK("orientation") ?><? getRK ("plotoptions.code.printout"); ?>))
rk.graph.off ()
<?
}
Modified: branches/release_branch_0.4.5/rkward/rkward/plugins/plots/density_plot.php
===================================================================
--- branches/release_branch_0.4.5/rkward/rkward/plugins/plots/density_plot.php 2007-01-12 12:31:31 UTC (rev 1131)
+++ branches/release_branch_0.4.5/rkward/rkward/plugins/plots/density_plot.php 2007-01-12 13:07:29 UTC (rev 1132)
@@ -25,27 +25,27 @@
<? } ?>
rk.graph.on ()
-
+try ({
<? if ($dohdrcde_plot && $dodensity_plot) { ?>
-par(mfrow=c(1,2))
+ par(mfrow=c(1,2))
<? } ?>
<? if ($dodensity_plot) { ?>
-plot (density(<? echo ($x); ?>, bw = "<? echo ($bw); ?>", adjust = <? echo ($adjust); ?>, <? echo ($giveRkern); ?>, kern = <? echo ($kern); ?>, n = <? getRK ("n"); ?>, <? echo ($narm); ?><? getRK ("plotoptions.code.printout"); ?>))
+ plot (density(<? echo ($x); ?>, bw = "<? echo ($bw); ?>", adjust = <? echo ($adjust); ?>, <? echo ($giveRkern); ?>, kern = <? echo ($kern); ?>, n = <? getRK ("n"); ?>, <? echo ($narm); ?><? getRK ("plotoptions.code.printout"); ?>))
<? } ?>
<? if ($dorug_density) { ?>
-rug(<? echo ($x); ?>, <? getRK ("ticksize"); ?>, <? getRK ("lwd"); ?>, <? getRK ("side"); ?>, col ="<? getRK ("col_rug"); ?>")
+ rug(<? echo ($x); ?>, <? getRK ("ticksize"); ?>, <? getRK ("lwd"); ?>, <? getRK ("side"); ?>, col ="<? getRK ("col_rug"); ?>")
<? }
if ($dohdrcde_plot) { ?>
-require(hdrcde)
-hdr.den(<? echo ($x); ?><? getRK ("plotoptions.code.printout"); ?>)
+ require(hdrcde)
+ hdr.den(<? echo ($x); ?><? getRK ("plotoptions.code.printout"); ?>)
<? }
if ($dorug_hdrcde) { ?>
-rug(<? echo ($x); ?>, <? getRK ("ticksize"); ?>, <? getRK ("lwd"); ?>, <? getRK ("side"); ?>, col ="<? getRK ("col_rug"); ?>")
+ rug(<? echo ($x); ?>, <? getRK ("ticksize"); ?>, <? getRK ("lwd"); ?>, <? getRK ("side"); ?>, col ="<? getRK ("col_rug"); ?>")
<? } ?>
-
+})
rk.graph.off ()
<?
}
Modified: branches/release_branch_0.4.5/rkward/rkward/plugins/plots/ecdf_plot.php
===================================================================
--- branches/release_branch_0.4.5/rkward/rkward/plugins/plots/ecdf_plot.php 2007-01-12 12:31:31 UTC (rev 1131)
+++ branches/release_branch_0.4.5/rkward/rkward/plugins/plots/ecdf_plot.php 2007-01-12 13:07:29 UTC (rev 1132)
@@ -14,13 +14,15 @@
?>
rk.header ("Empirical Cumulative Distribution Function", list ("Variable", rk.get.description (<? echo ($x); ?>), "Minimum", rk.temp.range[1], "Maximum", rk.temp.range[2]))
rk.graph.on ()
-plot.ecdf (<? echo ($x); ?>, <? getRK ("dopoints"); ?>, <? getRK ("verticals"); ?> <? getRK ("plotoptions.code.printout"); ?>)
+try ({
+ plot.ecdf (<? echo ($x); ?>, <? getRK ("dopoints"); ?>, <? getRK ("verticals"); ?> <? getRK ("plotoptions.code.printout"); ?>)
<? if (getRK_val ("th_pnorm")) { ?>
-curve (pnorm, from=rk.temp.range[1], to=rk.temp.range[2], add=TRUE, col="<? echo ($col); ?>")
+ curve (pnorm, from=rk.temp.range[1], to=rk.temp.range[2], add=TRUE, col="<? echo ($col); ?>")
<? }
if (getRK_val ("rug")) { ?>
-rug (<? echo ($x); ?>, <? getRK ("ticksize"); ?>, <? getRK ("lwd"); ?>, <? getRK ("side"); ?>, col ="<? getRK ("col_rug"); ?>")
+ rug (<? echo ($x); ?>, <? getRK ("ticksize"); ?>, <? getRK ("lwd"); ?>, <? getRK ("side"); ?>, col ="<? getRK ("col_rug"); ?>")
<? } ?>
+})
rk.graph.off ()
<?
}
Modified: branches/release_branch_0.4.5/rkward/rkward/plugins/plots/histogram.php
===================================================================
--- branches/release_branch_0.4.5/rkward/rkward/plugins/plots/histogram.php 2007-01-12 12:31:31 UTC (rev 1131)
+++ branches/release_branch_0.4.5/rkward/rkward/plugins/plots/histogram.php 2007-01-12 13:07:29 UTC (rev 1132)
@@ -14,7 +14,7 @@
$giveRkern = getRK_val ("giveRkern");
$x = getRK_val ("x");
if ($breaks == "int") {
- $breaksopt = "breaks =seq (floor (min (" . $x . "))-0.5, ceiling (max (" . $x ."))+0.5)";
+ $breaksopt = "breaks =seq (floor (min (" . $x . ", na.rm=TRUE))-0.5, ceiling (max (" . $x .", na.rm=TRUE))+0.5)";
$breaks = "Integers";
} else if (!empty ($breaks)) {
$breaksopt = "breaks=\"" . $breaks . "\"";
@@ -22,10 +22,12 @@
?>
rk.header ("Histogram", list ("Frequency", "<? echo $scale; ?>", "Breaks algorithm", <? echo ("\"" . $breaks . "\""); ?>, "Variable", rk.get.description (<? echo ($x); ?>)))
rk.graph.on ()
-hist (<? echo ($x); ?>, <? echo ($breaksopt); ?>, freq = <? echo $scale; ?><? getRK ("plotoptions.code.printout"); ?>)
+try ({
+ hist (<? echo ($x); ?>, <? echo ($breaksopt); ?>, freq = <? echo $scale; ?><? getRK ("plotoptions.code.printout"); ?>)
<? if (($scale=="FALSE") && getRK_val ("density")) { ?>
-lines(density(<? echo ($x); ?>, bw="<? echo ($bw); ?>", adjust = <? echo ($adjust); ?>, <? echo ($giveRkern); ?>, <? echo ($narm); ?>, n = <? getRK ("n"); ?>), col= "<? getRK ("col_density"); ?>")
+ lines(density(<? echo ($x); ?>, bw="<? echo ($bw); ?>", adjust = <? echo ($adjust); ?>, <? echo ($giveRkern); ?>, <? echo ($narm); ?>, n = <? getRK ("n"); ?>), col= "<? getRK ("col_density"); ?>")
<? } ?>
+})
rk.graph.off ()
<?
}
Modified: branches/release_branch_0.4.5/rkward/rkward/plugins/plots/stripchart_plot.php
===================================================================
--- branches/release_branch_0.4.5/rkward/rkward/plugins/plots/stripchart_plot.php 2007-01-12 12:31:31 UTC (rev 1131)
+++ branches/release_branch_0.4.5/rkward/rkward/plugins/plots/stripchart_plot.php 2007-01-12 13:07:29 UTC (rev 1132)
@@ -15,7 +15,7 @@
?>
rk.header ("Stripchart", list ("Variable", rk.get.description (<? echo ($x); ?>), "Method", <? echo ($method); ?>, "Jitter", <? echo ($jitter); ?>, "Plot drawn vertically", <? echo ($vertical); ?>, "Offset", <? echo ($offset); ?>))
rk.graph.on ()
-stripchart (<? echo ($x); ?> ~ (<? echo ($g); ?>), vertical=<? echo ($vertical); ?>, method = <? echo ($method); ?>, jitter = <? echo ($jitter); ?>, offset = <? echo ($offset); ?> <? getRK ("plotoptions.code.printout"); ?>)
+try (stripchart (<? echo ($x); ?> ~ (<? echo ($g); ?>), vertical=<? echo ($vertical); ?>, method = <? echo ($method); ?>, jitter = <? echo ($jitter); ?>, offset = <? echo ($offset); ?> <? getRK ("plotoptions.code.printout"); ?>))
rk.graph.off ()
<?
}
Modified: branches/release_branch_0.4.5/rkward/rkward/rkconsolepart.rc
===================================================================
--- branches/release_branch_0.4.5/rkward/rkward/rkconsolepart.rc 2007-01-12 12:31:31 UTC (rev 1131)
+++ branches/release_branch_0.4.5/rkward/rkward/rkconsolepart.rc 2007-01-12 13:07:29 UTC (rev 1132)
@@ -1,17 +1,28 @@
<!DOCTYPE kpartgui>
-<kpartgui name="rkward" version="0.4.2">
+<kpartgui name="rkward" version="0.4.5">
<MenuBar>
+ <Menu name="edit">
+ <Action name="rkconsole_copy"></Action>
+ <Action name="rkconsole_copy_literal"></Action>
+ <Action name="rkconsole_paste"></Action>
+ <Separator/>
+ <Action name="rkconsole_clear"></Action>
+ </Menu>
<Menu name="run"><text>&Run</text>
<Merge/>
<Separator/>
<Action name="run_selection"/>
<Action name="interrupt"/>
</Menu>
+ <Menu name="settings">
+ <Action name="rkconsole_configure"></Action>
+ </Menu>
<Menu name="help"><text>&Help</text>
<Action name="function_reference"></Action>
</Menu>
</MenuBar>
<ToolBar fullWidth="true" name="runToolBar">
+ <Action name="run_selection"/>
<Action name="interrupt"/>
<Separator/>
<Merge/>
Modified: branches/release_branch_0.4.5/rkward/rkward/windows/rkcommandeditorwindowpart.cpp
===================================================================
--- branches/release_branch_0.4.5/rkward/rkward/windows/rkcommandeditorwindowpart.cpp 2007-01-12 12:31:31 UTC (rev 1131)
+++ branches/release_branch_0.4.5/rkward/rkward/windows/rkcommandeditorwindowpart.cpp 2007-01-12 13:07:29 UTC (rev 1132)
@@ -50,11 +50,9 @@
void RKCommandEditorWindowPart::initializeActions () {
RK_TRACE (COMMANDEDITOR);
- runAll = new KAction (i18n ("Run all"), KShortcut ("F9"), this, SLOT (slotRunAll ()), actionCollection (), "run_all");
- runAll->setIcon("player_fwd");
- runSelection = new KAction (i18n ("Run selection"), KShortcut ("F8"), this, SLOT (slotRunSelection ()), actionCollection (), "run_selection");
- runSelection->setIcon("player_play");
- runLine = new KAction (i18n ("Run current line"), KShortcut ("Ctrl+L"), this, SLOT (slotRunLine ()), actionCollection (), "run_line");
+ runAll = new KAction (i18n ("Run all"), "player_fwd", KShortcut ("F9"), this, SLOT (slotRunAll ()), actionCollection (), "run_all");
+ runSelection = new KAction (i18n ("Run selection"), "player_play", KShortcut ("F8"), this, SLOT (slotRunSelection ()), actionCollection (), "run_selection");
+ runLine = new KAction (i18n ("Run current line"), "player_end", KShortcut ("Ctrl+L"), this, SLOT (slotRunLine ()), actionCollection (), "run_line");
helpFunction = new KAction (i18n ("&Function reference"), KShortcut ("F2"), this, SLOT (slotFunctionReference ()), actionCollection (), "function_reference");
}
Modified: branches/release_branch_0.4.5/rkward/rkward/windows/rkcommandlogpart.rc
===================================================================
--- branches/release_branch_0.4.5/rkward/rkward/windows/rkcommandlogpart.rc 2007-01-12 12:31:31 UTC (rev 1131)
+++ branches/release_branch_0.4.5/rkward/rkward/windows/rkcommandlogpart.rc 2007-01-12 13:07:29 UTC (rev 1132)
@@ -1,5 +1,18 @@
<!DOCTYPE kpartgui>
-<kpartgui name="rkward" version="0.4.2">
+<kpartgui name="rkward" version="0.4.5">
+ <Menubar>
+ <Menu name="edit">
+ <Action name="log_select_all"/>
+ <Action name="log_copy"/>
+ <Action name="log_clear"/>
+ </Menu>
+ <Menu name="run">
+ <Action name="log_run_selection"/>
+ </Menu>
+ <Menu name="settings">
+ <Action name="log_configure"/>
+ </Menu>
+ </Menubar>
<Menu name="rkcommandlog_context_menu">
<Action name="log_copy"/>
<Action name="log_run_selection"/>
@@ -10,4 +23,7 @@
<Separator/>
<Action name="log_configure"/>
</Menu>
+ <ToolBar fullWidth="true" name="runToolBar">
+ <Action name="log_run_selection"/>
+ </ToolBar>
</kpartgui>
Modified: branches/release_branch_0.4.5/rkward/rkward/windows/rkhtmlwindow.cpp
===================================================================
--- branches/release_branch_0.4.5/rkward/rkward/windows/rkhtmlwindow.cpp 2007-01-12 12:31:31 UTC (rev 1131)
+++ branches/release_branch_0.4.5/rkward/rkward/windows/rkhtmlwindow.cpp 2007-01-12 13:07:29 UTC (rev 1132)
@@ -212,7 +212,7 @@
setIcon (SmallIcon ("text_block"));
setCaption (i18n ("Output"));
- outputFlush = new KAction (i18n ("&Flush Output"), "editclear", 0, this, SLOT (flushOutput ()), actionCollection (), "output_flush");
+ outputFlush = new KAction (i18n ("&Flush Output"), "editdelete", 0, this, SLOT (flushOutput ()), actionCollection (), "output_flush");
outputRefresh = new KAction (i18n ("&Refresh Output"), "reload", 0, this, SLOT (refreshOutput ()), actionCollection (), "output_refresh");
print = KStdAction::print (this, SLOT (slotPrint ()), actionCollection (), "print_output");
print->setText (i18n ("Print Output"));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the rkward-tracker
mailing list