[Yuima-commits] r652 - in pkg/yuimaGUI/inst/yuimaGUI: . server www

[noreply at r-forge.r-project.org]

Author: phoenix844
Date: 2018-05-22 12:32:58 +0200 (Tue, 22 May 2018)
New Revision: 652

Modified:
   pkg/yuimaGUI/inst/yuimaGUI/server/settings.R
   pkg/yuimaGUI/inst/yuimaGUI/ui.R
   pkg/yuimaGUI/inst/yuimaGUI/www/black.css
Log:
ppr

Modified: pkg/yuimaGUI/inst/yuimaGUI/server/settings.R
===================================================================
--- pkg/yuimaGUI/inst/yuimaGUI/server/settings.R	2018-05-22 10:01:06 UTC (rev 651)
+++ pkg/yuimaGUI/inst/yuimaGUI/server/settings.R	2018-05-22 10:32:58 UTC (rev 652)
@@ -28,8 +28,10 @@
 } 
 
 observeEvent(input$loadSession, {
-  try(load(choose.files(caption = "Select a .yuimaGUI file", multi = FALSE)))
-  for(i in names(yuimaGUIdata)) yuimaGUIdata[[i]] <<- yuimaGUIdata[[i]]
+	if (!is.null(input$loadSession$datapath)){
+		try(load(input$loadSession$datapath))
+		for(i in names(yuimaGUIdata)) yuimaGUIdata[[i]] <<- yuimaGUIdata[[i]]
+	}
 })
 
 

Modified: pkg/yuimaGUI/inst/yuimaGUI/ui.R
===================================================================
--- pkg/yuimaGUI/inst/yuimaGUI/ui.R	2018-05-22 10:01:06 UTC (rev 651)
+++ pkg/yuimaGUI/inst/yuimaGUI/ui.R	2018-05-22 10:32:58 UTC (rev 652)
@@ -30,7 +30,7 @@
     div(id="sessionButtons",
       fluidRow( downloadButton("saveSession", label = "Save Session")),
       br(),
-      fluidRow(actionButton("loadSession", label = "Load Session", icon = icon("open", lib = "glyphicon")))
+	  fluidRow(column(1),column(9,fileInput("loadSession", label = "Load Session", multiple=FALSE)))
     ),
     br(),
     div(id="theyuimaprojct",

Modified: pkg/yuimaGUI/inst/yuimaGUI/www/black.css
===================================================================
--- pkg/yuimaGUI/inst/yuimaGUI/www/black.css	2018-05-22 10:01:06 UTC (rev 651)
+++ pkg/yuimaGUI/inst/yuimaGUI/www/black.css	2018-05-22 10:32:58 UTC (rev 652)
@@ -110,7 +110,7 @@
   text-align: center;
 }
 #loadSession{
-  display: block;
+  display: inline-block;
   margin: 0 auto;
 }