Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
12619 3 minor fixes https://pharo.fogbugz.com/f/cases/12619 12631 methods missing in RPackageTag https://pharo.fogbugz.com/f/cases/12631 12634 Update https://pharo.fogbugz.com/f/cases/12634 12635 Better mechanism to remove a key based on its shortcut https://pharo.fogbugz.com/f/cases/12635 12630 Add ScriptLoader>>#commentForIssues: https://pharo.fogbugz.com/f/cases/12630 http://files.pharo.org/image/30/30691.zip
- Loading branch information
Jenkins Build Server
authored and
ci
committed
Jan 13, 2014
1 parent
2f93f86
commit 7d3699f
Showing
82 changed files
with
570 additions
and
75 deletions.
There are no files selected for viewing
4 changes: 3 additions & 1 deletion
4
Keymapping-Core.package/KMCategory.class/instance/associating/removeKeymapEntry_.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,5 @@ | ||
removeKeymapEntry: aKeymapEntry | ||
|
||
self commonEntries remove: aKeymapEntry. | ||
[ self commonEntries remove: aKeymapEntry ] | ||
on: Error | ||
do: [ self platformEntries remove: aKeymapEntry ] |
2 changes: 1 addition & 1 deletion
2
Keymapping-Core.package/KMCategory.class/instance/binding/keymapForShortcut_.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
keymapForShortcut: aShortcut | ||
|
||
^ self commonEntries keymapForShortcut: aShortcut | ||
^ self allEntries keymapForShortcut: aShortcut |
3 changes: 3 additions & 0 deletions
3
Keymapping-Core.package/KMCategoryBinding.class/instance/binding/keymapForShortcut_.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
keymapForShortcut: aKey | ||
|
||
^ category keymapForShortcut: aKey |
11 changes: 9 additions & 2 deletions
11
Keymapping-Core.package/KMDispatcher.class/instance/building/removeKeyCombination_.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,14 @@ | ||
removeKeyCombination: aShortcut | ||
| keymap | | ||
| keymap removalTarget | | ||
|
||
removalTarget := self directKeymaps. | ||
|
||
keymap := self keymapForShortcut: aShortcut. | ||
keymap ifNil: [ | ||
self targets do: [ :e | (e keymapForShortcut: aShortcut) | ||
ifNotNil: [ :s | | ||
removalTarget := e category. | ||
keymap := s ] ] ]. | ||
keymap ifNil: [ ^ self ]. | ||
|
||
self directKeymaps removeKeymapEntry: keymap | ||
removalTarget removeKeymapEntry: keymap |
4 changes: 3 additions & 1 deletion
4
Morphic-Base.package/PluggableListMorph.class/instance/accessing/autoDeselect.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,5 @@ | ||
autoDeselect | ||
|
||
^ self resetListSelector notNil or: [ autoDeselect ifNil: [ true ] ] | ||
^ autoDeselect | ||
ifNil: [ self resetListSelector notNil ] | ||
ifNotNil: [ autoDeselect ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 12 additions & 0 deletions
12
Morphic-Base.package/PluggableTextMorph.class/instance/styling/basicHasUnacceptedEdits_.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
basicHasUnacceptedEdits: aBoolean | ||
"Set the hasUnacceptedEdits flag to the given value. " | ||
|
||
Smalltalk tools userManager canEditCode | ||
ifFalse: [ aBoolean ifTrue: [ ^ self ]]. | ||
aBoolean == hasUnacceptedEdits | ||
ifFalse: [hasUnacceptedEdits := aBoolean. | ||
self changed]. | ||
aBoolean | ||
ifFalse: [hasEditingConflicts := false]. | ||
self okToStyle | ||
ifTrue: [ self styler styleInBackgroundProcess: textMorph contents] |
12 changes: 3 additions & 9 deletions
12
Morphic-Base.package/PluggableTextMorph.class/instance/styling/hasUnacceptedEdits_.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,6 @@ | ||
hasUnacceptedEdits: aBoolean | ||
"Set the hasUnacceptedEdits flag to the given value. " | ||
|
||
Smalltalk tools userManager canEditCode | ||
ifFalse: [ aBoolean ifTrue: [ ^ self ]]. | ||
aBoolean == hasUnacceptedEdits | ||
ifFalse: [hasUnacceptedEdits := aBoolean. | ||
self changed]. | ||
aBoolean | ||
ifFalse: [hasEditingConflicts := false]. | ||
self okToStyle | ||
ifTrue: [ self styler styleInBackgroundProcess: textMorph contents] | ||
(model respondsTo: #hasUnacceptedEdits:) | ||
ifTrue: [ model hasUnacceptedEdits: aBoolean ] | ||
ifFalse: [ self basicHasUnacceptedEdits: aBoolean ] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
BorderedMorph subclass: #TextMorph | ||
uses: TAbleToRotate | ||
instanceVariableNames: 'textStyle text wrapFlag paragraph editor container predecessor successor backgroundColor margins' | ||
instanceVariableNames: 'textStyle text wrapFlag paragraph editor container predecessor successor backgroundColor margins defaultColor' | ||
classVariableNames: '' | ||
poolDictionaries: '' | ||
category: 'Morphic-Base-Basic' |
7 changes: 7 additions & 0 deletions
7
Morphic-Base.package/TextMorph.class/instance/accessing/enabled_.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
enabled: aBoolean | ||
|
||
aBoolean | ||
ifTrue: [ text makeAllColor: self defaultColor ] | ||
ifFalse: [ text makeAllColor: Color lightGray ]. | ||
|
||
self changed |
4 changes: 2 additions & 2 deletions
4
Morphic-Base.package/TextMorph.class/instance/initialization/defaultColor.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
defaultColor | ||
"answer the default color/fill style for the receiver" | ||
^ Color black | ||
|
||
^ defaultColor ifNil: [ Color black ] |
1 change: 1 addition & 0 deletions
1
Morphic-Base.package/TextMorph.class/instance/private/text_textStyle_.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,6 @@ | ||
text: t textStyle: s | ||
"Private -- for use only in morphic duplication" | ||
text := t. | ||
defaultColor := (t attributesAt: 1) detect: [ :e | e isKindOf: TextColor ] ifNone: [ self color ]. | ||
textStyle := s. | ||
paragraph ifNotNil: [paragraph textStyle: s] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 2 additions & 0 deletions
2
RPackage-Core.package/RPackageTag.class/instance/accessing/extensionCategoriesForClass_.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
extensionCategoriesForClass: aClass | ||
^ self package extensionCategoriesForClass: aClass |
2 changes: 2 additions & 0 deletions
2
RPackage-Core.package/RPackageTag.class/instance/testing/includesClass_.st
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
includesClass: aClass | ||
^ self hasClassNamed: aClass name |
Oops, something went wrong.