version 0.3

cran · Jan 23, 2009 · 2b7a9b0 · 2b7a9b0
1 parent 90edb03
commit 2b7a9b0
Show file tree

Hide file tree

Showing 6 changed files with 487 additions and 100 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: fgui
-Version: 0.2.1
-Date: 2008-05-09
+Version: 0.3
+Date: 2009-01-23
 Title: Function GUI
 Author: Thomas Hoffmann
 Maintainer: Thomas Hoffmann <thoffman@hsph.harvard.edu>
@@ -10,4 +10,4 @@ Description: Rapidly create a GUI interface for a function you created by automa
 License: GPL
 URL: http://www.people.fas.harvard.edu/~tjhoffm/fgui.html
 LazyLoad: true
-Packaged: Mon Jun  9 22:11:08 2008; merlin
+Packaged: Wed Feb 11 00:19:03 2009; merlin
diff --git a/NAMESPACE b/NAMESPACE
@@ -1,5 +1,6 @@
 export(
-  gui, guiNestedF, guiExec,
+  gui, guiv,
+  guiNestedF, guiExec,
   guiGetValue, guiGetAllValues, guiSetValue,
   guiSet, guiGet, guiGetSafe,
   guiFrame,

diff --git a/R/fguiWindow.R b/R/fguiWindow.R
@@ -195,9 +195,12 @@ mgui <- function( func,
                   argOption=NULL, argFilename=NULL, argList=NULL, argSlider=NULL,
                   argCommand=NULL, argEdit=NULL, argFilter=NULL,
                   argText=NULL, argType=NULL,
-                  argGridOrder=1:length(formals(func)), sticky="nws",
+                  argGridOrder=1:length(formals(func)),
+                   argGridSticky=rep("a",length(formals(func))),
+                   argGridFrame=rep("f",length(formals(func))),
                   title=NULL,
-                  exec="Calculate ...",
+                  exec="OK",
+                  closeOnExec=is.null(output), cancelButton=TRUE,
                   callback=NULL,
                   output='m',
                   helps='auto', helpsFunc=NULL,
@@ -215,9 +218,12 @@ mgui <- function( func,
                       argOption=argOption, argFilename=argFilename, argList=argList, argSlider=argSlider,
                       argCommand=argCommand, argEdit=argEdit, argFilter=argFilter,
                       argText=argText, argType=argType,
-                      argGridOrder=argGridOrder, sticky=sticky,
+                      argGridOrder=argGridOrder,
+                       argGridSticky=argGridSticky,
+                       argGridFrame=argGridFrame,
                       title=title[length(title)],
                       exec=exec,
+                      closeOnExec=closeOnExec, cancelButton=cancelButton,
                       callback=callback,
                       output=output,
                       helps=helps, helpsFunc=helpsFunc,