The R Project SVN R-packages

Rev

Hide changed files | Details | Compare with Previous | Blame | RSS feed

Filtering Options

Rev Age Author Path Log message Diff Changes
6453 4892 d 3 h ripley /branches/MacGUI-2-x/ branch  
/branches/MacGUI-2-x
6238 5085 d 3 h bibiko /trunk/Mac-GUI/ • added Code Folding of { ... } multi-line blocks in R Script Editor; see gutter and/or Menu > Format > Code Folding > ...  
/trunk/Mac-GUI/images/Folding Bottom Hoover.png
/trunk/Mac-GUI/images/Folding Bottom Pressed.png
/trunk/Mac-GUI/images/Folding Bottom.png
/trunk/Mac-GUI/images/Folding Collapsed Hoover.png
/trunk/Mac-GUI/images/Folding Collapsed Pressed.png
/trunk/Mac-GUI/images/Folding Collapsed.png
/trunk/Mac-GUI/images/Folding Top Hoover.png
/trunk/Mac-GUI/images/Folding Top Pressed.png
/trunk/Mac-GUI/images/Folding Top.png
/trunk/Mac-GUI/English.lproj/EditorPrefPane.xib
/trunk/Mac-GUI/English.lproj/MainMenu.xib
/trunk/Mac-GUI/FoldingSignTextAttachmentCell.m
/trunk/Mac-GUI/NEWS
/trunk/Mac-GUI/NoodleLineNumberView.h
/trunk/Mac-GUI/NoodleLineNumberView.m
/trunk/Mac-GUI/PreferenceKeys.h
/trunk/Mac-GUI/R.xcodeproj/project.pbxproj
/trunk/Mac-GUI/RDocumentWinCtrl.m
/trunk/Mac-GUI/RScriptEditorGlyphGenerator.h
/trunk/Mac-GUI/RScriptEditorGlyphGenerator.m
/trunk/Mac-GUI/RScriptEditorLayoutManager.h
/trunk/Mac-GUI/RScriptEditorLayoutManager.m
/trunk/Mac-GUI/RScriptEditorTextStorage.h
/trunk/Mac-GUI/RScriptEditorTextStorage.m
/trunk/Mac-GUI/RScriptEditorTextView.h
/trunk/Mac-GUI/RScriptEditorTextView.m
/trunk/Mac-GUI/RScriptEditorTypeSetter.m
/trunk/Mac-GUI/RTextView.m
/trunk/Mac-GUI/Tools/RTooltip.m
/trunk/Mac-GUI/de.lproj/ColorsPrefPane.xib
/trunk/Mac-GUI/de.lproj/EditorPrefPane.xib
/trunk/Mac-GUI/de.lproj/MainMenu.xib
/trunk/Mac-GUI/fr.lproj/MainMenu.xib
/trunk/Mac-GUI/it.lproj/MainMenu.xib
/trunk/Mac-GUI/ja.lproj/MainMenu.xib
/trunk/Mac-GUI/nl.lproj/MainMenu.xib
6233 5093 d 19 h bibiko /trunk/Mac-GUI/ • further work on folding code
- not yet activated
- test phase began
 
/trunk/Mac-GUI/FoldingSignTextAttachmentCell.m
/trunk/Mac-GUI/NoodleLineNumberView.m
/trunk/Mac-GUI/PreferenceKeys.h
/trunk/Mac-GUI/RDocumentWinCtrl.m
/trunk/Mac-GUI/RScriptEditorGlyphGenerator.h
/trunk/Mac-GUI/RScriptEditorGlyphGenerator.m
/trunk/Mac-GUI/RScriptEditorLayoutManager.h
/trunk/Mac-GUI/RScriptEditorLayoutManager.m
/trunk/Mac-GUI/RScriptEditorTextStorage.h
/trunk/Mac-GUI/RScriptEditorTextStorage.m
/trunk/Mac-GUI/RScriptEditorTextView.h
/trunk/Mac-GUI/RScriptEditorTextView.m
/trunk/Mac-GUI/RScriptEditorTypeSetter.h
/trunk/Mac-GUI/RScriptEditorTypeSetter.m
6128 5261 d 3 h bibiko /trunk/Mac-GUI/ • initial commit to support text chunk folding in RScriptEditor
- not yet activated since testing phase is not yet finished (esp. for speed)
• fixed line numbering refreshing calls
 
/trunk/Mac-GUI/FoldingSignTextAttachmentCell.h
/trunk/Mac-GUI/FoldingSignTextAttachmentCell.m
/trunk/Mac-GUI/RScriptEditorGlyphGenerator.h
/trunk/Mac-GUI/RScriptEditorGlyphGenerator.m
/trunk/Mac-GUI/RScriptEditorLayoutManager.h
/trunk/Mac-GUI/RScriptEditorLayoutManager.m
/trunk/Mac-GUI/RScriptEditorTextStorage.h
/trunk/Mac-GUI/RScriptEditorTextStorage.m
/trunk/Mac-GUI/RScriptEditorTypeSetter.h
/trunk/Mac-GUI/RScriptEditorTypeSetter.m
/trunk/Mac-GUI/NoodleLineNumberView.h
/trunk/Mac-GUI/NoodleLineNumberView.m
/trunk/Mac-GUI/PreferenceKeys.h
/trunk/Mac-GUI/R.xcodeproj/project.pbxproj
/trunk/Mac-GUI/RController.m
/trunk/Mac-GUI/RDocumentWinCtrl.m
/trunk/Mac-GUI/RScriptEditorTextView.h
/trunk/Mac-GUI/RScriptEditorTextView.m
6070 5282 d 18 h bibiko /trunk/Mac-GUI/ • fixed bug for RTextView:copy
• fixed issues for changing font size via trackpad gesture
• fixed issue for setting selection background color
• started to add functionality to support user-definable actions like inserting programmable text macros with highlighted snippet etc. - will be continued soon
• improved *.R dragging by applying the above mentioned text macro mechanism
- the value of the parameter(s) 'chdir' is/are highlighted which can then changed by the user; use TAB and SHIFT+TAB to navigate through the highlighted snippets; a final TAB will place the cursor at the end of the inserted template - docs will follow
- added possibility to the user to define other drag actions due to file extension - docs will follow
- fixed some minor issues
• some minor fixes and improvements
 
/trunk/Mac-GUI/NEWS
/trunk/Mac-GUI/NSString_RAdditions.m
/trunk/Mac-GUI/NSTextView_RAdditions.m
/trunk/Mac-GUI/PrefPanes/SyntaxColorsPrefPane.m
/trunk/Mac-GUI/PreferenceKeys.h
/trunk/Mac-GUI/RController.h
/trunk/Mac-GUI/RController.m
/trunk/Mac-GUI/RDocumentWinCtrl.m
/trunk/Mac-GUI/RScriptEditorTextView.m
/trunk/Mac-GUI/RTextView.h
/trunk/Mac-GUI/RTextView.m
6062 5288 d 2 h bibiko /trunk/Mac-GUI/ • fixed several bugs while color setting in RConsole and R script editors
- if user has NSColorPanel open and will set the focus to a RTextView close that panel to avoid annoying color changes
- introduced new selectionColor setting (not yet in GUI)
 
/trunk/Mac-GUI/PrefPanes/ColorsPrefPane.h
/trunk/Mac-GUI/PrefPanes/ColorsPrefPane.m
/trunk/Mac-GUI/PrefPanes/SyntaxColorsPrefPane.h
/trunk/Mac-GUI/PrefPanes/SyntaxColorsPrefPane.m
/trunk/Mac-GUI/PreferenceKeys.h
/trunk/Mac-GUI/RController.m
/trunk/Mac-GUI/RTextView.m
6060 5288 d 21 h bibiko /trunk/Mac-GUI/ • renamed and added resp. NSString's methods from "runBashCommandWithEnvironment" to "evaluateAsBashCommandWithEnvironment" and "runAsBashCommandWithEnvironment" resp.
- runAs... will run it without returning stdout for speed
- evaluateAs... will run it and return stdout
- added further placeholder methods like runAsBashCommand or runAsBashCommandAndError: etc.
- if no NSError will be passed write stderr to /dev/null
 
/trunk/Mac-GUI/NSString_RAdditions.h
/trunk/Mac-GUI/NSString_RAdditions.m
/trunk/Mac-GUI/PreferenceKeys.h
/trunk/Mac-GUI/RDocument.m
/trunk/Mac-GUI/RDocumentWinCtrl.m
6059 5288 d 23 h bibiko /trunk/Mac-GUI/ • further improvements for Format R Code
- keep users empty lines since (but clean them)
- sped it up a bit
- fixed mixing indentation of 4 and 2 spaces coming from deparse()
• avoid re-entering Rd tools or R code formatting methods
• made deparse's width.cutoff customizable via Pref key RScriptEditorFormatWidthCutoff; if set to 0 the window's width will be taken otherwise the user's setting
 
/trunk/Mac-GUI/NSString_RAdditions.m
/trunk/Mac-GUI/PreferenceKeys.h
/trunk/Mac-GUI/RDocument.h
/trunk/Mac-GUI/RDocument.m
/trunk/Mac-GUI/RDocumentWinCtrl.h
/trunk/Mac-GUI/RDocumentWinCtrl.m
/trunk/Mac-GUI/RTextView.m
6058 5289 d 17 h bibiko /trunk/Mac-GUI/ • added NSString method runBashCommandWithEnvironment:atCurrentDirectoryPath:error: to be able to run any bash command(s) including code of other scripting languages like Python, Perl, etc (by specifying the magic header #!...)
- example: NSString *d = [@"date" runBashCommandWithEnvironment:nil atCurrentDirectoryPath:nil error:nil];
will run the command 'date' in a separate bash shell and set d to the current date.
- any of these called bash commands can be cancelled by pressing ⌘+. (Apple standard)
• applied above mentioned method to decouple editing stuff from REngine for checking Rd docs, converting Rd doc into HTML/PDF, and formatting R code since it's not a good idea to disturb a running R command in the RConsole while editing a doc. Furthermore now if the checking of a Rd doc freezes the user can simply press ⌘+. to cancel that separate task
• improved Format R code
• fixed some minor stuff for deleting temporary files
 
/trunk/Mac-GUI/NSString_RAdditions.h
/trunk/Mac-GUI/NSString_RAdditions.m
/trunk/Mac-GUI/PreferenceKeys.h
/trunk/Mac-GUI/R.xcodeproj/project.pbxproj
/trunk/Mac-GUI/RDocument.h
/trunk/Mac-GUI/RDocument.m
/trunk/Mac-GUI/RDocumentWinCtrl.m
6051 5291 d 22 h bibiko /trunk/Mac-GUI/ • In R Script editor pressing ENTER after a simple if(), for(), while(), or function() clause or if current line has more opened parenthesis than closed will only indent the next line. This behavior is active for preference setting "Indent new lines". In addition it can be explicitly disabled if you execute the following command in the Terminal:

defaults write org.R-project.R RScriptEditorIndentNewLineAfterSimpleClause -string NO

• started to implement a "Tidy R Code" function to tidy up and format selected R code or the entire document. The idea is to wrap the selected R code by "dummy<-function(){" and "}" which will be sourced and dumped by a separate R session. Instances of "}\nelse" will be replaced by "} else" to be able to source the tidied R code. The main problem by using the R function "dump()" with "options(keep.source = FALSE)" is that any comments will be removed. To avoid this each comment will be replaced by "if(@_@_@_@the_comment){}" before the code will be sourced. This allows us to keep and indent comments even for simple if() clauses to come e.g. with
if(a==2)
#comment
print(a)
foo(..)
The only remained problem which has to be solved is the comment after a R expression like:
print(2) # print two
which will be fixed soon.
 
/trunk/Mac-GUI/NEWS
/trunk/Mac-GUI/PreferenceKeys.h
/trunk/Mac-GUI/RDocumentWinCtrl.h
/trunk/Mac-GUI/RDocumentWinCtrl.m
6021 5302 d 23 h bibiko /trunk/Mac-GUI/ • re-implemented displaying a customized context menu for RTextView in such a way that all additional menu items coming from the spell checker, services, etc. will be shown correctly  
/trunk/Mac-GUI/PreferenceKeys.h
/trunk/Mac-GUI/RController.m
/trunk/Mac-GUI/RDocumentWinCtrl.m
/trunk/Mac-GUI/RTextView.m
6001 5306 d 18 h bibiko /trunk/Mac-GUI/ • implemented own colors for Rd syntax highlighting; accordingly added preference keys and defaults  
/trunk/Mac-GUI/PreferenceKeys.h
/trunk/Mac-GUI/RScriptEditorTextView.h
/trunk/Mac-GUI/RScriptEditorTextView.m
5983 5329 d 2 h bibiko /trunk/Mac-GUI/ • Font setting in RConsole will now be stored persistently
• Improved options()'s width setting and updating behaviour due to RConsole's size and used font
• unified some code regarding font size settings
 
/trunk/Mac-GUI/NEWS
/trunk/Mac-GUI/PreferenceKeys.h
/trunk/Mac-GUI/RController.h
/trunk/Mac-GUI/RController.m
/trunk/Mac-GUI/RScriptEditorTextView.m
/trunk/Mac-GUI/RTextView.m
5764 5563 d 22 h urbaneks /trunk/Mac-GUI/ add separate color for console errors  
/trunk/Mac-GUI/NEWS
/trunk/Mac-GUI/PreferenceKeys.h
/trunk/Mac-GUI/RController.h
/trunk/Mac-GUI/RController.m
/trunk/Mac-GUI/REngine/Rcallbacks.h
/trunk/Mac-GUI/REngine/Rcallbacks.m
/trunk/Mac-GUI/REngine/Rinit.m
5726 5603 d 15 h urbaneks /trunk/Mac-GUI/ merge up to r122  
/trunk/Mac-GUI/English.lproj/EditorPrefPane.xib
/trunk/Mac-GUI/NEWS
/trunk/Mac-GUI/PrefPanes/EditorPrefPane.h
/trunk/Mac-GUI/PrefPanes/EditorPrefPane.m
/trunk/Mac-GUI/PreferenceKeys.h
/trunk/Mac-GUI/RController.m
/trunk/Mac-GUI/RDocumentController.h
/trunk/Mac-GUI/RDocumentController.m
/trunk/Mac-GUI/de.lproj/EditorPrefPane.xib
/trunk/Mac-GUI/fr.lproj/EditorPrefPane.xib
/trunk/Mac-GUI/it.lproj/EditorPrefPane.xib
/trunk/Mac-GUI/ja.lproj/EditorPrefPane.xib
/trunk/Mac-GUI/nl.lproj/EditorPrefPane.xib
5721 5605 d 21 h urbaneks /trunk/Mac-GUI/ merge up to r114  
/trunk/Mac-GUI/PrefPanes/RColorWellCell.h
/trunk/Mac-GUI/PrefPanes/RColorWellCell.m
/trunk/Mac-GUI/PrefPanes/RFontPreviewTextField.h
/trunk/Mac-GUI/PrefPanes/RFontPreviewTextField.m
/trunk/Mac-GUI/AMPrefs/AMPreferenceWindowController.h
/trunk/Mac-GUI/AMPrefs/AMPreferenceWindowController.m
/trunk/Mac-GUI/English.lproj/EditorPrefPane.xib
/trunk/Mac-GUI/English.lproj/RDocument.xib
/trunk/Mac-GUI/English.lproj/SyntaxColorsPrefPane.xib
/trunk/Mac-GUI/PrefPanes/EditorPrefPane.h
/trunk/Mac-GUI/PrefPanes/EditorPrefPane.m
/trunk/Mac-GUI/PrefPanes/PrefWindowController.m
/trunk/Mac-GUI/PrefPanes/SyntaxColorsPrefPane.h
/trunk/Mac-GUI/PrefPanes/SyntaxColorsPrefPane.m
/trunk/Mac-GUI/PreferenceKeys.h
/trunk/Mac-GUI/R.xcodeproj/project.pbxproj
/trunk/Mac-GUI/RController.m
/trunk/Mac-GUI/RDocumentWinCtrl.m
/trunk/Mac-GUI/REditorTextStorage.m
/trunk/Mac-GUI/RScriptEditorTextView.h
/trunk/Mac-GUI/RScriptEditorTextView.m
/trunk/Mac-GUI/de.lproj/EditorPrefPane.xib
/trunk/Mac-GUI/de.lproj/SyntaxColorsPrefPane.xib
5719 5606 d 21 h urbaneks /trunk/Mac-GUI/ merge r109  
/trunk/Mac-GUI/English.lproj/EncodingPopupView.xib
/trunk/Mac-GUI/English.lproj/SelectEncodingsPanel.xib
/trunk/Mac-GUI/NSTextView_RAdditions.h
/trunk/Mac-GUI/NSTextView_RAdditions.m
/trunk/Mac-GUI/RChooseEncodingPopupAccessory.h
/trunk/Mac-GUI/RChooseEncodingPopupAccessory.m
/trunk/Mac-GUI/de.lproj/SelectEncodingsPanel.xib
/trunk/Mac-GUI/fr.lproj/SelectEncodingsPanel.xib
/trunk/Mac-GUI/it.lproj/SelectEncodingsPanel.xib
/trunk/Mac-GUI/ja.lproj/SelectEncodingsPanel.xib
/trunk/Mac-GUI/nl.lproj/SelectEncodingsPanel.xib
/trunk/Mac-GUI/English.lproj/MainMenu.xib
/trunk/Mac-GUI/NEWS
/trunk/Mac-GUI/PreferenceKeys.h
/trunk/Mac-GUI/R.xcodeproj/project.pbxproj
/trunk/Mac-GUI/RController.h
/trunk/Mac-GUI/RController.m
/trunk/Mac-GUI/RDocument.h
/trunk/Mac-GUI/RDocument.m
/trunk/Mac-GUI/RDocumentController.h
/trunk/Mac-GUI/RDocumentController.m
/trunk/Mac-GUI/RDocumentWinCtrl.h
/trunk/Mac-GUI/RDocumentWinCtrl.m
/trunk/Mac-GUI/RScriptEditorTextView.m
/trunk/Mac-GUI/RTextView.h
/trunk/Mac-GUI/RTextView.m
/trunk/Mac-GUI/de.lproj/MainMenu.xib
/trunk/Mac-GUI/fr.lproj/MainMenu.xib
/trunk/Mac-GUI/it.lproj/MainMenu.xib
/trunk/Mac-GUI/ja.lproj/MainMenu.xib
/trunk/Mac-GUI/nl.lproj/MainMenu.xib
5705 5613 d 20 h urbaneks /trunk/Mac-GUI/ merge r79 from the new GUI plus bugfixes  
/trunk/Mac-GUI/English.lproj/MainMenu.nib/designable.nib
/trunk/Mac-GUI/NoodleLineNumberView.h
/trunk/Mac-GUI/NoodleLineNumberView.m
/trunk/Mac-GUI/RScriptEditorTextView.h
/trunk/Mac-GUI/RScriptEditorTextView.m
/trunk/Mac-GUI/RScriptEditorTokens.h
/trunk/Mac-GUI/RScriptEditorTokens.l
/trunk/Mac-GUI/RegexKitLite.h
/trunk/Mac-GUI/RegexKitLite.m
/trunk/Mac-GUI/English.lproj/MainMenu.nib/classes.nib
/trunk/Mac-GUI/English.lproj/MainMenu.nib/info.nib
/trunk/Mac-GUI/AMPrefs/AMPreferenceWindowController.m
/trunk/Mac-GUI/DataManager.h
/trunk/Mac-GUI/DataManager.m
/trunk/Mac-GUI/English.lproj/MainMenu.nib/keyedobjects.nib
/trunk/Mac-GUI/English.lproj/RDocument.nib/designable.nib
/trunk/Mac-GUI/English.lproj/RDocument.nib/keyedobjects.nib
/trunk/Mac-GUI/GUI-tools.R
/trunk/Mac-GUI/HelpManager.h
/trunk/Mac-GUI/HelpManager.m
/trunk/Mac-GUI/PackageInstaller.m
/trunk/Mac-GUI/PackageManager.h
/trunk/Mac-GUI/PackageManager.m
/trunk/Mac-GUI/PreferenceKeys.h
/trunk/Mac-GUI/R.xcodeproj/project.pbxproj
/trunk/Mac-GUI/RConsoleController.m
/trunk/Mac-GUI/RController.h
/trunk/Mac-GUI/RController.m
/trunk/Mac-GUI/RDocument.m
/trunk/Mac-GUI/RDocumentController.h
/trunk/Mac-GUI/RDocumentController.m
/trunk/Mac-GUI/RDocumentWinCtrl.h
/trunk/Mac-GUI/RDocumentWinCtrl.m
/trunk/Mac-GUI/REditorToolbar.m
/trunk/Mac-GUI/RTextView.h
/trunk/Mac-GUI/RTextView.m
/trunk/Mac-GUI/SearchTable.h
/trunk/Mac-GUI/SearchTable.m
/trunk/Mac-GUI/Tools/CodeCompletion.h
/trunk/Mac-GUI/Tools/CodeCompletion.m
/trunk/Mac-GUI/de.lproj/MainMenu.nib/designable.nib
/trunk/Mac-GUI/de.lproj/MainMenu.nib/keyedobjects.nib
/trunk/Mac-GUI/fr.lproj/MainMenu.nib/designable.nib
/trunk/Mac-GUI/fr.lproj/MainMenu.nib/keyedobjects.nib
/trunk/Mac-GUI/it.lproj/MainMenu.nib/designable.nib
/trunk/Mac-GUI/it.lproj/MainMenu.nib/keyedobjects.nib
/trunk/Mac-GUI/ja.lproj/MainMenu.nib/designable.nib
/trunk/Mac-GUI/ja.lproj/MainMenu.nib/keyedobjects.nib
/trunk/Mac-GUI/nl.lproj/MainMenu.nib/designable.nib
/trunk/Mac-GUI/nl.lproj/MainMenu.nib/keyedobjects.nib
5589 5900 d 22 h urbaneks /trunk/Mac-GUI/ 1.34 R 2.11.1 release  
/trunk/Mac-GUI/InfoPlist.h
/trunk/Mac-GUI/NEWS
/trunk/Mac-GUI/PrefPanes/MiscPrefPane.m
/trunk/Mac-GUI/PreferenceKeys.h
/trunk/Mac-GUI/RController.m
/trunk/Mac-GUI/docs/RMacOSX-FAQ.texi
5536 6070 d 15 h urbaneks /trunk/Mac-GUI/ add use.external.help preference  
/trunk/Mac-GUI/HelpManager.m
/trunk/Mac-GUI/NEWS
/trunk/Mac-GUI/PreferenceKeys.h

Show All