-
Notifications
You must be signed in to change notification settings - Fork 85
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1063 from jecisc/1061-Introduce-iconNamed-in-IceD…
…efinition-and-IceTipModel-and-remove-all-the-terrible-Smalltalk-ui-icons 1061-Introduce-iconNamed-in-IceDefinition-and-IceTipModel-and-remove-all-the-terrible-Smalltalk-ui-icons
- Loading branch information
Showing
22 changed files
with
43 additions
and
51 deletions.
There are no files selected for viewing
6 changes: 1 addition & 5 deletions
6
...erg-Plugin-GitHub.package/IceGitHubPullRequestDataSource.class/instance/iconForStatus..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,3 @@ | ||
| private | ||
| iconForStatus: status | ||
| status = 'success' ifTrue: [ ^ self iconNamed: #testGreen ]. | ||
| status = 'failure' ifTrue: [ ^ self iconNamed: #testRed ]. | ||
| status = 'pending' ifTrue: [ ^ self iconNamed: #testYellow ]. | ||
|
|
||
| ^ self iconNamed: #testNotRun | ||
| ^ self iconNamed: (self iconNameForStatus: status) |
7 changes: 7 additions & 0 deletions
7
...Plugin-GitHub.package/IceGitHubPullRequestDataSource.class/instance/iconNameForStatus..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 @@ | ||
| private | ||
| iconNameForStatus: status | ||
| status = 'success' ifTrue: [ ^ #testGreen ]. | ||
| status = 'failure' ifTrue: [ ^ #testRed ]. | ||
| status = 'pending' ifTrue: [ ^ #testYellow ]. | ||
|
|
||
| ^ #testNotRun |
2 changes: 1 addition & 1 deletion
2
...ugin-GitHub.package/IceNewBranchFromGitHubIssueCommand.class/class/defaultMenuIconName.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 @@ | ||
| testing | ||
| defaultMenuIconName | ||
| ^ #branch | ||
| ^ #github |
4 changes: 0 additions & 4 deletions
4
...lugin-GitHub.package/IceNewBranchFromGitHubIssueCommand.class/instance/defaultMenuIcon.st
This file was deleted.
Oops, something went wrong.
3 changes: 1 addition & 2 deletions
3
Iceberg-Plugin-Pharo.package/IcePharoMenuGroup.class/instance/icon.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,4 +1,3 @@ | ||
| accessing | ||
| icon | ||
|
|
||
| ^ (Smalltalk ui iconNamed: #pharo) scaledToSize: 16@16 | ||
| ^ (self iconNamed: #pharo) scaledToSize: 16 @ 16 |
2 changes: 1 addition & 1 deletion
2
...g-Plugin-Pharo.package/IceTipNewBranchFromIssueCommand.class/class/defaultMenuIconName.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 @@ | ||
| testing | ||
| defaultMenuIconName | ||
| ^ #branch | ||
| ^ #pharo |
4 changes: 0 additions & 4 deletions
4
...rg-Plugin-Pharo.package/IceTipNewBranchFromIssueCommand.class/instance/defaultMenuIcon.st
This file was deleted.
Oops, something went wrong.
3 changes: 1 addition & 2 deletions
3
Iceberg-TipUI.package/IceClassDefinition.extension/instance/icon.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,4 +1,3 @@ | ||
| *Iceberg-TipUI | ||
| icon | ||
|
|
||
| ^ Smalltalk ui icons iconNamed: #class | ||
| ^ self iconNamed: #class |
3 changes: 1 addition & 2 deletions
3
Iceberg-TipUI.package/IceConflictingOperation.extension/instance/operationIcon.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,4 +1,3 @@ | ||
| *Iceberg-TipUI | ||
| operationIcon | ||
|
|
||
| ^ Smalltalk ui icons iconNamed: #changeUpdate | ||
| ^ self iconNamed: #changeUpdate |
3 changes: 3 additions & 0 deletions
3
Iceberg-TipUI.package/IceDefinition.extension/instance/iconNamed..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 @@ | ||
| *Iceberg-TipUI | ||
| iconNamed: aSymbol | ||
| ^ Smalltalk ui icons iconNamed: aSymbol |
3 changes: 1 addition & 2 deletions
3
Iceberg-TipUI.package/IceExtensionDefinition.extension/instance/icon.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,4 +1,3 @@ | ||
| *Iceberg-TipUI | ||
| icon | ||
|
|
||
| ^ Smalltalk ui icons iconNamed: #group | ||
| ^ self iconNamed: #group |
7 changes: 3 additions & 4 deletions
7
Iceberg-TipUI.package/IceOperationMerge.extension/instance/icon.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,8 +1,7 @@ | ||
| *Iceberg-TipUI | ||
| icon | ||
|
|
||
| self isRightChosen ifTrue: [ | ||
| ^ Smalltalk ui icons iconNamed: #changeBlock ]. | ||
| self isLeftChosen ifTrue: [ | ||
| ^ Smalltalk ui icons iconNamed: #forward ]. | ||
| self isRightChosen ifTrue: [ ^ self iconNamed: #changeBlock ]. | ||
| self isLeftChosen ifTrue: [ ^ self iconNamed: #forward ]. | ||
|
|
||
| ^ self operationIcon |
3 changes: 1 addition & 2 deletions
3
Iceberg-TipUI.package/IcePackageDefinition.extension/instance/icon.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,4 +1,3 @@ | ||
| *Iceberg-TipUI | ||
| icon | ||
|
|
||
| ^ Smalltalk ui icons iconNamed: #dirtyMonticelloPackage | ||
| ^ self iconNamed: #dirtyMonticelloPackage |
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 @@ | ||
| accessing | ||
| iconNamed: aSymbol | ||
| ^ Smalltalk ui icons iconNamed: aSymbol |
3 changes: 3 additions & 0 deletions
3
Iceberg-TipUI.package/IceTipBrowser.class/instance/iconNamed..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 @@ | ||
| accessing | ||
| iconNamed: aSymbol | ||
| ^ Smalltalk ui icons iconNamed: aSymbol |
3 changes: 3 additions & 0 deletions
3
Iceberg-TipUI.package/IceTipComposablePresenter.class/class/iconNamed..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 @@ | ||
| accessing | ||
| iconNamed: aSymbol | ||
| ^ Smalltalk ui icons iconNamed: aSymbol |
3 changes: 3 additions & 0 deletions
3
Iceberg-TipUI.package/IceTipComposablePresenter.class/instance/iconNamed..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 @@ | ||
| accessing | ||
| iconNamed: aSymbol | ||
| ^ self class iconNamed: aSymbol |
3 changes: 1 addition & 2 deletions
3
Iceberg-TipUI.package/IceTraitDefinition.extension/instance/icon.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,4 +1,3 @@ | ||
| *Iceberg-TipUI | ||
| icon | ||
|
|
||
| ^ Smalltalk ui icons iconNamed: #trait | ||
| ^ self iconNamed: #trait |
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 @@ | ||
| *Iceberg-TipUI | ||
| icon | ||
| ^ Smalltalk ui icons iconNamed: #changeAdd | ||
| ^ self iconNamed: #changeAdd |
2 changes: 1 addition & 1 deletion
2
Iceberg-TipUI.package/MCModification.extension/instance/icon.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 @@ | ||
| *Iceberg-TipUI | ||
| icon | ||
| ^ Smalltalk ui icons iconNamed: #changeUpdate | ||
| ^ self iconNamed: #changeUpdate |
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 @@ | ||
| *Iceberg-TipUI | ||
| icon | ||
| ^ Smalltalk ui icons iconNamed: #changeRemove | ||
| ^ self iconNamed: #changeRemove |
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,27 +1,16 @@ | ||
| settings | ||
| settingsOn: aBuilder | ||
| settingsOn: aBuilder | ||
| <systemsettings> | ||
| (aBuilder group: #Iceberg) | ||
| parent: #SCM; | ||
| with: [ | ||
| (aBuilder setting: #enableMetacelloIntegration) | ||
| with: [ (aBuilder setting: #enableMetacelloIntegration) | ||
| target: self; | ||
| order: 0.1; | ||
| label: 'Enable Metacello integration'; | ||
| description: 'If selected, Metacello github:// repositories will be loaded using iceberg'; | ||
| " icon: (Smalltalk ui icons iconNamed: #smallConfigurationIcon);" | ||
| with: [ | ||
| (aBuilder pickOne: #remoteTypeSelector) | ||
| with: [ (aBuilder pickOne: #remoteTypeSelector) | ||
| label: 'Remote type'; | ||
| description: 'When creating an Iceberg repository out of a github:// URL choose whether you want to user an SCP URL (i.e. with the form ''[email protected]:<username>/<project>.git'') or an HTTPS URL (i.e. with the form ''https://github.com/<username>/<project>.git'''; | ||
| domainValues: { | ||
| 'SCP ([email protected]:<username>/<project>.git)' -> #scpUrl. | ||
| 'HTTPS (https://github.com/<username>/<project>.git)' -> #httpsUrl | ||
| }. | ||
| ]. | ||
| "(aBuilder setting: #showSystemRepositories) | ||
| order: 0.2; | ||
| label: 'Include system repositories by default'; | ||
| description: 'If checked then system repositories (like ''pharo'') will be shown in repositories list by default'; | ||
| target: self." | ||
| ] | ||
| domainValues: | ||
| {('SCP ([email protected]:<username>/<project>.git)' -> #scpUrl). | ||
| ('HTTPS (https://github.com/<username>/<project>.git)' -> #httpsUrl)} ] ] |