Skip to content

Commit

Permalink
60470
Browse files Browse the repository at this point in the history
19958 Find and Replace dialog uses black text color in dark theme
	https://pharo.fogbugz.com/f/cases/19958

19963 Improvement of TravisIntegrationHelp
	https://pharo.fogbugz.com/f/cases/19963

19977 Menu failure on right click in code pane when coming from MessageBrowser
	https://pharo.fogbugz.com/f/cases/19977

http://files.pharo.org/image/60/60470.zip
  • Loading branch information
Jenkins Build Server authored and ci committed Apr 26, 2017
1 parent 899b874 commit 625bfb8
Show file tree
Hide file tree
Showing 17 changed files with 141 additions and 54 deletions.
@@ -1,9 +1,16 @@
bestNodeFor: anInterval

| selectedChildren |

anInterval ifNil: [ ^ nil ].

(self intersectsInterval: anInterval) ifFalse: [^nil].
(self containedBy: anInterval) ifTrue: [^self].
selectedChildren := self children
select: [:each | each intersectsInterval: anInterval].
^selectedChildren size == 1
ifTrue: [selectedChildren first bestNodeFor: anInterval]
ifFalse: [self]

selectedChildren := self children select: [:each |
each intersectsInterval: anInterval
].

^ selectedChildren size = 1
ifTrue: [ selectedChildren first bestNodeFor: anInterval ]
ifFalse: [ self ]
Expand Up @@ -21,4 +21,5 @@ current: aUITheme
balloonMorph setBalloonColorTo: aUITheme balloonBackgroundColor. ].

aUITheme updateWorldDockingBars.
World themeChanged.
World themeChanged.
(SystemWindow allSubInstances select:[:e | e owner isNil]) do:#themeChanged.
@@ -1,6 +1,6 @@
script60469
script60470

^ 'AST-Core-TheIntegrator.492.mcz
^ 'AST-Core-TheIntegrator.494.mcz
AST-Tests-Core-TheIntegrator.134.mcz
Alien-RonieSalgado.40.mcz
Announcements-Core-TheIntegrator.84.mcz
Expand Down Expand Up @@ -253,7 +253,7 @@ OpalTools-TheIntegrator.24.mcz
Pharo-Help-TheIntegrator.38.mcz
PharoBootstrap-Initialization-TheIntegrator.4.mcz
PharoDocComment-StephaneDucasse.6.mcz
Polymorph-Widgets-TheIntegrator.1429.mcz
Polymorph-Widgets-TheIntegrator.1430.mcz
Polymorph-Widgets-Rules-TheIntegrator.11.mcz
PragmaCollector-TheIntegrator.18.mcz
ProfStef-Core-TheIntegrator.83.mcz
Expand Down Expand Up @@ -403,7 +403,7 @@ Tools-TheIntegrator.1532.mcz
Tools-Test-TheIntegrator.26.mcz
Traits-TheIntegrator.984.mcz
Transcript-TheIntegrator.56.mcz
TravisIntegrationHelp-TheIntegrator.2.mcz
TravisIntegrationHelp-TheIntegrator.5.mcz
TxText-Athens-EstebanLorenzano.58.mcz
TxText-AthensTests-HenrikNergaard.13.mcz
TxText-Model-MarcusDenker.67.mcz
Expand Down

This file was deleted.

@@ -0,0 +1,12 @@
update60470
"self new update60470"
self withUpdateLog: '19958 Find and Replace dialog uses black text color in dark theme
https://pharo.fogbugz.com/f/cases/19958
19963 Improvement of TravisIntegrationHelp
https://pharo.fogbugz.com/f/cases/19963
19977 Menu failure on right click in code pane when coming from MessageBrowser
https://pharo.fogbugz.com/f/cases/19977'.
self loadTogether: self script60470 merge: false.
self flushCaches.
@@ -1,9 +1,9 @@
commentForCurrentUpdate
^ '19960 Comments in changed code in Diff tool
https://pharo.fogbugz.com/f/cases/19960
^ '19958 Find and Replace dialog uses black text color in dark theme
https://pharo.fogbugz.com/f/cases/19958
19962 Watery theme is broken because SimpleButtonMorph does not understand isDefault
https://pharo.fogbugz.com/f/cases/19962
19963 Improvement of TravisIntegrationHelp
https://pharo.fogbugz.com/f/cases/19963
19970 Formatting methods recently introduced for WelcomeHelp should be accessible to all Help classes
https://pharo.fogbugz.com/f/cases/19970'
19977 Menu failure on right click in code pane when coming from MessageBrowser
https://pharo.fogbugz.com/f/cases/19977'
@@ -1 +1 @@
Please comment me using the following template inspired by Class Responsibility Collaborator (CRC) design:For the Class part: State a one line summary. For example, "I represent a paragraph of text".For the Responsibility part: Three sentences about my main responsibilities - what I do, what I know.For the Collaborators Part: State my main collaborators and one line about how I interact with them. Public API and Key Messages- message one - message two - (for bonus points) how to create instances. One simple example is simply gorgeous. Internal Representation and Key Implementation Points. Implementation Points
Help for getting Travis running with Pharo.
@@ -1,3 +1,2 @@
bookName
"the character zero is a hack to display it always first"
^ (Character value: 0) asString, 'Travis Integration'
^ 'Travis Integration'
@@ -1,2 +1,2 @@
pages
^ #(introduction step01 step02 step03 step04 step05 moreInformation)
^ #(introduction step01 step02 step03 step04 step05 matrix moreInformation)
@@ -1,7 +1,9 @@
introduction
^ HelpTopic
title: 'Introduction to Travis Integration'
contents: 'Travis is a wunderful continuous integration server. Thanks to SmalltalkCI, it can be easily used with any Pharo application.
contents:
(self heading: 'Introduction to Travis Integration'),
'Travis is a wunderful continuous integration server. Thanks to SmalltalkCI, it can be easily used with any Pharo application.
The example used in this help is Roassal2.
Expand Down
@@ -0,0 +1,72 @@
matrix
^ HelpTopic
title: 'Matrix Configuration'
contents:
(self heading: 'Matrix Configuration'),
'It may happen that you need different configuration. For example, having a development configuration and a stable one. The development configuration usually consider the latest version of your packages, while the stable uses particular versions.
You would need to create a new ', (self bold: '.smalltalk.ston'), ' file. To follow with our example, we have introduced this file in Step 04. We will now define a new file, called ', (self bold: '.smalltalk_stable.ston'), ' with the following content:
',
(self bold: '
SmalltalkCISpec {
#loading : [
SCIMetacelloLoadSpec {
#configuration : ''Roassal2'',
#repository : ''http://smalltalkhub.com/mc/ObjectProfile/Roassal2/main/'',
#load : [ ''default'' ],
#platforms : [ #pharo ],
#version: #stable
}
],
#testing : {
#coverage : {
#categories : [ ''Roassal2-AttachPoint-Tests'', ''Roassal2-Builder-AnimatedScatterPlot'', ''Roassal2-Builder-ApplicationMatrix'', ''Roassal2-Builder-CircularMap'', ''Roassal2-Builder-Common'', ''Roassal2-Builder-Composer'', ''Roassal2-Builder-DSM'', ''Roassal2-Builder-Explora'', ''Roassal2-Builder-Grapher-Decorators-Tests'', ''Roassal2-Builder-Grapher-Scaling-Tests'', ''Roassal2-Builder-Grapher-Tests'', ''Roassal2-Builder-Kiviat'', ''Roassal2-Builder-Legend'', ''Roassal2-Builder-Map-Tests'', ''Roassal2-Builder-Mondrian'', ''Roassal2-Builder-MondrianOLD'', ''Roassal2-Builder-NameCloud'', ''Roassal2-Builder-PieChart'', ''Roassal2-Builder-ScrollBar'', ''Roassal2-Builder-Simon'', ''Roassal2-Builder-Spectrograph'', ''Roassal2-Builder-StackBarPlot'', ''Roassal2-Builder-TextBuilder'', ''Roassal2-Builder-Timeline-Tests'', ''Roassal2-Builder-TreeMap'', ''Roassal2-Builder-UI-Slider'', ''Roassal2-Builder-UML'', ''Roassal2-ColorNormalizer-Tests'', ''Roassal2-Core-Tests'', ''Roassal2-Exporter-SVG'', ''Roassal2-Interactions'', ''Roassal2-Exporter-PNG'', ''Roassal2-Exporter-HTML5'', ''Roassal2-Interactions-Resize-Tests'', ''Roassal2-Layouts-Tests'',
''Roassal2-LineDecorations'', ''Roassal2-MorphSpecific'', ''Roassal2-OpenStreetMap'', ''Roassal2-Plugins'', ''Roassal2-Sparkline'', ''Roassal2-Table'', ''Roassal2-Tests'', ''Roassal2-Utility'', ''Trachel-MorphSpecific'', ''Trachel-Tests'', ''Trachel-Viva'', ''Roassal2GT-Glamour'', ''Roassal2GT-Glamour-Actions'', ''Roassal2GT-Glamour-Context'', ''Roassal2GT-Glamour-Roassal-Interaction'', ''Roassal2GT-Tests-Examples''
]
},
#exclude : {
#classes : [ #RTCacheTest , #Roassal2VWTest ]
}
}
}
'),
'
The principal difference between this file and ', (self bold: '.smalltalk.ston'), ' is the ', (self bold: ' #version: #stable'),
'
We are now ready to tell to Travis that we want to use this new file in some particular conditions, defined with a matrix.
The ', (self bold: '.travis.yml'), ' should be:
',
(self bold:
'language: smalltalk
os:
- osx
- linux
smalltalk:
- Pharo-6.0
- Pharo-5.0
matrix:
include:
- smalltalk: Pharo-6.0
smalltalk_config: .smalltalk_stable.ston
os: osx
- smalltalk: Pharo-5.0
smalltalk_config: .smalltalk_stable.ston
os: osx
- smalltalk: Pharo-6.0
smalltalk_config: .smalltalk_stable.ston
os: linux
- smalltalk: Pharo-5.0
smalltalk_config: .smalltalk_stable.ston
os: linux
'),
'
With this new content, Travis will run different configurations.'
@@ -1,16 +1,15 @@
moreInformation
^ HelpTopic
title: 'More information'
contents: '
Currently, there is no automatic way to start a build by simply committing to SmalltalkHub. The CronJob will run the test every 24 hours. You can manually run the build by either clicking on "start build" in Travis, or doing a commit in the git repository.
Personally, I have created a short shell script, called update.sh, that simply does
git commit --allow-empty -m "Trigger" && git push
contents:
(self heading: 'More information'),
'Currently, there is no automatic way to start a build by simply committing to SmalltalkHub. The CronJob will run the test every 24 hours. You can manually run the build by either clicking on "start build" in Travis, or doing a commit in the git repository.
Personally, I have created a short shell script, called update.sh, that simply does',
(self bold: 'git commit --allow-empty -m "Trigger" && git push'),
'
This help is written by Alexandre Bergel (http://bergel.eu) with the help of Juraj Kubelka.
Big thanks to the HPI team that has produced the Pharo support. More information about the Pharo support on Travis may be found on:
https://github.com/hpi-swa/smalltalkCI
'
Big thanks to the HPI team that has produced the Pharo support. More information about the Pharo support on Travis may be found on: ',
(self url: 'https://github.com/hpi-swa/smalltalkCI')
@@ -1,8 +1,10 @@
step01
^ HelpTopic
title: 'Step 01 - Configuration'
contents: 'You need a configuration for your project. A configuration contains the necessary to load your application, and Travis has to know about it.
contents:
(self heading: 'Step 01 - Configuration'),
'You need a configuration for your project. A configuration contains the necessary to load your application, and Travis has to know about it.
Before moving to the next step, you need to have a working configuration. Note that it does not matter where your configuration is located (e.g., in your SmalltalkHub repository, or in MetaRepoForPharoXX).
In this help, we will use the ConfigurationOfRoassal2 located in http://smalltalkhub.com/mc/Pharo/MetaRepoForPharo60/main'
In this help, we will use the ConfigurationOfRoassal2 located in ', (self url: 'http://smalltalkhub.com/mc/Pharo/MetaRepoForPharo60/main')
@@ -1,7 +1,9 @@
step02
^ HelpTopic
title: 'Step 02 - GitHub repository'
contents: 'You need a GitHub repository that will contains some configuration files. Even if your code is stored in SmalltalkHub, you need a GitHub repository.
contents:
(self heading: 'Step 02 - GitHub repository'),
'You need a GitHub repository that will contains some configuration files. Even if your code is stored in SmalltalkHub, you need a GitHub repository.
You can have a look at the Roassal2 GitHub repository: https://github.com/ObjectProfile/Roassal2
'
@@ -1,7 +1,9 @@
step03
^ HelpTopic
title: 'Step 03 - Account on Travis-ci.org'
contents: '* Go to http://travis-ci.org
contents:
(self heading: 'Step 03 - Account on Travis-ci.org'),
'* Go to http://travis-ci.org
* connect to it using your GitHub account
* You can add a repository (click on the + button on the left hand side, next to ''My Repositories''
* Select the repository you would like to have a build for. If you also be part of an organization you belong to. Move the switch to enable the repository
Expand Down
@@ -1,7 +1,9 @@
step04
^ HelpTopic
title: 'Step 04 - Define .smalltalk.ston'
contents: 'In your Git repository you will need to add two files, .smalltalk.ston and .travis.yml (yes, with a period at the begining).
contents:
(self heading: 'Step 04 - Define .smalltalk.ston'),
'In your Git repository you will need to add two files, .smalltalk.ston and .travis.yml (yes, with a period at the begining).
#configuration is the name of your project. Travis will look for ConfigurationOfRoassal2 in that case
#repository where the configuration is kept
Expand Down
@@ -1,9 +1,11 @@
step05
^ HelpTopic
title: 'Step 05 - Define .travis.yml'
contents: 'You need to indicates to Travis on which platform you want to run the tests. Consider the file:
-=-=-=-=
language: smalltalk
contents:
(self heading: 'Step 05 - Define .travis.yml'),
'You need to indicates to Travis on which platform you want to run the tests. Consider the file:',
(self bold:
'language: smalltalk
os:
- osx
Expand All @@ -12,8 +14,7 @@ os:
smalltalk:
- Pharo-6.0
- Pharo-5.0
-=-=-=-=
'), '
This simple files indicates that the test of your application will be run over a matrix (osx, linux) X (Pharo-6.0, Pharo-5.0).
Travis will begin the build after you have pushed the .travis.yml and .smalltalk.ston files
Expand Down

0 comments on commit 625bfb8

Please sign in to comment.