[Rqda-commits] r34 - pkg pkg/R pkg/man www

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

Author: wincent
Date: 2008-12-05 05:31:44 +0100 (Fri, 05 Dec 2008)
New Revision: 34

Added:
   pkg/R/Setting.R
Modified:
   pkg/ChangeLog
   pkg/DESCRIPTION
   pkg/R/root_gui.R
   pkg/man/RQDA-internal.rd
   www/ChangeLog.txt
Log:
RC1 of version 1.6.

Modified: pkg/ChangeLog
===================================================================
--- pkg/ChangeLog	2008-12-05 03:07:37 UTC (rev 33)
+++ pkg/ChangeLog	2008-12-05 04:31:44 UTC (rev 34)
@@ -2,6 +2,7 @@
 	* New functionality of add memo to File category and Code category.
 	* Reorganize the memo for Cases.  Now opem case memo by double-click or popup menu
 	* Unmark button for cases.
+	* Add Settings Tab, so user can change settings easily.
 	
 2008-12-04
 	* Better handler colors for coding and case-mark. Now can customize colors for coding-mark 

Modified: pkg/DESCRIPTION
===================================================================
--- pkg/DESCRIPTION	2008-12-05 03:07:37 UTC (rev 33)
+++ pkg/DESCRIPTION	2008-12-05 04:31:44 UTC (rev 34)
@@ -1,7 +1,7 @@
 Package: RQDA
 Type: Package
 Title: Qualitative Data Analysis
-Version: 0.1.5-31
+Version: 0.1.5-34
 Date: 2008-11-01
 Author: HUANG Ronggui
 Maintainer: HUANG Ronggui <ronggui.huang at gmail.com>

Added: pkg/R/Setting.R
===================================================================
--- pkg/R/Setting.R	                        (rev 0)
+++ pkg/R/Setting.R	2008-12-05 04:31:44 UTC (rev 34)
@@ -0,0 +1,71 @@
+## "back.col" "BOM"      "encoding" "fore.col" "owner"
+addSettingGUI <- function(container){
+Setting <- list(type = "ggroup",
+              horizontal = FALSE,
+              children = list(
+                list(type="fieldset",
+                     columns = 1,
+                     label = "Settings",
+                     label.pos = "top",
+                     label.font = c(weight="bold"),
+                     children = list(
+                       list(name = "owner",
+                            label = "Name of Coder",
+                            type = "gedit",
+                            text = .rqda$owner
+                            ),
+                       list(name = "encoding",
+                            label = "File Encoding",
+                            type = "gedit",
+                            text = .rqda$encoding
+                            ),
+                       list(name = "fore.col",
+                            label = "Color for Coding",
+                            type = "gedit",
+                            text = .rqda$fore.col
+                            ),
+                       list(name = "back.col",
+                            label = "Color for Case",
+                            type = "gedit",
+                            text = .rqda$back.col
+                            ),
+                       list(name = "BOM",
+                            label = "BOM",
+                            type = "gcombobox",
+                            items = c(FALSE, TRUE)
+                            )
+
+                       )
+                     )
+                )
+                )
+
+
+##
+
+SettingFL <- gformlayout(Setting, cont = container, expand=TRUE)
+
+ButtonContainer <- ggroup(cont = container)
+addSpring(ButtonContainer)
+resetButton <- gbutton("Default", cont = ButtonContainer)
+okButton <- gbutton("OK", cont = ButtonContainer)
+
+addHandlerChanged(okButton, function(h,...) {
+  out <- svalue(SettingFL)
+  ##print(out)
+  for (i in names(out)) assign(i,out[[i]],env=.rqda)
+})
+
+addHandlerChanged(resetButton, function(h,...) {
+  tryCatch(svalue(SettingFL[]$BOM) <- FALSE,error=function(e){})
+  tryCatch(svalue(SettingFL[]$encoding) <- "unknown",error=function(e){})
+  tryCatch(svalue(SettingFL[]$owner) <- "default",error=function(e){})
+  tryCatch(svalue(SettingFL[]$back.col) <- "gray92",error=function(e){})
+  tryCatch(svalue(SettingFL[]$fore.col) <- "blue",error=function(e){})
+  assign("BOM",FALSE,env=.rqda)
+  assign("encoding","unknown",env=.rqda)
+  assign("owner","default",env=.rqda)
+  assign("back.col","gray92",env=.rqda)
+  assign("fore.col","blue",env=.rqda)
+})}
+

Modified: pkg/R/root_gui.R
===================================================================
--- pkg/R/root_gui.R	2008-12-05 03:07:37 UTC (rev 33)
+++ pkg/R/root_gui.R	2008-12-05 04:31:44 UTC (rev 34)
@@ -124,8 +124,8 @@
 
 ######################### GUI  for settings
 #########################
-##   ".settings_gui" <- ggroup(container=.nb_rqdagui,horizontal=FALSE,label="Settings")
-
+   ".settings_gui" <- ggroup(container=.nb_rqdagui,horizontal=FALSE,label="Settings")
+   addSettingGUI(cont=.settings_gui)
   
 ######################### Put them together
 #########################

Modified: pkg/man/RQDA-internal.rd
===================================================================
--- pkg/man/RQDA-internal.rd	2008-12-05 03:07:37 UTC (rev 33)
+++ pkg/man/RQDA-internal.rd	2008-12-05 04:31:44 UTC (rev 34)
@@ -72,6 +72,7 @@
 \alias{HL_Case}
 \alias{UpdateFileofCaseWidget}
 \alias{MemoWidget}
+\alias{addSettingGUI}
 %% add related alias functions here.
 
 \title{Internal Functions}

Modified: www/ChangeLog.txt
===================================================================
--- www/ChangeLog.txt	2008-12-05 03:07:37 UTC (rev 33)
+++ www/ChangeLog.txt	2008-12-05 04:31:44 UTC (rev 34)
@@ -2,6 +2,7 @@
 	* New functionality of add memo to File category and Code category.
 	* Reorganize the memo for Cases.  Now opem case memo by double-click or popup menu
 	* Unmark button for cases.
+	* Add Settings Tab, so user can change settings easily.
 	
 2008-12-04
 	* Better handler colors for coding and case-mark. Now can customize colors for coding-mark