author | Jan Vrany <jan.vrany@fit.cvut.cz> |
Fri, 20 Sep 2013 10:52:30 +0100 | |
branch | jv |
changeset 13612 | 1acb01525f56 |
parent 13178 | c9bf900fe729 |
child 13674 | 7cf98b160823 |
permissions | -rw-r--r-- |
10028 | 1 |
" |
10065 | 2 |
COPYRIGHT (c) 2010 by Jan Vrany, SWING Research Group. CTU in Prague |
12292 | 3 |
All Rights Reserved |
10028 | 4 |
|
10065 | 5 |
Permission is hereby granted, free of charge, to any person |
6 |
obtaining a copy of this software and associated documentation |
|
7 |
files (the 'Software'), to deal in the Software without |
|
8 |
restriction, including without limitation the rights to use, |
|
9 |
copy, modify, merge, publish, distribute, sublicense, and/or sell |
|
10 |
copies of the Software, and to permit persons to whom the |
|
11 |
Software is furnished to do so, subject to the following |
|
12 |
conditions: |
|
13 |
||
14 |
The above copyright notice and this permission notice shall be |
|
15 |
included in all copies or substantial portions of the Software. |
|
16 |
||
17 |
THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, |
|
18 |
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES |
|
19 |
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND |
|
20 |
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT |
|
21 |
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, |
|
22 |
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
|
23 |
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR |
|
24 |
OTHER DEALINGS IN THE SOFTWARE. |
|
10028 | 25 |
" |
26 |
"{ Package: 'stx:libtool' }" |
|
27 |
||
28 |
"{ NameSpace: Tools }" |
|
29 |
||
30 |
ToolApplicationModel subclass:#ChangeSetBrowser2 |
|
11198 | 31 |
instanceVariableNames:'changesetHolder titleHolder allowOpenHolder changesetFile |
32 |
navigatorChangesetHolder navigatorSpecHolder list1 list1Holder |
|
33 |
selection1Holder list2 list2Holder selection2Holder classHolder |
|
34 |
languageHolder codeAspectHolder showRemovedAspect showSameAspect |
|
12681
adbbcc25326f
Fix in Tools::ChangeSetBrowser2>>#oneColumnNavigatorSpec after bad merge.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12680
diff
changeset
|
35 |
showTimestampHolder sourceView changeSourceHolder |
adbbcc25326f
Fix in Tools::ChangeSetBrowser2>>#oneColumnNavigatorSpec after bad merge.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12680
diff
changeset
|
36 |
imageSourceHolder targetPackage targetNamespace allowRemoveHolder |
adbbcc25326f
Fix in Tools::ChangeSetBrowser2>>#oneColumnNavigatorSpec after bad merge.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12680
diff
changeset
|
37 |
allowAcceptHolder infoPanel updateChangeFileHolder |
adbbcc25326f
Fix in Tools::ChangeSetBrowser2>>#oneColumnNavigatorSpec after bad merge.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12680
diff
changeset
|
38 |
showFilterHolder showingRegularChangesetHolder isWorkingHolder |
adbbcc25326f
Fix in Tools::ChangeSetBrowser2>>#oneColumnNavigatorSpec after bad merge.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12680
diff
changeset
|
39 |
isWorkingNotHolder hasSelectionHolder showConflictsOnlyAspect' |
11796
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
40 |
classVariableNames:'ShowRemoved LastSelectionConditionString RecentTargetPackages' |
11198 | 41 |
poolDictionaries:'' |
42 |
category:'Interface-Browsers-ChangeSet' |
|
10028 | 43 |
! |
44 |
||
10914 | 45 |
ApplicationModel subclass:#ChangeEditor |
11198 | 46 |
instanceVariableNames:'changeHolder readonlyHolder showdiffHolder sourceChangeHolder |
47 |
sourceImageHolder' |
|
48 |
classVariableNames:'' |
|
49 |
poolDictionaries:'' |
|
50 |
privateIn:ChangeSetBrowser2 |
|
10914 | 51 |
! |
52 |
||
10028 | 53 |
!ChangeSetBrowser2 class methodsFor:'documentation'! |
54 |
||
55 |
copyright |
|
56 |
" |
|
10065 | 57 |
COPYRIGHT (c) 2010 by Jan Vrany, SWING Research Group. CTU in Prague |
12292 | 58 |
All Rights Reserved |
10065 | 59 |
|
60 |
Permission is hereby granted, free of charge, to any person |
|
61 |
obtaining a copy of this software and associated documentation |
|
62 |
files (the 'Software'), to deal in the Software without |
|
63 |
restriction, including without limitation the rights to use, |
|
64 |
copy, modify, merge, publish, distribute, sublicense, and/or sell |
|
65 |
copies of the Software, and to permit persons to whom the |
|
66 |
Software is furnished to do so, subject to the following |
|
67 |
conditions: |
|
10028 | 68 |
|
10065 | 69 |
The above copyright notice and this permission notice shall be |
70 |
included in all copies or substantial portions of the Software. |
|
71 |
||
72 |
THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, |
|
73 |
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES |
|
74 |
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND |
|
75 |
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT |
|
76 |
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, |
|
77 |
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
|
78 |
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR |
|
79 |
OTHER DEALINGS IN THE SOFTWARE. |
|
10028 | 80 |
" |
81 |
! ! |
|
82 |
||
83 |
!ChangeSetBrowser2 class methodsFor:'instance creation'! |
|
84 |
||
12247
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
85 |
on: aStringOrChangeSet |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
86 |
"Opens a browser on given changeset. If the argument is |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
87 |
string, then loads the changeset from given file - for |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
88 |
compatibility with other tools" |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
89 |
|
12252
2ea15e194087
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12249
diff
changeset
|
90 |
^aStringOrChangeSet isString ifTrue:[ |
12571
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
91 |
self onFile: aStringOrChangeSet |
12247
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
92 |
] ifFalse:[ |
12571
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
93 |
self on: aStringOrChangeSet label: aStringOrChangeSet name |
12247
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
94 |
] |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
95 |
|
12252
2ea15e194087
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12249
diff
changeset
|
96 |
"Modified: / 21-05-2012 / 13:55:40 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10028 | 97 |
! |
98 |
||
99 |
on: aChangeSet label: aString |
|
100 |
||
101 |
^self on: aChangeSet label: aString setupWith: [:browser] |
|
102 |
||
103 |
"Created: / 26-10-2010 / 22:50:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
104 |
! |
|
105 |
||
106 |
on: aChangeSet label: label setupWith: aBlock |
|
107 |
||
108 |
| browser | |
|
109 |
||
110 |
browser := self new. |
|
111 |
browser |
|
12292 | 112 |
changeset: aChangeSet; |
113 |
title: label. |
|
10028 | 114 |
aBlock value: browser. |
115 |
^browser |
|
116 |
||
117 |
"Created: / 26-10-2010 / 22:50:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
12247
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
118 |
! |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
119 |
|
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
120 |
onFile: aString |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
121 |
| browser | |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
122 |
|
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
123 |
browser := self new. |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
124 |
browser enqueueDelayedAction:[browser doOpenFile: aString]. |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
125 |
^browser |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
126 |
|
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
127 |
"Created: / 17-05-2012 / 23:36:13 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10028 | 128 |
! ! |
129 |
||
130 |
!ChangeSetBrowser2 class methodsFor:'accessing'! |
|
131 |
||
132 |
showRemoved |
|
133 |
||
134 |
^ShowRemoved == true |
|
135 |
! |
|
136 |
||
137 |
showRemoved: aBoolean |
|
138 |
||
139 |
ShowRemoved := aBoolean |
|
140 |
! ! |
|
141 |
||
142 |
!ChangeSetBrowser2 class methodsFor:'help specs'! |
|
143 |
||
11034 | 144 |
flyByHelpSpec |
10028 | 145 |
"This resource specification was automatically generated |
146 |
by the UIHelpTool of ST/X." |
|
147 |
||
148 |
"Do not manually edit this!! If it is corrupted, |
|
149 |
the UIHelpTool may not be able to read the specification." |
|
150 |
||
151 |
" |
|
10467
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
152 |
UIHelpTool openOnClass:Tools::ChangeSetBrowser |
10028 | 153 |
" |
154 |
||
155 |
<resource: #help> |
|
156 |
||
11034 | 157 |
^ super flyByHelpSpec addPairsFrom:#( |
10028 | 158 |
|
159 |
#fileLoad |
|
11034 | 160 |
'Select a file and show its contained changeset' |
10028 | 161 |
|
162 |
#fileSave |
|
11034 | 163 |
'Save the changeset in a file' |
10028 | 164 |
|
12211 | 165 |
#applyAll |
166 |
'Apply all changes.' |
|
167 |
||
168 |
#applyForClassToEnd |
|
169 |
'Apply changes which affect this class to the end.' |
|
170 |
||
171 |
#applyFromLastSnapshot |
|
172 |
'Apply changes from the last snapshot to the end.' |
|
173 |
||
174 |
#applyLine |
|
175 |
'Apply the selected change.' |
|
176 |
||
177 |
#applyToEnd |
|
178 |
'Apply all changes from the selected one to the end.' |
|
179 |
||
180 |
#deleteAll |
|
181 |
'Deletes all changes.' |
|
182 |
||
183 |
#deleteCompress |
|
184 |
'Deletes all obsolete changes.' |
|
185 |
||
186 |
#deleteCompressForClass |
|
187 |
'Deletes obsolete changes for this class, leaving the last one.' |
|
188 |
||
189 |
#deleteForClassToEnd |
|
190 |
'Deletes changes for this class from the selection to the end.' |
|
191 |
||
192 |
#deleteLine |
|
193 |
'Deletes the selected change.' |
|
194 |
||
195 |
#deleteToEnd |
|
196 |
'Deletes changes from the selected one to the end.' |
|
197 |
||
198 |
#fileLoad |
|
199 |
'Opens a dialog for selecting and loading another changes file.' |
|
200 |
||
201 |
#fileReload |
|
202 |
'Reloads the changes file (undo your modifications).' |
|
203 |
||
204 |
#fileSave |
|
205 |
'Saves the list of changes into the current changes file.' |
|
206 |
||
207 |
#filterField |
|
208 |
'Matching patterns filtering the changes (separate patterns by blanks).' |
|
209 |
||
210 |
#settingsAutoUpdate |
|
211 |
'Toggle automatic update.' |
|
212 |
||
213 |
#settingsColumns |
|
214 |
'Configure which columns are shown in the list.' |
|
215 |
||
216 |
#settingsColumnsCategory |
|
217 |
'Toggle display of the changes category in the list.' |
|
218 |
||
219 |
#settingsColumnsDeltaInfo |
|
220 |
'Toggle display of the delta-info in the list.' |
|
221 |
||
222 |
#settingsColumnsPosition |
|
223 |
'Togle display of the changes file-position in the list.' |
|
224 |
||
225 |
#settingsColumnsTimeStamp |
|
226 |
'Toggle display of the changes time stamp in the list.' |
|
227 |
||
228 |
#settingsColumnsType |
|
229 |
'Toggle display of the change-type in the list.' |
|
230 |
||
231 |
#settingsPrivateAsSeparate |
|
232 |
'Toggle if changes for private private are included when applying, deleting, or compressing for a class.' |
|
233 |
||
234 |
#testCompareWithCurrentVersion |
|
235 |
'Opens a info dialog showing the difference between the changes code and the method current code.' |
|
236 |
||
237 |
#testFindPreviousSnapshot |
|
238 |
'Searches backward for the previous snapshot entry.' |
|
239 |
||
240 |
#testFindNextSnapshot |
|
241 |
'Searches forward for the next snapshot entry.' |
|
242 |
||
10028 | 243 |
) |
11034 | 244 |
|
245 |
"Created: / 27-12-2011 / 10:37:47 / cg" |
|
12211 | 246 |
"Modified: / 29-03-2012 / 12:13:59 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
247 |
! |
|
248 |
||
249 |
helpSpec |
|
250 |
"This resource specification was automatically generated |
|
251 |
by the UIHelpTool of ST/X." |
|
252 |
||
253 |
"Do not manually edit this!! If it is corrupted, |
|
254 |
the UIHelpTool may not be able to read the specification." |
|
255 |
||
256 |
" |
|
12292 | 257 |
UIHelpTool openOnClass:Tools::ChangeSetBrowser2 |
12211 | 258 |
" |
259 |
||
260 |
<resource: #help> |
|
261 |
||
262 |
^ super helpSpec addPairsFrom:#( |
|
263 |
||
264 |
#applyAll |
|
265 |
'Apply all changes.' |
|
266 |
||
267 |
#applyForClassToEnd |
|
268 |
'Apply changes to the end which affect this class.' |
|
269 |
||
270 |
#applyFromLastSnapshot |
|
271 |
'Apply changes from the last snapshot to the end.' |
|
272 |
||
273 |
#applyLine |
|
274 |
'Apply the selected change.' |
|
275 |
||
276 |
#applyToEnd |
|
277 |
'Apply all changes from the selected one to the end.' |
|
278 |
||
279 |
#deleteAll |
|
280 |
'Deletes all changes.' |
|
281 |
||
282 |
#deleteCompress |
|
283 |
'Deletes all obsolete changes.' |
|
284 |
||
285 |
#deleteCompressForClass |
|
286 |
'Deletes obsolete changes for this class, leaving the last one.' |
|
287 |
||
288 |
#deleteForClassToEnd |
|
289 |
'Deletes changes for this class from the selection to the end.' |
|
290 |
||
291 |
#deleteLine |
|
292 |
'Deletes the selected change.' |
|
293 |
||
294 |
#deleteToEnd |
|
295 |
'Deletes changes from the selected one to the end.' |
|
296 |
||
297 |
#fileLoad |
|
12274
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
298 |
'Open a changeset file (.chg or .st)' |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
299 |
|
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
300 |
#fileOpenSelection |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
301 |
'' |
12211 | 302 |
|
303 |
#fileReload |
|
304 |
'Reloads the changes file (undo your modifications).' |
|
305 |
||
306 |
#fileSave |
|
12274
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
307 |
'Saves changes to current change file.' |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
308 |
|
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
309 |
#fileSaveAs |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
310 |
'Save changes to a file' |
12211 | 311 |
|
312 |
#filterField |
|
313 |
'Matching patterns filtering the changes (separate patterns by blanks).' |
|
314 |
||
315 |
#settingsAutoUpdate |
|
316 |
'Toggle automatic update.' |
|
317 |
||
318 |
#settingsColumns |
|
319 |
'Configure which columns are shown in the list.' |
|
320 |
||
321 |
#settingsColumnsCategory |
|
322 |
'Toggle display of the changes category in the list.' |
|
323 |
||
324 |
#settingsColumnsClassName |
|
325 |
'Toggle display of the className in the list.' |
|
326 |
||
327 |
#settingsColumnsDeltaInfo |
|
328 |
'Toggle display of the delta-info in the list.' |
|
329 |
||
330 |
#settingsColumnsPosition |
|
331 |
'Togle display of the changes file-position in the list.' |
|
332 |
||
333 |
#settingsColumnsTimeStamp |
|
334 |
'Toggle display of the changes time stamp in the list.' |
|
335 |
||
336 |
#settingsColumnsType |
|
337 |
'Toggle display of the change-type in the list.' |
|
338 |
||
339 |
#settingsPrivateAsSeparate |
|
340 |
'Toggle if changes for private private are included when applying, deleting, or compressing for a class.' |
|
341 |
||
342 |
#testCompareWithCurrentVersion |
|
343 |
'Opens a info dialog showing the difference between the changes code and the method current code.' |
|
344 |
||
345 |
#testFindLastSnapshot |
|
346 |
'Searches backward for the previous snapshot entry.' |
|
347 |
||
348 |
#testFindNextSnapshot |
|
349 |
'Searches forward for the next snapshot entry.' |
|
350 |
||
12247
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
351 |
#testFindPreviousSnapshot |
12274
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
352 |
'Searches backward for the previous snapshot entry.' |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
353 |
|
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
354 |
#fileOpenCurrent |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
355 |
'Open current system changeset' |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
356 |
|
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
357 |
#fileOpenSelection |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
358 |
'Opens a new browser on currently selected changes' |
12247
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
359 |
|
12211 | 360 |
) |
12274
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
361 |
|
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
362 |
"Modified: / 01-08-2012 / 18:40:10 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10028 | 363 |
! ! |
364 |
||
12207
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
365 |
!ChangeSetBrowser2 class methodsFor:'image specs'! |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
366 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
367 |
applyFromLastSnapshotIcon |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
368 |
^ self applyFromLastSnapshotIcon2 |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
369 |
! |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
370 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
371 |
applyFromLastSnapshotIcon1 |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
372 |
"This resource specification was automatically generated |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
373 |
by the ImageEditor of ST/X." |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
374 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
375 |
"Do not manually edit this!! If it is corrupted, |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
376 |
the ImageEditor may not be able to read the specification." |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
377 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
378 |
" |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
379 |
self applyFromLastSnapshotIcon inspect |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
380 |
ImageEditor openOnClass:self andSelector:#applyFromLastSnapshotIcon |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
381 |
Icon flushCachedIcons |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
382 |
" |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
383 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
384 |
<resource: #image> |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
385 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
386 |
^Icon |
12292 | 387 |
constantNamed:#'NewChangesBrowser class applyFromLastSnapshotIcon' |
388 |
ifAbsentPut:[(Depth4Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#(4)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:' |
|
12207
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
389 |
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@BH"H"H@@@@@@@@@H"H"H @@@@@@@@@@@@@B@@@@@@ |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
390 |
@@;.;.; H@@@@@@@C.;.;.@@@@@@@@@@@@@@8@@N@@@@C?????C @@@N@@@O????<@@@8@@@@@@@@@C0@@@@8@@O????<O@@C @@@@?????0@@@@C @@@@@@ |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
391 |
@O@@@N@@@@DQDQDP<@C @@@@@_??DQ@@@@@@@@@A????D@@@@@@@@@DQDQDP@@@@C @@@@@@@@@@@@@@@@@b') ; colorMapFromArray:#[0 0 0 255 255 255 255 0 0 0 255 0 0 0 255 0 255 255 255 255 0 255 0 255 127 0 0 0 127 0 0 0 127 0 127 127 127 127 0 127 0 127 127 127 127 170 170 170]; mask:((Depth1Image new) width: 22; height: 22; photometric:(#blackIs0); bitsPerSample:(#(1)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@@C?0@B@P@B@P@O?P@O?P@O?0@??@@??@@??LC?<\C?<\C?<8O?08O?10O?10??C ??[@??_@?<^@?<_@?<_@') ; yourself); yourself] |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
392 |
! |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
393 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
394 |
applyFromLastSnapshotIcon2 |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
395 |
"This resource specification was automatically generated |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
396 |
by the ImageEditor of ST/X." |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
397 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
398 |
"Do not manually edit this!! If it is corrupted, |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
399 |
the ImageEditor may not be able to read the specification." |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
400 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
401 |
" |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
402 |
self applyFromLastSnapshotIcon1 inspect |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
403 |
ImageEditor openOnClass:self andSelector:#applyFromLastSnapshotIcon1 |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
404 |
Icon flushCachedIcons |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
405 |
" |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
406 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
407 |
<resource: #image> |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
408 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
409 |
^Icon |
12292 | 410 |
constantNamed:#'NewChangesBrowser class applyFromLastSnapshotIcon1' |
411 |
ifAbsentPut:[(Depth4Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#(4)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:' |
|
12207
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
412 |
@@@BH@@@@@@QDQ<@@BH @@@@@AH"H@@@H"@@@@@@D"H H H"@@@@@@@RH"@"H"@@@@@@@AH"H@H"H@@@@@@@<@@@@BH@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
413 |
@@;.;.; @@@@@@@@C.;.;.@@@@@@@@@@@@@@8@@N@@@@C?????C @@@N@@@O????<@@@8@@@@@@@@@C0@@@@8@@O????<O@@C @@@@?????0@@@@C @@@@@@ |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
414 |
@O@@@N@@@@DQDQDP<@C @@@@@_??DQ@@@@@@@@@A????D@@@@@@@@@DQDQDP@@@@C @@@@@@@@@@@@@@@@@b') ; colorMapFromArray:#[0 0 0 255 255 255 255 0 0 0 255 0 0 0 255 0 255 255 255 255 0 255 0 255 127 0 0 0 127 0 0 0 127 0 127 127 127 127 0 127 0 127 127 127 127 170 170 170]; mask:((Depth1Image new) width: 22; height: 22; photometric:(#blackIs0); bitsPerSample:(#(1)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'A@C<C@C<C@C<&@C<<@C<\@C<H@@@@?<@@?<@@?<LC?<\C?<\C?<8O?08O?10O?10??C ??[@??_@?<^@?<_@?<_@') ; yourself); yourself] |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
415 |
! |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
416 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
417 |
applyIcon |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
418 |
^ self applyIcon2 |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
419 |
! |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
420 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
421 |
applyIcon1 |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
422 |
"This resource specification was automatically generated |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
423 |
by the ImageEditor of ST/X." |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
424 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
425 |
"Do not manually edit this!! If it is corrupted, |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
426 |
the ImageEditor may not be able to read the specification." |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
427 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
428 |
" |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
429 |
self applyIcon inspect |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
430 |
ImageEditor openOnClass:self andSelector:#applyIcon |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
431 |
Icon flushCachedIcons |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
432 |
" |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
433 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
434 |
<resource: #image> |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
435 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
436 |
^Icon |
12292 | 437 |
constantNamed:#'NewChangesBrowser class applyIcon' |
438 |
ifAbsentPut:[(Depth2Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#(2)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:' |
|
12207
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
439 |
UUUUUUUPUUUUUU?PUUUUUU?[UUUUUW=PP@@@@C<QQUUU=_4PQUUU?_4VQ**U_?TPQUUUW?TPQUUUW=TXQ***U=TPQ**UUUTPQ*****TPQ***%UTPQ****)TP |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
440 |
QUUUUUTPQUUUUUTUP@@@@@@PUUUUUUUPUUUUUUUPUUUUUUUPUUUUUUUP') ; colorMapFromArray:#[0 0 0 255 255 255 170 170 170 255 0 0]; mask:((Depth1Image new) width: 22; height: 22; photometric:(#blackIs0); bitsPerSample:(#(1)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:' |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
441 |
@@@@@@@8@@@8@@A0_??8_??8_??8_??8_??8_??8_??8_??8_??8_??8_??8_??8_??8_??8@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
442 |
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
443 |
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
444 |
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
445 |
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
446 |
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@a') ; yourself); yourself] |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
447 |
! |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
448 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
449 |
applyIcon2 |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
450 |
"This resource specification was automatically generated |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
451 |
by the ImageEditor of ST/X." |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
452 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
453 |
"Do not manually edit this!! If it is corrupted, |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
454 |
the ImageEditor may not be able to read the specification." |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
455 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
456 |
" |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
457 |
self applyIcon2 inspect |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
458 |
ImageEditor openOnClass:self andSelector:#applyIcon2 |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
459 |
Icon flushCachedIcons |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
460 |
" |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
461 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
462 |
<resource: #image> |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
463 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
464 |
^Icon |
12292 | 465 |
constantNamed:#'NewChangesBrowser class applyIcon2' |
466 |
ifAbsentPut:[(Depth4Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#[4]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:' |
|
12207
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
467 |
DQDQDQDQDQDQP3PQDQDQDQDQDQECMADQDQDQDQDQECMADQDQDQEDPQDTL4DP@@@@@DL4@DL4@Q@QDQDQP3MAP3PADADQDQDTL3P3PPDPD"H"HQECL3MA@Q@Q |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
468 |
DQDQDQP3MADADADQDQDQDTL4DPDPD"H"H"HQEDDQ@Q@RH"H!!DQDQDQDADAH"H"H"H"H"DPDPD"H"H"H!!DQDQ@Q@RH"H"H"H"HQDADADQDQDQDQDQDPDPDQDQ |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
469 |
DQDQDQDQ@Q@@@@@@@@@@@@@ADQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDQDb') ; colorMapFromArray:#[0 0 0 255 255 255 170 170 170 255 0 0 85 85 85]; mask:((Depth1Image new) width: 22; height: 22; photometric:(#blackIs0); bitsPerSample:(#(1)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:' |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
470 |
@@@<@@@<@@A8@C!!8_??8_??8_??8_??8_??8_??8_??8_??8_??8_??8_??8_??8_??8_??8@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
471 |
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
472 |
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
473 |
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
474 |
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
475 |
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@a') ; yourself); yourself] |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
476 |
! |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
477 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
478 |
applyToEndIcon |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
479 |
"This resource specification was automatically generated |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
480 |
by the ImageEditor of ST/X." |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
481 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
482 |
"Do not manually edit this!! If it is corrupted, |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
483 |
the ImageEditor may not be able to read the specification." |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
484 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
485 |
" |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
486 |
self applyToEndIcon inspect |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
487 |
ImageEditor openOnClass:self andSelector:#applyToEndIcon |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
488 |
Icon flushCachedIcons |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
489 |
" |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
490 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
491 |
<resource: #image> |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
492 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
493 |
^Icon |
12292 | 494 |
constantNamed:#'NewChangesBrowser class applyToEndIcon' |
495 |
ifAbsentPut:[(Depth4Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#[4]); samplesPerPixel:(1); bits:(ByteArray fromPackedString:' |
|
12207
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
496 |
@@@DP@@@@@@@@@@@@DQ@@@@@@@@@@@@@QD@@@"H"H"@@Q@QD@@@BH"H"H@ADQD@@@@@@@@@ @@QDP@@BH"H"HB@@@DP@@@H"H"H @@@@@@@@@@@@@B@@@@@@ |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
497 |
@@L3L3L0H@@@@@@@@3L3L3@@@@@@@@@@@@@@L@@B@@@@@3L3L3@0@@@B@@@CL3L3L@@@H@@@@@@@@@@0@@@@H@@ADQDQDC@@@ @@@@DQDQDP@@@@@ @@@@@@ |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
498 |
@A@@@B@@@@DQDQDPD@@ @@@@@SL3DQ@@@@@@@@@AL3L3D@@@@@@@@@DQDQDP@@@@@ @@@@@@@@@@@@@@@@@b') ; colorMapFromArray:#[0 0 0 255 255 255 127 127 127 170 170 170 255 0 0]; mask:((Depth1Image new) width: 22; height: 22; photometric:(#blackIs0); bitsPerSample:(#(1)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'A@@@CC?0CC?0&C?0<O?0\O?0HO?0@??@@??@@??LC?<\C?<\C?<8O?08O?10O?10??C ??[@??_@?<^@?<_@?<_@') ; yourself); yourself] |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
499 |
! |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
500 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
501 |
compressIcon |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
502 |
"This resource specification was automatically generated |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
503 |
by the ImageEditor of ST/X." |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
504 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
505 |
"Do not manually edit this!! If it is corrupted, |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
506 |
the ImageEditor may not be able to read the specification." |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
507 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
508 |
" |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
509 |
ImageEditor openOnClass:self andSelector:#compressIcon |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
510 |
" |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
511 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
512 |
<resource: #image> |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
513 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
514 |
^Icon |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
515 |
constantNamed:#'NewChangesBrowser compressIcon' |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
516 |
ifAbsentPut:[(Depth2Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#(2 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@@@@@@@????<@@@:***(@@@8@@@8@@@8@@@8@@@@@@@8@@@@@@@8A@@@@@@8@@:**0@8HC**+@@8@@@@@@@8H@@@@@@8@@@@@@@8@@@@@@@8@@@@@@@8@@C????8@@C****(@@@@@@@@H@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@') ; colorMapFromArray:#[0 0 0 124 124 124 170 170 170 255 255 255]; mask:((Depth1Image new) width: 22; height: 22; photometric:(#blackIs0); bitsPerSample:(#(1 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@??0A??8A??8A??8A8A8G>A8@@A8G?98O?18_?!!8??A8@@A8G>A8@0A8C??8C??8C??8C??0@0@@D2@@G>@@D2@@') ; yourself); yourself] |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
517 |
! |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
518 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
519 |
deleteIcon |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
520 |
"This resource specification was automatically generated |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
521 |
by the ImageEditor of ST/X." |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
522 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
523 |
"Do not manually edit this!! If it is corrupted, |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
524 |
the ImageEditor may not be able to read the specification." |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
525 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
526 |
" |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
527 |
ImageEditor openOnClass:self andSelector:#deleteIcon |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
528 |
" |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
529 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
530 |
<resource: #image> |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
531 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
532 |
^Icon |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
533 |
constantNamed:#'NewChangesBrowser deleteIcon' |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
534 |
ifAbsentPut:[(Depth2Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#(2 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@@@@@AUUUU@@OA??UU@@@AUUUU@@@AUUUU@B@A???U@H@A??5U@@@A???0@@@AUUUB@B@@@@@@@@@@@@@A@BK@@@@A_:@@@@@AO2G@@@@AL2@@@@@AL2C@@@@AL2@@@@@AL2@@@@@AL2H@@@@AL2@@@@@A\:@@@@@H_8 @@@@@@@H') ; colorMapFromArray:#[0 0 0 255 255 255 127 127 127 170 170 170]; mask:((Depth1Image new) width: 22; height: 22; photometric:(#blackIs0); bitsPerSample:(#(1 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'_?<@_?<@_?<P_?<P_?<X_?<X_?<H_? H_?O<_?XL@@_<@@_<@@_<@@_<@@_<@@_<@@_<@@_<@@_<@@_<@@_<@@G0') ; yourself); yourself] |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
535 |
! |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
536 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
537 |
deleteToEndIcon |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
538 |
"This resource specification was automatically generated |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
539 |
by the ImageEditor of ST/X." |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
540 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
541 |
"Do not manually edit this!! If it is corrupted, |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
542 |
the ImageEditor may not be able to read the specification." |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
543 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
544 |
" |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
545 |
ImageEditor openOnClass:self andSelector:#deleteToEndIcon |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
546 |
" |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
547 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
548 |
<resource: #image> |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
549 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
550 |
^Icon |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
551 |
constantNamed:#'NewChangesBrowser deleteToEndIcon' |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
552 |
ifAbsentPut:[(Depth2Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#(2 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@@@@@@B** @@O@B** @@@@@@@ @@@@??< @B@@??<@@H@@@@L@@@@EUUL@@@@G?U@B@B@G?=@@@@@EUU@A@BK@@@@A_:@@@@@AO2G@@@@AL2@@@@@AL2C@@@@AL2@@@@@AL2@@@@@AL2H@@@@AL2@@@@@A\:@@@@@H_8 @@@@@@@H') ; colorMapFromArray:#[0 0 0 255 255 255 127 127 127 170 170 170]; mask:((Depth1Image new) width: 22; height: 22; photometric:(#blackIs0); bitsPerSample:(#(1 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'C?0@C?0@C?0PO?0PO?0XO?0X??@H??@H??O<?<XL?<_<?<_<@@_<@@_<@@_<@@_<@@_<@@_<@@_<@@_<@@_<@@G0') ; yourself); yourself] |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
553 |
! |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
554 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
555 |
findLastSnapshotIcon |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
556 |
"This resource specification was automatically generated |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
557 |
by the ImageEditor of ST/X." |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
558 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
559 |
"Do not manually edit this!! If it is corrupted, |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
560 |
the ImageEditor may not be able to read the specification." |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
561 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
562 |
" |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
563 |
ImageEditor openOnClass:self andSelector:#findLastSnapshotIcon |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
564 |
" |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
565 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
566 |
<resource: #image> |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
567 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
568 |
^Icon |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
569 |
constantNamed:#'NewChangesBrowser findLastSnapshotIcon' |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
570 |
ifAbsentPut:[(Depth2Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#(2 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@EUUUW@A@F***(@@@F***(@@@F***(@@@F***(@@@F***(@@@F***(@@@F***(@A@F***(@M@F***(@H@F***(@@@F***(@@@F***(@I@L@@@@@@@@@@@@@A@P@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@') ; colorMapFromArray:#[0 0 0 255 255 255 255 0 0 170 170 170]; mask:((Depth1Image new) width: 22; height: 22; photometric:(#blackIs0); bitsPerSample:(#(1 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'C??@C??@C??@C??@C??@C??@C??@C??@C??@C??@C??@C??@C??@C??B@@@B@C@B@G B@O0@@_8@@G @@G @@G @') ; yourself); yourself] |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
571 |
! |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
572 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
573 |
findNextSnapshotIcon |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
574 |
"This resource specification was automatically generated |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
575 |
by the ImageEditor of ST/X." |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
576 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
577 |
"Do not manually edit this!! If it is corrupted, |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
578 |
the ImageEditor may not be able to read the specification." |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
579 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
580 |
" |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
581 |
ImageEditor openOnClass:self andSelector:#findNextSnapshotIcon |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
582 |
" |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
583 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
584 |
<resource: #image> |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
585 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
586 |
^Icon |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
587 |
constantNamed:#'NewChangesBrowser findNextSnapshotIcon' |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
588 |
ifAbsentPut:[(Depth2Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#(2 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@@@@@DA@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@D@B@@@@@@@@@@@@@@@E@@@@@@@@@EUUUW@N@F***(@@@F***(@@@F***(@@@F***(@@@F***(@@@F***(@@@V***(@H@F***(@@@F***(@@@F***(@@@F***(@@@F***(@@@L@@@@@@') ; colorMapFromArray:#[0 0 0 255 255 255 255 0 0 170 170 170]; mask:((Depth1Image new) width: 22; height: 22; photometric:(#blackIs0); bitsPerSample:(#(1 )); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'@G @@G @@G @@_8@@O0@@G @@C@@@@@@C??@C??@C??@C??@C??@C??BC??BC??BC??BC??@C??@C??@C??@C??@') ; yourself); yourself] |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
589 |
! |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
590 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
591 |
findPreviousForClassIcon |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
592 |
"This resource specification was automatically generated |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
593 |
by the ImageEditor of ST/X." |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
594 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
595 |
"Do not manually edit this!! If it is corrupted, |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
596 |
the ImageEditor may not be able to read the specification." |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
597 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
598 |
" |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
599 |
self findPreviousForClassIcon inspect |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
600 |
ImageEditor openOnClass:self andSelector:#findPreviousForClassIcon |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
601 |
Icon flushCachedIcons |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
602 |
" |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
603 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
604 |
<resource: #image> |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
605 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
606 |
^Icon |
12292 | 607 |
constantNamed:#'NewChangesBrowser class findPreviousForClassIcon' |
608 |
ifAbsentPut:[(Depth2Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#(2)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:' |
|
12207
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
609 |
@EUUUW@A@G???<@@@G???<@@@G???<@@@G???<@@@G???<@@@G???<@@@G???<@A@G???<@M@G???<@H@G???<@@@G???<@@@G???<@I@L@@@@@@@@@@@@@A |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
610 |
@P@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@') ; colorMapFromArray:#[0 0 0 255 255 255 255 0 0 170 170 170]; mask:((Depth1Image new) width: 22; height: 22; photometric:(#blackIs0); bitsPerSample:(#(1)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'C??@C??@C??@C??@C??@C??@C??@C??@C??@C??@C??@C??@C??@C??B@@@B@C@B@G B@O0@@_8@@G @@G @@G @') ; yourself); yourself] |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
611 |
! |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
612 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
613 |
findPreviousSnapshotIcon |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
614 |
"This resource specification was automatically generated |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
615 |
by the ImageEditor of ST/X." |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
616 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
617 |
"Do not manually edit this!! If it is corrupted, |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
618 |
the ImageEditor may not be able to read the specification." |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
619 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
620 |
" |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
621 |
self findPreviousSnapshotIcon inspect |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
622 |
ImageEditor openOnClass:self andSelector:#findPreviousSnapshotIcon |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
623 |
Icon flushCachedIcons |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
624 |
" |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
625 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
626 |
<resource: #image> |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
627 |
|
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
628 |
^Icon |
12292 | 629 |
constantNamed:#'NewChangesBrowser class findPreviousSnapshotIcon' |
630 |
ifAbsentPut:[(Depth2Image new) width: 22; height: 22; photometric:(#palette); bitsPerSample:(#(2)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:' |
|
12207
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
631 |
@EUUUW@A@F***(@@@F***(@@@F***(@@@F***(@@@F***(@@@F***(@@@F***(@A@F***(@M@F***(@H@F***(@@@F***(@@@F***(@I@L@@@@@@@@@@@@@A |
17656fc80e6c
Improvements in method rewriter
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12205
diff
changeset
|
632 |
@P@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@') ; colorMapFromArray:#[0 0 0 255 255 255 255 0 0 170 170 170]; mask:((Depth1Image new) width: 22; height: 22; photometric:(#blackIs0); bitsPerSample:(#(1)); samplesPerPixel:(1); bits:(ByteArray fromPackedString:'C??@C??@C??@C??@C??@C??@C??@C??@C??@C??@C??@C??@C??@C??B@@@B@C@B@G B@O0@@_8@@G @@G @@G @') ; yourself); yourself] |
10028 | 633 |
! ! |
634 |
||
635 |
!ChangeSetBrowser2 class methodsFor:'interface opening'! |
|
636 |
||
637 |
confirmChanges: aChangeSet |
|
638 |
||
11674 | 639 |
^self confirmChanges: aChangeSet label: 'Apply the following changes?' |
10028 | 640 |
|
641 |
"Modified: / 08-11-2010 / 18:01:16 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11674 | 642 |
"Modified: / 26-07-2012 / 13:19:49 / cg" |
10028 | 643 |
! |
644 |
||
645 |
confirmChanges:aChangeSet label: aString |
|
646 |
"Hmm, DialogBox class layout options are quite limited :-((" |
|
10467
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
647 |
|
10028 | 648 |
|browser browserView dialog| |
649 |
||
10309 | 650 |
browser := self on: aChangeSet. |
11196 | 651 |
browser allowAccept: false. |
652 |
browser allowRemove: true. |
|
12272 | 653 |
browser showRemovedAspect: true asValue. |
12144 | 654 |
browser beHierarchical. |
10467
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
655 |
browserView := ApplicationSubView new |
12292 | 656 |
client:browser |
657 |
spec:#windowSpecForEmbedding. |
|
10028 | 658 |
dialog := (Dialog new) |
12292 | 659 |
addComponent:browserView withHeight: 300; |
660 |
addAbortAndOkButtons; |
|
661 |
yourself. |
|
10028 | 662 |
dialog label: aString. |
10467
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
663 |
dialog buttonPanel |
12292 | 664 |
layout:(LayoutFrame fractions:(0.0 @ 1.0 corner:1.0 @ 1.0) |
665 |
offsets:(0 @ -30 corner:0 @ 0)). |
|
10028 | 666 |
browserView layout:(LayoutFrame fractions:(0.0 @ 0.0 corner:1.0 @ 1.0) |
12292 | 667 |
offsets:(0 @ 0 corner:0 @ -30)). |
10467
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
668 |
dialog |
12292 | 669 |
okAction: |
670 |
[^browser list1Holder value condenseChangesForRemoved]; |
|
671 |
abortAction: |
|
672 |
[^#()]. |
|
10345 | 673 |
dialog openWithExtent: 800@700. |
10028 | 674 |
^#() |
675 |
||
676 |
" |
|
12292 | 677 |
Tools::ChangeSetBrowser2 |
678 |
confirmChanges: |
|
679 |
(ChangeSet current copyFrom: ((ChangeSet current size - 10) max: 1) to: ChangeSet current size) |
|
680 |
label: 'Last 10 changes...' |
|
10028 | 681 |
" |
682 |
||
683 |
"Created: / 08-11-2010 / 17:59:51 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10682 | 684 |
"Modified: / 07-09-2011 / 20:19:44 / cg" |
12272 | 685 |
"Modified: / 27-07-2012 / 17:12:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10028 | 686 |
! |
687 |
||
11198 | 688 |
open |
689 |
"Open browser and load current changefile" |
|
690 |
||
12151
ac18977416c2
Added (experimental) support for inline message panel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12144
diff
changeset
|
691 |
| browser | |
ac18977416c2
Added (experimental) support for inline message panel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12144
diff
changeset
|
692 |
|
ac18977416c2
Added (experimental) support for inline message panel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12144
diff
changeset
|
693 |
browser := self new. |
ac18977416c2
Added (experimental) support for inline message panel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12144
diff
changeset
|
694 |
browser open. |
12274
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
695 |
"JV: I would like to open current changefile only if the tool is opened from |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
696 |
launcher toolbar button" |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
697 |
|
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
698 |
(thisContext sender sender receiver isKindOf: AbstractLauncherApplication) ifTrue:[ |
12292 | 699 |
browser builder window sensor |
700 |
pushUserEvent: #doOpenCurrent for: browser. |
|
12274
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
701 |
] ifFalse:[ |
12292 | 702 |
browser builder window sensor |
703 |
pushUserEvent: #doOpenNew for: browser. |
|
12274
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
704 |
|
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
705 |
] |
11198 | 706 |
|
707 |
"Created: / 25-01-2012 / 17:16:20 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11709 | 708 |
"Modified: / 27-07-2012 / 21:24:19 / cg" |
11198 | 709 |
! |
710 |
||
10028 | 711 |
openOn: aChangeSet |
11674 | 712 |
^(self on: aChangeSet) |
713 |
open; |
|
714 |
yourself |
|
11196 | 715 |
|
716 |
" |
|
717 |
self openOn: ChangeSet current |
|
718 |
" |
|
719 |
||
720 |
"Modified (comment): / 24-01-2012 / 20:01:25 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11674 | 721 |
"Modified: / 26-07-2012 / 13:19:18 / cg" |
10028 | 722 |
! |
723 |
||
724 |
openOn: aChangeSet label: aString |
|
725 |
||
726 |
^self openOn: aChangeSet label: aString setupWith: [:browser] |
|
727 |
||
728 |
"Created: / 26-10-2010 / 22:50:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
729 |
! |
|
730 |
||
731 |
openOn: aChangeSet label: aString setupWith: aBlock |
|
732 |
||
11674 | 733 |
^(self on: aChangeSet label: aString setupWith: aBlock) open; yourself |
10028 | 734 |
|
735 |
"Created: / 26-10-2010 / 23:07:34 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11674 | 736 |
"Modified: / 26-07-2012 / 13:19:30 / cg" |
10028 | 737 |
! ! |
738 |
||
739 |
!ChangeSetBrowser2 class methodsFor:'interface specs'! |
|
740 |
||
741 |
hierarchicalNavigatorSpec |
|
742 |
"This resource specification was automatically generated |
|
743 |
by the UIPainter of ST/X." |
|
744 |
||
745 |
"Do not manually edit this!! If it is corrupted, |
|
746 |
the UIPainter may not be able to read the specification." |
|
747 |
||
748 |
" |
|
10448 | 749 |
UIPainter new openOnClass:Tools::ChangeSetBrowser2 andSelector:#hierarchicalNavigatorSpec |
750 |
Tools::ChangeSetBrowser2 new openInterface:#hierarchicalNavigatorSpec |
|
10028 | 751 |
" |
752 |
||
753 |
<resource: #canvas> |
|
754 |
||
10467
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
755 |
^ |
10028 | 756 |
#(FullSpec |
11196 | 757 |
name: hierarchicalNavigatorSpec |
758 |
window: |
|
10028 | 759 |
(WindowSpec |
11196 | 760 |
label: 'Hierarchical Navigator' |
761 |
name: 'Hierarchical Navigator' |
|
762 |
min: (Point 10 10) |
|
763 |
bounds: (Rectangle 0 0 300 300) |
|
764 |
) |
|
765 |
component: |
|
10028 | 766 |
(SpecCollection |
11196 | 767 |
collection: ( |
768 |
(SubCanvasSpec |
|
769 |
name: 'ChangeList' |
|
770 |
layout: (LayoutFrame 0 0 0 0 0 1 0 1) |
|
771 |
hasHorizontalScrollBar: false |
|
772 |
hasVerticalScrollBar: false |
|
773 |
majorKey: #'Tools::HierarchicalChangeList' |
|
774 |
subAspectHolders: |
|
775 |
(Array |
|
776 |
||
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
777 |
(SubChannelInfoSpec |
11196 | 778 |
subAspect: allowAcceptHolder |
779 |
aspect: allowAcceptHolder |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
780 |
) |
11196 | 781 |
(SubChannelInfoSpec |
782 |
subAspect: allowRemoveHolder |
|
783 |
aspect: allowRemoveHolder |
|
784 |
) |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
785 |
|
11196 | 786 |
(SubChannelInfoSpec |
787 |
subAspect: inGeneratorHolder |
|
788 |
aspect: list1Holder |
|
789 |
) |
|
790 |
(SubChannelInfoSpec |
|
791 |
subAspect: menuHolder |
|
792 |
aspect: list1MenuHolder |
|
793 |
) |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
794 |
|
11196 | 795 |
(SubChannelInfoSpec |
796 |
subAspect: selectionHolder |
|
797 |
aspect: selection1Holder |
|
798 |
) |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
799 |
(SubChannelInfoSpec |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
800 |
subAspect: showFilterHolder |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
801 |
aspect: showFilterHolder |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
802 |
) |
11196 | 803 |
|
804 |
(SubChannelInfoSpec |
|
805 |
subAspect: showRemovedHolder |
|
806 |
aspect: showRemovedAspect |
|
807 |
) |
|
808 |
(SubChannelInfoSpec |
|
809 |
subAspect: showSameHolder |
|
810 |
aspect: showSameAspect |
|
811 |
) |
|
12658 | 812 |
(SubChannelInfoSpec |
813 |
subAspect: showConflictsOnlyHolder |
|
814 |
aspect: showConflictsOnlyAspect |
|
815 |
) |
|
11196 | 816 |
) |
817 |
createNewApplication: true |
|
818 |
createNewBuilder: true |
|
819 |
postBuildCallback: list1View: |
|
820 |
) |
|
821 |
) |
|
822 |
||
823 |
) |
|
10028 | 824 |
) |
825 |
! |
|
826 |
||
827 |
oneColumnNavigatorSpec |
|
828 |
"This resource specification was automatically generated |
|
829 |
by the UIPainter of ST/X." |
|
830 |
||
831 |
"Do not manually edit this!! If it is corrupted, |
|
832 |
the UIPainter may not be able to read the specification." |
|
833 |
||
834 |
" |
|
10448 | 835 |
UIPainter new openOnClass:Tools::ChangeSetBrowser2 andSelector:#oneColumnNavigatorSpec |
836 |
Tools::ChangeSetBrowser2 new openInterface:#oneColumnNavigatorSpec |
|
10028 | 837 |
" |
838 |
||
839 |
<resource: #canvas> |
|
840 |
||
12292 | 841 |
^ |
10028 | 842 |
#(FullSpec |
11196 | 843 |
name: oneColumnNavigatorSpec |
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
844 |
window: |
10028 | 845 |
(WindowSpec |
11196 | 846 |
label: 'One Column Navigator' |
847 |
name: 'One Column Navigator' |
|
848 |
min: (Point 10 10) |
|
849 |
bounds: (Rectangle 0 0 300 300) |
|
850 |
) |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
851 |
component: |
10028 | 852 |
(SpecCollection |
11196 | 853 |
collection: ( |
854 |
(SubCanvasSpec |
|
855 |
name: 'ChangeList' |
|
856 |
layout: (LayoutFrame 0 0 0 0 0 1 0 1) |
|
857 |
hasHorizontalScrollBar: false |
|
858 |
hasVerticalScrollBar: false |
|
859 |
majorKey: #'Tools::ChangeList' |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
860 |
subAspectHolders: |
11196 | 861 |
(Array |
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
862 |
|
11196 | 863 |
(SubChannelInfoSpec |
864 |
subAspect: allowAcceptHolder |
|
865 |
aspect: allowAcceptHolder |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
866 |
) |
11196 | 867 |
(SubChannelInfoSpec |
868 |
subAspect: allowRemoveHolder |
|
869 |
aspect: allowRemoveHolder |
|
870 |
) |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
871 |
|
11196 | 872 |
(SubChannelInfoSpec |
873 |
subAspect: inGeneratorHolder |
|
874 |
aspect: list1Holder |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
875 |
) |
11196 | 876 |
(SubChannelInfoSpec |
877 |
subAspect: menuHolder |
|
878 |
aspect: list1MenuHolder |
|
879 |
) |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
880 |
|
11196 | 881 |
(SubChannelInfoSpec |
882 |
subAspect: selectionHolder |
|
883 |
aspect: selection1Holder |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
884 |
) |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
885 |
(SubChannelInfoSpec |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
886 |
subAspect: showFilterHolder |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
887 |
aspect: showFilterHolder |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
888 |
) |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
889 |
|
11196 | 890 |
(SubChannelInfoSpec |
891 |
subAspect: showRemovedHolder |
|
892 |
aspect: showRemovedAspect |
|
893 |
) |
|
894 |
(SubChannelInfoSpec |
|
895 |
subAspect: showSameHolder |
|
896 |
aspect: showSameAspect |
|
897 |
) |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
898 |
|
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
899 |
(SubChannelInfoSpec |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
900 |
subAspect: showTimestampHolder |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
901 |
aspect: showTimestampHolder |
12681
adbbcc25326f
Fix in Tools::ChangeSetBrowser2>>#oneColumnNavigatorSpec after bad merge.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12680
diff
changeset
|
902 |
) |
12658 | 903 |
(SubChannelInfoSpec |
904 |
subAspect: showConflictsOnlyHolder |
|
905 |
aspect: showConflictsOnlyAspect |
|
12681
adbbcc25326f
Fix in Tools::ChangeSetBrowser2>>#oneColumnNavigatorSpec after bad merge.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12680
diff
changeset
|
906 |
|
12658 | 907 |
) |
11196 | 908 |
) |
909 |
createNewApplication: true |
|
910 |
createNewBuilder: true |
|
911 |
postBuildCallback: list1View: |
|
912 |
) |
|
913 |
) |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
914 |
|
11196 | 915 |
) |
10028 | 916 |
) |
12681
adbbcc25326f
Fix in Tools::ChangeSetBrowser2>>#oneColumnNavigatorSpec after bad merge.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12680
diff
changeset
|
917 |
|
adbbcc25326f
Fix in Tools::ChangeSetBrowser2>>#oneColumnNavigatorSpec after bad merge.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12680
diff
changeset
|
918 |
"Modified: / 16-04-2013 / 16:10:04 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10028 | 919 |
! |
920 |
||
921 |
twoColumnNavigatorSpec |
|
922 |
"This resource specification was automatically generated |
|
923 |
by the UIPainter of ST/X." |
|
924 |
||
925 |
"Do not manually edit this!! If it is corrupted, |
|
926 |
the UIPainter may not be able to read the specification." |
|
927 |
||
928 |
" |
|
10448 | 929 |
UIPainter new openOnClass:Tools::ChangeSetBrowser2 andSelector:#twoColumnNavigatorSpec |
930 |
Tools::ChangeSetBrowser2 new openInterface:#twoColumnNavigatorSpec |
|
10028 | 931 |
" |
932 |
||
933 |
<resource: #canvas> |
|
934 |
||
10467
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
935 |
^ |
10028 | 936 |
#(FullSpec |
11196 | 937 |
name: twoColumnNavigatorSpec |
938 |
window: |
|
10028 | 939 |
(WindowSpec |
11196 | 940 |
label: 'Two Column Navigator' |
941 |
name: 'Two Column Navigator' |
|
942 |
min: (Point 10 10) |
|
943 |
bounds: (Rectangle 0 0 300 300) |
|
944 |
) |
|
945 |
component: |
|
10028 | 946 |
(SpecCollection |
11196 | 947 |
collection: ( |
948 |
(VariableHorizontalPanelSpec |
|
949 |
name: 'Columns' |
|
950 |
layout: (LayoutFrame 0 0 0 0 0 1 0 1) |
|
951 |
component: |
|
952 |
(SpecCollection |
|
953 |
collection: ( |
|
954 |
(SubCanvasSpec |
|
955 |
name: 'FirstColumn' |
|
956 |
hasHorizontalScrollBar: false |
|
957 |
hasVerticalScrollBar: false |
|
958 |
majorKey: #'Tools::ChangeList' |
|
959 |
subAspectHolders: |
|
960 |
(Array |
|
961 |
||
962 |
(SubChannelInfoSpec |
|
963 |
subAspect: allowAcceptHolder |
|
964 |
aspect: allowAcceptHolder |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
965 |
) |
11196 | 966 |
(SubChannelInfoSpec |
967 |
subAspect: allowRemoveHolder |
|
968 |
aspect: allowRemoveHolder |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
969 |
) |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
970 |
|
11196 | 971 |
(SubChannelInfoSpec |
972 |
subAspect: inGeneratorHolder |
|
973 |
aspect: list1Holder |
|
974 |
) |
|
975 |
(SubChannelInfoSpec |
|
976 |
subAspect: menuHolder |
|
977 |
aspect: list1MenuHolder |
|
978 |
) |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
979 |
|
11196 | 980 |
(SubChannelInfoSpec |
981 |
subAspect: outGeneratorHolder |
|
982 |
aspect: list2Holder |
|
983 |
) |
|
984 |
(SubChannelInfoSpec |
|
985 |
subAspect: selectionHolder |
|
986 |
aspect: selection1Holder |
|
987 |
) |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
988 |
|
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
989 |
(SubChannelInfoSpec |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
990 |
subAspect: showFilterHolder |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
991 |
aspect: showFilterHolder |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
992 |
) |
11196 | 993 |
(SubChannelInfoSpec |
994 |
subAspect: showRemovedHolder |
|
995 |
aspect: showRemovedAspect |
|
996 |
) |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
997 |
|
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
998 |
(SubChannelInfoSpec |
11196 | 999 |
subAspect: showSameHolder |
1000 |
aspect: showSameAspect |
|
1001 |
) |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1002 |
(SubChannelInfoSpec |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1003 |
subAspect: showTimestampHolder |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1004 |
aspect: showTimestampHolder |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1005 |
) |
12658 | 1006 |
(SubChannelInfoSpec |
1007 |
subAspect: showConflictsOnlyHolder |
|
1008 |
aspect: showConflictsOnlyAspect |
|
1009 |
) |
|
11196 | 1010 |
) |
1011 |
createNewApplication: true |
|
1012 |
createNewBuilder: true |
|
1013 |
postBuildCallback: list1View: |
|
1014 |
) |
|
1015 |
(SubCanvasSpec |
|
1016 |
name: 'SecondColumn' |
|
1017 |
hasHorizontalScrollBar: false |
|
1018 |
hasVerticalScrollBar: false |
|
1019 |
majorKey: #'Tools::ChangeList' |
|
1020 |
subAspectHolders: |
|
1021 |
(Array |
|
1022 |
||
1023 |
(SubChannelInfoSpec |
|
1024 |
subAspect: allowAcceptHolder |
|
1025 |
aspect: allowAcceptHolder |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1026 |
) |
11196 | 1027 |
(SubChannelInfoSpec |
1028 |
subAspect: allowRemoveHolder |
|
1029 |
aspect: allowRemoveHolder |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1030 |
) |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1031 |
|
11196 | 1032 |
(SubChannelInfoSpec |
1033 |
subAspect: inGeneratorHolder |
|
1034 |
aspect: list2Holder |
|
1035 |
) |
|
1036 |
(SubChannelInfoSpec |
|
1037 |
subAspect: menuHolder |
|
1038 |
aspect: list2MenuHolder |
|
1039 |
) |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1040 |
|
11196 | 1041 |
(SubChannelInfoSpec |
1042 |
subAspect: selectionHolder |
|
1043 |
aspect: selection2Holder |
|
1044 |
) |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1045 |
(SubChannelInfoSpec |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1046 |
subAspect: showFilterHolder |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1047 |
aspect: showFilterHolder |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1048 |
) |
11196 | 1049 |
|
1050 |
(SubChannelInfoSpec |
|
1051 |
subAspect: showRemovedHolder |
|
1052 |
aspect: showRemovedAspect |
|
1053 |
) |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1054 |
(SubChannelInfoSpec |
11196 | 1055 |
subAspect: showSameHolder |
1056 |
aspect: showSameAspect |
|
1057 |
) |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1058 |
|
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1059 |
(SubChannelInfoSpec |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1060 |
subAspect: showTimestampHolder |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1061 |
aspect: showTimestampHolder |
12805
7d5a56d8c41f
Bugfix in Tools::ChangeSetBrowser2>>#twoColumnNavigatorSpec.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12681
diff
changeset
|
1062 |
) |
7d5a56d8c41f
Bugfix in Tools::ChangeSetBrowser2>>#twoColumnNavigatorSpec.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12681
diff
changeset
|
1063 |
(SubChannelInfoSpec |
7d5a56d8c41f
Bugfix in Tools::ChangeSetBrowser2>>#twoColumnNavigatorSpec.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12681
diff
changeset
|
1064 |
subAspect: showConflictsOnlyHolder |
7d5a56d8c41f
Bugfix in Tools::ChangeSetBrowser2>>#twoColumnNavigatorSpec.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12681
diff
changeset
|
1065 |
aspect: showConflictsOnlyAspect |
7d5a56d8c41f
Bugfix in Tools::ChangeSetBrowser2>>#twoColumnNavigatorSpec.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12681
diff
changeset
|
1066 |
) |
7d5a56d8c41f
Bugfix in Tools::ChangeSetBrowser2>>#twoColumnNavigatorSpec.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12681
diff
changeset
|
1067 |
|
11196 | 1068 |
) |
1069 |
createNewApplication: true |
|
1070 |
createNewBuilder: true |
|
1071 |
postBuildCallback: list2View: |
|
1072 |
) |
|
1073 |
) |
|
1074 |
handles: (Any 0.5 1.0) |
|
1075 |
) |
|
1076 |
) |
|
1077 |
||
1078 |
) |
|
12805
7d5a56d8c41f
Bugfix in Tools::ChangeSetBrowser2>>#twoColumnNavigatorSpec.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12681
diff
changeset
|
1079 |
) |
7d5a56d8c41f
Bugfix in Tools::ChangeSetBrowser2>>#twoColumnNavigatorSpec.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12681
diff
changeset
|
1080 |
) |
7d5a56d8c41f
Bugfix in Tools::ChangeSetBrowser2>>#twoColumnNavigatorSpec.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12681
diff
changeset
|
1081 |
|
7d5a56d8c41f
Bugfix in Tools::ChangeSetBrowser2>>#twoColumnNavigatorSpec.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12681
diff
changeset
|
1082 |
"Modified: / 01-05-2013 / 11:22:16 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10028 | 1083 |
! |
1084 |
||
1085 |
windowSpec |
|
1086 |
"This resource specification was automatically generated |
|
1087 |
by the UIPainter of ST/X." |
|
1088 |
||
1089 |
"Do not manually edit this!! If it is corrupted, |
|
1090 |
the UIPainter may not be able to read the specification." |
|
1091 |
||
1092 |
" |
|
12151
ac18977416c2
Added (experimental) support for inline message panel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12144
diff
changeset
|
1093 |
UIPainter new openOnClass:Tools::ChangeSetBrowser2 andSelector:#windowSpec |
ac18977416c2
Added (experimental) support for inline message panel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12144
diff
changeset
|
1094 |
Tools::ChangeSetBrowser2 new openInterface:#windowSpec |
ac18977416c2
Added (experimental) support for inline message panel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12144
diff
changeset
|
1095 |
Tools::ChangeSetBrowser2 open |
10028 | 1096 |
" |
1097 |
||
1098 |
<resource: #canvas> |
|
1099 |
||
10467
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
1100 |
^ |
10028 | 1101 |
#(FullSpec |
12292 | 1102 |
name: windowSpec |
1103 |
window: |
|
10028 | 1104 |
(WindowSpec |
12292 | 1105 |
label: 'ChangeSet browser' |
1106 |
name: 'ChangeSet browser' |
|
1107 |
labelChannel: titleHolder |
|
1108 |
min: (Point 10 10) |
|
1109 |
bounds: (Rectangle 0 0 800 600) |
|
1110 |
menu: mainMenu |
|
1111 |
) |
|
1112 |
component: |
|
10028 | 1113 |
(SpecCollection |
12292 | 1114 |
collection: ( |
1115 |
(MenuPanelSpec |
|
1116 |
name: 'ToolBar' |
|
1117 |
layout: (LayoutFrame 0 0 0 0 0 1 30 0) |
|
1118 |
menu: toolbarMenu |
|
1119 |
textDefault: true |
|
1120 |
) |
|
1121 |
(SubCanvasSpec |
|
1122 |
name: 'InfoPanel' |
|
1123 |
layout: (LayoutFrame 0 0 30 0 0 1 70 0) |
|
1124 |
level: 0 |
|
1125 |
initiallyInvisible: true |
|
1126 |
hasHorizontalScrollBar: false |
|
1127 |
hasVerticalScrollBar: false |
|
1128 |
clientKey: infoPanel |
|
1129 |
createNewBuilder: false |
|
1130 |
) |
|
1131 |
(UISubSpecification |
|
1132 |
name: 'Contents' |
|
1133 |
layout: (LayoutFrame 0 0 30 0 0 1 0 1) |
|
1134 |
minorKey: windowSpecWithoutToolbar |
|
1135 |
) |
|
1136 |
) |
|
1137 |
||
1138 |
) |
|
10028 | 1139 |
) |
1140 |
! |
|
1141 |
||
1142 |
windowSpecForEmbedding |
|
1143 |
||
1144 |
^self windowSpecWithoutToolbar |
|
1145 |
! |
|
1146 |
||
1147 |
windowSpecWithoutToolbar |
|
1148 |
"This resource specification was automatically generated |
|
1149 |
by the UIPainter of ST/X." |
|
1150 |
||
1151 |
"Do not manually edit this!! If it is corrupted, |
|
1152 |
the UIPainter may not be able to read the specification." |
|
1153 |
||
1154 |
" |
|
10333 | 1155 |
UIPainter new openOnClass:Tools::ChangeSetBrowser2 andSelector:#windowSpecWithoutToolbar |
1156 |
Tools::ChangeSetBrowser2 new openInterface:#windowSpecWithoutToolbar |
|
10028 | 1157 |
" |
1158 |
||
1159 |
<resource: #canvas> |
|
1160 |
||
10467
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
1161 |
^ |
10028 | 1162 |
#(FullSpec |
12292 | 1163 |
name: windowSpecWithoutToolbar |
1164 |
window: |
|
10028 | 1165 |
(WindowSpec |
12292 | 1166 |
label: 'ChangeSet browser' |
1167 |
name: 'ChangeSet browser' |
|
1168 |
min: (Point 10 10) |
|
1169 |
bounds: (Rectangle 0 0 653 488) |
|
1170 |
menu: mainMenu |
|
1171 |
) |
|
1172 |
component: |
|
10028 | 1173 |
(SpecCollection |
12292 | 1174 |
collection: ( |
1175 |
(VariableVerticalPanelSpec |
|
1176 |
name: 'VerticalPanel' |
|
1177 |
layout: (LayoutFrame 0 0 0 0 0 1 0 1) |
|
1178 |
component: |
|
1179 |
(SpecCollection |
|
1180 |
collection: ( |
|
1181 |
(SubCanvasSpec |
|
1182 |
name: 'NavigatorPanel' |
|
1183 |
hasHorizontalScrollBar: false |
|
1184 |
hasVerticalScrollBar: false |
|
1185 |
specHolder: navigatorSpecHolder |
|
1186 |
createNewBuilder: false |
|
1187 |
) |
|
1188 |
(SubCanvasSpec |
|
1189 |
name: 'TextDiffTool' |
|
1190 |
hasHorizontalScrollBar: false |
|
1191 |
hasVerticalScrollBar: false |
|
1192 |
majorKey: #'Tools::TextDiff2Tool' |
|
1193 |
minorKey: windowSpecForEmbedding |
|
1194 |
subAspectHolders: |
|
1195 |
(Array |
|
1196 |
||
1197 |
(SubChannelInfoSpec |
|
1198 |
subAspect: classHolder |
|
1199 |
aspect: classHolder |
|
1200 |
) |
|
1201 |
(SubChannelInfoSpec |
|
1202 |
subAspect: languageHolder |
|
1203 |
aspect: languageHolder |
|
1204 |
) |
|
1205 |
(SubChannelInfoSpec |
|
1206 |
subAspect: codeAspectHolder |
|
1207 |
aspect: codeAspectHolder |
|
1208 |
) |
|
1209 |
||
1210 |
(SubChannelInfoSpec |
|
1211 |
subAspect: labelAHolder |
|
1212 |
aspect: labelAHolder |
|
1213 |
) |
|
1214 |
(SubChannelInfoSpec |
|
1215 |
subAspect: labelBHolder |
|
1216 |
aspect: labelBHolder |
|
1217 |
) |
|
1218 |
||
1219 |
(SubChannelInfoSpec |
|
1220 |
subAspect: textAHolder |
|
1221 |
aspect: changeSourceHolder |
|
1222 |
) |
|
1223 |
(SubChannelInfoSpec |
|
1224 |
subAspect: textBHolder |
|
1225 |
aspect: imageSourceHolder |
|
1226 |
) |
|
1227 |
) |
|
1228 |
createNewApplication: true |
|
1229 |
createNewBuilder: true |
|
1230 |
) |
|
1231 |
) |
|
1232 |
||
1233 |
) |
|
1234 |
handles: (Any 0.5 1.0) |
|
1235 |
) |
|
1236 |
) |
|
1237 |
||
1238 |
) |
|
10028 | 1239 |
) |
10953 | 1240 |
|
1241 |
"Modified: / 03-12-2011 / 10:36:40 / cg" |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12154
diff
changeset
|
1242 |
"Modified: / 16-03-2012 / 13:09:44 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10028 | 1243 |
! ! |
1244 |
||
1245 |
!ChangeSetBrowser2 class methodsFor:'menu specs'! |
|
1246 |
||
1247 |
changeMenu |
|
1248 |
"This resource specification was automatically generated |
|
1249 |
by the MenuEditor of ST/X." |
|
1250 |
||
1251 |
"Do not manually edit this!! If it is corrupted, |
|
1252 |
the MenuEditor may not be able to read the specification." |
|
1253 |
||
10658 | 1254 |
|
10028 | 1255 |
" |
10448 | 1256 |
MenuEditor new openOnClass:Tools::ChangeSetBrowser2 andSelector:#changeMenu |
1257 |
(Menu new fromLiteralArrayEncoding:(Tools::ChangeSetBrowser2 changeMenu)) startUp |
|
10028 | 1258 |
" |
1259 |
||
1260 |
<resource: #menu> |
|
1261 |
||
12292 | 1262 |
^ |
10028 | 1263 |
#(Menu |
10643 | 1264 |
( |
1265 |
(MenuItem |
|
1266 |
enabled: hasChangeSelectedAndNotRemoved: |
|
1267 |
label: 'Apply' |
|
1268 |
itemValue: changeMenuApplySelection: |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1269 |
translateLabel: true |
11196 | 1270 |
isVisible: allowAcceptHolder |
10643 | 1271 |
shortcutKey: Accept |
1272 |
auxValue: 100 |
|
1273 |
) |
|
1274 |
(MenuItem |
|
1275 |
label: 'Apply all' |
|
1276 |
itemValue: changeMenuApply: |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1277 |
translateLabel: true |
11196 | 1278 |
isVisible: allowAcceptHolder |
10643 | 1279 |
) |
1280 |
(MenuItem |
|
1281 |
label: '-' |
|
11196 | 1282 |
isVisible: allowAcceptHolder |
10643 | 1283 |
) |
1284 |
(MenuItem |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1285 |
label: 'Delete (selected)' |
10643 | 1286 |
itemValue: changeMenuDeleteSelection: |
1287 |
nameKey: Delete |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1288 |
translateLabel: true |
11196 | 1289 |
isVisible: allowRemoveHolder |
10643 | 1290 |
shortcutKey: Delete |
1291 |
) |
|
1292 |
(MenuItem |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1293 |
label: 'Delete (unselected)' |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1294 |
itemValue: changeMenuDeleteSelectionInverted: |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1295 |
nameKey: Delete |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1296 |
translateLabel: true |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1297 |
isVisible: allowRemoveHolder |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1298 |
) |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1299 |
(MenuItem |
10643 | 1300 |
label: 'Undelete' |
1301 |
itemValue: changeMenuUndeleteSelection: |
|
1302 |
nameKey: Undelete |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1303 |
translateLabel: true |
11196 | 1304 |
isVisible: allowRemoveHolder |
10643 | 1305 |
) |
1306 |
(MenuItem |
|
1307 |
label: '-' |
|
11196 | 1308 |
isVisible: allowRemoveHolder |
10643 | 1309 |
) |
1310 |
(MenuItem |
|
1311 |
label: 'Select...' |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1312 |
translateLabel: true |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1313 |
submenu: |
10643 | 1314 |
(Menu |
1315 |
( |
|
1316 |
(MenuItem |
|
1317 |
label: 'Select same' |
|
1318 |
itemValue: changeMenuSelectSame: |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1319 |
translateLabel: true |
10643 | 1320 |
) |
1321 |
(MenuItem |
|
1322 |
label: 'Select additions (new classes/methods)' |
|
1323 |
itemValue: changeMenuSelectAdditions: |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1324 |
translateLabel: true |
10643 | 1325 |
) |
1326 |
(MenuItem |
|
1327 |
label: 'Select removals' |
|
1328 |
itemValue: changeMenuSelectRemovals: |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1329 |
translateLabel: true |
10643 | 1330 |
) |
1331 |
(MenuItem |
|
1332 |
label: 'Select differences' |
|
1333 |
itemValue: changeMenuSelectDifferences: |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1334 |
translateLabel: true |
10643 | 1335 |
) |
1336 |
(MenuItem |
|
1337 |
label: '-' |
|
1338 |
) |
|
1339 |
(MenuItem |
|
1340 |
label: 'Select all' |
|
1341 |
itemValue: changeMenuSelectAll: |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1342 |
translateLabel: true |
11677 | 1343 |
shortcutKey: SelectAll |
10643 | 1344 |
) |
1345 |
(MenuItem |
|
1346 |
label: 'Select none' |
|
1347 |
itemValue: changeMenuSelectNone: |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1348 |
translateLabel: true |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1349 |
) |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1350 |
(MenuItem |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1351 |
label: 'Invert Selection' |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1352 |
itemValue: changeMenuSelectInversion: |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1353 |
translateLabel: true |
10643 | 1354 |
) |
1355 |
(MenuItem |
|
1356 |
label: '-' |
|
1357 |
) |
|
1358 |
(MenuItem |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1359 |
label: 'Select Using Block...' |
10643 | 1360 |
itemValue: changeMenuSelectUsingBlock: |
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1361 |
translateLabel: true |
10643 | 1362 |
) |
1363 |
) |
|
1364 |
nil |
|
1365 |
nil |
|
1366 |
) |
|
1367 |
) |
|
1368 |
(MenuItem |
|
1369 |
label: '-' |
|
1370 |
) |
|
1371 |
(MenuItem |
|
12658 | 1372 |
enabled: notShowConflictsOnlyAspect |
10643 | 1373 |
label: 'Show Deleted' |
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1374 |
translateLabel: true |
11196 | 1375 |
isVisible: allowRemoveHolder |
10643 | 1376 |
indication: showRemovedAspect |
1377 |
) |
|
1378 |
(MenuItem |
|
12658 | 1379 |
enabled: notShowConflictsOnlyAspect |
10643 | 1380 |
label: 'Show Same' |
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1381 |
translateLabel: true |
10643 | 1382 |
indication: showSameAspect |
1383 |
) |
|
1384 |
(MenuItem |
|
12658 | 1385 |
label: 'Show Conflicts Only' |
1386 |
indication: showConflictsOnlyAspect |
|
1387 |
) |
|
1388 |
(MenuItem |
|
10643 | 1389 |
label: '-' |
1390 |
) |
|
1391 |
(MenuItem |
|
1392 |
label: 'Inspect change' |
|
1393 |
itemValue: changeMenuInspect: |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1394 |
translateLabel: true |
10643 | 1395 |
) |
1396 |
(MenuItem |
|
1397 |
enabled: hasSingleChangeSelectedAndCanBrowse: |
|
10658 | 1398 |
label: 'Browse Method(s)' |
10643 | 1399 |
itemValue: changeMenuBrowse: |
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1400 |
translateLabel: true |
10643 | 1401 |
) |
1402 |
) |
|
1403 |
nil |
|
1404 |
nil |
|
10028 | 1405 |
) |
1406 |
! |
|
1407 |
||
10666 | 1408 |
changeMenu1 |
1409 |
<resource: #menu> |
|
1410 |
||
12247
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
1411 |
^self changeMenu |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
1412 |
|
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
1413 |
"Modified: / 17-05-2012 / 22:51:38 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10666 | 1414 |
! |
1415 |
||
1416 |
changeMenu2 |
|
1417 |
<resource: #menu> |
|
1418 |
||
12247
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
1419 |
^self changeMenu |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
1420 |
|
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
1421 |
"Modified: / 17-05-2012 / 22:51:48 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10666 | 1422 |
! |
1423 |
||
10028 | 1424 |
mainMenu |
1425 |
"This resource specification was automatically generated |
|
1426 |
by the MenuEditor of ST/X." |
|
1427 |
||
1428 |
"Do not manually edit this!! If it is corrupted, |
|
1429 |
the MenuEditor may not be able to read the specification." |
|
1430 |
||
10682 | 1431 |
|
10028 | 1432 |
" |
10448 | 1433 |
MenuEditor new openOnClass:Tools::ChangeSetBrowser2 andSelector:#mainMenu |
1434 |
(Menu new fromLiteralArrayEncoding:(Tools::ChangeSetBrowser2 mainMenu)) startUp |
|
10028 | 1435 |
" |
1436 |
||
1437 |
<resource: #menu> |
|
1438 |
||
12292 | 1439 |
^ |
10028 | 1440 |
#(Menu |
10682 | 1441 |
( |
1442 |
(MenuItem |
|
1443 |
label: 'File' |
|
12571
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1444 |
submenu: |
10682 | 1445 |
(Menu |
1446 |
( |
|
1447 |
(MenuItem |
|
12571
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1448 |
label: 'New' |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1449 |
submenu: |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1450 |
(Menu |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1451 |
( |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1452 |
(MenuItem |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1453 |
activeHelpKey: fileNew |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1454 |
label: 'New Changeset' |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1455 |
itemValue: doOpenNew |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1456 |
) |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1457 |
(MenuItem |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1458 |
label: 'New Window' |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1459 |
itemValue: doOpenNewWindow |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1460 |
) |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1461 |
) |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1462 |
nil |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1463 |
nil |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1464 |
) |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1465 |
) |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1466 |
(MenuItem |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1467 |
label: '-' |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1468 |
) |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1469 |
(MenuItem |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1470 |
activeHelpKey: fileOpenSelection |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1471 |
enabled: isWorkingNotHolder |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1472 |
label: 'Spawn Browser on Selection' |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1473 |
itemValue: doOpenOnSelection |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1474 |
isVisible: allowOpenHolder |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1475 |
) |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1476 |
(MenuItem |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1477 |
activeHelpKey: fileOpenSelection |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1478 |
enabled: isWorkingNotHolder |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1479 |
label: 'Spawn on Selection' |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1480 |
itemValue: doOpenOnSelection |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1481 |
isVisible: allowOpenHolder |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1482 |
) |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1483 |
(MenuItem |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1484 |
label: '-' |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1485 |
) |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1486 |
(MenuItem |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1487 |
activeHelpKey: fileLoad |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1488 |
enabled: isWorkingNotHolder |
11034 | 1489 |
label: 'Open...' |
10682 | 1490 |
itemValue: doOpen |
1491 |
isVisible: allowOpenHolder |
|
1492 |
shortcutKey: Ctrlo |
|
1493 |
) |
|
1494 |
(MenuItem |
|
12571
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1495 |
activeHelpKey: fileOpenCurrent |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1496 |
enabled: isWorkingNotHolder |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1497 |
label: 'Open Current' |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1498 |
itemValue: doOpenCurrent |
10682 | 1499 |
isVisible: allowOpenHolder |
1500 |
) |
|
1501 |
(MenuItem |
|
12571
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1502 |
activeHelpKey: fileOpenCurrent |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1503 |
enabled: isWorkingNotHolder |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1504 |
label: 'Open Cypress Package' |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1505 |
itemValue: doOpenCypress |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1506 |
isVisible: allowOpenHolderAndCypressPresent |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1507 |
) |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1508 |
(MenuItem |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1509 |
activeHelpKey: fileSaveAs |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1510 |
enabled: isWorkingNotHolder |
10682 | 1511 |
label: 'Save' |
1512 |
itemValue: doSave |
|
1513 |
) |
|
1514 |
(MenuItem |
|
12571
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1515 |
enabled: isWorkingNotHolder |
10682 | 1516 |
label: 'Save As...' |
1517 |
itemValue: doSaveAs |
|
1518 |
) |
|
1519 |
(MenuItem |
|
1520 |
label: '-' |
|
1521 |
) |
|
1522 |
(MenuItem |
|
1523 |
label: 'Exit' |
|
1524 |
itemValue: closeRequest |
|
1525 |
) |
|
1526 |
) |
|
1527 |
nil |
|
1528 |
nil |
|
1529 |
) |
|
1530 |
) |
|
1531 |
(MenuItem |
|
12571
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1532 |
enabled: isWorkingNotHolder |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1533 |
label: 'Changes' |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1534 |
isVisible: isTwoColumnHolderNot |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1535 |
submenuChannel: list1MenuHolder |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1536 |
) |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1537 |
(MenuItem |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1538 |
enabled: isWorkingNotHolder |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1539 |
label: 'Left' |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1540 |
isVisible: isTwoColumnHolder |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1541 |
submenuChannel: list1MenuHolder |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1542 |
) |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1543 |
(MenuItem |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1544 |
enabled: isWorkingNotHolder |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1545 |
label: 'Right' |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1546 |
isVisible: isTwoColumnHolder |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1547 |
submenuChannel: list2MenuHolder |
12660
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
1548 |
) |
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
1549 |
(MenuItem |
10682 | 1550 |
label: 'View' |
12571
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1551 |
submenu: |
10682 | 1552 |
(Menu |
1553 |
( |
|
1554 |
(MenuItem |
|
1555 |
label: 'List' |
|
1556 |
choice: navigatorSpecHolder |
|
1557 |
choiceValue: oneColumnNavigatorSpec |
|
1558 |
) |
|
1559 |
(MenuItem |
|
1560 |
label: 'Hierarchical List' |
|
1561 |
choice: navigatorSpecHolder |
|
1562 |
choiceValue: hierarchicalNavigatorSpec |
|
1563 |
) |
|
1564 |
(MenuItem |
|
1565 |
label: 'Browser Like' |
|
1566 |
choice: navigatorSpecHolder |
|
1567 |
choiceValue: twoColumnNavigatorSpec |
|
1568 |
) |
|
1569 |
(MenuItem |
|
1570 |
label: '-' |
|
1571 |
) |
|
1572 |
(MenuItem |
|
12658 | 1573 |
enabled: notShowConflictsOnlyAspect |
10682 | 1574 |
label: 'Show Deleted' |
1575 |
indication: showRemovedAspect |
|
1576 |
) |
|
1577 |
(MenuItem |
|
12658 | 1578 |
enabled: notShowConflictsOnlyAspect |
10682 | 1579 |
label: 'Show Same' |
1580 |
indication: showSameAspect |
|
1581 |
) |
|
12525
50b803c4ee6a
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12088
diff
changeset
|
1582 |
(MenuItem |
12576
57ca4df67791
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12525
diff
changeset
|
1583 |
label: 'Show Conflicts Only' |
57ca4df67791
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12525
diff
changeset
|
1584 |
indication: showConflictsOnlyAspect |
57ca4df67791
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12525
diff
changeset
|
1585 |
) |
57ca4df67791
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12525
diff
changeset
|
1586 |
(MenuItem |
12525
50b803c4ee6a
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12088
diff
changeset
|
1587 |
label: '-' |
50b803c4ee6a
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12088
diff
changeset
|
1588 |
) |
50b803c4ee6a
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12088
diff
changeset
|
1589 |
(MenuItem |
12571
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1590 |
label: 'Show Filter' |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1591 |
indication: showFilterHolder |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1592 |
) |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1593 |
(MenuItem |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1594 |
label: '-' |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1595 |
) |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1596 |
(MenuItem |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1597 |
label: 'Show Timestamp' |
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1598 |
indication: showTimestampHolder |
12525
50b803c4ee6a
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12088
diff
changeset
|
1599 |
) |
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1600 |
(MenuItem |
12525
50b803c4ee6a
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12088
diff
changeset
|
1601 |
label: 'Update' |
50b803c4ee6a
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12088
diff
changeset
|
1602 |
itemValue: menuUpdate |
50b803c4ee6a
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12088
diff
changeset
|
1603 |
) |
10682 | 1604 |
) |
1605 |
nil |
|
1606 |
nil |
|
1607 |
) |
|
1608 |
) |
|
1609 |
(MenuItem |
|
1610 |
label: 'Loading' |
|
12571
b2e5fdb702cb
Merged 4af2effeeb06 and b9d8a19b796c (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1611 |
submenu: |
10682 | 1612 |
(Menu |
1613 |
( |
|
1614 |
(MenuItem |
|
1615 |
label: 'Set Target Package...' |
|
1616 |
itemValue: setTargetPackage |
|
1617 |
) |
|
1618 |
(MenuItem |
|
1619 |
label: 'Set Target Namespace...' |
|
1620 |
itemValue: setTargetNamespace |
|
1621 |
) |
|
1622 |
(MenuItem |
|
1623 |
label: '-' |
|
1624 |
) |
|
1625 |
(MenuItem |
|
1626 |
label: 'Update Changefile' |
|
1627 |
indication: updateChangeFileHolder |
|
1628 |
) |
|
1629 |
) |
|
1630 |
nil |
|
1631 |
nil |
|
1632 |
) |
|
1633 |
) |
|
12668
bab9d5826fff
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12667
diff
changeset
|
1634 |
(MenuItem |
bab9d5826fff
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12667
diff
changeset
|
1635 |
label: 'MENU_Help' |
bab9d5826fff
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12667
diff
changeset
|
1636 |
startGroup: conditionalRight |
bab9d5826fff
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12667
diff
changeset
|
1637 |
submenu: |
bab9d5826fff
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12667
diff
changeset
|
1638 |
(Menu |
bab9d5826fff
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12667
diff
changeset
|
1639 |
( |
bab9d5826fff
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12667
diff
changeset
|
1640 |
(MenuItem |
bab9d5826fff
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12667
diff
changeset
|
1641 |
label: 'ChangesBrowser Documentation' |
bab9d5826fff
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12667
diff
changeset
|
1642 |
itemValue: openHTMLDocument: |
bab9d5826fff
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12667
diff
changeset
|
1643 |
argument: 'tools/cbrowser/TOP.html' |
bab9d5826fff
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12667
diff
changeset
|
1644 |
) |
bab9d5826fff
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12667
diff
changeset
|
1645 |
(MenuItem |
bab9d5826fff
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12667
diff
changeset
|
1646 |
label: '-' |
bab9d5826fff
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12667
diff
changeset
|
1647 |
) |
bab9d5826fff
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12667
diff
changeset
|
1648 |
(MenuItem |
bab9d5826fff
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12667
diff
changeset
|
1649 |
label: 'About ChangesBrowser...' |
bab9d5826fff
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12667
diff
changeset
|
1650 |
itemValue: openAboutThisApplication |
bab9d5826fff
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12667
diff
changeset
|
1651 |
) |
bab9d5826fff
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12667
diff
changeset
|
1652 |
) |
bab9d5826fff
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12667
diff
changeset
|
1653 |
nil |
bab9d5826fff
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12667
diff
changeset
|
1654 |
nil |
bab9d5826fff
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12667
diff
changeset
|
1655 |
) |
bab9d5826fff
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12667
diff
changeset
|
1656 |
) |
10682 | 1657 |
) |
1658 |
nil |
|
1659 |
nil |
|
10028 | 1660 |
) |
11034 | 1661 |
|
11709 | 1662 |
"Modified: / 27-07-2012 / 21:17:20 / cg" |
10028 | 1663 |
! |
1664 |
||
1665 |
toolbarMenu |
|
1666 |
"This resource specification was automatically generated |
|
1667 |
by the MenuEditor of ST/X." |
|
1668 |
||
1669 |
"Do not manually edit this!! If it is corrupted, |
|
1670 |
the MenuEditor may not be able to read the specification." |
|
1671 |
||
11034 | 1672 |
|
10028 | 1673 |
" |
11034 | 1674 |
MenuEditor new openOnClass:Tools::ChangeSetBrowser2 andSelector:#toolbarMenu |
1675 |
(Menu new fromLiteralArrayEncoding:(Tools::ChangeSetBrowser2 toolbarMenu)) startUp |
|
10028 | 1676 |
" |
1677 |
||
1678 |
<resource: #menu> |
|
1679 |
||
12292 | 1680 |
^ |
10028 | 1681 |
#(Menu |
12292 | 1682 |
( |
1683 |
(MenuItem |
|
1684 |
activeHelpKey: fileLoad |
|
1685 |
enabled: isWorkingNotHolder |
|
1686 |
label: 'Load' |
|
1687 |
itemValue: doOpen |
|
1688 |
translateLabel: true |
|
1689 |
isButton: true |
|
1690 |
labelImage: (ResourceRetriever XPToolbarIconLibrary loadFromFileIcon) |
|
1691 |
) |
|
1692 |
(MenuItem |
|
1693 |
activeHelpKey: fileSave |
|
1694 |
enabled: isWorkingNotHolder |
|
1695 |
label: 'Save' |
|
1696 |
itemValue: doSave |
|
1697 |
translateLabel: true |
|
1698 |
isButton: true |
|
1699 |
labelImage: (ResourceRetriever XPToolbarIconLibrary saveToFileIcon) |
|
1700 |
) |
|
1701 |
(MenuItem |
|
1702 |
label: '-' |
|
1703 |
) |
|
1704 |
(MenuItem |
|
1705 |
activeHelpKey: applyLine |
|
1706 |
enabled: hasSelectionHolder |
|
1707 |
label: 'Apply' |
|
1708 |
itemValue: doApply |
|
1709 |
translateLabel: true |
|
1710 |
isButton: true |
|
1711 |
labelImage: (ResourceRetriever nil applyIcon) |
|
1712 |
) |
|
1713 |
(MenuItem |
|
1714 |
activeHelpKey: applyToEnd |
|
1715 |
enabled: hasSelectionHolder |
|
1716 |
label: 'Apply To End' |
|
1717 |
itemValue: doApplyToEnd |
|
1718 |
translateLabel: true |
|
1719 |
isButton: true |
|
1720 |
labelImage: (ResourceRetriever nil applyToEndIcon) |
|
1721 |
) |
|
1722 |
(MenuItem |
|
1723 |
activeHelpKey: applyFromLastSnapshot |
|
1724 |
enabled: hasSelectionHolder |
|
1725 |
label: 'Apply From Last Snapshot' |
|
1726 |
itemValue: doApplyFromLastSnapshot |
|
1727 |
translateLabel: true |
|
1728 |
isButton: true |
|
1729 |
labelImage: (ResourceRetriever nil applyFromLastSnapshotIcon) |
|
1730 |
) |
|
1731 |
(MenuItem |
|
1732 |
label: '-' |
|
1733 |
) |
|
1734 |
(MenuItem |
|
1735 |
activeHelpKey: deleteLine |
|
1736 |
enabled: hasSelectionHolder |
|
1737 |
label: 'Delete' |
|
1738 |
itemValue: doDelete |
|
1739 |
translateLabel: true |
|
1740 |
isButton: true |
|
1741 |
labelImage: (ResourceRetriever nil deleteIcon) |
|
1742 |
) |
|
1743 |
(MenuItem |
|
1744 |
activeHelpKey: deleteToEnd |
|
1745 |
enabled: hasSelectionHolder |
|
1746 |
label: 'Delete To End' |
|
1747 |
itemValue: doDeleteToEnd |
|
1748 |
translateLabel: true |
|
1749 |
isButton: true |
|
1750 |
labelImage: (ResourceRetriever nil deleteToEndIcon) |
|
1751 |
) |
|
1752 |
(MenuItem |
|
1753 |
activeHelpKey: deleteCompress |
|
1754 |
enabled: isWorkingNotHolder |
|
1755 |
label: 'Compress' |
|
1756 |
itemValue: doCompress |
|
1757 |
translateLabel: true |
|
1758 |
isButton: true |
|
1759 |
isVisible: showingRegularChangesetHolder |
|
1760 |
labelImage: (ResourceRetriever nil compressIcon) |
|
1761 |
) |
|
1762 |
(MenuItem |
|
1763 |
label: '-' |
|
1764 |
isVisible: showingRegularChangesetHolder |
|
1765 |
) |
|
1766 |
(MenuItem |
|
1767 |
activeHelpKey: testFindPreviousSnapshot |
|
1768 |
enabled: hasSelectionHolder |
|
1769 |
label: 'Find Previous Snapshot' |
|
1770 |
itemValue: doFindSnapshot: |
|
1771 |
translateLabel: true |
|
1772 |
isButton: true |
|
1773 |
isVisible: showingRegularChangesetHolder |
|
1774 |
labelImage: (ResourceRetriever nil findPreviousSnapshotIcon) |
|
1775 |
argument: 'previous' |
|
1776 |
) |
|
1777 |
(MenuItem |
|
1778 |
activeHelpKey: testFindNextSnapshot |
|
1779 |
enabled: hasSelectionHolder |
|
1780 |
label: 'Find Next Snapshot' |
|
1781 |
itemValue: doFindSnapshot: |
|
1782 |
translateLabel: true |
|
1783 |
isButton: true |
|
1784 |
isVisible: showingRegularChangesetHolder |
|
1785 |
labelImage: (ResourceRetriever nil findNextSnapshotIcon) |
|
1786 |
argument: 'next' |
|
1787 |
) |
|
1788 |
) |
|
1789 |
nil |
|
1790 |
nil |
|
10028 | 1791 |
) |
1792 |
! ! |
|
1793 |
||
1794 |
!ChangeSetBrowser2 class methodsFor:'plugIn spec'! |
|
1795 |
||
1796 |
aspectSelectors |
|
1797 |
"This resource specification was automatically generated |
|
1798 |
by the UIPainter of ST/X." |
|
1799 |
||
1800 |
"Do not manually edit this. If it is corrupted, |
|
1801 |
the UIPainter may not be able to read the specification." |
|
1802 |
||
1803 |
"Return a description of exported aspects; |
|
1804 |
these can be connected to aspects of an embedding application |
|
1805 |
(if this app is embedded in a subCanvas)." |
|
1806 |
||
1807 |
^ #( |
|
12292 | 1808 |
#changesetHolder |
10028 | 1809 |
). |
1810 |
||
1811 |
! ! |
|
1812 |
||
1813 |
!ChangeSetBrowser2 methodsFor:'accessing'! |
|
1814 |
||
11196 | 1815 |
allowAccept: aBoolean |
1816 |
||
1817 |
^self allowAcceptHolder value: aBoolean |
|
1818 |
||
1819 |
"Created: / 24-01-2012 / 19:50:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10028 | 1820 |
! |
1821 |
||
1822 |
allowOpen: aBoolean |
|
1823 |
||
1824 |
self allowOpenHolder value: aBoolean |
|
1825 |
||
1826 |
"Created: / 26-10-2010 / 23:18:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1827 |
! |
|
1828 |
||
11196 | 1829 |
allowRemove: aBoolean |
1830 |
||
1831 |
^self allowRemoveHolder value: aBoolean |
|
1832 |
||
1833 |
"Created: / 24-01-2012 / 20:00:36 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1834 |
! |
|
1835 |
||
10028 | 1836 |
beHierarchical |
1837 |
||
1838 |
^self navigatorSpecHolder value: #hierarchicalNavigatorSpec |
|
1839 |
||
1840 |
"Modified: / 14-10-2010 / 15:52:18 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1841 |
! |
|
1842 |
||
1843 |
beOneColumn |
|
1844 |
||
1845 |
^self navigatorSpecHolder value: #oneColumnNavigatorSpec |
|
1846 |
||
1847 |
"Modified: / 14-10-2010 / 15:52:13 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1848 |
! |
|
1849 |
||
1850 |
beTwoColumn |
|
1851 |
||
1852 |
^self navigatorSpecHolder value: #twoColumnNavigatorSpec |
|
1853 |
||
1854 |
"Modified: / 14-10-2010 / 15:51:10 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1855 |
! |
|
1856 |
||
1857 |
changeset |
|
1858 |
||
1859 |
^self changesetHolder value |
|
1860 |
! |
|
1861 |
||
1862 |
changeset: aChangeSet |
|
1863 |
||
1864 |
self changesetHolder value: aChangeSet |
|
1865 |
! |
|
1866 |
||
12650
e0f607754b9a
Merged 18d06283743d and ff31bac2fd1b (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12626
diff
changeset
|
1867 |
codeAspect |
e0f607754b9a
Merged 18d06283743d and ff31bac2fd1b (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12626
diff
changeset
|
1868 |
^self codeAspectHolder value |
e0f607754b9a
Merged 18d06283743d and ff31bac2fd1b (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12626
diff
changeset
|
1869 |
|
e0f607754b9a
Merged 18d06283743d and ff31bac2fd1b (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12626
diff
changeset
|
1870 |
"Created: / 04-04-2013 / 18:28:18 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
e0f607754b9a
Merged 18d06283743d and ff31bac2fd1b (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12626
diff
changeset
|
1871 |
! |
e0f607754b9a
Merged 18d06283743d and ff31bac2fd1b (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12626
diff
changeset
|
1872 |
|
10028 | 1873 |
readOnly: aBoolean |
11677 | 1874 |
self allowAcceptHolder value:false. |
10028 | 1875 |
|
1876 |
"Created: / 20-07-2010 / 09:48:22 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11677 | 1877 |
"Modified: / 26-07-2012 / 14:31:50 / cg" |
10028 | 1878 |
! |
1879 |
||
12660
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
1880 |
selectedChanges |
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
1881 |
| sel | |
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
1882 |
|
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
1883 |
sel := selection2Holder value. |
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
1884 |
sel isEmptyOrNil ifTrue:[ |
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
1885 |
sel := selection1Holder value. |
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
1886 |
]. |
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
1887 |
^ sel select:[:each | each notNil]. |
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
1888 |
! |
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
1889 |
|
12154
f27f8ee5ef3a
More improvements in InlineMessageDialog
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12151
diff
changeset
|
1890 |
showFilter: aBoolean |
f27f8ee5ef3a
More improvements in InlineMessageDialog
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12151
diff
changeset
|
1891 |
self showFilterHolder value: aBoolean |
f27f8ee5ef3a
More improvements in InlineMessageDialog
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12151
diff
changeset
|
1892 |
|
f27f8ee5ef3a
More improvements in InlineMessageDialog
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12151
diff
changeset
|
1893 |
"Created: / 11-02-2012 / 22:47:42 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
f27f8ee5ef3a
More improvements in InlineMessageDialog
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12151
diff
changeset
|
1894 |
! |
f27f8ee5ef3a
More improvements in InlineMessageDialog
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12151
diff
changeset
|
1895 |
|
10682 | 1896 |
targetNamespace:something |
1897 |
targetNamespace := something. |
|
1898 |
! |
|
1899 |
||
1900 |
targetPackage:something |
|
1901 |
targetPackage := something. |
|
1902 |
! |
|
1903 |
||
10028 | 1904 |
theSingleSelectedChange |
10448 | 1905 |
| change sel | |
10028 | 1906 |
change := nil. |
10448 | 1907 |
sel := selection2Holder value. |
1908 |
sel isNil ifTrue:[ |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1909 |
sel := selection1Holder value. |
10448 | 1910 |
]. |
12269
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1911 |
sel isNil ifTrue:[ |
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1912 |
^nil |
10448 | 1913 |
]. |
1914 |
sel do: |
|
12680
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1915 |
[:each| |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1916 |
change notNil ifTrue:[nil]. |
4e2f5b0d4cb2
Merged 7dffb3cbf7c4 and f2c1f0fd05fb (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
1917 |
change isNil ifTrue:[change := each]]. |
10028 | 1918 |
^change |
10448 | 1919 |
|
12269
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
1920 |
"Modified: / 26-07-2012 / 19:33:25 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10028 | 1921 |
! |
1922 |
||
1923 |
title: aString |
|
1924 |
||
1925 |
self titleHolder value: aString |
|
1926 |
||
1927 |
"Created: / 26-10-2010 / 23:01:51 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1928 |
! ! |
|
1929 |
||
1930 |
!ChangeSetBrowser2 methodsFor:'accessing - defaults'! |
|
1931 |
||
1932 |
defaultTitle |
|
1933 |
^ 'No changeset' |
|
1934 |
||
1935 |
"Modified: / 08-04-2011 / 10:10:37 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1936 |
! ! |
|
1937 |
||
1938 |
!ChangeSetBrowser2 methodsFor:'accessing - menus'! |
|
1939 |
||
10448 | 1940 |
list1MenuHolder |
10666 | 1941 |
^ [ |
12292 | 1942 |
|menu| |
1943 |
||
1944 |
menu := builder menuFor:#changeMenu1. |
|
1945 |
menu allItemsDo:[:item | item argument:list1 ]. |
|
1946 |
menu |
|
10448 | 1947 |
] |
10028 | 1948 |
|
10448 | 1949 |
"Created: / 04-08-2011 / 18:11:03 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10666 | 1950 |
"Modified (format): / 05-09-2011 / 16:07:20 / cg" |
10448 | 1951 |
! |
1952 |
||
1953 |
list2MenuHolder |
|
10666 | 1954 |
^ [ |
12292 | 1955 |
|menu| |
1956 |
||
1957 |
menu := builder menuFor:#changeMenu2. |
|
1958 |
menu allItemsDo:[:item | item argument:list2 ]. |
|
1959 |
menu |
|
10448 | 1960 |
] |
1961 |
||
1962 |
"Created: / 04-08-2011 / 18:13:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10666 | 1963 |
"Modified (format): / 05-09-2011 / 16:07:34 / cg" |
10028 | 1964 |
! ! |
1965 |
||
1966 |
!ChangeSetBrowser2 methodsFor:'actions'! |
|
1967 |
||
1968 |
accept: source |
|
1969 |
||
10880 | 1970 |
| entry chg | |
1971 |
(entry := self theSingleSelectedChange) isNil ifTrue:[^self]. |
|
1972 |
chg := entry change. |
|
1973 |
chg isMethodCodeChange ifTrue: |
|
12292 | 1974 |
[chg source: source asString] |
10028 | 1975 |
|
1976 |
"Modified: / 29-11-2010 / 22:40:50 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10880 | 1977 |
"Modified: / 18-11-2011 / 14:56:53 / cg" |
10028 | 1978 |
! |
1979 |
||
1980 |
postBuildSourceView: aView |
|
1981 |
||
10309 | 1982 |
sourceView := aView. |
1983 |
||
10345 | 1984 |
"Modified: / 19-07-2011 / 19:08:13 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10028 | 1985 |
! ! |
1986 |
||
1987 |
!ChangeSetBrowser2 methodsFor:'aspects'! |
|
1988 |
||
11196 | 1989 |
allowAcceptHolder |
10028 | 1990 |
"return/create the 'selectionHolder' value holder (automatically generated)" |
1991 |
||
11196 | 1992 |
allowAcceptHolder isNil ifTrue:[ |
12292 | 1993 |
allowAcceptHolder := ValueHolder with: true. |
10028 | 1994 |
]. |
11196 | 1995 |
^ allowAcceptHolder |
10028 | 1996 |
|
1997 |
"Modified: / 24-10-2009 / 19:56:37 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11196 | 1998 |
"Created: / 24-01-2012 / 19:50:05 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10028 | 1999 |
! |
2000 |
||
2001 |
allowOpenHolder |
|
2002 |
"return/create the 'allowOpenHolder' value holder (automatically generated)" |
|
2003 |
||
2004 |
allowOpenHolder isNil ifTrue:[ |
|
12292 | 2005 |
allowOpenHolder := ValueHolder with: true. |
10028 | 2006 |
]. |
2007 |
^ allowOpenHolder |
|
2008 |
||
2009 |
"Modified: / 17-03-2011 / 22:32:33 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2010 |
! |
|
2011 |
||
12282
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2012 |
allowOpenHolderAndCypressPresent |
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2013 |
|
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2014 |
^BlockValue |
12292 | 2015 |
with: [:value| |
2016 |
value and: [ ConfigurableFeatures includesFeature:#Cypress ] |
|
2017 |
] |
|
2018 |
argument: self allowOpenHolder. |
|
12282
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2019 |
|
12289
75613e714c3d
- Cypress support improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12287
diff
changeset
|
2020 |
"Modified (format): / 07-09-2012 / 20:09:09 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
12282
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2021 |
! |
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2022 |
|
11196 | 2023 |
allowRemoveHolder |
2024 |
"return/create the 'allowRemoveHolder' value holder (automatically generated)" |
|
12292 | 2025 |
|
11196 | 2026 |
allowRemoveHolder isNil ifTrue:[ |
12292 | 2027 |
allowRemoveHolder := ValueHolder with:false. |
2028 |
allowRemoveHolder addDependent:self. |
|
11196 | 2029 |
]. |
2030 |
^ allowRemoveHolder |
|
2031 |
||
2032 |
"Modified: / 24-01-2012 / 19:59:30 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2033 |
! |
|
2034 |
||
12292 | 2035 |
allowRemoveHolder:something |
11196 | 2036 |
"set the 'showRemovedHolder' value holder (automatically generated)" |
12292 | 2037 |
|
11196 | 2038 |
|oldValue newValue| |
2039 |
||
2040 |
allowRemoveHolder notNil ifTrue:[ |
|
12292 | 2041 |
oldValue := allowRemoveHolder value. |
2042 |
allowRemoveHolder removeDependent:self. |
|
11196 | 2043 |
]. |
2044 |
allowRemoveHolder := something. |
|
2045 |
allowRemoveHolder notNil ifTrue:[ |
|
12292 | 2046 |
allowRemoveHolder addDependent:self. |
11196 | 2047 |
]. |
2048 |
newValue := allowRemoveHolder value. |
|
2049 |
oldValue ~~ newValue ifTrue:[ |
|
12292 | 2050 |
self |
2051 |
update:#value |
|
2052 |
with:newValue |
|
2053 |
from:allowRemoveHolder. |
|
11196 | 2054 |
]. |
2055 |
||
2056 |
"Modified (format): / 24-01-2012 / 19:48:51 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2057 |
! |
|
2058 |
||
10333 | 2059 |
changeSourceHolder |
2060 |
<resource: #uiAspect> |
|
10467
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
2061 |
changeSourceHolder isNil ifTrue: [ |
12292 | 2062 |
changeSourceHolder := nil asValue. |
10333 | 2063 |
]. |
2064 |
^ changeSourceHolder. |
|
2065 |
||
2066 |
"Modified: / 19-07-2011 / 11:54:41 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2067 |
! |
|
2068 |
||
10028 | 2069 |
changesetHolder |
2070 |
"return/create the 'changesetHolder' value holder (automatically generated)" |
|
2071 |
||
2072 |
changesetHolder isNil ifTrue:[ |
|
12292 | 2073 |
changesetHolder := ValueHolder new. |
2074 |
changesetHolder addDependent:self. |
|
10028 | 2075 |
]. |
2076 |
^ changesetHolder |
|
2077 |
! |
|
2078 |
||
2079 |
changesetHolder:something |
|
2080 |
"set the 'changesetHolder' value holder (automatically generated)" |
|
2081 |
||
2082 |
|oldValue newValue| |
|
2083 |
||
2084 |
changesetHolder notNil ifTrue:[ |
|
12292 | 2085 |
oldValue := changesetHolder value. |
2086 |
changesetHolder removeDependent:self. |
|
10028 | 2087 |
]. |
2088 |
changesetHolder := something. |
|
2089 |
changesetHolder notNil ifTrue:[ |
|
12292 | 2090 |
changesetHolder addDependent:self. |
10028 | 2091 |
]. |
2092 |
newValue := changesetHolder value. |
|
2093 |
oldValue ~~ newValue ifTrue:[ |
|
12292 | 2094 |
self update:#value with:newValue from:changesetHolder. |
10028 | 2095 |
]. |
2096 |
! |
|
2097 |
||
2098 |
classHolder |
|
2099 |
"return/create the 'classHolder' value holder (automatically generated)" |
|
2100 |
||
2101 |
classHolder isNil ifTrue:[ |
|
12292 | 2102 |
classHolder := ValueHolder with:nil. |
10028 | 2103 |
]. |
2104 |
^ classHolder |
|
10345 | 2105 |
|
2106 |
"Modified: / 19-07-2011 / 19:12:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2107 |
! |
|
2108 |
||
2109 |
codeAspectHolder |
|
2110 |
"return/create the 'codeAspectHolder' value holder (automatically generated)" |
|
2111 |
||
2112 |
codeAspectHolder isNil ifTrue:[ |
|
12650
e0f607754b9a
Merged 18d06283743d and ff31bac2fd1b (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12626
diff
changeset
|
2113 |
codeAspectHolder := ValueHolder with: nil. |
10345 | 2114 |
]. |
2115 |
^ codeAspectHolder |
|
11709 | 2116 |
|
2117 |
"Modified: / 27-07-2012 / 22:04:12 / cg" |
|
12650
e0f607754b9a
Merged 18d06283743d and ff31bac2fd1b (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12626
diff
changeset
|
2118 |
"Modified: / 04-04-2013 / 18:28:02 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10028 | 2119 |
! |
2120 |
||
10333 | 2121 |
imageSourceHolder |
2122 |
<resource: #uiAspect> |
|
10467
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
2123 |
imageSourceHolder isNil ifTrue: [ |
12292 | 2124 |
imageSourceHolder := nil asValue. |
10333 | 2125 |
]. |
2126 |
^ imageSourceHolder. |
|
2127 |
||
2128 |
"Created: / 19-07-2011 / 11:54:29 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2129 |
! |
|
2130 |
||
12151
ac18977416c2
Added (experimental) support for inline message panel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12144
diff
changeset
|
2131 |
infoPanel |
ac18977416c2
Added (experimental) support for inline message panel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12144
diff
changeset
|
2132 |
infoPanel isNil ifTrue:[ |
12292 | 2133 |
infoPanel := InlineMessageDialog new |
12151
ac18977416c2
Added (experimental) support for inline message panel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12144
diff
changeset
|
2134 |
]. |
ac18977416c2
Added (experimental) support for inline message panel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12144
diff
changeset
|
2135 |
^ infoPanel |
ac18977416c2
Added (experimental) support for inline message panel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12144
diff
changeset
|
2136 |
|
ac18977416c2
Added (experimental) support for inline message panel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12144
diff
changeset
|
2137 |
"Created: / 09-02-2012 / 19:23:51 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
ac18977416c2
Added (experimental) support for inline message panel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12144
diff
changeset
|
2138 |
! |
ac18977416c2
Added (experimental) support for inline message panel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12144
diff
changeset
|
2139 |
|
12213
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2140 |
isTwoColumnHolder |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2141 |
| holder | |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2142 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2143 |
holder := builder bindings at: #isTwoColumnHolder ifAbsentPut:[ |
12292 | 2144 |
BlockValue |
2145 |
with:[:v| v value == #twoColumnNavigatorSpec] |
|
2146 |
argument: self navigatorSpecHolder. |
|
12213
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2147 |
]. |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2148 |
^holder |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2149 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2150 |
"Created: / 30-03-2012 / 12:07:35 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2151 |
! |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2152 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2153 |
isTwoColumnHolderNot |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2154 |
| holder | |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2155 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2156 |
holder := builder bindings at: #isTwoColumnHolderNot ifAbsentPut:[ |
12292 | 2157 |
BlockValue |
2158 |
with:[:v| v value ~~ #twoColumnNavigatorSpec] |
|
2159 |
argument: self navigatorSpecHolder. |
|
12213
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2160 |
]. |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2161 |
^holder |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2162 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2163 |
"Created: / 30-03-2012 / 12:08:50 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2164 |
! |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2165 |
|
10333 | 2166 |
labelAHolder |
2167 |
||
2168 |
^'Change' asValue |
|
2169 |
||
2170 |
"Created: / 19-07-2011 / 11:46:31 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2171 |
! |
|
2172 |
||
2173 |
labelBHolder |
|
2174 |
||
2175 |
^'Image' asValue |
|
2176 |
||
2177 |
"Created: / 19-07-2011 / 11:46:36 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2178 |
! |
|
2179 |
||
10953 | 2180 |
languageHolder |
2181 |
languageHolder isNil ifTrue:[ |
|
12292 | 2182 |
languageHolder := ValueHolder with:nil. |
10953 | 2183 |
]. |
2184 |
^ languageHolder |
|
2185 |
||
2186 |
"Modified: / 19-07-2011 / 19:12:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2187 |
"Created: / 03-12-2011 / 10:37:39 / cg" |
|
2188 |
! |
|
2189 |
||
10448 | 2190 |
list1Holder |
2191 |
"return/create the 'list1Holder' value holder (automatically generated)" |
|
10028 | 2192 |
|
10448 | 2193 |
list1Holder isNil ifTrue:[ |
12292 | 2194 |
list1Holder := ValueHolder new. |
10028 | 2195 |
]. |
10448 | 2196 |
^ list1Holder |
10028 | 2197 |
! |
2198 |
||
10448 | 2199 |
list1Holder:something |
2200 |
"set the 'list1Holder' value holder (automatically generated)" |
|
10028 | 2201 |
|
10448 | 2202 |
list1Holder := something. |
10028 | 2203 |
! |
2204 |
||
10448 | 2205 |
list2Holder |
2206 |
"return/create the 'list2Holder' value holder (automatically generated)" |
|
10028 | 2207 |
|
10448 | 2208 |
list2Holder isNil ifTrue:[ |
12292 | 2209 |
list2Holder := ValueHolder new. |
10448 | 2210 |
]. |
2211 |
^ list2Holder |
|
2212 |
! |
|
10028 | 2213 |
|
10448 | 2214 |
list2Holder:something |
2215 |
"set the 'list2Holder' value holder (automatically generated)" |
|
2216 |
||
2217 |
list2Holder := something. |
|
10028 | 2218 |
! |
2219 |
||
2220 |
navigatorChangesetHolder |
|
2221 |
"return/create the 'navigatorChangesetHolder' value holder (automatically generated)" |
|
2222 |
||
2223 |
navigatorChangesetHolder isNil ifTrue:[ |
|
12292 | 2224 |
navigatorChangesetHolder := ValueHolder new. |
10028 | 2225 |
]. |
2226 |
^ navigatorChangesetHolder |
|
2227 |
! |
|
2228 |
||
2229 |
navigatorSpecHolder |
|
2230 |
<resource: #uiAspect> |
|
2231 |
||
2232 |
navigatorSpecHolder isNil ifTrue:[ |
|
11193 | 2233 |
navigatorSpecHolder := ValueHolder with: |
2234 |
"/#hierarchicalNavigatorSpec |
|
2235 |
"/#twoColumnNavigatorSpec |
|
12626
7ae48abfedac
Merged 482496b7e155 and af982630f6ad (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
2236 |
#oneColumnNavigatorSpec. |
7ae48abfedac
Merged 482496b7e155 and af982630f6ad (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
2237 |
navigatorSpecHolder addDependent: self. |
10467
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
2238 |
|
10028 | 2239 |
]. |
2240 |
^ navigatorSpecHolder. |
|
2241 |
||
12144 | 2242 |
"Modified: / 04-02-2012 / 21:25:57 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10028 | 2243 |
! |
2244 |
||
12658 | 2245 |
notShowConflictsOnlyAspect |
2246 |
^ BlockValue forLogicalNot:(self showConflictsOnlyAspect) |
|
2247 |
! |
|
2248 |
||
10028 | 2249 |
selection1Holder |
2250 |
"return/create the 'selection1Holder' value holder (automatically generated)" |
|
2251 |
||
2252 |
selection1Holder isNil ifTrue:[ |
|
12292 | 2253 |
selection1Holder := ValueHolder new. |
2254 |
selection1Holder addDependent:self. |
|
10028 | 2255 |
]. |
2256 |
^ selection1Holder |
|
10448 | 2257 |
! |
10028 | 2258 |
|
10448 | 2259 |
selection1Holder:something |
2260 |
"set the 'selection1Holder' value holder (automatically generated)" |
|
2261 |
||
10450 | 2262 |
|oldValue newValue| |
2263 |
||
2264 |
selection1Holder notNil ifTrue:[ |
|
12292 | 2265 |
oldValue := selection1Holder value. |
2266 |
selection1Holder removeDependent:self. |
|
10450 | 2267 |
]. |
10448 | 2268 |
selection1Holder := something. |
10450 | 2269 |
selection1Holder notNil ifTrue:[ |
12292 | 2270 |
selection1Holder addDependent:self. |
10450 | 2271 |
]. |
2272 |
newValue := selection1Holder value. |
|
2273 |
oldValue ~~ newValue ifTrue:[ |
|
12292 | 2274 |
self update:#value with:newValue from:selection1Holder. |
10450 | 2275 |
]. |
10028 | 2276 |
! |
2277 |
||
10448 | 2278 |
selection2Holder |
2279 |
"return/create the 'selection2Holder' value holder (automatically generated)" |
|
10028 | 2280 |
|
10448 | 2281 |
selection2Holder isNil ifTrue:[ |
12292 | 2282 |
selection2Holder := ValueHolder new. |
2283 |
selection2Holder addDependent:self. |
|
10028 | 2284 |
]. |
10448 | 2285 |
^ selection2Holder |
2286 |
! |
|
10028 | 2287 |
|
10448 | 2288 |
selection2Holder:something |
2289 |
"set the 'selection2Holder' value holder (automatically generated)" |
|
2290 |
||
10450 | 2291 |
|oldValue newValue| |
2292 |
||
2293 |
selection2Holder notNil ifTrue:[ |
|
12292 | 2294 |
oldValue := selection2Holder value. |
2295 |
selection2Holder removeDependent:self. |
|
10450 | 2296 |
]. |
10448 | 2297 |
selection2Holder := something. |
10450 | 2298 |
selection2Holder notNil ifTrue:[ |
12292 | 2299 |
selection2Holder addDependent:self. |
10450 | 2300 |
]. |
2301 |
newValue := selection2Holder value. |
|
2302 |
oldValue ~~ newValue ifTrue:[ |
|
12292 | 2303 |
self update:#value with:newValue from:selection2Holder. |
10450 | 2304 |
]. |
10028 | 2305 |
! |
2306 |
||
12658 | 2307 |
showConflictsOnlyAspect |
2308 |
"return/create the 'showConflictsOnlyAspect' value holder (automatically generated)" |
|
2309 |
||
2310 |
showConflictsOnlyAspect isNil ifTrue:[ |
|
2311 |
showConflictsOnlyAspect := ValueHolder with: false. |
|
2312 |
]. |
|
2313 |
^ showConflictsOnlyAspect |
|
2314 |
! |
|
2315 |
||
2316 |
showConflictsOnlyAspect:aValueHolder |
|
2317 |
showConflictsOnlyAspect := aValueHolder. |
|
2318 |
! |
|
2319 |
||
12154
f27f8ee5ef3a
More improvements in InlineMessageDialog
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12151
diff
changeset
|
2320 |
showFilterHolder |
f27f8ee5ef3a
More improvements in InlineMessageDialog
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12151
diff
changeset
|
2321 |
"return/create the 'showFilterHolder' value holder (automatically generated)" |
f27f8ee5ef3a
More improvements in InlineMessageDialog
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12151
diff
changeset
|
2322 |
|
f27f8ee5ef3a
More improvements in InlineMessageDialog
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12151
diff
changeset
|
2323 |
showFilterHolder isNil ifTrue:[ |
12292 | 2324 |
showFilterHolder := false asValue. |
10450 | 2325 |
]. |
12154
f27f8ee5ef3a
More improvements in InlineMessageDialog
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12151
diff
changeset
|
2326 |
^ showFilterHolder |
f27f8ee5ef3a
More improvements in InlineMessageDialog
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12151
diff
changeset
|
2327 |
|
f27f8ee5ef3a
More improvements in InlineMessageDialog
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12151
diff
changeset
|
2328 |
"Modified: / 11-02-2012 / 22:46:10 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
f27f8ee5ef3a
More improvements in InlineMessageDialog
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12151
diff
changeset
|
2329 |
! |
f27f8ee5ef3a
More improvements in InlineMessageDialog
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12151
diff
changeset
|
2330 |
|
f27f8ee5ef3a
More improvements in InlineMessageDialog
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12151
diff
changeset
|
2331 |
showFilterHolder:something |
f27f8ee5ef3a
More improvements in InlineMessageDialog
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12151
diff
changeset
|
2332 |
"set the 'showFilterHolder' value holder (automatically generated)" |
f27f8ee5ef3a
More improvements in InlineMessageDialog
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12151
diff
changeset
|
2333 |
|
f27f8ee5ef3a
More improvements in InlineMessageDialog
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12151
diff
changeset
|
2334 |
showFilterHolder := something. |
10028 | 2335 |
! |
2336 |
||
2337 |
showRemovedAspect |
|
2338 |
"return/create the 'showDeletedAspect' value holder (automatically generated)" |
|
2339 |
||
2340 |
showRemovedAspect isNil ifTrue:[ |
|
12292 | 2341 |
showRemovedAspect := (AspectAdaptor forAspect:#showRemoved) |
2342 |
subject: self class. |
|
10028 | 2343 |
]. |
2344 |
^ showRemovedAspect |
|
2345 |
! |
|
2346 |
||
2347 |
showRemovedAspect:aValueHolder |
|
2348 |
showRemovedAspect := aValueHolder. |
|
2349 |
! |
|
2350 |
||
10448 | 2351 |
showSameAspect |
2352 |
"return/create the 'showSameAspect' value holder (automatically generated)" |
|
2353 |
||
2354 |
showSameAspect isNil ifTrue:[ |
|
12292 | 2355 |
showSameAspect := ValueHolder with: true. |
10448 | 2356 |
]. |
2357 |
^ showSameAspect |
|
2358 |
||
2359 |
"Modified: / 04-08-2011 / 18:42:39 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2360 |
! |
|
2361 |
||
2362 |
showSameAspect:something |
|
2363 |
"set the 'showSameAspect' value holder (automatically generated)" |
|
2364 |
||
2365 |
showSameAspect := something. |
|
2366 |
! |
|
2367 |
||
12269
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2368 |
showTimestampHolder |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2369 |
"return/create the 'showTimestampHolder' value holder (automatically generated)" |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2370 |
|
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2371 |
showTimestampHolder isNil ifTrue:[ |
12292 | 2372 |
showTimestampHolder := ValueHolder with: false. |
12269
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2373 |
]. |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2374 |
^ showTimestampHolder |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2375 |
|
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2376 |
"Modified: / 26-07-2012 / 18:47:24 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2377 |
! |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2378 |
|
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2379 |
showTimestampHolder:something |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2380 |
"set the 'showTimestampHolder' value holder (automatically generated)" |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2381 |
|
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2382 |
showTimestampHolder := something. |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2383 |
! |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2384 |
|
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2385 |
showingRegularChangesetHolder |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2386 |
"return/create the 'showingRegularChangesetHolder' value holder (automatically generated)" |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2387 |
|
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2388 |
showingRegularChangesetHolder isNil ifTrue:[ |
12292 | 2389 |
showingRegularChangesetHolder := ValueHolder with: false. |
2390 |
showingRegularChangesetHolder addDependent:self. |
|
12269
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2391 |
]. |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2392 |
^ showingRegularChangesetHolder |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2393 |
|
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2394 |
"Modified: / 26-07-2012 / 19:45:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2395 |
! |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2396 |
|
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2397 |
showingRegularChangesetHolder:something |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2398 |
"set the 'showingRegularChangesetHolder' value holder (automatically generated)" |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2399 |
|
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2400 |
|oldValue newValue| |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2401 |
|
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2402 |
showingRegularChangesetHolder notNil ifTrue:[ |
12292 | 2403 |
oldValue := showingRegularChangesetHolder value. |
2404 |
showingRegularChangesetHolder removeDependent:self. |
|
12269
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2405 |
]. |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2406 |
showingRegularChangesetHolder := something. |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2407 |
showingRegularChangesetHolder notNil ifTrue:[ |
12292 | 2408 |
showingRegularChangesetHolder addDependent:self. |
12269
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2409 |
]. |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2410 |
newValue := showingRegularChangesetHolder value. |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2411 |
oldValue ~~ newValue ifTrue:[ |
12292 | 2412 |
self update:#value with:newValue from:showingRegularChangesetHolder. |
12269
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2413 |
]. |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2414 |
! |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2415 |
|
10028 | 2416 |
titleHolder |
2417 |
"return/create the 'titleHolder' value holder (automatically generated)" |
|
10467
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
2418 |
|
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
2419 |
titleHolder isNil |
12292 | 2420 |
ifTrue:[ titleHolder := ValueHolder with:self defaultTitle. ]. |
10028 | 2421 |
^ titleHolder |
2422 |
||
2423 |
"Modified: / 26-10-2010 / 22:54:38 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10682 | 2424 |
! |
2425 |
||
12154
f27f8ee5ef3a
More improvements in InlineMessageDialog
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12151
diff
changeset
|
2426 |
updateChangeFileHolder |
f27f8ee5ef3a
More improvements in InlineMessageDialog
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12151
diff
changeset
|
2427 |
updateChangeFileHolder isNil ifTrue:[ |
12292 | 2428 |
updateChangeFileHolder := false asValue. |
10682 | 2429 |
]. |
12154
f27f8ee5ef3a
More improvements in InlineMessageDialog
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12151
diff
changeset
|
2430 |
^ updateChangeFileHolder |
10682 | 2431 |
|
2432 |
"Created: / 07-09-2011 / 15:54:03 / cg" |
|
12154
f27f8ee5ef3a
More improvements in InlineMessageDialog
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12151
diff
changeset
|
2433 |
"Created: / 11-02-2012 / 22:40:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
13612
1acb01525f56
Fix in Tools::ChangeSetBrowser2 - do not update change file but update internal changeset...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13178
diff
changeset
|
2434 |
! ! |
10028 | 2435 |
|
12247
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2436 |
!ChangeSetBrowser2 methodsFor:'aspects-queries'! |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2437 |
|
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2438 |
hasSelectionHolder |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2439 |
|
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2440 |
hasSelectionHolder isNil ifTrue:[ |
12292 | 2441 |
hasSelectionHolder := |
2442 |
BlockValue |
|
2443 |
with:[:sel1 :sel2| |
|
2444 |
sel1 value notEmptyOrNil or:[sel2 value notEmptyOrNil] |
|
2445 |
] |
|
2446 |
argument: self selection1Holder |
|
2447 |
argument: self selection2Holder |
|
12247
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2448 |
]. |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2449 |
^hasSelectionHolder |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2450 |
|
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2451 |
"Created: / 17-05-2012 / 20:45:30 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2452 |
! |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2453 |
|
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2454 |
isWorkingHolder |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2455 |
|
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2456 |
isWorkingHolder isNil ifTrue:[ |
12292 | 2457 |
isWorkingHolder := ValueHolder with: false. |
12247
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2458 |
]. |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2459 |
^isWorkingHolder |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2460 |
|
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2461 |
"Created: / 17-05-2012 / 20:45:20 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2462 |
! |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2463 |
|
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2464 |
isWorkingNotHolder |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2465 |
|
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2466 |
isWorkingNotHolder isNil ifTrue:[ |
12292 | 2467 |
isWorkingNotHolder := BlockValue forLogicalNot: self isWorkingHolder |
12247
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2468 |
]. |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2469 |
^isWorkingNotHolder |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2470 |
|
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2471 |
"Created: / 17-05-2012 / 20:45:30 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10028 | 2472 |
! ! |
2473 |
||
2474 |
!ChangeSetBrowser2 methodsFor:'change & update'! |
|
2475 |
||
2476 |
changesetChanged |
|
2477 |
||
11716 | 2478 |
self titleHolder value: (self changeset name ifNil:[self defaultTitle]). |
10448 | 2479 |
self list1Holder value: self getNavigatorChangeSet |
10028 | 2480 |
|
10448 | 2481 |
"Modified: / 04-08-2011 / 18:05:50 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
11716 | 2482 |
"Modified: / 29-07-2012 / 13:18:54 / cg" |
10028 | 2483 |
! |
2484 |
||
2485 |
selectionChanged |
|
12594
b3906c30ac21
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12576
diff
changeset
|
2486 |
| listEntry change srcImage srcChange| |
11663 | 2487 |
|
2488 |
listEntry := self theSingleSelectedChange. |
|
2489 |
(listEntry notNil and:[(change := listEntry change) isCompositeChange not]) ifTrue:[ |
|
11709 | 2490 |
codeAspectHolder setValue: |
11663 | 2491 |
(change isMethodCodeChange |
11709 | 2492 |
ifTrue:[SyntaxHighlighter codeAspectMethod] |
12576
57ca4df67791
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12525
diff
changeset
|
2493 |
ifFalse:[ |
57ca4df67791
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12525
diff
changeset
|
2494 |
(change isClassDefinitionChange |
57ca4df67791
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12525
diff
changeset
|
2495 |
ifTrue:[SyntaxHighlighter codeAspectClassDefinition] |
57ca4df67791
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12525
diff
changeset
|
2496 |
ifFalse:[SyntaxHighlighter codeAspectExpression])]). |
11709 | 2497 |
self classHolder value: change changeClass. |
2498 |
changeSourceHolder setValue: change changeSource"; changed: #value". |
|
12594
b3906c30ac21
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12576
diff
changeset
|
2499 |
srcImage := change imageSource. |
b3906c30ac21
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12576
diff
changeset
|
2500 |
srcChange := change changeSource. |
b3906c30ac21
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12576
diff
changeset
|
2501 |
srcImage = srcChange ifTrue:[ |
11709 | 2502 |
imageSourceHolder setValue: nil"; changed: #value". |
2503 |
] ifFalse:[ |
|
12594
b3906c30ac21
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12576
diff
changeset
|
2504 |
imageSourceHolder setValue: srcImage"; changed: #value". |
12576
57ca4df67791
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12525
diff
changeset
|
2505 |
|
57ca4df67791
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12525
diff
changeset
|
2506 |
"/ check agan, based on parser (ignoring indentation) |
57ca4df67791
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12525
diff
changeset
|
2507 |
change isClassDefinitionChange ifTrue:[ |
57ca4df67791
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12525
diff
changeset
|
2508 |
|parseError treeA treeB| |
57ca4df67791
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12525
diff
changeset
|
2509 |
|
12594
b3906c30ac21
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12576
diff
changeset
|
2510 |
(srcImage notEmptyOrNil and:[ srcChange notEmptyOrNil ]) ifTrue:[ |
b3906c30ac21
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12576
diff
changeset
|
2511 |
parseError := false. |
b3906c30ac21
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12576
diff
changeset
|
2512 |
treeA := RBParser parseExpression:srcImage onError: [:str :pos | parseError := true]. |
b3906c30ac21
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12576
diff
changeset
|
2513 |
treeB := RBParser parseExpression:srcChange onError: [:str :pos | parseError := true]. |
b3906c30ac21
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12576
diff
changeset
|
2514 |
parseError ifFalse:[ |
b3906c30ac21
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12576
diff
changeset
|
2515 |
(treeA equalTo:treeB withMapping:(Dictionary new)) ifTrue:[ |
b3906c30ac21
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12576
diff
changeset
|
2516 |
imageSourceHolder setValue: nil |
b3906c30ac21
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12576
diff
changeset
|
2517 |
] |
12576
57ca4df67791
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12525
diff
changeset
|
2518 |
] |
57ca4df67791
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12525
diff
changeset
|
2519 |
] |
57ca4df67791
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12525
diff
changeset
|
2520 |
]. |
11709 | 2521 |
]. |
2522 |
changeSourceHolder changed. |
|
12576
57ca4df67791
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12525
diff
changeset
|
2523 |
imageSourceHolder changed. |
11709 | 2524 |
codeAspectHolder changed. |
2525 |
||
10953 | 2526 |
self showSource: true |
10309 | 2527 |
] ifFalse:[ |
10953 | 2528 |
self showSource: false. |
2529 |
self classHolder value: nil. |
|
2530 |
changeSourceHolder setValue: nil; changed: #value. |
|
2531 |
imageSourceHolder setValue: nil; changed: #value. |
|
10309 | 2532 |
]. |
10028 | 2533 |
|
2534 |
"Created: / 24-10-2009 / 19:49:29 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11709 | 2535 |
"Modified: / 27-07-2012 / 23:42:46 / cg" |
10028 | 2536 |
! |
2537 |
||
12269
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2538 |
showingRegularChangesetChanged |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2539 |
|
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2540 |
self showTimestampHolder value: showingRegularChangesetHolder value. |
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2541 |
|
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2542 |
"Created: / 26-07-2012 / 19:40:20 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10028 | 2543 |
! |
2544 |
||
10467
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
2545 |
update: aspect with: param from: sender |
10028 | 2546 |
|
12292 | 2547 |
sender == changesetHolder ifTrue: [ |
2548 |
self changesetChanged . |
|
2549 |
^self |
|
12144 | 2550 |
]. |
12292 | 2551 |
sender == navigatorSpecHolder ifTrue: [ |
2552 |
self changesetChanged . |
|
2553 |
^self |
|
12144 | 2554 |
]. |
12292 | 2555 |
sender == selection1Holder ifTrue: [ |
2556 |
self selectionChanged. |
|
2557 |
^self |
|
12144 | 2558 |
]. |
12292 | 2559 |
sender == selection2Holder ifTrue: [ |
2560 |
self selectionChanged. |
|
2561 |
^self |
|
12144 | 2562 |
]. |
12269
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2563 |
|
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2564 |
sender == showingRegularChangesetHolder ifTrue:[ |
12292 | 2565 |
self showingRegularChangesetChanged. |
2566 |
^self. |
|
12269
79f87eee62e5
ChangeSetBrowser2 improvements:
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12268
diff
changeset
|
2567 |
]. |
12144 | 2568 |
super update: aspect with: param from: sender |
10028 | 2569 |
|
2570 |
"Created: / 24-10-2009 / 19:29:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2571 |
! ! |
|
2572 |
||
11796
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
2573 |
!ChangeSetBrowser2 methodsFor:'initialization'! |
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
2574 |
|
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
2575 |
list1View: aSubApplicationView |
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
2576 |
aSubApplicationView application applyAction:[:change | self changeMenuApplyChange:change]. |
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
2577 |
list1 := aSubApplicationView application |
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
2578 |
|
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
2579 |
"Created: / 04-08-2011 / 17:56:54 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
2580 |
"Modified: / 10-09-2012 / 14:22:37 / cg" |
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
2581 |
! |
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
2582 |
|
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
2583 |
list2View: aSubApplicationView |
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
2584 |
aSubApplicationView application applyAction:[:change | self changeMenuApplyChange:change]. |
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
2585 |
list2 := aSubApplicationView application |
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
2586 |
|
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
2587 |
"Created: / 04-08-2011 / 17:57:01 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
2588 |
"Modified: / 10-09-2012 / 14:22:50 / cg" |
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
2589 |
! ! |
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
2590 |
|
10028 | 2591 |
!ChangeSetBrowser2 methodsFor:'menu actions'! |
2592 |
||
12211 | 2593 |
doApply |
2594 |
"Applies currently selected change" |
|
2595 |
||
12213
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2596 |
self changeMenuApplySelection: self list. |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2597 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2598 |
"Modified: / 30-03-2012 / 12:18:06 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2599 |
! |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2600 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2601 |
doApplyFromLastSnapshot |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2602 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2603 |
self doFindSnapshot: #last. |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2604 |
self doApplyToEnd. |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2605 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2606 |
"Modified: / 30-03-2012 / 12:19:44 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2607 |
! |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2608 |
|
12660
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
2609 |
doApplySelectedChanges |
12757
7ce7a0cab142
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12669
diff
changeset
|
2610 |
self selectedChanges do:[:chgListEntry | |
7ce7a0cab142
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12669
diff
changeset
|
2611 |
self changeMenuApplyChange: chgListEntry change. |
7ce7a0cab142
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12669
diff
changeset
|
2612 |
]. |
12660
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
2613 |
! |
3d3c8cb4f62c
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12658
diff
changeset
|
2614 |
|
12213
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2615 |
doApplyToEnd |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2616 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2617 |
self changeMenuApplyToEnd: self list. |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2618 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2619 |
"Modified: / 30-03-2012 / 12:35:23 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2620 |
! |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2621 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2622 |
doCompress |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2623 |
self breakPoint: #jv. |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2624 |
Dialog warn: 'Sorry, not yet implemented' |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2625 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2626 |
"Modified: / 30-03-2012 / 12:20:34 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2627 |
! |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2628 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2629 |
doDelete |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2630 |
self changeMenuDeleteSelection: self list. |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2631 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2632 |
"Modified: / 30-03-2012 / 12:21:26 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2633 |
! |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2634 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2635 |
doDeleteToEnd |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2636 |
"automatically generated by UIEditor ..." |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2637 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2638 |
"*** the code below performs no action" |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2639 |
"*** (except for some feedback on the Transcript)" |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2640 |
"*** Please change as required and accept in the browser." |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2641 |
"*** (and replace this comment by something more useful ;-)" |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2642 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2643 |
"action to be added ..." |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2644 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2645 |
Transcript showCR:self class name, ': action for #doDeleteToEnd ...'. |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2646 |
! |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2647 |
|
12271 | 2648 |
doFindSnapshot:previousOrNext |
2649 |
self doFindSnapshot: previousOrNext in: self list. |
|
2650 |
||
2651 |
"Modified: / 27-07-2012 / 15:40:31 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2652 |
! |
|
2653 |
||
2654 |
doFindSnapshot:previousOrNext in: changeList |
|
2655 |
| snapshot selection searchBlock notFoundMessage | |
|
2656 |
||
2657 |
||
2658 |
selection := self theSingleSelectedChange. |
|
2659 |
searchBlock := [:listEntry| |
|
12292 | 2660 |
listEntry == selection ifTrue:[ |
2661 |
snapshot notNil ifTrue:[ |
|
2662 |
changeList selection: (OrderedCollection with: snapshot). |
|
2663 |
] ifFalse:[ |
|
2664 |
self infoPanel showMessage: notFoundMessage closeAfter: 5"sec". |
|
2665 |
]. |
|
2666 |
^self. |
|
2667 |
] ifFalse:[ |
|
2668 |
(listEntry change isOtherChange and:[listEntry change type == #snapshot]) ifTrue:[ |
|
2669 |
snapshot := listEntry |
|
2670 |
]. |
|
2671 |
]. |
|
12271 | 2672 |
]. |
2673 |
previousOrNext = 'previous' ifTrue:[ |
|
12292 | 2674 |
selection isNil ifTrue:[ |
2675 |
selection := changeList list last. |
|
2676 |
changeList selection: (Array with: selection). |
|
2677 |
]. |
|
2678 |
notFoundMessage := resources string:'No snapshot prior selected change found.'. |
|
2679 |
changeList list do: searchBlock. |
|
12271 | 2680 |
] ifFalse:[ |
12292 | 2681 |
selection isNil ifTrue:[ |
2682 |
selection := changeList list first. |
|
2683 |
changeList selection: (Array with: selection). |
|
2684 |
]. |
|
2685 |
notFoundMessage := resources string:'No snapshot after selected change found.'. |
|
2686 |
changeList list reverseDo: searchBlock. |
|
12271 | 2687 |
] |
2688 |
||
2689 |
"Created: / 27-07-2012 / 15:38:07 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
12211 | 2690 |
! |
2691 |
||
10028 | 2692 |
doOpen |
12213
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2693 |
| file | |
12282
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2694 |
[ |
12292 | 2695 |
file := Dialog requestFileName:'Select Changeset to Load' pattern:'*.chg;*.st'. |
12282
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2696 |
] on: Dialog aboutToOpenBoxNotificationSignal do:[:ex| |
12292 | 2697 |
| dialog | |
2698 |
||
2699 |
dialog := ex parameter. |
|
2700 |
||
2701 |
ex pass. |
|
12282
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2702 |
]. |
10880 | 2703 |
file isNil ifTrue:[^self]. |
12213
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2704 |
self doOpenFile: file |
10028 | 2705 |
|
2706 |
"Modified: / 08-04-2011 / 10:11:37 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11709 | 2707 |
"Modified: / 27-07-2012 / 21:21:40 / cg" |
10028 | 2708 |
! |
2709 |
||
2710 |
doOpen: aChangeSet |
|
11709 | 2711 |
<resource: #obsolete> |
2712 |
"/ a bad name - implying opening a window... |
|
2713 |
self loadChangeSet: aChangeSet |
|
10028 | 2714 |
|
2715 |
"Created: / 05-12-2009 / 13:43:32 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11709 | 2716 |
"Modified: / 27-07-2012 / 21:21:24 / cg" |
10028 | 2717 |
! |
2718 |
||
2719 |
doOpenCurrent |
|
2720 |
||
12154
f27f8ee5ef3a
More improvements in InlineMessageDialog
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12151
diff
changeset
|
2721 |
self doOpenFile: ObjectMemory nameForChanges. |
f27f8ee5ef3a
More improvements in InlineMessageDialog
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12151
diff
changeset
|
2722 |
self showFilter: true. |
10028 | 2723 |
|
2724 |
"Created: / 05-12-2009 / 13:44:05 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2725 |
! |
|
2726 |
||
11709 | 2727 |
doOpenCurrentChangeFile |
2728 |
self withWaitCursorDo:[ |
|
12292 | 2729 |
self class openOn: (ChangeSet fromFile: ObjectMemory nameForChanges) |
11709 | 2730 |
]. |
10028 | 2731 |
|
2732 |
"Created: / 05-12-2009 / 13:44:05 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11709 | 2733 |
"Created: / 27-07-2012 / 21:16:42 / cg" |
10028 | 2734 |
! |
2735 |
||
12282
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2736 |
doOpenCypress |
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2737 |
|
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2738 |
| file | |
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2739 |
[ |
12292 | 2740 |
file := Dialog requestDirectoryName:(resources string: 'Select Cypress Package')."/ pattern:'*.package'. |
12282
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2741 |
] on: Dialog aboutToOpenBoxNotificationSignal do:[:ex| |
12292 | 2742 |
| dialog | |
2743 |
||
2744 |
dialog := ex parameter. |
|
2745 |
||
2746 |
ex pass. |
|
12282
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2747 |
]. |
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2748 |
|
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2749 |
file isNil ifTrue:[^self]. |
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2750 |
self doOpenCypress: file |
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2751 |
|
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2752 |
"Modified: / 03-09-2012 / 11:53:54 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2753 |
! |
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2754 |
|
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2755 |
doOpenCypress: aStringOrFilename |
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2756 |
"Opens a Cypress package in given directory" |
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2757 |
|
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2758 |
| dir changeset | |
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2759 |
|
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2760 |
dir := aStringOrFilename asFilename. |
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2761 |
dir exists ifFalse:[ |
12292 | 2762 |
Dialog warn: (resources string:'Selected directory does not exists'). |
2763 |
^self. |
|
12282
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2764 |
]. |
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2765 |
dir isDirectory ifFalse:[ |
12292 | 2766 |
Dialog warn: (resources string:'Selected file is not a directory'). |
2767 |
^self. |
|
12282
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2768 |
]. |
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2769 |
(dir / 'properties.json') isReadable ifFalse:[ |
12292 | 2770 |
Dialog warn: (resources string:'No properties.json found. Perhaps not a Cypress package directory?'). |
2771 |
^self. |
|
12282
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2772 |
]. |
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2773 |
|
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2774 |
self showProgress: (resources string: 'Reading Cypress Package...') while: [ |
12292 | 2775 |
changeset := ((Smalltalk at:#CypressPackageReader) readPackageFrom: dir) asChangeSet. |
2776 |
self doOpen: changeset. |
|
12282
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2777 |
]. |
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2778 |
|
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2779 |
"Created: / 03-09-2012 / 11:44:55 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2780 |
! |
f2499734636a
- Tools::ChangeSetBrowser2: Cypress package support
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
2781 |
|
12151
ac18977416c2
Added (experimental) support for inline message panel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12144
diff
changeset
|
2782 |
doOpenFile: aStringOrFilename |
12214
4b7eedbab2a7
- ChangeSetBrowser2: scroll to bottom after opening a changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12213
diff
changeset
|
2783 |
| cs fn | |
4b7eedbab2a7
- ChangeSetBrowser2: scroll to bottom after opening a changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12213
diff
changeset
|
2784 |
|
4b7eedbab2a7
- ChangeSetBrowser2: scroll to bottom after opening a changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12213
diff
changeset
|
2785 |
self showProgress: 'Reading ' , (fn := aStringOrFilename asFilename) baseName while:[ |
12312
451b0a9fdc0d
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12306
diff
changeset
|
2786 |
[ |
451b0a9fdc0d
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12306
diff
changeset
|
2787 |
cs := ChangeSet fromFile: aStringOrFilename. |
451b0a9fdc0d
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12306
diff
changeset
|
2788 |
] on: ChangeSet::InvalidChangeChunkError do:[:ex| |
451b0a9fdc0d
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12306
diff
changeset
|
2789 |
ex proceed. |
451b0a9fdc0d
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12306
diff
changeset
|
2790 |
]. |
451b0a9fdc0d
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12306
diff
changeset
|
2791 |
((fn suffix = 'chg') or:[fn pathName = ObjectMemory nameForChanges]) ifTrue:[ |
451b0a9fdc0d
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12306
diff
changeset
|
2792 |
self list scrollToBottom: true. |
451b0a9fdc0d
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12306
diff
changeset
|
2793 |
self showingRegularChangesetHolder value: true. |
451b0a9fdc0d
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12306
diff
changeset
|
2794 |
] ifFalse:[ |
451b0a9fdc0d
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12306
diff
changeset
|
2795 |
self showingRegularChangesetHolder value: false. |
451b0a9fdc0d
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12306
diff
changeset
|
2796 |
]. |
451b0a9fdc0d
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12306
diff
changeset
|
2797 |
self allowRemove: false."/true. |
451b0a9fdc0d
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12306
diff
changeset
|
2798 |
self doOpen: cs. |
12151
ac18977416c2
Added (experimental) support for inline message panel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12144
diff
changeset
|
2799 |
]. |
ac18977416c2
Added (experimental) support for inline message panel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12144
diff
changeset
|
2800 |
|
ac18977416c2
Added (experimental) support for inline message panel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12144
diff
changeset
|
2801 |
"Created: / 09-02-2012 / 19:11:58 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
12312
451b0a9fdc0d
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12306
diff
changeset
|
2802 |
"Modified: / 05-12-2012 / 11:38:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
12151
ac18977416c2
Added (experimental) support for inline message panel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12144
diff
changeset
|
2803 |
! |
ac18977416c2
Added (experimental) support for inline message panel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12144
diff
changeset
|
2804 |
|
12274
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
2805 |
doOpenNew |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
2806 |
self doOpen: ChangeSet new. |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
2807 |
self showFilterHolder value: false. |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
2808 |
self infoPanel |
12292 | 2809 |
reset; |
2810 |
beInformation; |
|
2811 |
message: (resources string:'Open file or drag''n''drop changes from other changeset/diff browser'); |
|
2812 |
addButtonWithLabel: (resources string:'Open File') action:[self doOpen]; |
|
2813 |
addButtonOK; |
|
2814 |
show. |
|
12274
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
2815 |
|
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
2816 |
"Modified: / 01-08-2012 / 18:36:48 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
2817 |
! |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
2818 |
|
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
2819 |
doOpenNewWindow |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
2820 |
| new | |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
2821 |
|
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
2822 |
new := self class new. |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
2823 |
new open. |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
2824 |
|
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
2825 |
"Created: / 01-08-2012 / 18:22:26 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
2826 |
! |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12272
diff
changeset
|
2827 |
|
12266 | 2828 |
doOpenOnSelection |
2829 |
||
2830 |
| selection | |
|
2831 |
||
2832 |
selection := ChangeSet new. |
|
2833 |
self selectionDo: [:each|selection add: each]. |
|
2834 |
self class openOn: selection label: (self titleHolder value , ' ' , (resources string:'(Selected changes)')) |
|
2835 |
||
2836 |
"Modified: / 25-07-2012 / 15:31:50 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2837 |
! |
|
2838 |
||
10028 | 2839 |
doSave |
2840 |
||
10467
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
2841 |
changesetFile |
12292 | 2842 |
ifNil:[self doSaveAs] |
2843 |
ifNotNil:[self doSaveAs: changesetFile] |
|
10028 | 2844 |
|
2845 |
"Modified: / 24-10-2009 / 22:55:07 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2846 |
! |
|
2847 |
||
2848 |
doSaveAs |
|
2849 |
| file | |
|
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
2850 |
Dialog aboutToOpenBoxNotificationSignal handle:[:ex| |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
2851 |
"/ OOPS, not supported!!!!!!!! |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
2852 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
2853 |
"/ | box | |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
2854 |
"/ box := ex parameter. |
12292 | 2855 |
"/ box verticalPanel |
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
2856 |
"/ add:(CheckBox label:'x' |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
2857 |
"/ model:true asValue). |
12292 | 2858 |
ex pass. |
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
2859 |
] do:[ |
12292 | 2860 |
file := Dialog requestFileName:'Select File for Save' default: (changesetFile ? 'somechanges.chg') pattern:('*.chg'). |
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
2861 |
]. |
10880 | 2862 |
file isNil ifTrue:[^self]. |
10028 | 2863 |
self doSaveAs: file. |
10880 | 2864 |
|
11034 | 2865 |
"Modified: / 27-12-2011 / 10:39:52 / cg" |
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
2866 |
"Modified: / 20-03-2012 / 13:52:22 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10028 | 2867 |
! |
2868 |
||
2869 |
doSaveAs: newFile |
|
12247
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2870 |
| changesetToSave | |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2871 |
|
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2872 |
changesetToSave := ChangeSet new. |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2873 |
self list1Holder value do:[:e| |
12292 | 2874 |
e removed ~~ true ifTrue:[changesetToSave add:e]. |
12247
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
2875 |
]. |
10028 | 2876 |
|
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
2877 |
"/ [ |
12292 | 2878 |
(newFile asFilename suffix = 'st') ifTrue:[ |
2879 |
changesetToSave saveToFile: newFile format: #classSource. |
|
2880 |
] ifFalse:[ |
|
2881 |
changesetToSave saveToFile: newFile |
|
2882 |
]. |
|
2883 |
changesetFile := newFile. |
|
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
2884 |
"/ ] on: Error do: |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
2885 |
"/ [:ex|Dialog warn: 'Erorr saving changes: ' , ex description] |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
2886 |
|
12125 | 2887 |
! |
2888 |
||
12214
4b7eedbab2a7
- ChangeSetBrowser2: scroll to bottom after opening a changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12213
diff
changeset
|
2889 |
doScrollToBottom |
4b7eedbab2a7
- ChangeSetBrowser2: scroll to bottom after opening a changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12213
diff
changeset
|
2890 |
|
4b7eedbab2a7
- ChangeSetBrowser2: scroll to bottom after opening a changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12213
diff
changeset
|
2891 |
| changeList | |
4b7eedbab2a7
- ChangeSetBrowser2: scroll to bottom after opening a changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12213
diff
changeset
|
2892 |
changeList := self list. |
4b7eedbab2a7
- ChangeSetBrowser2: scroll to bottom after opening a changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12213
diff
changeset
|
2893 |
changeList selection: { changeList list last } |
4b7eedbab2a7
- ChangeSetBrowser2: scroll to bottom after opening a changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12213
diff
changeset
|
2894 |
|
4b7eedbab2a7
- ChangeSetBrowser2: scroll to bottom after opening a changeset
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12213
diff
changeset
|
2895 |
"Created: / 30-03-2012 / 16:56:03 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
11709 | 2896 |
! |
2897 |
||
2898 |
loadChangeSet: aChangeSet |
|
2899 |
self changesetHolder value: aChangeSet |
|
2900 |
||
2901 |
"Created: / 05-12-2009 / 13:43:32 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2902 |
"Created: / 27-07-2012 / 21:20:50 / cg" |
|
2903 |
! |
|
2904 |
||
2905 |
loadCurrentChangeFile |
|
2906 |
self withWaitCursorDo:[ |
|
12292 | 2907 |
self loadChangeSet: (ChangeSet fromFile: ObjectMemory nameForChanges) |
11709 | 2908 |
]. |
2909 |
||
2910 |
"Created: / 05-12-2009 / 13:44:05 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2911 |
"Created: / 27-07-2012 / 21:20:44 / cg" |
|
10682 | 2912 |
! |
2913 |
||
12525
50b803c4ee6a
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12088
diff
changeset
|
2914 |
menuUpdate |
50b803c4ee6a
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12088
diff
changeset
|
2915 |
self changesetChanged. |
50b803c4ee6a
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12088
diff
changeset
|
2916 |
"/ list1 updateList. |
50b803c4ee6a
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12088
diff
changeset
|
2917 |
"/ list2 updateList. |
50b803c4ee6a
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12088
diff
changeset
|
2918 |
! |
50b803c4ee6a
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12088
diff
changeset
|
2919 |
|
10682 | 2920 |
setTargetNamespace |
2921 |
"specify an st/x namespace to be used as default" |
|
2922 |
||
2923 |
| nsName | |
|
2924 |
||
12292 | 2925 |
nsName := Dialog |
2926 |
requestNameSpace:'Namepace to load code into:' |
|
2927 |
initialAnswer:targetNamespace. |
|
10682 | 2928 |
nsName isEmptyOrNil ifTrue:[^self]. |
2929 |
||
2930 |
targetNamespace := nsName. |
|
2931 |
"/ self targetNamespaceNameHolder value:('Target-Namespace: ',targetNamespace). |
|
2932 |
||
11447 | 2933 |
list1 list do:[:each | |
12292 | 2934 |
each change nameSpaceOverride:nsName |
11447 | 2935 |
]. |
2936 |
list2 list do:[:each | |
|
12292 | 2937 |
each change nameSpaceOverride:nsName |
11447 | 2938 |
]. |
2939 |
self changeset do:[:chg | chg nameSpaceOverride:nsName]. |
|
2940 |
||
10682 | 2941 |
"Created: / 07-09-2011 / 12:49:42 / cg" |
2942 |
! |
|
2943 |
||
2944 |
setTargetPackage |
|
2945 |
"specify an st/x package identifier to be used as default" |
|
2946 |
||
2947 |
| package | |
|
2948 |
||
12292 | 2949 |
package := Dialog |
2950 |
requestProject:'Default Smalltalk/X package to load code into:' |
|
2951 |
initialAnswer:targetPackage |
|
2952 |
suggestions:(RecentTargetPackages ? #()). |
|
10880 | 2953 |
package isNil ifTrue:[^self]. |
10682 | 2954 |
|
11796
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
2955 |
RecentTargetPackages isNil ifTrue:[ |
12292 | 2956 |
RecentTargetPackages := OrderedCollection new. |
11796
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
2957 |
]. |
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
2958 |
RecentTargetPackages remove:package ifAbsent:[]. |
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
2959 |
RecentTargetPackages addFirst:package. |
d1e21486f612
setup changeList to honor the targetPackage/targetNamespace
Claus Gittinger <cg@exept.de>
parents:
11716
diff
changeset
|
2960 |
|
10682 | 2961 |
targetPackage := "lastPackage := "package. |
2962 |
"/ self targetPackageHolder value:('Target-Package: ',targetPackage). |
|
2963 |
||
2964 |
"Created: / 07-09-2011 / 12:47:15 / cg" |
|
10028 | 2965 |
! ! |
2966 |
||
2967 |
!ChangeSetBrowser2 methodsFor:'menu actions - changes'! |
|
2968 |
||
10448 | 2969 |
changeMenuApply: changeList |
10028 | 2970 |
| changesToApply | |
11037 | 2971 |
|
10467
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
2972 |
changesToApply := OrderedCollection new. |
10028 | 2973 |
self changesDo:[:chg|chg removed ifFalse:[changesToApply add: chg]]. |
10448 | 2974 |
self changeMenuApplyChanges: changesToApply. |
11038 | 2975 |
list2 notNil ifTrue:[ |
12292 | 2976 |
"/ to get the =-icons |
2977 |
list2 updateList |
|
11038 | 2978 |
]. |
10028 | 2979 |
|
10448 | 2980 |
"Created: / 04-08-2011 / 17:26:36 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
11038 | 2981 |
"Modified: / 28-12-2011 / 15:49:00 / cg" |
10028 | 2982 |
! |
2983 |
||
10448 | 2984 |
changeMenuApplySelection: changeList |
10028 | 2985 |
|
12213
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
2986 |
changeList selection do:[:change| |
12292 | 2987 |
| changeIdx | |
2988 |
||
2989 |
self changeMenuApplyChange:change change. |
|
2990 |
||
2991 |
"Advance to next change" |
|
2992 |
changeIdx := changeList list identityIndexOf: change. |
|
2993 |
changeIdx < changeList list size ifTrue:[ |
|
2994 |
changeList selection: { changeList list at: changeIdx + 1 } |
|
2995 |
]. |
|
11038 | 2996 |
]. |
10028 | 2997 |
|
10448 | 2998 |
"Created: / 04-08-2011 / 17:27:08 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
11038 | 2999 |
"Modified (format): / 28-12-2011 / 15:48:53 / cg" |
12213
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3000 |
"Modified (comment): / 30-03-2012 / 13:18:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
11037 | 3001 |
! |
3002 |
||
3003 |
changeMenuApplyToEnd: changeList |
|
12213
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3004 |
| start stop list | |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3005 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3006 |
list := changeList list. |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3007 |
start := changeList selectionIndices max. |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3008 |
stop := list size. |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3009 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3010 |
start to: stop do:[:idx| |
12292 | 3011 |
| chg | |
3012 |
||
3013 |
chg := list at: idx. |
|
3014 |
changeList selection: { chg }. |
|
3015 |
self changeMenuApplyChange:chg change. |
|
12213
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3016 |
]. |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3017 |
|
11038 | 3018 |
list2 notNil ifTrue:[ |
12292 | 3019 |
"/ to get the =-icons |
3020 |
list2 updateList |
|
11038 | 3021 |
]. |
11037 | 3022 |
|
3023 |
"Created: / 04-08-2011 / 17:27:08 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3024 |
"Created: / 27-12-2011 / 10:53:00 / cg" |
|
12213
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3025 |
"Modified: / 30-03-2012 / 12:34:38 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10028 | 3026 |
! |
3027 |
||
10448 | 3028 |
changeMenuBrowse: changeList |
10642
ce2759d1c03b
changed: #changeMenuBrowse:
Claus Gittinger <cg@exept.de>
parents:
10467
diff
changeset
|
3029 |
|changes methods classes| |
10028 | 3030 |
|
11651 | 3031 |
changes := self selectedChangesIn: changeList. |
10666 | 3032 |
"/ changes := changeList listHolder value collect:[:c | c change]. |
11651 | 3033 |
|
10642
ce2759d1c03b
changed: #changeMenuBrowse:
Claus Gittinger <cg@exept.de>
parents:
10467
diff
changeset
|
3034 |
(changes conform:[:c | c isClassDefinitionChange]) ifTrue:[ |
ce2759d1c03b
changed: #changeMenuBrowse:
Claus Gittinger <cg@exept.de>
parents:
10467
diff
changeset
|
3035 |
classes := (changes collect:[:c | c changeClass]). |
13018
65d449c405b2
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12757
diff
changeset
|
3036 |
UserPreferences systemBrowserClass |
10642
ce2759d1c03b
changed: #changeMenuBrowse:
Claus Gittinger <cg@exept.de>
parents:
10467
diff
changeset
|
3037 |
browseClasses:classes title:'selected monticello classes'. |
ce2759d1c03b
changed: #changeMenuBrowse:
Claus Gittinger <cg@exept.de>
parents:
10467
diff
changeset
|
3038 |
] ifFalse:[ |
10658 | 3039 |
methods := OrderedCollection new. |
3040 |
changes do:[:each | |
|
3041 |
each isCompositeChange ifTrue:[ |
|
3042 |
each changes do:[:each2 | each2 isMethodChange ifTrue:[ methods add:each2 changeMethod ]] |
|
3043 |
] ifFalse:[ |
|
3044 |
each isMethodChange ifTrue:[ |
|
3045 |
methods add:(each changeMethod). |
|
3046 |
] |
|
3047 |
] |
|
3048 |
]. |
|
3049 |
(methods includes:nil) ifTrue:[ |
|
3050 |
Dialog warn:('%1 methods are not present in the image' bindWith:(methods occurrencesOf:nil)). |
|
3051 |
methods := methods reject:[:m | m isNil]. |
|
10665
bbaa7c4154de
changed: #changeMenuBrowse:
Claus Gittinger <cg@exept.de>
parents:
10658
diff
changeset
|
3052 |
methods isEmpty ifTrue:[^ self]. |
10658 | 3053 |
]. |
13018
65d449c405b2
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12757
diff
changeset
|
3054 |
UserPreferences systemBrowserClass |
10642
ce2759d1c03b
changed: #changeMenuBrowse:
Claus Gittinger <cg@exept.de>
parents:
10467
diff
changeset
|
3055 |
browseMethods:methods title:'selected monticello methods' sort:false. |
ce2759d1c03b
changed: #changeMenuBrowse:
Claus Gittinger <cg@exept.de>
parents:
10467
diff
changeset
|
3056 |
]. |
10028 | 3057 |
|
10448 | 3058 |
"Created: / 04-08-2011 / 17:27:20 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
11651 | 3059 |
"Modified: / 23-07-2012 / 13:13:37 / cg" |
10666 | 3060 |
! |
3061 |
||
3062 |
changeMenuBrowseClass: changeList |
|
10906
a12ce19f292f
changed: #changeMenuBrowseClass:
Claus Gittinger <cg@exept.de>
parents:
10880
diff
changeset
|
3063 |
|changes classes addThemChanges cls| |
10666 | 3064 |
|
11651 | 3065 |
changes := self selectedChangesIn: changeList. |
10666 | 3066 |
|
3067 |
classes := Set new. |
|
3068 |
addThemChanges := |
|
3069 |
[:c | |
|
3070 |
c isClassDefinitionChange ifTrue:[ |
|
3071 |
classes add:c changeClass theNonMetaclass |
|
3072 |
] ifFalse:[ |
|
3073 |
c isMethodChange ifTrue:[ |
|
10906
a12ce19f292f
changed: #changeMenuBrowseClass:
Claus Gittinger <cg@exept.de>
parents:
10880
diff
changeset
|
3074 |
cls := c changeMethod isNil |
a12ce19f292f
changed: #changeMenuBrowseClass:
Claus Gittinger <cg@exept.de>
parents:
10880
diff
changeset
|
3075 |
ifTrue:[ c changeClass ] |
a12ce19f292f
changed: #changeMenuBrowseClass:
Claus Gittinger <cg@exept.de>
parents:
10880
diff
changeset
|
3076 |
ifFalse:[ c changeMethod mclass theNonMetaclass ]. |
a12ce19f292f
changed: #changeMenuBrowseClass:
Claus Gittinger <cg@exept.de>
parents:
10880
diff
changeset
|
3077 |
classes add:cls |
10666 | 3078 |
] ifFalse:[ |
3079 |
c isCompositeChange ifTrue:[ |
|
3080 |
c changes do:addThemChanges |
|
3081 |
] |
|
3082 |
] |
|
3083 |
] |
|
3084 |
]. |
|
3085 |
changes do:addThemChanges. |
|
3086 |
||
13018
65d449c405b2
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12757
diff
changeset
|
3087 |
UserPreferences systemBrowserClass |
10666 | 3088 |
browseClasses:classes title:'selected monticello classes'. |
3089 |
||
3090 |
"Created: / 04-08-2011 / 17:27:20 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3091 |
"Created: / 05-09-2011 / 16:08:35 / cg" |
|
10028 | 3092 |
! |
3093 |
||
10943
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
3094 |
changeMenuCompareClass: changeList |
12292 | 3095 |
|changes classNames classNameToClassMapping lastNameSpace |
10943
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
3096 |
addClassName addThemChanges existingClasses |
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
3097 |
allChanges changeSet1 changeSet2 diffSet| |
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
3098 |
|
11651 | 3099 |
changes := self selectedChangesIn: changeList. |
10943
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
3100 |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
3101 |
classNameToClassMapping := Dictionary new. |
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
3102 |
classNames := Set new. |
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
3103 |
allChanges := ChangeSet new. |
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
3104 |
existingClasses := Set new. |
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
3105 |
|
12292 | 3106 |
addClassName := |
3107 |
[:nmArg | |
|
3108 |
|nm ns existingClass goodAnswer cls| |
|
3109 |
||
3110 |
nm := nmArg. |
|
3111 |
existingClass := Smalltalk classNamed:nm. |
|
3112 |
||
3113 |
existingClass notNil ifTrue:[ |
|
3114 |
goodAnswer := nm |
|
3115 |
] ifFalse:[ |
|
3116 |
ns := NameSpace allNameSpaces |
|
3117 |
detect:[:ns | (ns classNamed:nm) notNil ] |
|
3118 |
ifNone:nil. |
|
3119 |
ns notNil ifTrue:[ |
|
3120 |
goodAnswer := (ns classNamed:nm) name. |
|
3121 |
] ifFalse:[ |
|
3122 |
goodAnswer := nm. |
|
3123 |
(lastNameSpace notNil |
|
3124 |
and:[ lastNameSpace isNameSpace |
|
3125 |
and:[(cls := lastNameSpace classNamed:nm) notNil ]] |
|
3126 |
) ifTrue:[ |
|
3127 |
goodAnswer := cls name. |
|
3128 |
] ifFalse:[ |
|
3129 |
(lastNameSpace notNil |
|
3130 |
and:[ lastNameSpace isBehavior |
|
3131 |
and:[(cls := lastNameSpace privateClassesAt:nm asSymbol) notNil ]] |
|
3132 |
) ifTrue:[ |
|
3133 |
goodAnswer := cls name. |
|
3134 |
] |
|
3135 |
]. |
|
3136 |
]. |
|
3137 |
]. |
|
3138 |
nm := Dialog |
|
3139 |
request:('Class to compare for "%1"?' bindWith:nmArg) |
|
3140 |
initialAnswer:goodAnswer. |
|
3141 |
nm isNil ifTrue:[^ self]. |
|
3142 |
nm notEmpty ifTrue:[ |
|
3143 |
existingClass := Smalltalk at:nm asSymbol. |
|
3144 |
]. |
|
3145 |
existingClass notNil ifTrue:[ |
|
3146 |
classNameToClassMapping at:nmArg put:existingClass. |
|
3147 |
existingClasses add:existingClass. |
|
3148 |
]. |
|
3149 |
classNames add:nmArg |
|
3150 |
]. |
|
10943
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
3151 |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
3152 |
addThemChanges := [:changes | |
12292 | 3153 |
"/ collect classes and mappings |
3154 |
changes do:[:c | |
|
3155 |
c isClassDefinitionChange ifTrue:[ |
|
3156 |
addClassName value:(c className). |
|
3157 |
allChanges add:c. |
|
3158 |
]]. |
|
3159 |
||
3160 |
changes do:[:c | |
|
3161 |
c isMethodChange ifTrue:[ |
|
3162 |
(classNames includes:(c className)) ifFalse:[ |
|
3163 |
addClassName value:(c className). |
|
3164 |
]. |
|
3165 |
allChanges add:c. |
|
3166 |
]]. |
|
3167 |
||
3168 |
changes do:[:c | |
|
3169 |
c isCompositeChange ifTrue:[ |
|
3170 |
addThemChanges value:(c changes) |
|
3171 |
]. |
|
3172 |
]. |
|
10943
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
3173 |
]. |
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
3174 |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
3175 |
changes do:addThemChanges. |
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
3176 |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
3177 |
"/ now, build a diffset and present it... |
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
3178 |
changeSet1 := allChanges. |
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
3179 |
changeSet2 := ChangeSet new. |
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
3180 |
existingClasses do:[:cls | |
12292 | 3181 |
changeSet2 addAll:(ChangeSet forExistingClass:cls). |
10943
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
3182 |
]. |
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
3183 |
diffSet := changeSet1 diffSetsAgainst:changeSet2. |
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
3184 |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
3185 |
(UserPreferences versionDiffViewerClass) |
12292 | 3186 |
openOnDiffSet:diffSet |
3187 |
labelA:'Monticello' |
|
3188 |
labelB:'Current (In Image)' |
|
3189 |
title:'Diffs' |
|
3190 |
ignoreExtensions:false. |
|
10943
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
3191 |
|
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
3192 |
"Created: / 04-08-2011 / 17:27:20 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
3193 |
"Created: / 01-12-2011 / 18:36:44 / cg" |
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
3194 |
! |
39d815d28b9d
added: #changeMenuCompareClass:
Claus Gittinger <cg@exept.de>
parents:
10914
diff
changeset
|
3195 |
|
10448 | 3196 |
changeMenuDeleteSelection: changeList |
10028 | 3197 |
|
12213
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3198 |
changeList selection do:[:change|self changeMenuDeleteChange:change change]. |
12247
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
3199 |
changeList updateList. |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
3200 |
(list2 notNil and:[changeList ~~ list2]) ifTrue:[ |
12292 | 3201 |
"/ to get the =-icons |
3202 |
list2 updateList |
|
12213
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3203 |
]. |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3204 |
|
10448 | 3205 |
"Created: / 04-08-2011 / 17:28:11 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10028 | 3206 |
! |
3207 |
||
12247
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
3208 |
changeMenuDeleteSelectionInverted: changeList |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
3209 |
| sel | |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
3210 |
|
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
3211 |
sel := changeList selection ? #(). |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
3212 |
changeList list do:[:change| |
12292 | 3213 |
(sel includes: change) ifFalse:[ |
3214 |
self changeMenuDeleteChange:change change |
|
3215 |
]. |
|
12247
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
3216 |
]. |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
3217 |
changeList updateList. |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
3218 |
(list2 notNil and:[changeList ~~ list2]) ifTrue:[ |
12292 | 3219 |
"/ to get the =-icons |
3220 |
list2 updateList |
|
12247
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
3221 |
]. |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
3222 |
|
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
3223 |
"Created: / 17-05-2012 / 22:55:53 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
3224 |
! |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
3225 |
|
12213
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3226 |
changeMenuDeleteToEnd: changeList |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3227 |
|lastIdx| |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3228 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3229 |
lastIdx := changeList selectionIndices max. |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3230 |
changeList list from:lastIdx do:[:change | self changeMenuDeleteChange:change change]. |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3231 |
list2 notNil ifTrue:[ |
12292 | 3232 |
"/ to get the =-icons |
3233 |
list2 updateList |
|
12213
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3234 |
]. |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3235 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3236 |
"Created: / 27-12-2011 / 10:53:00 / cg" |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3237 |
"Created: / 30-03-2012 / 12:22:13 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3238 |
! |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3239 |
|
10448 | 3240 |
changeMenuInspect: changeList |
10028 | 3241 |
|
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
3242 |
changeList selection size == 1 ifTrue:[ |
12292 | 3243 |
changeList selection anyOne change inspect |
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
3244 |
] ifFalse:[ |
12292 | 3245 |
(changeList selection collect:[:each|each change]) inspect |
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
3246 |
] |
10028 | 3247 |
|
10448 | 3248 |
"Created: / 04-08-2011 / 17:28:43 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10028 | 3249 |
! |
3250 |
||
10448 | 3251 |
changeMenuInspectChangeset: changeList |
10028 | 3252 |
self changesetHolder value inspect. |
10448 | 3253 |
|
3254 |
"Created: / 04-08-2011 / 17:28:59 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10028 | 3255 |
! |
3256 |
||
10448 | 3257 |
changeMenuSelectAdditions: changeList |
10028 | 3258 |
|
10448 | 3259 |
self changeMenuSelectIn: changeList suchThat:[:change|change delta = #+] |
10028 | 3260 |
|
10448 | 3261 |
"Created: / 04-08-2011 / 17:29:07 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10028 | 3262 |
! |
3263 |
||
10448 | 3264 |
changeMenuSelectAll: changeList |
10028 | 3265 |
|
10448 | 3266 |
self changeMenuSelectIn: changeList suchThat:[:change|true] |
10028 | 3267 |
|
10448 | 3268 |
"Created: / 04-08-2011 / 17:29:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10028 | 3269 |
! |
3270 |
||
10448 | 3271 |
changeMenuSelectDifferences: changeList |
10028 | 3272 |
|
10448 | 3273 |
self changeMenuSelectIn: changeList suchThat:[:change|change delta = #~] |
10028 | 3274 |
|
10448 | 3275 |
"Created: / 04-08-2011 / 17:29:48 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10028 | 3276 |
! |
3277 |
||
12247
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
3278 |
changeMenuSelectInversion: changeList |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
3279 |
|
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
3280 |
| oldSel newSel | |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
3281 |
oldSel := changeList selection. |
12249 | 3282 |
newSel := OrderedCollection new. |
12247
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
3283 |
changeList list do:[:change| |
12292 | 3284 |
(oldSel includes: change) ifFalse:[ |
3285 |
newSel add: change. |
|
3286 |
] |
|
12247
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
3287 |
]. |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
3288 |
changeList selection: newSel. |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
3289 |
|
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
3290 |
"Created: / 17-05-2012 / 23:03:00 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
3291 |
! |
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
3292 |
|
10448 | 3293 |
changeMenuSelectNone: changeList |
10028 | 3294 |
|
10448 | 3295 |
self changeMenuSelectIn: changeList suchThat:[:change|false] |
10028 | 3296 |
|
10448 | 3297 |
"Created: / 04-08-2011 / 17:30:24 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10028 | 3298 |
! |
3299 |
||
10448 | 3300 |
changeMenuSelectRemovals: changeList |
10028 | 3301 |
|
10448 | 3302 |
self changeMenuSelectIn: changeList suchThat:[:change|change delta = #-] |
10028 | 3303 |
|
10448 | 3304 |
"Modified: / 29-10-2010 / 13:18:23 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
3305 |
"Created: / 04-08-2011 / 17:35:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10028 | 3306 |
! |
3307 |
||
10448 | 3308 |
changeMenuSelectSame: changeList |
10028 | 3309 |
|
10448 | 3310 |
self changeMenuSelectIn: changeList suchThat:[:change|change delta = #=] |
10028 | 3311 |
|
10448 | 3312 |
"Modified: / 29-10-2010 / 13:18:35 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
3313 |
"Created: / 04-08-2011 / 17:35:30 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10028 | 3314 |
! |
3315 |
||
10448 | 3316 |
changeMenuSelectUsingBlock: changeList |
10028 | 3317 |
|
3318 |
|conditionBlockString conditionBlock dialog textHolder template| |
|
3319 |
||
3320 |
template := |
|
3321 |
'[:change| |
|
3322 |
"/ Define condition for selection below: |
|
3323 |
"/ change is an instance of Change |
|
3324 |
"/ change will be selected if and only if block returns true |
|
3325 |
||
10467
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
3326 |
|
10028 | 3327 |
true"/always select the change |
3328 |
] |
|
3329 |
'. |
|
3330 |
||
3331 |
LastSelectionConditionString isNil ifTrue:[ |
|
11196 | 3332 |
LastSelectionConditionString := template. |
10028 | 3333 |
]. |
3334 |
||
3335 |
||
3336 |
textHolder := ValueHolder new. |
|
3337 |
dialog := Dialog |
|
11196 | 3338 |
forRequestText:(resources string:'Enter condition for selection') |
3339 |
lines:20 |
|
3340 |
columns:70 |
|
3341 |
initialAnswer:LastSelectionConditionString |
|
3342 |
model:textHolder. |
|
10028 | 3343 |
dialog addButton:(Button label:'Template' action:[textHolder value:template. textHolder changed:#value.]). |
3344 |
dialog open. |
|
3345 |
dialog accepted ifFalse:[^ self]. |
|
3346 |
||
3347 |
conditionBlockString := textHolder value. |
|
3348 |
LastSelectionConditionString := conditionBlockString. |
|
3349 |
||
3350 |
conditionBlock := Parser evaluate:conditionBlockString. |
|
3351 |
conditionBlock isBlock ifFalse:[ |
|
11196 | 3352 |
self error:'Bad selection block (syntax error?)'. |
3353 |
^ self |
|
10028 | 3354 |
]. |
3355 |
||
12328
2d47a394e0cf
Bugfix in Tools::ChangeSetBrowser2. selecting changeset using custom block.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12314
diff
changeset
|
3356 |
self changeMenuSelectIn: changeList suchThat: [:change|conditionBlock value: change change]. |
2d47a394e0cf
Bugfix in Tools::ChangeSetBrowser2. selecting changeset using custom block.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12314
diff
changeset
|
3357 |
|
10448 | 3358 |
"Created: / 04-08-2011 / 17:42:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
12328
2d47a394e0cf
Bugfix in Tools::ChangeSetBrowser2. selecting changeset using custom block.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12314
diff
changeset
|
3359 |
"Modified: / 21-01-2013 / 17:13:48 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10028 | 3360 |
! |
3361 |
||
10448 | 3362 |
changeMenuUndeleteSelection: changeList |
10028 | 3363 |
|
3364 |
self selectionDo:[:chg|chg removed: false] |
|
3365 |
||
3366 |
"Modified: / 29-10-2010 / 13:53:16 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10448 | 3367 |
"Created: / 04-08-2011 / 17:42:36 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
11651 | 3368 |
! |
3369 |
||
3370 |
selectedChangesIn: changeList |
|
3371 |
|changes| |
|
3372 |
||
12292 | 3373 |
changes := (changeList == list1 |
3374 |
ifTrue:[ selection1Holder ] |
|
3375 |
ifFalse:[ selection2Holder ]) value. |
|
11651 | 3376 |
^ changes collect:[:eachListEntry | eachListEntry change]. |
3377 |
||
3378 |
"Created: / 23-07-2012 / 13:13:11 / cg" |
|
10448 | 3379 |
! ! |
3380 |
||
3381 |
!ChangeSetBrowser2 methodsFor:'menu actions - changes - helpers'! |
|
3382 |
||
3383 |
changeMenuApplyChange: aChange |
|
3384 |
||
10688
0d9b70639154
changed: #changeMenuApplyChange:
Claus Gittinger <cg@exept.de>
parents:
10682
diff
changeset
|
3385 |
"/ aChange isClassDefinitionChange ifTrue: |
0d9b70639154
changed: #changeMenuApplyChange:
Claus Gittinger <cg@exept.de>
parents:
10682
diff
changeset
|
3386 |
"/ [(Smalltalk at: aChange superClassName asSymbol) |
0d9b70639154
changed: #changeMenuApplyChange:
Claus Gittinger <cg@exept.de>
parents:
10682
diff
changeset
|
3387 |
"/ ifNil:[^self error: 'Nil superclass']]. |
10682 | 3388 |
|
12306
9dc69e54fdd6
Tools::ChangeSetBrowser2>>#changeMenuApplyChange: fixes for cases when Monticello is not loaded!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12292
diff
changeset
|
3389 |
| nsQueries packageQueries hasMC apply | |
9dc69e54fdd6
Tools::ChangeSetBrowser2>>#changeMenuApplyChange: fixes for cases when Monticello is not loaded!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12292
diff
changeset
|
3390 |
|
12213
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3391 |
aChange removed ifTrue:[ ^ self ]. |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3392 |
|
12306
9dc69e54fdd6
Tools::ChangeSetBrowser2>>#changeMenuApplyChange: fixes for cases when Monticello is not loaded!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12292
diff
changeset
|
3393 |
|
9dc69e54fdd6
Tools::ChangeSetBrowser2>>#changeMenuApplyChange: fixes for cases when Monticello is not loaded!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12292
diff
changeset
|
3394 |
nsQueries := Class nameSpaceQuerySignal. |
9dc69e54fdd6
Tools::ChangeSetBrowser2>>#changeMenuApplyChange: fixes for cases when Monticello is not loaded!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12292
diff
changeset
|
3395 |
packageQueries := Class packageQuerySignal. |
9dc69e54fdd6
Tools::ChangeSetBrowser2>>#changeMenuApplyChange: fixes for cases when Monticello is not loaded!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12292
diff
changeset
|
3396 |
hasMC := ConfigurableFeatures includesFeature:#MonticelloSupport. |
9dc69e54fdd6
Tools::ChangeSetBrowser2>>#changeMenuApplyChange: fixes for cases when Monticello is not loaded!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12292
diff
changeset
|
3397 |
hasMC ifTrue:[ |
9dc69e54fdd6
Tools::ChangeSetBrowser2>>#changeMenuApplyChange: fixes for cases when Monticello is not loaded!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12292
diff
changeset
|
3398 |
nsQueries := nsQueries , MCStXNamespaceQuery. |
9dc69e54fdd6
Tools::ChangeSetBrowser2>>#changeMenuApplyChange: fixes for cases when Monticello is not loaded!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12292
diff
changeset
|
3399 |
packageQueries := packageQueries , MCStXPackageQuery. |
9dc69e54fdd6
Tools::ChangeSetBrowser2>>#changeMenuApplyChange: fixes for cases when Monticello is not loaded!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12292
diff
changeset
|
3400 |
]. |
9dc69e54fdd6
Tools::ChangeSetBrowser2>>#changeMenuApplyChange: fixes for cases when Monticello is not loaded!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12292
diff
changeset
|
3401 |
apply := [ |
9dc69e54fdd6
Tools::ChangeSetBrowser2>>#changeMenuApplyChange: fixes for cases when Monticello is not loaded!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12292
diff
changeset
|
3402 |
updateChangeFileHolder value ifTrue:[ |
9dc69e54fdd6
Tools::ChangeSetBrowser2>>#changeMenuApplyChange: fixes for cases when Monticello is not loaded!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12292
diff
changeset
|
3403 |
aChange apply |
9dc69e54fdd6
Tools::ChangeSetBrowser2>>#changeMenuApplyChange: fixes for cases when Monticello is not loaded!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12292
diff
changeset
|
3404 |
] ifFalse:[ |
13612
1acb01525f56
Fix in Tools::ChangeSetBrowser2 - do not update change file but update internal changeset...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13178
diff
changeset
|
3405 |
Class updateChangeFileQuerySignal answer: false do:[ |
12306
9dc69e54fdd6
Tools::ChangeSetBrowser2>>#changeMenuApplyChange: fixes for cases when Monticello is not loaded!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12292
diff
changeset
|
3406 |
aChange apply |
9dc69e54fdd6
Tools::ChangeSetBrowser2>>#changeMenuApplyChange: fixes for cases when Monticello is not loaded!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12292
diff
changeset
|
3407 |
] |
9dc69e54fdd6
Tools::ChangeSetBrowser2>>#changeMenuApplyChange: fixes for cases when Monticello is not loaded!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12292
diff
changeset
|
3408 |
]. |
9dc69e54fdd6
Tools::ChangeSetBrowser2>>#changeMenuApplyChange: fixes for cases when Monticello is not loaded!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12292
diff
changeset
|
3409 |
]. |
9dc69e54fdd6
Tools::ChangeSetBrowser2>>#changeMenuApplyChange: fixes for cases when Monticello is not loaded!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12292
diff
changeset
|
3410 |
|
12292 | 3411 |
self withWaitCursorDo:[ |
12306
9dc69e54fdd6
Tools::ChangeSetBrowser2>>#changeMenuApplyChange: fixes for cases when Monticello is not loaded!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12292
diff
changeset
|
3412 |
nsQueries |
9dc69e54fdd6
Tools::ChangeSetBrowser2>>#changeMenuApplyChange: fixes for cases when Monticello is not loaded!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12292
diff
changeset
|
3413 |
answer:(NameSpace name:(targetNamespace ? 'Smalltalk')) |
10682 | 3414 |
do: [ |
12306
9dc69e54fdd6
Tools::ChangeSetBrowser2>>#changeMenuApplyChange: fixes for cases when Monticello is not loaded!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12292
diff
changeset
|
3415 |
packageQueries |
9dc69e54fdd6
Tools::ChangeSetBrowser2>>#changeMenuApplyChange: fixes for cases when Monticello is not loaded!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12292
diff
changeset
|
3416 |
answer: self targetPackage |
10682 | 3417 |
do: [ |
12306
9dc69e54fdd6
Tools::ChangeSetBrowser2>>#changeMenuApplyChange: fixes for cases when Monticello is not loaded!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12292
diff
changeset
|
3418 |
hasMC ifTrue:[ |
9dc69e54fdd6
Tools::ChangeSetBrowser2>>#changeMenuApplyChange: fixes for cases when Monticello is not loaded!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12292
diff
changeset
|
3419 |
MCInteractiveLoadingQuery answer: true do: apply |
9dc69e54fdd6
Tools::ChangeSetBrowser2>>#changeMenuApplyChange: fixes for cases when Monticello is not loaded!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12292
diff
changeset
|
3420 |
] ifFalse:[ |
9dc69e54fdd6
Tools::ChangeSetBrowser2>>#changeMenuApplyChange: fixes for cases when Monticello is not loaded!
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12292
diff
changeset
|
3421 |
apply value. |
10682 | 3422 |
] |
3423 |
]. |
|
3424 |
]. |
|
3425 |
]. |
|
10448 | 3426 |
|
10688
0d9b70639154
changed: #changeMenuApplyChange:
Claus Gittinger <cg@exept.de>
parents:
10682
diff
changeset
|
3427 |
"Modified: / 07-09-2011 / 22:24:57 / cg" |
13612
1acb01525f56
Fix in Tools::ChangeSetBrowser2 - do not update change file but update internal changeset...
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
13178
diff
changeset
|
3428 |
"Modified: / 20-09-2013 / 10:41:28 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10448 | 3429 |
! |
3430 |
||
3431 |
changeMenuApplyChanges: changesToApply |
|
3432 |
||
3433 |
| changesThatFailToApply | |
|
3434 |
||
3435 |
changesThatFailToApply := ChangeSet new. |
|
3436 |
ProgressIndicator |
|
11196 | 3437 |
displayProgress:'Applying changes...' |
12088
5ae808a3d675
class: Tools::ChangeSetBrowser2
Stefan Vogel <sv@exept.de>
parents:
11797
diff
changeset
|
3438 |
at:(Screen default centerOfMonitorHavingPointer) |
11196 | 3439 |
from:200 to:400 |
3440 |
during:[:val | |
|
3441 |
1 to: changesToApply size do: |
|
3442 |
[:i| |
|
3443 |
val value:((100 / changesToApply size) * i) rounded. |
|
3444 |
[self changeMenuApplyChange: (changesToApply at: i)] |
|
3445 |
on: Error do:[changesThatFailToApply add: (changesToApply at: i)]]] |
|
10448 | 3446 |
|
3447 |
"Created: / 04-08-2011 / 17:26:19 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3448 |
! |
|
3449 |
||
12213
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3450 |
changeMenuDeleteChange: change |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3451 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3452 |
change removed: true |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3453 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3454 |
"Created: / 30-03-2012 / 12:22:13 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3455 |
! |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3456 |
|
10467
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
3457 |
changeMenuSelectIn: changeList suchThat:conditionBlock |
10448 | 3458 |
|
3459 |
| sel | |
|
3460 |
sel := OrderedCollection new. |
|
3461 |
changeList listHolder value do: [:chg|(conditionBlock value: chg) ifTrue:[sel add: chg]]. |
|
3462 |
changeList selectionHolder value: sel. |
|
3463 |
||
3464 |
"Created: / 04-08-2011 / 17:29:34 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
12328
2d47a394e0cf
Bugfix in Tools::ChangeSetBrowser2. selecting changeset using custom block.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12314
diff
changeset
|
3465 |
"Modified: / 21-01-2013 / 17:12:58 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10028 | 3466 |
! ! |
3467 |
||
3468 |
!ChangeSetBrowser2 methodsFor:'private'! |
|
3469 |
||
10655 | 3470 |
changesDo:aBlock |
3471 |
self changeset do:aBlock. |
|
3472 |
||
3473 |
"Created: / 30-08-2011 / 14:30:58 / cg" |
|
3474 |
! |
|
3475 |
||
10028 | 3476 |
getNavigatorChangeSet |
3477 |
||
3478 |
| changeset | |
|
12271 | 3479 |
changeset := changesetHolder value. "/deepCopy. |
10028 | 3480 |
(changeset isKindOf: ChangeSet) ifFalse: |
12292 | 3481 |
[changeset := ChangeSet withAll: changeset]. |
10028 | 3482 |
|
12144 | 3483 |
^ (self navigatorSpecHolder value ~~ #oneColumnNavigatorSpec) ifTrue:[ |
12292 | 3484 |
changeset groupByClass |
12144 | 3485 |
] ifFalse:[ |
12292 | 3486 |
changeset flatten |
12144 | 3487 |
] |
10028 | 3488 |
|
3489 |
"Created: / 24-10-2009 / 19:31:10 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
12272 | 3490 |
"Modified: / 27-07-2012 / 17:02:36 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10028 | 3491 |
! |
3492 |
||
12667
5b04311f860d
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12660
diff
changeset
|
3493 |
iconSelectorForChange:aChange |
5b04311f860d
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12660
diff
changeset
|
3494 |
|currentMethod| |
5b04311f860d
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12660
diff
changeset
|
3495 |
|
5b04311f860d
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12660
diff
changeset
|
3496 |
targetPackage notNil ifTrue:[ |
5b04311f860d
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12660
diff
changeset
|
3497 |
aChange isMethodChange ifTrue:[ |
5b04311f860d
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12660
diff
changeset
|
3498 |
(currentMethod := aChange changeMethod) notNil ifTrue:[ |
5b04311f860d
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12660
diff
changeset
|
3499 |
currentMethod package ~= targetPackage ifTrue:[ |
5b04311f860d
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12660
diff
changeset
|
3500 |
^ #iconExcla |
5b04311f860d
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12660
diff
changeset
|
3501 |
] |
5b04311f860d
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12660
diff
changeset
|
3502 |
] |
5b04311f860d
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12660
diff
changeset
|
3503 |
]. |
5b04311f860d
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12660
diff
changeset
|
3504 |
]. |
5b04311f860d
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12660
diff
changeset
|
3505 |
^ nil. |
5b04311f860d
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12660
diff
changeset
|
3506 |
! |
5b04311f860d
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12660
diff
changeset
|
3507 |
|
12213
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3508 |
list |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3509 |
"Returns list to operate on" |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3510 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3511 |
^self isTwoColumn ifTrue:[list2] ifFalse:[list1] |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3512 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3513 |
"Created: / 30-03-2012 / 12:02:26 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10028 | 3514 |
! |
3515 |
||
3516 |
redrawChangeListViews |
|
3517 |
||
10448 | 3518 |
list1 notNil ifTrue:[ |
12292 | 3519 |
list1 builder window allSubViewsDo: [:v|v redraw] |
10448 | 3520 |
]. |
3521 |
list2 notNil ifTrue:[ |
|
12292 | 3522 |
list2 builder window allSubViewsDo: [:v|v redraw] |
10448 | 3523 |
]. |
10028 | 3524 |
|
3525 |
"Created: / 16-03-2011 / 22:41:57 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3526 |
! |
|
3527 |
||
10453 | 3528 |
selectionDo: aBlock |
3529 |
||
11447 | 3530 |
| applyBlock | |
3531 |
||
3532 |
applyBlock := [:e|aBlock value: e change]. |
|
3533 |
||
10467
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
3534 |
"/ selectionHolder value isEmptyOrNil ifTrue:[ |
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
3535 |
"/ (self navigatorChangesetHolder value ? #()) do: aBlock |
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
3536 |
"/ ] ifFalse:[ |
11447 | 3537 |
selection2Holder value isEmptyOrNil not |
12405
76f9a872362b
Merged 3efd83b86c07 and 1206aff1f11 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
3538 |
ifTrue:[selection2Holder value do: [:e|e notNil ifTrue:[applyBlock value:e]]] |
76f9a872362b
Merged 3efd83b86c07 and 1206aff1f11 (branch default - CVS HEAD)
Jan Vrany <jan.vrany@fit.cvut.cz>
diff
changeset
|
3539 |
ifFalse:[selection1Holder value do: [:e|e notNil ifTrue:[applyBlock value:e]]]. |
10467
d6bd6c9c5a1b
oops - I messed it up, when resolving conflicts...
Claus Gittinger <cg@exept.de>
parents:
10453
diff
changeset
|
3540 |
"/ ]. |
11447 | 3541 |
self redrawChangeListViews |
10453 | 3542 |
|
3543 |
"Created: / 29-10-2010 / 13:47:21 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11447 | 3544 |
"Modified: / 20-03-2012 / 17:16:40 / cg" |
12249 | 3545 |
"Modified: / 18-05-2012 / 09:05:02 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10453 | 3546 |
! |
3547 |
||
12151
ac18977416c2
Added (experimental) support for inline message panel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12144
diff
changeset
|
3548 |
showProgress: label while: block |
ac18977416c2
Added (experimental) support for inline message panel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12144
diff
changeset
|
3549 |
|
12247
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
3550 |
self infoPanel progress: label while: [ |
12292 | 3551 |
[ |
3552 |
self isWorkingHolder value: true. |
|
3553 |
block value |
|
3554 |
] ensure:[ |
|
3555 |
self isWorkingHolder value: false. |
|
3556 |
] |
|
12247
1bd3e7f3c9c9
- Tools::ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
3557 |
] |
12151
ac18977416c2
Added (experimental) support for inline message panel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12144
diff
changeset
|
3558 |
|
ac18977416c2
Added (experimental) support for inline message panel
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12144
diff
changeset
|
3559 |
"Created: / 10-02-2012 / 10:35:04 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10453 | 3560 |
! |
3561 |
||
10309 | 3562 |
showSource: aBoolean |
3563 |
| panel | |
|
3564 |
||
3565 |
"Not yet implemented" |
|
3566 |
||
3567 |
^self. |
|
3568 |
||
11663 | 3569 |
"/ cg: but what is it supposed to do??? |
3570 |
"/ sourceView ifNil:[^self]. |
|
3571 |
"/ panel := builder componentAt: #VerticalPanel. |
|
3572 |
"/ aBoolean ifTrue:[ |
|
3573 |
"/ (panel subViews includes: sourceView) ifTrue:[^self]. |
|
3574 |
"/ panel addSubView: sourceView. |
|
3575 |
"/ ] ifFalse:[ |
|
3576 |
"/ (panel subViews includes: sourceView) ifFalse:[^self]. |
|
3577 |
"/ panel removeSubView: sourceView. |
|
3578 |
"/ sourceView setId: nil. |
|
3579 |
"/ ] |
|
10309 | 3580 |
|
3581 |
"Created: / 11-07-2011 / 16:06:26 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11663 | 3582 |
"Modified: / 25-07-2012 / 17:44:01 / cg" |
10682 | 3583 |
! |
10028 | 3584 |
|
10682 | 3585 |
targetPackage |
3586 |
^ targetPackage ? PackageId noProjectID |
|
10028 | 3587 |
|
10682 | 3588 |
"Created: / 07-09-2011 / 20:12:04 / cg" |
10028 | 3589 |
! ! |
3590 |
||
3591 |
!ChangeSetBrowser2 methodsFor:'queries'! |
|
3592 |
||
3593 |
canApplyChanges |
|
3594 |
||
3595 |
^true |
|
3596 |
||
3597 |
"Created: / 29-10-2010 / 13:07:44 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3598 |
! |
|
3599 |
||
3600 |
canDrop: somethign |
|
3601 |
||
10682 | 3602 |
self breakPoint:#jv. |
10028 | 3603 |
|
3604 |
"Created: / 20-03-2011 / 21:34:11 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10682 | 3605 |
"Modified: / 07-09-2011 / 20:21:15 / cg" |
10028 | 3606 |
! |
3607 |
||
10448 | 3608 |
hasChangeSelectedAndNotRemoved: changeList |
10028 | 3609 |
|
10448 | 3610 |
| sel | |
3611 |
sel := changeList selection. |
|
3612 |
sel isEmptyOrNil ifTrue:[^false]. |
|
3613 |
^(sel anySatisfy:[:each|each removed]) not |
|
10028 | 3614 |
|
10380
f2a255ec6fc9
not ifTrue -> ifFalse (trying the rewrite tool ;-)
Claus Gittinger <cg@exept.de>
parents:
10370
diff
changeset
|
3615 |
"Modified: / 24-07-2011 / 06:52:28 / cg" |
10448 | 3616 |
"Created: / 04-08-2011 / 18:23:03 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10028 | 3617 |
! |
3618 |
||
10448 | 3619 |
hasSingleChangeSelectedAndCanBrowse: changeList |
10028 | 3620 |
|
10448 | 3621 |
| sel | |
3622 |
sel := changeList selection. |
|
3623 |
sel isEmptyOrNil ifTrue:[^false]. |
|
3624 |
^true |
|
10028 | 3625 |
|
10448 | 3626 |
"Created: / 04-08-2011 / 18:25:20 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10028 | 3627 |
! ! |
3628 |
||
12213
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3629 |
!ChangeSetBrowser2 methodsFor:'testing'! |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3630 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3631 |
isHierarchical |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3632 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3633 |
^self navigatorSpecHolder == #hierarchicalNavigatorSpec |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3634 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3635 |
"Modified: / 14-10-2010 / 15:52:18 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3636 |
"Created: / 30-03-2012 / 11:59:48 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3637 |
! |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3638 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3639 |
isOneColumn |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3640 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3641 |
^self navigatorSpecHolder value == #oneColumnNavigatorSpec |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3642 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3643 |
"Modified: / 14-10-2010 / 15:52:13 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3644 |
"Created: / 30-03-2012 / 11:59:36 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3645 |
! |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3646 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3647 |
isTwoColumn |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3648 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3649 |
^self navigatorSpecHolder == #twoColumnNavigatorSpec |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3650 |
|
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3651 |
"Modified: / 14-10-2010 / 15:51:10 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3652 |
"Created: / 30-03-2012 / 11:59:58 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3653 |
! ! |
63694f12baba
Improvements in ChangeSetBrowser2
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12211
diff
changeset
|
3654 |
|
10914 | 3655 |
!ChangeSetBrowser2::ChangeEditor class methodsFor:'documentation'! |
3656 |
||
3657 |
documentation |
|
3658 |
" |
|
3659 |
A simple, embeddable window to show a single change. |
|
3660 |
If readonlyHolder's value is false, then user is |
|
3661 |
allowed to edit the change (i.e., modify the source code) |
|
3662 |
||
3663 |
[author:] |
|
12292 | 3664 |
Jan Vrany <jan.vrany@fit.cvut.cz> |
10914 | 3665 |
|
3666 |
[instance variables:] |
|
3667 |
||
3668 |
[class variables:] |
|
3669 |
||
3670 |
[see also:] |
|
3671 |
||
3672 |
" |
|
3673 |
! |
|
3674 |
||
3675 |
examples |
|
3676 |
" |
|
3677 |
Starting the application: |
|
12292 | 3678 |
[exBegin] |
10914 | 3679 |
Tools::ChangeEditor open |
3680 |
||
12292 | 3681 |
[exEnd] |
10914 | 3682 |
|
3683 |
more examples to be added: |
|
12292 | 3684 |
[exBegin] |
3685 |
... add code fragment for |
|
10914 | 3686 |
... executable example here ... |
12292 | 3687 |
[exEnd] |
10914 | 3688 |
" |
3689 |
! ! |
|
3690 |
||
3691 |
!ChangeSetBrowser2::ChangeEditor class methodsFor:'interface specs'! |
|
3692 |
||
3693 |
windowSpec |
|
3694 |
"This resource specification was automatically generated |
|
3695 |
by the UIPainter of ST/X." |
|
3696 |
||
3697 |
"Do not manually edit this!! If it is corrupted, |
|
3698 |
the UIPainter may not be able to read the specification." |
|
3699 |
||
3700 |
" |
|
3701 |
UIPainter new openOnClass:Tools::ChangeSetBrowser2::ChangeEditor andSelector:#windowSpec |
|
3702 |
Tools::ChangeSetBrowser2::ChangeEditor new openInterface:#windowSpec |
|
3703 |
Tools::ChangeSetBrowser2::ChangeEditor open |
|
3704 |
" |
|
3705 |
||
3706 |
<resource: #canvas> |
|
3707 |
||
12292 | 3708 |
^ |
10914 | 3709 |
#(FullSpec |
12292 | 3710 |
name: windowSpec |
3711 |
window: |
|
10914 | 3712 |
(WindowSpec |
12292 | 3713 |
label: 'Change Editor' |
3714 |
name: 'Change Editor' |
|
3715 |
min: (Point 10 10) |
|
3716 |
bounds: (Rectangle 0 0 579 341) |
|
3717 |
) |
|
3718 |
component: |
|
10914 | 3719 |
(SpecCollection |
12292 | 3720 |
collection: ( |
3721 |
(SubCanvasSpec |
|
3722 |
name: 'TextDiffTool' |
|
3723 |
layout: (LayoutFrame 0 0 0 0 0 1 0 1) |
|
3724 |
hasHorizontalScrollBar: false |
|
3725 |
hasVerticalScrollBar: false |
|
3726 |
majorKey: #'Tools::TextDiff2Tool' |
|
3727 |
minorKey: windowSpecForEmbedding |
|
3728 |
subAspectHolders: |
|
3729 |
(Array |
|
3730 |
||
3731 |
(SubChannelInfoSpec |
|
3732 |
subAspect: classHolder |
|
3733 |
aspect: classAspect |
|
3734 |
) |
|
3735 |
(SubChannelInfoSpec |
|
3736 |
subAspect: codeAspectHolder |
|
3737 |
aspect: codeAspect |
|
3738 |
) |
|
3739 |
||
3740 |
(SubChannelInfoSpec |
|
3741 |
subAspect: labelAHolder |
|
3742 |
aspect: labelAHolder |
|
3743 |
) |
|
3744 |
(SubChannelInfoSpec |
|
3745 |
subAspect: labelBHolder |
|
3746 |
aspect: labelBHolder |
|
3747 |
) |
|
3748 |
||
3749 |
(SubChannelInfoSpec |
|
3750 |
subAspect: showDiffHolder |
|
3751 |
aspect: showdiffHolder |
|
3752 |
) |
|
3753 |
(SubChannelInfoSpec |
|
3754 |
subAspect: textAHolder |
|
3755 |
aspect: sourceChangeHolder |
|
3756 |
) |
|
3757 |
||
3758 |
(SubChannelInfoSpec |
|
3759 |
subAspect: textBHolder |
|
3760 |
aspect: sourceImageHolder |
|
3761 |
) |
|
3762 |
) |
|
3763 |
createNewApplication: true |
|
3764 |
createNewBuilder: true |
|
3765 |
) |
|
3766 |
) |
|
3767 |
||
3768 |
) |
|
10914 | 3769 |
) |
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12154
diff
changeset
|
3770 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12154
diff
changeset
|
3771 |
"Modified: / 16-03-2012 / 13:08:12 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10914 | 3772 |
! ! |
3773 |
||
3774 |
!ChangeSetBrowser2::ChangeEditor methodsFor:'accessing'! |
|
3775 |
||
3776 |
sourceChangeHolder |
|
3777 |
^ sourceChangeHolder |
|
3778 |
! |
|
3779 |
||
3780 |
sourceChangeHolder:something |
|
3781 |
sourceChangeHolder := something. |
|
3782 |
! |
|
3783 |
||
3784 |
sourceImageHolder |
|
3785 |
^ sourceImageHolder |
|
3786 |
! |
|
3787 |
||
3788 |
sourceImageHolder:something |
|
3789 |
sourceImageHolder := something. |
|
3790 |
! ! |
|
3791 |
||
3792 |
!ChangeSetBrowser2::ChangeEditor methodsFor:'aspects'! |
|
3793 |
||
3794 |
changeHolder |
|
3795 |
"return/create the 'changeHolder' value holder (automatically generated)" |
|
3796 |
||
3797 |
changeHolder isNil ifTrue:[ |
|
12292 | 3798 |
changeHolder := ValueHolder new. |
3799 |
changeHolder addDependent:self. |
|
10914 | 3800 |
]. |
3801 |
^ changeHolder |
|
3802 |
! |
|
3803 |
||
3804 |
changeHolder:something |
|
3805 |
"set the 'changeHolder' value holder (automatically generated)" |
|
3806 |
||
3807 |
|oldValue newValue| |
|
3808 |
||
3809 |
changeHolder notNil ifTrue:[ |
|
12292 | 3810 |
oldValue := changeHolder value. |
3811 |
changeHolder removeDependent:self. |
|
10914 | 3812 |
]. |
3813 |
changeHolder := something. |
|
3814 |
changeHolder notNil ifTrue:[ |
|
12292 | 3815 |
changeHolder addDependent:self. |
10914 | 3816 |
]. |
3817 |
newValue := changeHolder value. |
|
3818 |
oldValue ~~ newValue ifTrue:[ |
|
12292 | 3819 |
self update:#value with:newValue from:changeHolder. |
10914 | 3820 |
]. |
3821 |
! |
|
3822 |
||
3823 |
classAspect |
|
3824 |
||
12292 | 3825 |
^(AspectAdaptor forAspect: #changeClass) |
3826 |
subjectChannel: self changeHolder |
|
10914 | 3827 |
|
3828 |
"Created: / 29-11-2011 / 11:21:59 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3829 |
! |
|
3830 |
||
3831 |
codeAspect |
|
3832 |
||
3833 |
^BlockValue |
|
12292 | 3834 |
with: [:change| |
3835 |
change isMethodCodeChange |
|
3836 |
ifTrue:[ SyntaxHighlighter codeAspectMethod ] |
|
3837 |
ifFalse:[ SyntaxHighlighter codeAspectExpression ] |
|
3838 |
] argument: self changeHolder |
|
10914 | 3839 |
|
3840 |
"Created: / 29-11-2011 / 11:21:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11709 | 3841 |
"Modified: / 27-07-2012 / 22:03:31 / cg" |
10914 | 3842 |
! |
3843 |
||
3844 |
labelAText |
|
3845 |
||
3846 |
^'Change' |
|
3847 |
||
3848 |
"Created: / 27-11-2011 / 14:59:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3849 |
! |
|
3850 |
||
3851 |
labelBText |
|
3852 |
||
3853 |
^'Current (in image)' |
|
3854 |
||
3855 |
"Created: / 27-11-2011 / 14:59:25 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3856 |
! |
|
3857 |
||
3858 |
readonlyHolder |
|
3859 |
"return/create the 'readonlyHolder' value holder (automatically generated)" |
|
3860 |
||
3861 |
readonlyHolder isNil ifTrue:[ |
|
12292 | 3862 |
readonlyHolder := ValueHolder new. |
3863 |
readonlyHolder addDependent:self. |
|
10914 | 3864 |
]. |
3865 |
^ readonlyHolder |
|
3866 |
! |
|
3867 |
||
3868 |
readonlyHolder:something |
|
3869 |
"set the 'readonlyHolder' value holder (automatically generated)" |
|
3870 |
||
3871 |
|oldValue newValue| |
|
3872 |
||
3873 |
readonlyHolder notNil ifTrue:[ |
|
12292 | 3874 |
oldValue := readonlyHolder value. |
3875 |
readonlyHolder removeDependent:self. |
|
10914 | 3876 |
]. |
3877 |
readonlyHolder := something. |
|
3878 |
readonlyHolder notNil ifTrue:[ |
|
12292 | 3879 |
readonlyHolder addDependent:self. |
10914 | 3880 |
]. |
3881 |
newValue := readonlyHolder value. |
|
3882 |
oldValue ~~ newValue ifTrue:[ |
|
12292 | 3883 |
self update:#value with:newValue from:readonlyHolder. |
10914 | 3884 |
]. |
3885 |
! |
|
3886 |
||
3887 |
showdiffHolder |
|
3888 |
"return/create the 'showdiffHolder' value holder (automatically generated)" |
|
3889 |
||
3890 |
showdiffHolder isNil ifTrue:[ |
|
12292 | 3891 |
showdiffHolder := ValueHolder new. |
10914 | 3892 |
]. |
3893 |
^ showdiffHolder |
|
3894 |
! |
|
3895 |
||
3896 |
showdiffHolder:something |
|
3897 |
"set the 'showdiffHolder' value holder (automatically generated)" |
|
3898 |
||
3899 |
showdiffHolder := something. |
|
3900 |
! ! |
|
3901 |
||
3902 |
!ChangeSetBrowser2::ChangeEditor methodsFor:'change & update'! |
|
3903 |
||
3904 |
changeChanged |
|
3905 |
"changeHolder has changed, update sources etc..." |
|
3906 |
||
3907 |
| change | |
|
11663 | 3908 |
|
10914 | 3909 |
change := changeHolder value. |
3910 |
||
3911 |
sourceChangeHolder value: change changeSource. |
|
3912 |
sourceImageHolder value: change imageSource. |
|
3913 |
||
3914 |
"Created: / 29-11-2011 / 11:15:37 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
11663 | 3915 |
"Modified (format): / 25-07-2012 / 17:39:48 / cg" |
10914 | 3916 |
! |
3917 |
||
3918 |
update:something with:aParameter from:changedObject |
|
3919 |
"Invoked when an object that I depend upon sends a change notification." |
|
3920 |
||
3921 |
||
3922 |
changedObject == changeHolder ifTrue:[ |
|
12292 | 3923 |
self changeChanged. |
3924 |
^ self. |
|
10914 | 3925 |
]. |
3926 |
super update:something with:aParameter from:changedObject |
|
3927 |
||
3928 |
"Modified: / 29-11-2011 / 11:15:00 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3929 |
! ! |
|
3930 |
||
10028 | 3931 |
!ChangeSetBrowser2 class methodsFor:'documentation'! |
3932 |
||
10450 | 3933 |
version |
13018
65d449c405b2
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12757
diff
changeset
|
3934 |
^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.53 2013-06-25 17:12:44 cg Exp $' |
10450 | 3935 |
! |
3936 |
||
10028 | 3937 |
version_CVS |
13018
65d449c405b2
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12757
diff
changeset
|
3938 |
^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.53 2013-06-25 17:12:44 cg Exp $' |
10028 | 3939 |
! |
3940 |
||
12328
2d47a394e0cf
Bugfix in Tools::ChangeSetBrowser2. selecting changeset using custom block.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12314
diff
changeset
|
3941 |
version_HG |
2d47a394e0cf
Bugfix in Tools::ChangeSetBrowser2. selecting changeset using custom block.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12314
diff
changeset
|
3942 |
|
2d47a394e0cf
Bugfix in Tools::ChangeSetBrowser2. selecting changeset using custom block.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12314
diff
changeset
|
3943 |
^ '$Changeset: <not expanded> $' |
2d47a394e0cf
Bugfix in Tools::ChangeSetBrowser2. selecting changeset using custom block.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12314
diff
changeset
|
3944 |
! |
2d47a394e0cf
Bugfix in Tools::ChangeSetBrowser2. selecting changeset using custom block.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12314
diff
changeset
|
3945 |
|
10028 | 3946 |
version_SVN |
13018
65d449c405b2
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12757
diff
changeset
|
3947 |
^ '$Id: Tools__ChangeSetBrowser2.st,v 1.53 2013-06-25 17:12:44 cg Exp $' |
10028 | 3948 |
! ! |
12525
50b803c4ee6a
class: Tools::ChangeSetBrowser2
Claus Gittinger <cg@exept.de>
parents:
12088
diff
changeset
|
3949 |