author | Jan Vrany <jan.vrany@fit.cvut.cz> |
Thu, 17 Jan 2013 21:52:18 +0000 | |
branch | jv |
changeset 12321 | 13d791d84a47 |
parent 12320 | 5b4ec70d83c1 |
child 12322 | 6ca193e20c8e |
permissions | -rw-r--r-- |
10194 | 1 |
" |
2 |
Copyright (c) 2007-2010 Jan Vrany |
|
3 |
Copyright (c) 2009-2010 eXept Software AG |
|
4 |
||
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. |
|
25 |
" |
|
12125 | 26 |
"{ Package: 'stx:libtool' }" |
10194 | 27 |
|
28 |
"{ NameSpace: Tools }" |
|
29 |
||
30 |
ApplicationModel subclass:#ChangeSetDiffTool |
|
12274
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
31 |
instanceVariableNames:'infoPanel diffInfoHolder listHolder singleSelectionHolder |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
32 |
diffsetHolder titleHolder firstColSelectionHolder |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
33 |
navigatorPanelSpecHolder diffMenuHolder diffsetHolderPrivate |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
34 |
selectionHolder versionATextHolder versionBTextHolder |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
35 |
versionBaseTextHolder textDiffToolHolder |
12321
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
36 |
textDiffToolWindowSpecHolder mergeHolder mergeData |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
37 |
mergeDataHolder showVersionMethodDiffsHolder |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
38 |
showCopyrightMethodDiffsHolder highlightConflictsHolder |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
39 |
hasDiffsetHolder mergeSavedHolder canSaveHolder |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
40 |
autoMoveToNextConflictHolder textDiff2App textDiff3App list1App |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
41 |
list2App alreadyWarnedAboutUnsavedMerge' |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
42 |
classVariableNames:'LastDiffInfo AutoMoveToNextConflict' |
10194 | 43 |
poolDictionaries:'' |
44 |
category:'Interface-Diff' |
|
45 |
! |
|
46 |
||
47 |
SimpleDialog subclass:#OpenDialog |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
48 |
instanceVariableNames:'doAcceptEnabled changesetSpecAHolder changesetSpecBHolder |
12200
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
49 |
changesetSpecBaseHolder changesetSpecBaseEnabledHolder |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
50 |
changesetSpecMergedHolder changesetSpecMergedEnabledHolder' |
10194 | 51 |
classVariableNames:'LastDirectory' |
52 |
poolDictionaries:'' |
|
53 |
privateIn:ChangeSetDiffTool |
|
54 |
! |
|
55 |
||
56 |
!ChangeSetDiffTool class methodsFor:'documentation'! |
|
57 |
||
58 |
copyright |
|
59 |
" |
|
60 |
Copyright (c) 2007-2010 Jan Vrany |
|
61 |
Copyright (c) 2009-2010 eXept Software AG |
|
62 |
||
63 |
Permission is hereby granted, free of charge, to any person |
|
64 |
obtaining a copy of this software and associated documentation |
|
65 |
files (the 'Software'), to deal in the Software without |
|
66 |
restriction, including without limitation the rights to use, |
|
67 |
copy, modify, merge, publish, distribute, sublicense, and/or sell |
|
68 |
copies of the Software, and to permit persons to whom the |
|
69 |
Software is furnished to do so, subject to the following |
|
70 |
conditions: |
|
71 |
||
72 |
The above copyright notice and this permission notice shall be |
|
73 |
included in all copies or substantial portions of the Software. |
|
74 |
||
75 |
THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, |
|
76 |
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES |
|
77 |
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND |
|
78 |
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT |
|
79 |
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, |
|
80 |
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING |
|
81 |
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR |
|
82 |
OTHER DEALINGS IN THE SOFTWARE. |
|
83 |
||
84 |
" |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
85 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
86 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
87 |
documentation |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
88 |
" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
89 |
Tool for viewing/merging differences between two change sets |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
90 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
91 |
[author:] |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
92 |
Jan Vrany <jan.vrany@fit.cvut.cz> |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
93 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
94 |
[instance variables:] |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
95 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
96 |
[class variables:] |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
97 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
98 |
[see also:] |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
99 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
100 |
" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
101 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
102 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
103 |
examples |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
104 |
" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
105 |
Starting the application: |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
106 |
[exBegin] |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
107 |
Tools::ChangeSetDiffTool open |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
108 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
109 |
[exEnd] |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
110 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
111 |
Show differences between CVS HEAD and SVN jv-branch |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
112 |
NewSystemBrowser: |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
113 |
[exBegin] |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
114 |
| cvsCs svnCs | |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
115 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
116 |
cvsCs := ChangeSet fromFile:'/home/jv/Private/Projects/SmalltalkX/sources/branches/exept@HEAD/stx/libtool/Tools__NewSystemBrowser.st'. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
117 |
svnCs := ChangeSet fromFile:'/home/jv/Private/Projects/SmalltalkX/sources/branches/jv2/build/stx/libtool/Tools__NewSystemBrowser.st'. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
118 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
119 |
Tools::ChangeSetDiffTool new |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
120 |
open; |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
121 |
fileMenuOpenOnDiffBetween: cvsCs and: svnCs. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
122 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
123 |
[exEnd] |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
124 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
125 |
Show differences between CVS HEAD and SVN jv-branch and |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
126 |
base version of NewSystemBrowser: |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
127 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
128 |
[exBegin] |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
129 |
| cvsBaseCs cvsCs svnCs | |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
130 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
131 |
cvsBaseCs := ChangeSet fromFile:'/home/jv/Private/Projects/SmalltalkX/sources/branches/exept@2012-01-01/stx/libtool/Tools__NewSystemBrowser.st'. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
132 |
cvsCs := ChangeSet fromFile:'/home/jv/Private/Projects/SmalltalkX/sources/branches/exept@HEAD/stx/libtool/Tools__NewSystemBrowser.st'. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
133 |
svnCs := ChangeSet fromFile:'/home/jv/Private/Projects/SmalltalkX/sources/branches/jv2/build/stx/libtool/Tools__NewSystemBrowser.st'. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
134 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
135 |
Tools::ChangeSetDiffTool new |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
136 |
open; |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
137 |
fileMenuOpenOnDiffBetween: cvsCs and: svnCs base: cvsBaseCs |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
138 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
139 |
[exEnd] |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
140 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
141 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
142 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
143 |
" |
10194 | 144 |
! ! |
145 |
||
12321
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
146 |
!ChangeSetDiffTool class methodsFor:'accessing'! |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
147 |
|
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
148 |
autoMoveToNextConflict |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
149 |
^AutoMoveToNextConflict == true |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
150 |
|
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
151 |
"Created: / 17-01-2013 / 19:49:40 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
152 |
! |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
153 |
|
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
154 |
autoMoveToNextConflict: aBoolean |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
155 |
AutoMoveToNextConflict := aBoolean |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
156 |
|
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
157 |
"Created: / 17-01-2013 / 19:49:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
158 |
! ! |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
159 |
|
10194 | 160 |
!ChangeSetDiffTool class methodsFor:'accessing - defaults'! |
161 |
||
162 |
versionAColor |
|
163 |
||
164 |
^Color green lightened lightened |
|
165 |
||
166 |
"Created: / 01-11-2009 / 10:14:24 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
167 |
! |
|
168 |
||
169 |
versionBColor |
|
170 |
||
171 |
^Color blue lightened lightened |
|
172 |
||
173 |
"Created: / 01-11-2009 / 10:14:41 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
174 |
! |
|
175 |
||
176 |
versionBaseColor |
|
177 |
||
178 |
^Color yellow lightened lightened |
|
179 |
||
180 |
"Created: / 01-11-2009 / 10:14:53 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
181 |
! |
|
182 |
||
183 |
versionNotPresentText |
|
184 |
^ 'Not present' asText allItalic colorizeAllWith:Color gray lighter |
|
185 |
! ! |
|
186 |
||
187 |
!ChangeSetDiffTool class methodsFor:'image specs'! |
|
188 |
||
189 |
versionA24x24 |
|
190 |
||
191 |
^ToolbarIconLibrary versionA24x24 |
|
192 |
||
193 |
"Created: / 24-03-2010 / 20:49:41 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
194 |
! |
|
195 |
||
196 |
versionB24x24 |
|
197 |
||
198 |
^ToolbarIconLibrary versionB24x24 |
|
199 |
||
200 |
"Created: / 24-03-2010 / 20:50:38 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
201 |
! ! |
|
202 |
||
12274
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
203 |
!ChangeSetDiffTool class methodsFor:'interface opening'! |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
204 |
|
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
205 |
open |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
206 |
| tool | |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
207 |
|
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
208 |
tool := self new. |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
209 |
tool open. |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
210 |
tool window sensor pushUserEvent: #fileMenuOpen for: tool. |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
211 |
|
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
212 |
"Created: / 01-08-2012 / 15:13:00 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
213 |
! ! |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
214 |
|
10194 | 215 |
!ChangeSetDiffTool class methodsFor:'interface specs'! |
216 |
||
217 |
labelSpec |
|
218 |
"This resource specification was automatically generated |
|
219 |
by the UIPainter of ST/X." |
|
220 |
||
221 |
"Do not manually edit this!! If it is corrupted, |
|
222 |
the UIPainter may not be able to read the specification." |
|
223 |
||
224 |
" |
|
225 |
UIPainter new openOnClass:SVN::DiffBrowser andSelector:#labelSpec |
|
226 |
SVN::DiffBrowser new openInterface:#labelSpec |
|
227 |
" |
|
228 |
||
229 |
<resource: #canvas> |
|
230 |
||
231 |
^ |
|
232 |
#(FullSpec |
|
233 |
name: labelSpec |
|
234 |
window: |
|
235 |
(WindowSpec |
|
236 |
label: 'Label' |
|
237 |
name: 'Label' |
|
238 |
min: (Point 10 10) |
|
239 |
bounds: (Rectangle 0 0 600 48) |
|
240 |
) |
|
241 |
component: |
|
242 |
(SpecCollection |
|
243 |
collection: ( |
|
244 |
(UISubSpecification |
|
245 |
name: 'LabelA' |
|
246 |
layout: (LayoutFrame 0 0 0 0 0 1 0 0.5) |
|
247 |
minorKey: versionALabelSpec |
|
248 |
) |
|
249 |
(UISubSpecification |
|
250 |
name: 'LabelB' |
|
251 |
layout: (LayoutFrame 0 0 0 0.5 0 1 0 1) |
|
252 |
minorKey: versionBLabelSpec |
|
253 |
) |
|
254 |
) |
|
255 |
||
256 |
) |
|
257 |
) |
|
258 |
! |
|
259 |
||
260 |
oneColumnNavigatorSpec |
|
261 |
"This resource specification was automatically generated |
|
262 |
by the UIPainter of ST/X." |
|
263 |
||
264 |
"Do not manually edit this!! If it is corrupted, |
|
265 |
the UIPainter may not be able to read the specification." |
|
266 |
||
267 |
" |
|
12232
4d9b62c111fc
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
268 |
UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#oneColumnNavigatorSpec |
4d9b62c111fc
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
269 |
Tools::ChangeSetDiffTool new openInterface:#oneColumnNavigatorSpec |
10194 | 270 |
" |
271 |
||
272 |
<resource: #canvas> |
|
273 |
||
274 |
^ |
|
275 |
#(FullSpec |
|
276 |
name: oneColumnNavigatorSpec |
|
277 |
window: |
|
278 |
(WindowSpec |
|
279 |
label: 'One Column Navigator' |
|
280 |
name: 'One Column Navigator' |
|
281 |
min: (Point 10 10) |
|
282 |
bounds: (Rectangle 0 0 300 300) |
|
283 |
) |
|
284 |
component: |
|
285 |
(SpecCollection |
|
286 |
collection: ( |
|
287 |
(SubCanvasSpec |
|
288 |
name: 'DiffList' |
|
289 |
layout: (LayoutFrame 0 0 0 0 0 1 0 1) |
|
290 |
hasHorizontalScrollBar: false |
|
291 |
hasVerticalScrollBar: false |
|
292 |
majorKey: #'Tools::ChangeSetDiffList' |
|
293 |
subAspectHolders: |
|
294 |
(Array |
|
295 |
||
296 |
(SubChannelInfoSpec |
|
12320
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
297 |
subAspect: highlightConflictsHolder |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
298 |
aspect: highlightConflictsHolder |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
299 |
) |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
300 |
(SubChannelInfoSpec |
10194 | 301 |
subAspect: inGeneratorHolder |
302 |
aspect: diffsetHolderPrivate |
|
12320
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
303 |
) |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
304 |
|
10194 | 305 |
(SubChannelInfoSpec |
306 |
subAspect: listEntryLabelGenerator |
|
307 |
aspect: diffListEntryLabelGeneratorAspect |
|
12320
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
308 |
) |
10194 | 309 |
(SubChannelInfoSpec |
310 |
subAspect: menuHolder |
|
311 |
aspect: listMenuHolder |
|
12320
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
312 |
) |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
313 |
|
10194 | 314 |
(SubChannelInfoSpec |
315 |
subAspect: outGeneratorHolder |
|
316 |
aspect: selectionHolder |
|
12320
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
317 |
) |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
318 |
(SubChannelInfoSpec |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
319 |
subAspect: showCopyrightMethodDiffsHolder |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
320 |
aspect: showCopyrightMethodDiffsHolder |
10194 | 321 |
) |
12232
4d9b62c111fc
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
322 |
|
4d9b62c111fc
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
323 |
(SubChannelInfoSpec |
4d9b62c111fc
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
324 |
subAspect: showVersionMethodDiffsHolder |
4d9b62c111fc
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
325 |
aspect: showVersionMethodDiffsHolder |
4d9b62c111fc
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
326 |
) |
10194 | 327 |
) |
328 |
createNewApplication: true |
|
329 |
createNewBuilder: false |
|
12320
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
330 |
postBuildCallback: list1View: |
10194 | 331 |
) |
332 |
) |
|
333 |
||
334 |
) |
|
335 |
) |
|
336 |
! |
|
337 |
||
338 |
twoColumnNavigatorSpec |
|
339 |
"This resource specification was automatically generated |
|
340 |
by the UIPainter of ST/X." |
|
341 |
||
342 |
"Do not manually edit this!! If it is corrupted, |
|
343 |
the UIPainter may not be able to read the specification." |
|
344 |
||
345 |
" |
|
12232
4d9b62c111fc
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
346 |
UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#twoColumnNavigatorSpec |
4d9b62c111fc
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
347 |
Tools::ChangeSetDiffTool new openInterface:#twoColumnNavigatorSpec |
10194 | 348 |
" |
349 |
||
350 |
<resource: #canvas> |
|
351 |
||
352 |
^ |
|
353 |
#(FullSpec |
|
354 |
name: twoColumnNavigatorSpec |
|
355 |
window: |
|
356 |
(WindowSpec |
|
357 |
label: 'Two Column Navigator' |
|
358 |
name: 'Two Column Navigator' |
|
359 |
min: (Point 10 10) |
|
360 |
bounds: (Rectangle 0 0 300 300) |
|
361 |
) |
|
362 |
component: |
|
363 |
(SpecCollection |
|
364 |
collection: ( |
|
365 |
(VariableHorizontalPanelSpec |
|
366 |
name: 'Columns' |
|
367 |
layout: (LayoutFrame 0 0 0 0 0 1 0 1) |
|
368 |
component: |
|
369 |
(SpecCollection |
|
370 |
collection: ( |
|
371 |
(SubCanvasSpec |
|
12320
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
372 |
name: 'LeftList' |
10194 | 373 |
hasHorizontalScrollBar: false |
374 |
hasVerticalScrollBar: false |
|
375 |
majorKey: #'Tools::ChangeSetDiffList' |
|
376 |
subAspectHolders: |
|
377 |
(Array |
|
378 |
||
379 |
(SubChannelInfoSpec |
|
12320
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
380 |
subAspect: highlightConflictsHolder |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
381 |
aspect: highlightConflictsHolder |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
382 |
) |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
383 |
(SubChannelInfoSpec |
10194 | 384 |
subAspect: inGeneratorHolder |
385 |
aspect: diffsetHolderPrivate |
|
12320
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
386 |
) |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
387 |
|
10194 | 388 |
(SubChannelInfoSpec |
389 |
subAspect: listEntryLabelGenerator |
|
390 |
aspect: diffListEntryLabelGeneratorAspect |
|
12320
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
391 |
) |
10194 | 392 |
(SubChannelInfoSpec |
393 |
subAspect: menuHolder |
|
394 |
aspect: listMenuHolder |
|
12320
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
395 |
) |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
396 |
|
10194 | 397 |
(SubChannelInfoSpec |
398 |
subAspect: outGeneratorHolder |
|
399 |
aspect: firstColSelectionHolder |
|
12320
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
400 |
) |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
401 |
(SubChannelInfoSpec |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
402 |
subAspect: showCopyrightMethodDiffsHolder |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
403 |
aspect: showCopyrightMethodDiffsHolder |
10194 | 404 |
) |
12232
4d9b62c111fc
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
405 |
|
4d9b62c111fc
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
406 |
(SubChannelInfoSpec |
4d9b62c111fc
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
407 |
subAspect: showVersionMethodDiffsHolder |
4d9b62c111fc
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
408 |
aspect: showVersionMethodDiffsHolder |
4d9b62c111fc
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
409 |
) |
10194 | 410 |
) |
411 |
createNewApplication: true |
|
412 |
createNewBuilder: true |
|
12320
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
413 |
postBuildCallback: list1View: |
10194 | 414 |
) |
415 |
(SubCanvasSpec |
|
12320
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
416 |
name: 'RightList' |
10194 | 417 |
hasHorizontalScrollBar: false |
418 |
hasVerticalScrollBar: false |
|
419 |
majorKey: #'Tools::ChangeSetDiffList' |
|
420 |
subAspectHolders: |
|
421 |
(Array |
|
422 |
||
423 |
(SubChannelInfoSpec |
|
12320
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
424 |
subAspect: highlightConflictsHolder |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
425 |
aspect: highlightConflictsHolder |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
426 |
) |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
427 |
(SubChannelInfoSpec |
10194 | 428 |
subAspect: inGeneratorHolder |
429 |
aspect: firstColSelectionHolder |
|
12320
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
430 |
) |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
431 |
|
10194 | 432 |
(SubChannelInfoSpec |
433 |
subAspect: listEntryLabelGenerator |
|
434 |
aspect: diffListEntryLabelGeneratorAspect |
|
12320
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
435 |
) |
10194 | 436 |
(SubChannelInfoSpec |
437 |
subAspect: menuHolder |
|
438 |
aspect: listMenuHolder |
|
12320
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
439 |
) |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
440 |
|
10194 | 441 |
(SubChannelInfoSpec |
442 |
subAspect: outGeneratorHolder |
|
443 |
aspect: selectionHolder |
|
12320
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
444 |
) |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
445 |
(SubChannelInfoSpec |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
446 |
subAspect: showCopyrightMethodDiffsHolder |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
447 |
aspect: showCopyrightMethodDiffsHolder |
10194 | 448 |
) |
12232
4d9b62c111fc
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
449 |
|
4d9b62c111fc
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
450 |
(SubChannelInfoSpec |
4d9b62c111fc
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
451 |
subAspect: showVersionMethodDiffsHolder |
4d9b62c111fc
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
452 |
aspect: showVersionMethodDiffsHolder |
4d9b62c111fc
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
453 |
) |
10194 | 454 |
) |
455 |
createNewApplication: true |
|
456 |
createNewBuilder: true |
|
12320
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
457 |
postBuildCallback: list2View: |
10194 | 458 |
) |
459 |
) |
|
460 |
||
461 |
) |
|
462 |
handles: (Any 0.5 1.0) |
|
463 |
) |
|
464 |
) |
|
465 |
||
466 |
) |
|
467 |
) |
|
468 |
! |
|
469 |
||
470 |
windowSpec |
|
471 |
"This resource specification was automatically generated |
|
472 |
by the UIPainter of ST/X." |
|
473 |
||
474 |
"Do not manually edit this!! If it is corrupted, |
|
475 |
the UIPainter may not be able to read the specification." |
|
476 |
||
477 |
" |
|
478 |
UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#windowSpec |
|
479 |
Tools::ChangeSetDiffTool new openInterface:#windowSpec |
|
480 |
Tools::ChangeSetDiffTool open |
|
481 |
" |
|
482 |
||
483 |
<resource: #canvas> |
|
484 |
||
485 |
^ |
|
486 |
#(FullSpec |
|
487 |
name: windowSpec |
|
488 |
window: |
|
489 |
(WindowSpec |
|
490 |
label: 'Diff Browser' |
|
491 |
name: 'Diff Browser' |
|
492 |
min: (Point 10 10) |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
493 |
bounds: (Rectangle 0 0 1024 768) |
10194 | 494 |
menu: mainMenu |
495 |
) |
|
496 |
component: |
|
497 |
(SpecCollection |
|
498 |
collection: ( |
|
12320
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
499 |
(MenuPanelSpec |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
500 |
name: 'ToolBar' |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
501 |
layout: (LayoutFrame 0 0 0 0 0 1 30 0) |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
502 |
menu: toolbarMenu |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
503 |
textDefault: true |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
504 |
) |
12274
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
505 |
(SubCanvasSpec |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
506 |
name: 'InfoPanel' |
12320
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
507 |
layout: (LayoutFrame 0 0 30 0 0 1 70 0) |
12274
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
508 |
level: 0 |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
509 |
initiallyInvisible: true |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
510 |
hasHorizontalScrollBar: false |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
511 |
hasVerticalScrollBar: false |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
512 |
clientKey: infoPanel |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
513 |
createNewBuilder: false |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
514 |
) |
12321
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
515 |
(ViewSpec |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
516 |
name: 'Content' |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
517 |
layout: (LayoutFrame 0 0 30 0 0 1 0 1) |
10194 | 518 |
component: |
519 |
(SpecCollection |
|
520 |
collection: ( |
|
12321
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
521 |
(UISubSpecification |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
522 |
name: 'Label' |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
523 |
layout: (LayoutFrame 0 0 0 0 0 1 56 0) |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
524 |
initiallyInvisible: true |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
525 |
visibilityChannel: hasDiffsetHolder |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
526 |
minorKey: labelSpec |
10194 | 527 |
) |
12321
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
528 |
(VariableVerticalPanelSpec |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
529 |
name: 'Panel' |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
530 |
layout: (LayoutFrame 0 0 56 0 0 1 0 1) |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
531 |
initiallyInvisible: true |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
532 |
visibilityChannel: hasDiffsetHolder |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
533 |
showHandle: true |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
534 |
component: |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
535 |
(SpecCollection |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
536 |
collection: ( |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
537 |
(SubCanvasSpec |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
538 |
name: 'NavigatorPanel' |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
539 |
hasHorizontalScrollBar: false |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
540 |
hasVerticalScrollBar: false |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
541 |
specHolder: navigatorPanelSpecHolder |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
542 |
createNewBuilder: false |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
543 |
) |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
544 |
(SubCanvasSpec |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
545 |
name: 'SubCanvas1' |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
546 |
specHolder: textDiffToolWindowSpecHolder |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
547 |
clientHolder: textDiffToolHolder |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
548 |
createNewBuilder: false |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
549 |
) |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
550 |
) |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
551 |
|
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
552 |
) |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
553 |
handles: (Any 0.5 1.0) |
10194 | 554 |
) |
555 |
) |
|
556 |
||
557 |
) |
|
558 |
) |
|
559 |
) |
|
560 |
||
561 |
) |
|
562 |
) |
|
563 |
! ! |
|
564 |
||
565 |
!ChangeSetDiffTool class methodsFor:'interface specs - labels'! |
|
566 |
||
567 |
versionALabelSpec |
|
568 |
"This resource specification was automatically generated |
|
569 |
by the UIPainter of ST/X." |
|
570 |
||
571 |
"Do not manually edit this!! If it is corrupted, |
|
572 |
the UIPainter may not be able to read the specification." |
|
573 |
||
574 |
" |
|
575 |
UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#versionALabelSpec |
|
576 |
Tools::ChangeSetDiffTool new openInterface:#versionALabelSpec |
|
577 |
" |
|
578 |
||
579 |
<resource: #canvas> |
|
580 |
||
581 |
^ |
|
582 |
#(FullSpec |
|
583 |
name: versionALabelSpec |
|
584 |
window: |
|
585 |
(WindowSpec |
|
586 |
label: 'Version A' |
|
587 |
name: 'Version A' |
|
588 |
min: (Point 10 10) |
|
589 |
bounds: (Rectangle 0 0 300 30) |
|
590 |
backgroundColor: (Color 79.6078431372549 90.5882352941177 69.4117647058823) |
|
591 |
forceRecursiveBackground: true |
|
592 |
) |
|
593 |
component: |
|
594 |
(SpecCollection |
|
595 |
collection: ( |
|
596 |
(LabelSpec |
|
597 |
label: 'versionA24x24' |
|
598 |
name: 'VersionAIcon' |
|
599 |
layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5) |
|
600 |
hasCharacterOrientedLabel: false |
|
601 |
translateLabel: true |
|
602 |
) |
|
603 |
(LabelSpec |
|
604 |
label: 'Version A' |
|
605 |
name: 'VersionALabel' |
|
606 |
layout: (LayoutFrame 30 0 0 0 0 1 0 1) |
|
607 |
translateLabel: true |
|
608 |
labelChannel: versionALabelHolder |
|
609 |
resizeForLabel: true |
|
610 |
adjust: left |
|
611 |
) |
|
12125 | 612 |
(LabelSpec |
613 |
label: '(A)' |
|
614 |
name: 'ALabel' |
|
615 |
layout: (LayoutFrame -30 1 0 0 0 1 0 1) |
|
616 |
translateLabel: true |
|
617 |
) |
|
10194 | 618 |
) |
619 |
||
620 |
) |
|
621 |
) |
|
622 |
! |
|
623 |
||
624 |
versionBLabelSpec |
|
625 |
"This resource specification was automatically generated |
|
626 |
by the UIPainter of ST/X." |
|
627 |
||
628 |
"Do not manually edit this!! If it is corrupted, |
|
629 |
the UIPainter may not be able to read the specification." |
|
630 |
||
631 |
" |
|
632 |
UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#versionBLabelSpec |
|
633 |
Tools::ChangeSetDiffTool new openInterface:#versionBLabelSpec |
|
634 |
" |
|
635 |
||
636 |
<resource: #canvas> |
|
637 |
||
638 |
^ |
|
639 |
#(FullSpec |
|
640 |
name: versionBLabelSpec |
|
641 |
window: |
|
642 |
(WindowSpec |
|
643 |
label: 'Version B' |
|
644 |
name: 'Version B' |
|
645 |
min: (Point 10 10) |
|
646 |
bounds: (Rectangle 0 0 300 30) |
|
647 |
backgroundColor: (Color 100.0 90.5882352941177 60.0) |
|
648 |
forceRecursiveBackground: true |
|
649 |
) |
|
650 |
component: |
|
651 |
(SpecCollection |
|
652 |
collection: ( |
|
653 |
(LabelSpec |
|
654 |
label: 'versionB24x24' |
|
655 |
name: 'VersionBIcon' |
|
656 |
layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5) |
|
657 |
hasCharacterOrientedLabel: false |
|
658 |
translateLabel: true |
|
659 |
) |
|
660 |
(LabelSpec |
|
661 |
label: 'Version B' |
|
662 |
name: 'VersionBLabel' |
|
663 |
layout: (LayoutFrame 30 0 0 0 167 0 0 1) |
|
664 |
translateLabel: true |
|
665 |
labelChannel: versionBLabelHolder |
|
666 |
resizeForLabel: true |
|
667 |
adjust: left |
|
668 |
useDynamicPreferredWidth: true |
|
669 |
usePreferredWidth: true |
|
670 |
) |
|
12125 | 671 |
(LabelSpec |
672 |
label: '(B)' |
|
673 |
name: 'BLabel' |
|
674 |
layout: (LayoutFrame -30 1 0 0 0 1 0 1) |
|
675 |
translateLabel: true |
|
676 |
) |
|
10194 | 677 |
) |
678 |
||
679 |
) |
|
680 |
) |
|
12125 | 681 |
|
682 |
"Modified: / 16-12-2011 / 14:17:33 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
10194 | 683 |
! ! |
684 |
||
685 |
!ChangeSetDiffTool class methodsFor:'menu specs'! |
|
686 |
||
12320
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
687 |
listMenuDiff |
10194 | 688 |
"This resource specification was automatically generated |
689 |
by the MenuEditor of ST/X." |
|
690 |
||
691 |
"Do not manually edit this!! If it is corrupted, |
|
692 |
the MenuEditor may not be able to read the specification." |
|
693 |
||
12192
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
694 |
|
10194 | 695 |
" |
12192
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
696 |
MenuEditor new openOnClass:Tools::ChangeSetDiffTool andSelector:#listMenu |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
697 |
(Menu new fromLiteralArrayEncoding:(Tools::ChangeSetDiffTool listMenu)) startUp |
10194 | 698 |
" |
699 |
||
700 |
<resource: #menu> |
|
701 |
||
702 |
^ |
|
703 |
#(Menu |
|
704 |
( |
|
705 |
(MenuItem |
|
12256
abdcf041d2ce
- Tools::ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12232
diff
changeset
|
706 |
enabled: hasSelection |
10194 | 707 |
label: 'Browse' |
708 |
itemValue: listMenuBrowse |
|
709 |
translateLabel: true |
|
710 |
) |
|
711 |
(MenuItem |
|
712 |
label: '-' |
|
713 |
) |
|
714 |
(MenuItem |
|
12256
abdcf041d2ce
- Tools::ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12232
diff
changeset
|
715 |
enabled: hasSelection |
10194 | 716 |
label: 'Load version A' |
717 |
itemValue: listMenuLoadVersionA |
|
718 |
nameKey: LoadVersionA |
|
719 |
translateLabel: true |
|
720 |
labelImage: (ResourceRetriever #'SVN::IconLibrary' versionA16x16 'Load version A') |
|
721 |
) |
|
722 |
(MenuItem |
|
12256
abdcf041d2ce
- Tools::ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12232
diff
changeset
|
723 |
enabled: hasSelection |
10194 | 724 |
label: 'Load version B' |
725 |
itemValue: listMenuLoadVersionB |
|
726 |
nameKey: LoadVersionB |
|
727 |
translateLabel: true |
|
728 |
labelImage: (ResourceRetriever #'SVN::IconLibrary' versionB16x16 'Load version B') |
|
729 |
) |
|
730 |
(MenuItem |
|
731 |
label: '-' |
|
732 |
) |
|
733 |
(MenuItem |
|
12192
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
734 |
label: 'Open in...' |
10194 | 735 |
translateLabel: true |
12192
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
736 |
submenu: |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
737 |
(Menu |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
738 |
( |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
739 |
(MenuItem |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
740 |
enabled: hasSelection |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
741 |
label: 'Inspector' |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
742 |
itemValue: listMenuInspect |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
743 |
translateLabel: true |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
744 |
) |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
745 |
(MenuItem |
12256
abdcf041d2ce
- Tools::ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12232
diff
changeset
|
746 |
enabled: hasSelection |
12192
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
747 |
label: 'kdiff3' |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
748 |
itemValue: listMenuOpenInExternal: |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
749 |
translateLabel: true |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
750 |
argument: 'kdiff3' |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
751 |
) |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
752 |
(MenuItem |
12256
abdcf041d2ce
- Tools::ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12232
diff
changeset
|
753 |
enabled: hasSelection |
12192
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
754 |
label: 'meld' |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
755 |
itemValue: listMenuOpenInExternal: |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
756 |
translateLabel: true |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
757 |
argument: 'meld' |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
758 |
) |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
759 |
) |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
760 |
nil |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
761 |
nil |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
762 |
) |
10194 | 763 |
) |
764 |
) |
|
765 |
nil |
|
766 |
nil |
|
767 |
) |
|
12320
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
768 |
|
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
769 |
"Created: / 16-01-2013 / 15:47:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
770 |
! |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
771 |
|
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
772 |
listMenuMerge |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
773 |
"This resource specification was automatically generated |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
774 |
by the MenuEditor of ST/X." |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
775 |
|
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
776 |
"Do not manually edit this!! If it is corrupted, |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
777 |
the MenuEditor may not be able to read the specification." |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
778 |
|
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
779 |
|
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
780 |
" |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
781 |
MenuEditor new openOnClass:Tools::ChangeSetDiffTool andSelector:#listMenuMerge |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
782 |
(Menu new fromLiteralArrayEncoding:(Tools::ChangeSetDiffTool listMenuMerge)) startUp |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
783 |
" |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
784 |
|
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
785 |
<resource: #menu> |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
786 |
|
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
787 |
^ |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
788 |
#(Menu |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
789 |
( |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
790 |
(MenuItem |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
791 |
enabled: hasSelection |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
792 |
label: 'Browse' |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
793 |
itemValue: listMenuBrowse |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
794 |
) |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
795 |
(MenuItem |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
796 |
label: '-' |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
797 |
) |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
798 |
(MenuItem |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
799 |
enabled: hasSelection |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
800 |
label: 'Merge using A' |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
801 |
itemValue: listMenuMergeUsingA |
12321
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
802 |
shortcutKey: Cmd2 |
12320
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
803 |
) |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
804 |
(MenuItem |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
805 |
enabled: hasSelection |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
806 |
label: 'Merge using B' |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
807 |
itemValue: listMenuMergeUsingB |
12321
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
808 |
shortcutKey: Cmd3 |
12320
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
809 |
) |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
810 |
(MenuItem |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
811 |
enabled: hasSelection |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
812 |
label: 'Merge using Base' |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
813 |
itemValue: listMenuMergeUsingBase |
12321
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
814 |
shortcutKey: Cmd1 |
12320
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
815 |
) |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
816 |
(MenuItem |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
817 |
label: '-' |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
818 |
) |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
819 |
(MenuItem |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
820 |
label: 'Open in...' |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
821 |
submenu: |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
822 |
(Menu |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
823 |
( |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
824 |
(MenuItem |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
825 |
enabled: hasSelection |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
826 |
label: 'Inspector' |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
827 |
itemValue: listMenuInspect |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
828 |
) |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
829 |
(MenuItem |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
830 |
enabled: hasSelection |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
831 |
label: 'kdiff3' |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
832 |
itemValue: listMenuOpenInExternal: |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
833 |
argument: 'kdiff3' |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
834 |
) |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
835 |
(MenuItem |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
836 |
enabled: hasSelection |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
837 |
label: 'meld' |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
838 |
itemValue: listMenuOpenInExternal: |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
839 |
argument: 'meld' |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
840 |
) |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
841 |
) |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
842 |
nil |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
843 |
nil |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
844 |
) |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
845 |
) |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
846 |
) |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
847 |
nil |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
848 |
nil |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
849 |
) |
10194 | 850 |
! |
851 |
||
852 |
mainMenu |
|
853 |
"This resource specification was automatically generated |
|
854 |
by the MenuEditor of ST/X." |
|
855 |
||
856 |
"Do not manually edit this!! If it is corrupted, |
|
857 |
the MenuEditor may not be able to read the specification." |
|
858 |
||
12125 | 859 |
|
10194 | 860 |
" |
12125 | 861 |
MenuEditor new openOnClass:Tools::ChangeSetDiffTool andSelector:#mainMenu |
862 |
(Menu new fromLiteralArrayEncoding:(Tools::ChangeSetDiffTool mainMenu)) startUp |
|
10194 | 863 |
" |
864 |
||
865 |
<resource: #menu> |
|
866 |
||
867 |
^ |
|
868 |
#(Menu |
|
869 |
( |
|
870 |
(MenuItem |
|
871 |
label: 'File' |
|
872 |
submenu: |
|
873 |
(Menu |
|
874 |
( |
|
875 |
(MenuItem |
|
12276 | 876 |
label: 'Open...' |
10194 | 877 |
itemValue: fileMenuOpen |
878 |
shortcutKey: Ctrlo |
|
879 |
) |
|
880 |
(MenuItem |
|
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
881 |
enabled: canSave |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
882 |
label: 'Save' |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
883 |
itemValue: fileMenuSave |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
884 |
shortcutKey: Ctrls |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
885 |
) |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
886 |
(MenuItem |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
887 |
enabled: canSaveAs |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
888 |
label: 'Save As...' |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
889 |
itemValue: fileMenuSaveAs |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
890 |
) |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
891 |
(MenuItem |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
892 |
enabled: canSaveAsPatch |
12276 | 893 |
label: 'Save As Patch ' |
10194 | 894 |
itemValue: fileMenuSaveAsPatch |
12276 | 895 |
isVisible: false |
896 |
) |
|
897 |
(MenuItem |
|
898 |
enabled: canSaveMergedAs |
|
899 |
label: 'Save Merged as... ' |
|
900 |
itemValue: fileMenuSaveMergedAs |
|
10194 | 901 |
) |
902 |
(MenuItem |
|
903 |
label: '-' |
|
904 |
) |
|
905 |
(MenuItem |
|
906 |
label: 'Exit' |
|
907 |
itemValue: closeRequest |
|
12202
eaa1f6cb6ce8
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12201
diff
changeset
|
908 |
shortcutKey: Ctrlq |
10194 | 909 |
) |
910 |
) |
|
911 |
nil |
|
912 |
nil |
|
913 |
) |
|
914 |
) |
|
915 |
(MenuItem |
|
12125 | 916 |
label: 'Changeset' |
917 |
submenu: |
|
918 |
(Menu |
|
919 |
( |
|
920 |
(MenuItem |
|
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
921 |
enabled: isDiff2Or3 |
12125 | 922 |
label: 'Browse changes (A)' |
923 |
itemValue: changesetMenuBrowseA |
|
924 |
) |
|
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
925 |
(MenuItem |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
926 |
enabled: isDiff2Or3 |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
927 |
label: 'Browse changes (B)' |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
928 |
itemValue: changesetMenuBrowseB |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
929 |
) |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
930 |
(MenuItem |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
931 |
enabled: isDiff3 |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
932 |
label: 'Browse changes (Base)' |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
933 |
itemValue: changesetMenuBrowseBase |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
934 |
) |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
935 |
(MenuItem |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
936 |
enabled: isMerge |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
937 |
label: 'Browse changes (Merge)' |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
938 |
itemValue: changesetMenuBrowseMerge |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
939 |
) |
12125 | 940 |
) |
941 |
nil |
|
942 |
nil |
|
943 |
) |
|
944 |
) |
|
945 |
(MenuItem |
|
12321
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
946 |
label: 'Movement' |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
947 |
submenu: |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
948 |
(Menu |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
949 |
( |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
950 |
(MenuItem |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
951 |
label: 'Go to Previous Delta' |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
952 |
itemValue: menuMoveUp |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
953 |
) |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
954 |
(MenuItem |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
955 |
label: 'Go To Next Delta' |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
956 |
itemValue: menuMoveDown |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
957 |
) |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
958 |
(MenuItem |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
959 |
label: 'Go to Previous Conflict' |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
960 |
itemValue: menuMoveUpConflict |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
961 |
shortcutKey: AltUp |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
962 |
) |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
963 |
(MenuItem |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
964 |
label: 'Go to Previous Conflict' |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
965 |
itemValue: menuMoveUpConflict |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
966 |
shortcutKey: CmdCursorUp |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
967 |
) |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
968 |
(MenuItem |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
969 |
label: 'Go to Next Conflict' |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
970 |
itemValue: menuMoveDownConflict |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
971 |
shortcutKey: CmdCursorDown |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
972 |
) |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
973 |
(MenuItem |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
974 |
label: '-' |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
975 |
) |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
976 |
(MenuItem |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
977 |
label: 'Automatically Go to Next Conflict' |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
978 |
indication: autoMoveToNextConflictHolder |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
979 |
) |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
980 |
) |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
981 |
nil |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
982 |
nil |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
983 |
) |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
984 |
) |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
985 |
(MenuItem |
12320
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
986 |
label: 'Change' |
10194 | 987 |
submenuChannel: listMenu |
988 |
) |
|
12232
4d9b62c111fc
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
989 |
(MenuItem |
4d9b62c111fc
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
990 |
label: 'View' |
4d9b62c111fc
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
991 |
submenu: |
4d9b62c111fc
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
992 |
(Menu |
4d9b62c111fc
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
993 |
( |
4d9b62c111fc
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
994 |
(MenuItem |
4d9b62c111fc
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
995 |
label: 'Show Diffs in Version Methods' |
4d9b62c111fc
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
996 |
indication: showVersionMethodDiffsHolder |
4d9b62c111fc
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
997 |
) |
12274
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
998 |
(MenuItem |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
999 |
label: 'Show Diff in #copyright Methods' |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1000 |
indication: showCopyrightMethodDiffsHolder |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1001 |
) |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1002 |
(MenuItem |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1003 |
label: 'Highlight Conflicts' |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1004 |
indication: highlightConflictsHolder |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1005 |
) |
12232
4d9b62c111fc
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
1006 |
) |
4d9b62c111fc
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
1007 |
nil |
4d9b62c111fc
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
1008 |
nil |
4d9b62c111fc
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
1009 |
) |
4d9b62c111fc
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
1010 |
) |
10194 | 1011 |
) |
1012 |
nil |
|
1013 |
nil |
|
1014 |
) |
|
12320
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1015 |
! |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1016 |
|
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1017 |
toolbarMenu |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1018 |
"This resource specification was automatically generated |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1019 |
by the MenuEditor of ST/X." |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1020 |
|
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1021 |
"Do not manually edit this!! If it is corrupted, |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1022 |
the MenuEditor may not be able to read the specification." |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1023 |
|
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1024 |
|
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1025 |
" |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1026 |
MenuEditor new openOnClass:Tools::ChangeSetDiffTool andSelector:#toolbarMenu |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1027 |
(Menu new fromLiteralArrayEncoding:(Tools::ChangeSetDiffTool toolbarMenu)) startUp |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1028 |
" |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1029 |
|
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1030 |
<resource: #menu> |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1031 |
|
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1032 |
^ |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1033 |
#(Menu |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1034 |
( |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1035 |
(MenuItem |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1036 |
label: 'Open' |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1037 |
itemValue: fileMenuOpen |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1038 |
isButton: true |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1039 |
labelImage: (ResourceRetriever ToolbarIconLibrary loadFromFile22x22Icon) |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1040 |
) |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1041 |
(MenuItem |
12321
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1042 |
enabled: canSaveHolder |
12320
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1043 |
label: 'Save' |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1044 |
itemValue: fileMenuSave |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1045 |
isButton: true |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1046 |
labelImage: (ResourceRetriever ToolbarIconLibrary saveImageIcon) |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1047 |
) |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1048 |
(MenuItem |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1049 |
label: '-' |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1050 |
) |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1051 |
(MenuItem |
12321
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1052 |
label: 'Go to Previous Delta' |
12320
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1053 |
itemValue: menuMoveUp |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1054 |
isButton: true |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1055 |
labelImage: (ResourceRetriever ToolbarIconLibrary mergePrev24x24) |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1056 |
) |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1057 |
(MenuItem |
12321
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1058 |
label: 'Go To Next Delta' |
12320
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1059 |
itemValue: menuMoveDown |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1060 |
isButton: true |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1061 |
labelImage: (ResourceRetriever ToolbarIconLibrary mergeNext24x24) |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1062 |
) |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1063 |
(MenuItem |
12321
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1064 |
label: 'Go to Previous Conflict' |
12320
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1065 |
itemValue: menuMoveUpConflict |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1066 |
isButton: true |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1067 |
labelImage: (ResourceRetriever ToolbarIconLibrary mergePrevConflict24x24) |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1068 |
) |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1069 |
(MenuItem |
12321
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1070 |
label: 'Go to Next Conflict' |
12320
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1071 |
itemValue: menuMoveDownConflict |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1072 |
isButton: true |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1073 |
labelImage: (ResourceRetriever ToolbarIconLibrary mergeNextConflict24x24) |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1074 |
) |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1075 |
(MenuItem |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1076 |
label: '-' |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1077 |
) |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1078 |
(MenuItem |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1079 |
label: 'Merge using Base' |
12321
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1080 |
itemValue: listMenuMergeUsingBase |
12320
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1081 |
isButton: true |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1082 |
labelImage: (ResourceRetriever ToolbarIconLibrary mergeUsingBase24x24) |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1083 |
) |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1084 |
(MenuItem |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1085 |
label: 'Merge using A' |
12321
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1086 |
itemValue: listMenuMergeUsingA |
12320
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1087 |
isButton: true |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1088 |
labelImage: (ResourceRetriever ToolbarIconLibrary mergeUsingA24x24) |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1089 |
) |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1090 |
(MenuItem |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1091 |
label: 'Merge using B' |
12321
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1092 |
itemValue: listMenuMergeUsingB |
12320
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1093 |
isButton: true |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1094 |
labelImage: (ResourceRetriever ToolbarIconLibrary mergeUsingB24x24) |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1095 |
) |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1096 |
) |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1097 |
nil |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1098 |
nil |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1099 |
) |
12321
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1100 |
|
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1101 |
"Modified: / 17-01-2013 / 21:23:26 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10194 | 1102 |
! ! |
1103 |
||
1104 |
!ChangeSetDiffTool class methodsFor:'plugIn spec'! |
|
1105 |
||
1106 |
aspectSelectors |
|
1107 |
"This resource specification was automatically generated |
|
1108 |
by the UIPainter of ST/X." |
|
1109 |
||
1110 |
"Do not manually edit this. If it is corrupted, |
|
1111 |
the UIPainter may not be able to read the specification." |
|
1112 |
||
1113 |
"Return a description of exported aspects; |
|
1114 |
these can be connected to aspects of an embedding application |
|
1115 |
(if this app is embedded in a subCanvas)." |
|
1116 |
||
1117 |
^ #( |
|
1118 |
#diffsetHolder |
|
1119 |
). |
|
1120 |
||
1121 |
! ! |
|
1122 |
||
1123 |
!ChangeSetDiffTool methodsFor:'accessing'! |
|
1124 |
||
1125 |
beSingleColumn |
|
1126 |
||
1127 |
self navigatorPanelSpecHolder value: #oneColumnNavigatorSpec |
|
1128 |
||
1129 |
"Created: / 20-11-2009 / 20:41:58 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1130 |
! |
|
1131 |
||
1132 |
beTwoColumn |
|
1133 |
||
1134 |
self navigatorPanelSpecHolder value: #twoColumnNavigatorSpec |
|
1135 |
||
1136 |
"Created: / 20-11-2009 / 20:42:09 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1137 |
! |
|
1138 |
||
1139 |
beTwoColumn: aBoolean |
|
1140 |
||
1141 |
aBoolean |
|
1142 |
ifTrue:[self beTwoColumn] |
|
1143 |
ifFalse:[self beSingleColumn] |
|
1144 |
||
1145 |
"Created: / 20-11-2009 / 20:43:12 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1146 |
! |
|
1147 |
||
12200
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1148 |
diffInfo |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1149 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1150 |
^self diffInfoHolder value |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1151 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1152 |
"Created: / 20-03-2012 / 11:00:45 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1153 |
! |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1154 |
|
10194 | 1155 |
diffset |
1156 |
||
1157 |
^self diffsetHolder value |
|
1158 |
||
1159 |
"Created: / 05-12-2009 / 11:53:00 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1160 |
! |
|
1161 |
||
1162 |
diffset: aDiff3Set |
|
1163 |
||
1164 |
self diffsetHolder value: aDiff3Set |
|
1165 |
||
1166 |
"Created: / 01-11-2009 / 09:33:24 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1167 |
! |
|
1168 |
||
1169 |
patchset |
|
1170 |
||
1171 |
| patchset | |
|
1172 |
patchset := ChangeSet new. |
|
1173 |
self diffset do: |
|
1174 |
[:diff|patchset add:diff versionA]. |
|
1175 |
^patchset |
|
1176 |
||
1177 |
"Created: / 05-12-2009 / 11:54:12 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1178 |
! |
|
1179 |
||
1180 |
selection |
|
1181 |
||
1182 |
^self selectionHolder value |
|
1183 |
||
1184 |
"Created: / 22-10-2008 / 11:30:03 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
1185 |
! |
|
1186 |
||
12277
46aea706fdb7
- Tools::ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12276
diff
changeset
|
1187 |
showCopyrightMethodDiffs |
46aea706fdb7
- Tools::ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12276
diff
changeset
|
1188 |
^self showCopyrightMethodDiffsHolder value |
46aea706fdb7
- Tools::ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12276
diff
changeset
|
1189 |
|
46aea706fdb7
- Tools::ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12276
diff
changeset
|
1190 |
"Created: / 10-08-2012 / 16:07:32 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
46aea706fdb7
- Tools::ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12276
diff
changeset
|
1191 |
! |
46aea706fdb7
- Tools::ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12276
diff
changeset
|
1192 |
|
46aea706fdb7
- Tools::ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12276
diff
changeset
|
1193 |
showCopyrightMethodDiffs: aBoolean |
46aea706fdb7
- Tools::ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12276
diff
changeset
|
1194 |
self showCopyrightMethodDiffsHolder value: aBoolean |
46aea706fdb7
- Tools::ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12276
diff
changeset
|
1195 |
|
46aea706fdb7
- Tools::ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12276
diff
changeset
|
1196 |
"Created: / 10-08-2012 / 16:07:40 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
46aea706fdb7
- Tools::ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12276
diff
changeset
|
1197 |
! |
46aea706fdb7
- Tools::ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12276
diff
changeset
|
1198 |
|
46aea706fdb7
- Tools::ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12276
diff
changeset
|
1199 |
showVersionMethodDiffs |
46aea706fdb7
- Tools::ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12276
diff
changeset
|
1200 |
^ self showVersionMethodDiffsHolder value |
46aea706fdb7
- Tools::ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12276
diff
changeset
|
1201 |
|
46aea706fdb7
- Tools::ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12276
diff
changeset
|
1202 |
"Created: / 10-08-2012 / 16:07:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
46aea706fdb7
- Tools::ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12276
diff
changeset
|
1203 |
! |
46aea706fdb7
- Tools::ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12276
diff
changeset
|
1204 |
|
46aea706fdb7
- Tools::ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12276
diff
changeset
|
1205 |
showVersionMethodDiffs: aBoolean |
46aea706fdb7
- Tools::ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12276
diff
changeset
|
1206 |
self showVersionMethodDiffsHolder value: aBoolean |
46aea706fdb7
- Tools::ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12276
diff
changeset
|
1207 |
|
46aea706fdb7
- Tools::ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12276
diff
changeset
|
1208 |
"Created: / 10-08-2012 / 16:08:04 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
46aea706fdb7
- Tools::ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12276
diff
changeset
|
1209 |
! |
46aea706fdb7
- Tools::ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12276
diff
changeset
|
1210 |
|
10194 | 1211 |
title: aString |
1212 |
||
1213 |
self titleHolder value: aString |
|
1214 |
||
1215 |
"Created: / 19-11-2009 / 15:44:20 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1216 |
! ! |
|
1217 |
||
1218 |
!ChangeSetDiffTool methodsFor:'accessing - selection'! |
|
1219 |
||
1220 |
theSingleSelectedObject |
|
1221 |
||
1222 |
| sel selSize obj | |
|
1223 |
sel := self selection. |
|
1224 |
||
1225 |
(sel isCollection and:[self isString not]) |
|
1226 |
ifFalse:[^sel]. |
|
1227 |
||
1228 |
selSize := 0. |
|
1229 |
obj := nil. |
|
1230 |
sel do: |
|
1231 |
[:each| |
|
1232 |
selSize := selSize + 1. |
|
1233 |
selSize > 1 ifTrue:[^nil]. |
|
1234 |
obj := each]. |
|
1235 |
^obj |
|
1236 |
||
1237 |
"Created: / 10-11-2009 / 11:12:58 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1238 |
"Modified: / 20-11-2009 / 19:54:36 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1239 |
! ! |
|
1240 |
||
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1241 |
!ChangeSetDiffTool methodsFor:'accessing - subapps'! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1242 |
|
12320
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1243 |
list1View: aView |
12321
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1244 |
list1App := aView application. |
12320
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1245 |
|
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1246 |
"Created: / 17-01-2013 / 13:44:26 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1247 |
! |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1248 |
|
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1249 |
list2View: aView |
12321
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1250 |
list2App := aView application. |
12320
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1251 |
|
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1252 |
"Created: / 17-01-2013 / 13:44:34 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1253 |
! |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1254 |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1255 |
textDiff2Tool |
12321
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1256 |
textDiff2App isNil ifTrue:[ |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1257 |
textDiff2App := TextDiff2Tool new |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1258 |
labelAHolder: self versionALabelHolder; |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1259 |
textAHolder: self versionATextHolder; |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1260 |
|
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1261 |
labelBHolder: self versionBLabelHolder; |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1262 |
textBHolder: self versionBTextHolder; |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1263 |
|
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1264 |
yourself |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1265 |
]. |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1266 |
^textDiff2App |
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1267 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1268 |
"Created: / 16-03-2012 / 13:58:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
12321
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1269 |
"Modified: / 17-01-2013 / 20:36:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1270 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1271 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1272 |
textDiff3Tool |
12321
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1273 |
textDiff3App isNil ifTrue:[ |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1274 |
textDiff3App := TextDiff3Tool new |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1275 |
mergeHolder: self mergeHolder; |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1276 |
mergeDataHolder: self mergeDataHolder; |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1277 |
|
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1278 |
labelCHolder: self versionBaseLabelHolder; |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1279 |
textCHolder: self versionBaseTextHolder; |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1280 |
|
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1281 |
labelBHolder: self versionBLabelHolder; |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1282 |
textBHolder: self versionBTextHolder; |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1283 |
|
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1284 |
|
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1285 |
labelAHolder: self versionALabelHolder; |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1286 |
textAHolder: self versionATextHolder; |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1287 |
|
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1288 |
yourself |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1289 |
]. |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1290 |
^textDiff3App |
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1291 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1292 |
"Created: / 16-03-2012 / 15:16:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
12321
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1293 |
"Modified: / 17-01-2013 / 20:36:23 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1294 |
! ! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1295 |
|
12320
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1296 |
!ChangeSetDiffTool methodsFor:'accessing-menus'! |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1297 |
|
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1298 |
listMenu |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1299 |
| spec | |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1300 |
|
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1301 |
spec := self isMerge ifTrue:[self class listMenuMerge] ifFalse:[self class listMenuDiff]. |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1302 |
^Menu decodeFromLiteralArray: spec. |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1303 |
|
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1304 |
"Created: / 16-01-2013 / 15:50:38 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1305 |
! ! |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1306 |
|
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1307 |
!ChangeSetDiffTool methodsFor:'accessing-selection'! |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1308 |
|
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1309 |
selection: entry |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1310 |
|
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1311 |
|
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1312 |
self isOneColumnBrowser ifTrue:[ |
12321
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1313 |
list1App selection: entry |
12320
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1314 |
] ifFalse:[ |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1315 |
| parent | |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1316 |
|
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1317 |
parent := self diffsetHolderPrivate value diffs |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1318 |
detect:[:each|each diffs includes: entry] ifNone:[nil]. |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1319 |
parent notNil ifTrue:[ |
12321
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1320 |
list1App selection: parent. |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1321 |
list1App updateOutputGenerator. |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1322 |
list2App updateList. |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1323 |
list2App selection: entry. |
12320
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1324 |
|
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1325 |
] |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1326 |
] |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1327 |
|
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1328 |
"Created: / 22-10-2008 / 11:30:11 / Jan Vrany <vranyj1@fel.cvut.cz>" |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1329 |
"Modified: / 17-01-2013 / 16:28:29 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1330 |
! |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1331 |
|
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1332 |
theFirstSelectedEntry |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1333 |
| selection | |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1334 |
|
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1335 |
selection := self selectionHolder value. |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1336 |
selection isNil ifTrue:[ ^ nil ]. |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1337 |
selection := selection collect:[:e|e]. "/selection might be an Iterator |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1338 |
selection isEmpty ifTrue:[ ^nil ]. |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1339 |
^selection first |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1340 |
|
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1341 |
"Created: / 17-01-2013 / 16:58:24 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1342 |
! |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1343 |
|
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1344 |
theLastSelectedEntry |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1345 |
| selection | |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1346 |
|
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1347 |
selection := self selectionHolder value. |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1348 |
selection isNil ifTrue:[ ^ nil ]. |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1349 |
selection := selection collect:[:e|e]. "/selection might be an Iterator |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1350 |
selection isEmpty ifTrue:[ ^nil ]. |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1351 |
^selection last |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1352 |
|
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1353 |
"Created: / 17-01-2013 / 13:22:45 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1354 |
! ! |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1355 |
|
10194 | 1356 |
!ChangeSetDiffTool methodsFor:'aspects'! |
1357 |
||
12321
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1358 |
autoMoveToNextConflictHolder |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1359 |
|
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1360 |
autoMoveToNextConflictHolder isNil ifTrue:[ |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1361 |
autoMoveToNextConflictHolder := AspectAdaptor forAspect: #autoMoveToNextConflict. |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1362 |
autoMoveToNextConflictHolder subject: self class. |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1363 |
]. |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1364 |
^autoMoveToNextConflictHolder |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1365 |
|
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1366 |
"Created: / 17-01-2013 / 19:51:24 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1367 |
! |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1368 |
|
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1369 |
canSaveHolder |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1370 |
"return/create the 'canSaveHolder' value holder (automatically generated)" |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1371 |
|
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1372 |
canSaveHolder isNil ifTrue:[ |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1373 |
canSaveHolder := false asValue |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1374 |
]. |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1375 |
^ canSaveHolder |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1376 |
|
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1377 |
"Modified: / 17-01-2013 / 21:00:13 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1378 |
! |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1379 |
|
12200
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1380 |
diffInfoHolder |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1381 |
"return/create the 'diffInfoHolder' value holder (automatically generated)" |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1382 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1383 |
diffInfoHolder isNil ifTrue:[ |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1384 |
diffInfoHolder := ValueHolder new. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1385 |
diffInfoHolder addDependent:self. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1386 |
]. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1387 |
^ diffInfoHolder |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1388 |
! |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1389 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1390 |
diffInfoHolder:something |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1391 |
"set the 'diffInfoHolder' value holder (automatically generated)" |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1392 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1393 |
|oldValue newValue| |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1394 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1395 |
diffInfoHolder notNil ifTrue:[ |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1396 |
oldValue := diffInfoHolder value. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1397 |
diffInfoHolder removeDependent:self. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1398 |
]. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1399 |
diffInfoHolder := something. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1400 |
diffInfoHolder notNil ifTrue:[ |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1401 |
diffInfoHolder addDependent:self. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1402 |
]. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1403 |
newValue := diffInfoHolder value. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1404 |
oldValue ~~ newValue ifTrue:[ |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1405 |
self update:#value with:newValue from:diffInfoHolder. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1406 |
]. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1407 |
! |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1408 |
|
10194 | 1409 |
diffListEntryLabelGeneratorAspect |
1410 |
||
1411 |
^nil |
|
1412 |
||
1413 |
"Created: / 24-11-2009 / 10:01:35 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1414 |
! |
|
1415 |
||
1416 |
diffsetHolder |
|
1417 |
"return/create the 'diffsetHolder' value holder (automatically generated)" |
|
1418 |
||
1419 |
diffsetHolder isNil ifTrue:[ |
|
1420 |
diffsetHolder := ValueHolder new. |
|
1421 |
diffsetHolder addDependent:self. |
|
1422 |
]. |
|
1423 |
^ diffsetHolder |
|
1424 |
! |
|
1425 |
||
1426 |
diffsetHolder:aValueHolder |
|
1427 |
"set the 'diffsetHolder' value holder (automatically generated)" |
|
1428 |
||
1429 |
|oldValue newValue| |
|
1430 |
||
1431 |
diffsetHolder notNil ifTrue:[ |
|
1432 |
oldValue := diffsetHolder value. |
|
1433 |
diffsetHolder removeDependent:self. |
|
1434 |
]. |
|
1435 |
diffsetHolder := aValueHolder. |
|
1436 |
diffsetHolder notNil ifTrue:[ |
|
1437 |
diffsetHolder addDependent:self. |
|
1438 |
]. |
|
1439 |
newValue := diffsetHolder value. |
|
1440 |
oldValue ~~ newValue ifTrue:[ |
|
1441 |
self update:#value with:newValue from:diffsetHolder. |
|
1442 |
]. |
|
1443 |
! |
|
1444 |
||
1445 |
diffsetHolderPrivate |
|
1446 |
"return/create the 'diffSetHolderPrivate' value holder (automatically generated)" |
|
1447 |
||
1448 |
diffsetHolderPrivate isNil ifTrue:[ |
|
1449 |
diffsetHolderPrivate := ValueHolder with: (self diffsetHolder value). |
|
1450 |
]. |
|
1451 |
^ diffsetHolderPrivate |
|
1452 |
||
1453 |
"Created: / 05-12-2009 / 11:03:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1454 |
! |
|
1455 |
||
1456 |
firstColSelectionHolder |
|
1457 |
"return/create the valueHolder 'firstColSelectionHolder'" |
|
1458 |
||
1459 |
firstColSelectionHolder isNil ifTrue:[ |
|
1460 |
firstColSelectionHolder := ValueHolder with:nil "defaultValue here". |
|
1461 |
]. |
|
1462 |
^ firstColSelectionHolder |
|
1463 |
! |
|
1464 |
||
12274
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1465 |
hasDiffsetHolder |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1466 |
"return/create the 'hasDiffsetHolder' value holder (automatically generated)" |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1467 |
|
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1468 |
hasDiffsetHolder isNil ifTrue:[ |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1469 |
hasDiffsetHolder := false asValue |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1470 |
]. |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1471 |
^ hasDiffsetHolder |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1472 |
|
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1473 |
"Modified: / 01-08-2012 / 17:16:30 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1474 |
! |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1475 |
|
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1476 |
hasDiffsetHolder:something |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1477 |
"set the 'hasDiffsetHolder' value holder (automatically generated)" |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1478 |
|
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1479 |
hasDiffsetHolder := something. |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1480 |
! |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1481 |
|
10194 | 1482 |
hasSelectionHolder |
1483 |
||
1484 |
|holder| |
|
1485 |
||
1486 |
(holder := builder bindingAt:#hasSelectionHolder) isNil ifTrue:[ |
|
1487 |
holder := (AspectAdaptor forAspect: #notEmptyOrNil) |
|
1488 |
subjectChannel: self selectionHolder. |
|
1489 |
builder aspectAt:#hasSelectionHolder put: holder |
|
1490 |
]. |
|
1491 |
^ holder. |
|
1492 |
||
1493 |
"Created: / 22-10-2008 / 11:34:36 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
1494 |
"Modified: / 22-10-2008 / 12:38:47 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
1495 |
! |
|
1496 |
||
12274
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1497 |
highlightConflictsHolder |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1498 |
"return/create the 'highlightConflictsHolder' value holder (automatically generated)" |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1499 |
|
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1500 |
highlightConflictsHolder isNil ifTrue:[ |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1501 |
highlightConflictsHolder := true asValue |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1502 |
]. |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1503 |
^ highlightConflictsHolder |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1504 |
|
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1505 |
"Modified: / 01-08-2012 / 17:07:10 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1506 |
! |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1507 |
|
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1508 |
highlightConflictsHolder:something |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1509 |
"set the 'highlightConflictsHolder' value holder (automatically generated)" |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1510 |
|
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1511 |
highlightConflictsHolder := something. |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1512 |
! |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1513 |
|
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1514 |
infoPanel |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1515 |
infoPanel isNil ifTrue:[ |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1516 |
infoPanel := InlineMessageDialog new |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1517 |
]. |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1518 |
^ infoPanel |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1519 |
|
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1520 |
"Created: / 09-02-2012 / 19:23:51 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1521 |
! |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1522 |
|
10194 | 1523 |
listHolder |
1524 |
"return/create the 'listHolder' value holder (automatically generated)" |
|
1525 |
||
1526 |
listHolder isNil ifTrue:[ |
|
1527 |
listHolder := ValueHolder new. |
|
1528 |
]. |
|
1529 |
^ listHolder |
|
1530 |
||
1531 |
"Modified: / 01-11-2009 / 16:57:37 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1532 |
! |
|
1533 |
||
1534 |
listMenuHolder |
|
12125 | 1535 |
diffMenuHolder isNil ifTrue:[ |
12320
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1536 |
"/ diffMenuHolder := ValueHolder with:self listMenu |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1537 |
diffMenuHolder := BlockValue with:[:v|self listMenu] argument: self mergeHolder |
12125 | 1538 |
]. |
10194 | 1539 |
^ diffMenuHolder |
1540 |
||
1541 |
"Created: / 21-11-2009 / 18:52:04 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
12125 | 1542 |
"Modified: / 18-11-2011 / 14:57:47 / cg" |
12320
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1543 |
"Modified: / 16-01-2013 / 15:59:50 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10194 | 1544 |
! |
1545 |
||
12198
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1546 |
mergeDataHolder |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1547 |
"return/create the 'mergeDataHolder' value holder (automatically generated)" |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1548 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1549 |
mergeDataHolder isNil ifTrue:[ |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1550 |
mergeDataHolder := ValueHolder new. |
12318
1dda95be3d40
Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12317
diff
changeset
|
1551 |
mergeDataHolder addDependent:self. |
12198
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1552 |
]. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1553 |
^ mergeDataHolder |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1554 |
! |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1555 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1556 |
mergeDataHolder:something |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1557 |
"set the 'mergeDataHolder' value holder (automatically generated)" |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1558 |
|
12318
1dda95be3d40
Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12317
diff
changeset
|
1559 |
|oldValue newValue| |
1dda95be3d40
Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12317
diff
changeset
|
1560 |
|
1dda95be3d40
Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12317
diff
changeset
|
1561 |
mergeDataHolder notNil ifTrue:[ |
1dda95be3d40
Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12317
diff
changeset
|
1562 |
oldValue := mergeDataHolder value. |
1dda95be3d40
Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12317
diff
changeset
|
1563 |
mergeDataHolder removeDependent:self. |
1dda95be3d40
Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12317
diff
changeset
|
1564 |
]. |
12198
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1565 |
mergeDataHolder := something. |
12318
1dda95be3d40
Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12317
diff
changeset
|
1566 |
mergeDataHolder notNil ifTrue:[ |
1dda95be3d40
Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12317
diff
changeset
|
1567 |
mergeDataHolder addDependent:self. |
1dda95be3d40
Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12317
diff
changeset
|
1568 |
]. |
1dda95be3d40
Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12317
diff
changeset
|
1569 |
newValue := mergeDataHolder value. |
1dda95be3d40
Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12317
diff
changeset
|
1570 |
oldValue ~~ newValue ifTrue:[ |
1dda95be3d40
Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12317
diff
changeset
|
1571 |
self update:#value with:newValue from:mergeDataHolder. |
1dda95be3d40
Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12317
diff
changeset
|
1572 |
]. |
12198
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1573 |
! |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1574 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1575 |
mergeHolder |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1576 |
"return/create the 'mergeHolder' value holder (automatically generated)" |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1577 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1578 |
mergeHolder isNil ifTrue:[ |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1579 |
mergeHolder := ValueHolder with: false. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1580 |
]. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1581 |
^ mergeHolder |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1582 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1583 |
"Modified: / 19-03-2012 / 14:09:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1584 |
! |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1585 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1586 |
mergeHolder:something |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1587 |
"set the 'mergeHolder' value holder (automatically generated)" |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1588 |
|
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1589 |
mergeHolder := something. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1590 |
! |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1591 |
|
12317 | 1592 |
mergeSavedHolder |
1593 |
"return/create the 'mergeSavedHolder' value holder (automatically generated)" |
|
1594 |
||
1595 |
mergeSavedHolder isNil ifTrue:[ |
|
1596 |
mergeSavedHolder := false asValue |
|
1597 |
]. |
|
1598 |
^ mergeSavedHolder |
|
1599 |
||
1600 |
"Modified: / 15-01-2013 / 11:39:29 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1601 |
! |
|
1602 |
||
10194 | 1603 |
nameAspect |
1604 |
||
1605 |
^(AspectAdaptor forAspect: #name) |
|
1606 |
subjectChannel: self diffsetHolder |
|
1607 |
||
1608 |
"Created: / 01-11-2009 / 11:14:32 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1609 |
! |
|
1610 |
||
1611 |
navigatorPanelSpecHolder |
|
1612 |
<resource: #uiAspect> |
|
1613 |
||
1614 |
navigatorPanelSpecHolder isNil ifTrue:[ |
|
1615 |
navigatorPanelSpecHolder := ValueHolder with: #twoColumnNavigatorSpec. |
|
1616 |
]. |
|
1617 |
^ navigatorPanelSpecHolder. |
|
1618 |
||
1619 |
"Modified: / 20-11-2009 / 20:12:06 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1620 |
! |
|
1621 |
||
12320
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1622 |
secondColSelectionHolder |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1623 |
"return/create the valueHolder 'firstColSelectionHolder'" |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1624 |
|
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1625 |
^self selectionHolder |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1626 |
|
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1627 |
"Created: / 17-01-2013 / 12:49:44 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1628 |
! |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1629 |
|
10194 | 1630 |
selectionHolder |
1631 |
"return/create the 'selectionHolder' value holder (automatically generated)" |
|
1632 |
||
1633 |
selectionHolder isNil ifTrue:[ |
|
1634 |
||
1635 |
selectionHolder := ValueHolder new. |
|
1636 |
selectionHolder addDependent:self. |
|
1637 |
]. |
|
1638 |
^ selectionHolder |
|
1639 |
||
1640 |
"Modified (format): / 06-07-2011 / 12:25:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1641 |
! |
|
1642 |
||
12274
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1643 |
showCopyrightMethodDiffsHolder |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1644 |
"return/create the 'showCopyrightMethodDiffsHolder' value holder (automatically generated)" |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1645 |
|
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1646 |
showCopyrightMethodDiffsHolder isNil ifTrue:[ |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1647 |
showCopyrightMethodDiffsHolder := true asValue |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1648 |
]. |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1649 |
^ showCopyrightMethodDiffsHolder |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1650 |
|
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1651 |
"Modified: / 01-08-2012 / 17:06:59 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1652 |
! |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1653 |
|
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1654 |
showCopyrightMethodDiffsHolder:something |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1655 |
"set the 'showCopyrightMethodDiffsHolder' value holder (automatically generated)" |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1656 |
|
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1657 |
showCopyrightMethodDiffsHolder := something. |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1658 |
! |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1659 |
|
12232
4d9b62c111fc
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
1660 |
showVersionMethodDiffsHolder |
4d9b62c111fc
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
1661 |
"return/create the 'showVersionMethodDiffsHolder' value holder (automatically generated)" |
4d9b62c111fc
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
1662 |
|
4d9b62c111fc
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
1663 |
showVersionMethodDiffsHolder isNil ifTrue:[ |
4d9b62c111fc
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
1664 |
showVersionMethodDiffsHolder := true asValue. |
4d9b62c111fc
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
1665 |
]. |
4d9b62c111fc
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
1666 |
^ showVersionMethodDiffsHolder |
4d9b62c111fc
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
1667 |
|
4d9b62c111fc
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
1668 |
"Modified: / 18-04-2012 / 19:02:29 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
4d9b62c111fc
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
1669 |
! |
4d9b62c111fc
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
1670 |
|
4d9b62c111fc
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
1671 |
showVersionMethodDiffsHolder:something |
4d9b62c111fc
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
1672 |
"set the 'showVersionMethodDiffsHolder' value holder (automatically generated)" |
4d9b62c111fc
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
1673 |
|
4d9b62c111fc
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
1674 |
showVersionMethodDiffsHolder := something. |
4d9b62c111fc
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
1675 |
! |
4d9b62c111fc
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12216
diff
changeset
|
1676 |
|
10194 | 1677 |
singleSelectionHolder |
1678 |
"return/create the 'singleSelectionHolder' value holder (automatically generated)" |
|
1679 |
||
1680 |
singleSelectionHolder isNil ifTrue:[ |
|
1681 |
singleSelectionHolder := ValueHolder new. |
|
1682 |
]. |
|
1683 |
^ singleSelectionHolder |
|
1684 |
||
1685 |
"Modified: / 10-11-2009 / 11:09:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1686 |
! |
|
1687 |
||
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1688 |
textDiffToolHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1689 |
"return/create the 'textDiffToolHolder' value holder (automatically generated)" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1690 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1691 |
textDiffToolHolder isNil ifTrue:[ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1692 |
textDiffToolHolder := ValueHolder with: self textDiff2Tool. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1693 |
]. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1694 |
^ textDiffToolHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1695 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1696 |
"Modified: / 16-03-2012 / 13:57:48 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1697 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1698 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1699 |
textDiffToolHolder:something |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1700 |
"set the 'textDiffToolHolder' value holder (automatically generated)" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1701 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1702 |
textDiffToolHolder := something. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1703 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1704 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1705 |
textDiffToolWindowSpecHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1706 |
"return/create the 'textDiffToolWindowSpecHolder' value holder (automatically generated)" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1707 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1708 |
textDiffToolWindowSpecHolder isNil ifTrue:[ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1709 |
textDiffToolWindowSpecHolder := #windowSpecForEmbedding asValue. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1710 |
]. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1711 |
^ textDiffToolWindowSpecHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1712 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1713 |
"Modified: / 16-03-2012 / 13:57:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1714 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1715 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1716 |
textDiffToolWindowSpecHolder:something |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1717 |
"set the 'textDiffToolWindowSpecHolder' value holder (automatically generated)" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1718 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1719 |
textDiffToolWindowSpecHolder := something. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1720 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1721 |
|
10194 | 1722 |
titleHolder |
1723 |
"return/create the 'titleHolder' value holder (automatically generated)" |
|
1724 |
||
1725 |
titleHolder isNil ifTrue:[ |
|
1726 |
titleHolder := ValueHolder with: 'Diff Browser'. |
|
1727 |
]. |
|
1728 |
^ titleHolder |
|
1729 |
||
1730 |
"Modified: / 01-11-2009 / 14:04:59 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1731 |
! |
|
1732 |
||
1733 |
versionALabelHolder |
|
1734 |
||
1735 |
^(AspectAdaptor forAspect: #versionALabel) |
|
1736 |
subjectChannel: self diffsetHolder |
|
1737 |
||
1738 |
"Created: / 09-04-2011 / 23:30:35 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1739 |
! |
|
1740 |
||
1741 |
versionATextHolder |
|
1742 |
||
12125 | 1743 |
versionATextHolder isNil ifTrue:[ |
10194 | 1744 |
versionATextHolder := ValueHolder new |
1745 |
]. |
|
1746 |
^versionATextHolder |
|
1747 |
||
1748 |
"Created: / 06-07-2011 / 12:05:25 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
12125 | 1749 |
"Modified: / 18-11-2011 / 14:57:56 / cg" |
10194 | 1750 |
! |
1751 |
||
1752 |
versionBLabelHolder |
|
1753 |
||
1754 |
^(AspectAdaptor forAspect: #versionBLabel) |
|
1755 |
subjectChannel: self diffsetHolder |
|
1756 |
||
1757 |
"Created: / 09-04-2011 / 23:30:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1758 |
! |
|
1759 |
||
1760 |
versionBTextHolder |
|
1761 |
||
12125 | 1762 |
versionBTextHolder isNil ifTrue:[ |
10194 | 1763 |
versionBTextHolder := ValueHolder new |
1764 |
]. |
|
1765 |
^versionBTextHolder |
|
1766 |
||
1767 |
"Created: / 06-07-2011 / 12:05:31 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
12125 | 1768 |
"Modified: / 18-11-2011 / 14:57:59 / cg" |
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1769 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1770 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1771 |
versionBaseLabelHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1772 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1773 |
^(AspectAdaptor forAspect: #versionBaseLabel) |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1774 |
subjectChannel: self diffsetHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1775 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1776 |
"Created: / 16-03-2012 / 15:18:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1777 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1778 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1779 |
versionBaseTextHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1780 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1781 |
versionBaseTextHolder isNil ifTrue:[ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1782 |
versionBaseTextHolder := ValueHolder new |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1783 |
]. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1784 |
^versionBaseTextHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1785 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1786 |
"Modified: / 18-11-2011 / 14:57:59 / cg" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1787 |
"Created: / 16-03-2012 / 15:19:01 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10194 | 1788 |
! ! |
1789 |
||
1790 |
!ChangeSetDiffTool methodsFor:'change & update'! |
|
1791 |
||
12200
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1792 |
diffInfoChanged |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1793 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1794 |
| info | |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1795 |
info := self diffInfoHolder value. |
12274
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1796 |
self hasDiffsetHolder value: false. |
12317 | 1797 |
self mergeSavedHolder value: false. |
12321
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1798 |
self canSaveHolder value: false. |
12274
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1799 |
info notNil ifTrue:[ |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1800 |
self infoPanel showProgressLabeled: (resources string:'Reading changesets') while: [ |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1801 |
info read. |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1802 |
self diffset: info diffset. |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1803 |
self updateViews. |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
1804 |
]. |
12321
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1805 |
]. |
12200
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1806 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1807 |
"Created: / 19-03-2012 / 23:40:23 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
12321
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1808 |
"Modified: / 17-01-2013 / 21:01:13 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
12200
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1809 |
! |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1810 |
|
10194 | 1811 |
diffsetChanged |
1812 |
||
1813 |
| ds | |
|
1814 |
||
1815 |
ds := self diffsetHolder value. |
|
12317 | 1816 |
ds depth = 2 ifTrue:[ |
1817 |
self beTwoColumn. |
|
1818 |
] ifFalse:[ |
|
1819 |
self beSingleColumn. |
|
1820 |
]. |
|
12277
46aea706fdb7
- Tools::ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12276
diff
changeset
|
1821 |
self hasDiffsetHolder value: ds notNil. |
12321
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1822 |
self canSaveHolder value: self canSave. |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1823 |
alreadyWarnedAboutUnsavedMerge := false. |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1824 |
|
10194 | 1825 |
|
1826 |
self diffsetHolderPrivate value: |
|
1827 |
(self isOneColumnBrowser |
|
12320
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1828 |
ifTrue:[ds flattened sort] |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
1829 |
ifFalse:[ds value sort]). |
12321
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1830 |
self autoMoveToNextConflictHolder value ifTrue:[ |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1831 |
self menuMoveDownConflict. |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1832 |
]. |
10194 | 1833 |
self versionALabelHolder value: ds versionALabel. |
1834 |
self versionBLabelHolder value: ds versionBLabel. |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1835 |
self versionBaseLabelHolder value: ds versionBaseLabel. |
10194 | 1836 |
|
1837 |
"Created: / 05-12-2009 / 11:03:10 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1838 |
"Modified: / 29-06-2011 / 08:24:18 / Jan Vrany <enter your email here>" |
|
12321
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1839 |
"Modified: / 17-01-2013 / 21:22:19 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10194 | 1840 |
! |
1841 |
||
12318
1dda95be3d40
Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12317
diff
changeset
|
1842 |
mergeDataChanged |
12321
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1843 |
"Resolution has been changed..." |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1844 |
|
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1845 |
self canSaveHolder value: self canSave. |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1846 |
alreadyWarnedAboutUnsavedMerge := false. |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1847 |
(self autoMoveToNextConflictHolder value and:[mergeData isMerged]) ifTrue:[ |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1848 |
self menuMoveDownConflict |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1849 |
] |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1850 |
|
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1851 |
"Created: / 17-01-2013 / 20:06:31 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1852 |
"Modified: / 17-01-2013 / 21:20:21 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1853 |
! |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1854 |
|
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1855 |
mergeDataHolderChanged |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1856 |
mergeData notNil ifTrue:[mergeData removeDependent: self]. |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1857 |
mergeData := self mergeDataHolder value. |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1858 |
mergeData notNil ifTrue:[mergeData addDependent: self]. |
12318
1dda95be3d40
Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12317
diff
changeset
|
1859 |
|
1dda95be3d40
Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12317
diff
changeset
|
1860 |
"Created: / 16-01-2013 / 09:24:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
12321
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1861 |
"Modified: / 17-01-2013 / 20:06:15 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
12318
1dda95be3d40
Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12317
diff
changeset
|
1862 |
! |
1dda95be3d40
Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12317
diff
changeset
|
1863 |
|
10194 | 1864 |
selectionChanged |
1865 |
||
12198
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1866 |
| diffItem mergeData | |
10194 | 1867 |
|
1868 |
diffItem := self theSingleSelectedObject. |
|
1869 |
self singleSelectionHolder value: diffItem. |
|
1870 |
diffItem isNil ifTrue:[^self]. |
|
1871 |
||
12198
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1872 |
self isMerge ifTrue:[ |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1873 |
self mergeDataHolder setValue: (mergeData := diffItem mergeInfo). |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1874 |
]. |
10194 | 1875 |
self versionATextHolder setValue: diffItem versionAText. |
1876 |
self versionBTextHolder setValue: diffItem versionBText. |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
1877 |
self versionBaseTextHolder setValue: diffItem versionBaseText. |
10194 | 1878 |
|
12198
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1879 |
|
10194 | 1880 |
self versionATextHolder changed: #value. |
1881 |
self versionBTextHolder changed: #value. |
|
12198
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1882 |
self versionBaseTextHolder changed: #value. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1883 |
self isMerge ifTrue:[ |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1884 |
self mergeDataHolder changed: #value. |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1885 |
"Maybe, there was no merge data beforehand. In that case, |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1886 |
update" |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1887 |
mergeData isNil ifTrue:[ |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1888 |
diffItem mergeInfo: (self mergeDataHolder value). |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1889 |
] |
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1890 |
] |
10194 | 1891 |
|
1892 |
"Created: / 22-10-2008 / 11:29:24 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
12198
414e7b69ecda
Text/ChangeSet diff improved
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12192
diff
changeset
|
1893 |
"Modified: / 19-03-2012 / 14:59:15 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10194 | 1894 |
! |
1895 |
||
1896 |
update: aspect with: param from: sender |
|
1897 |
||
1898 |
sender == selectionHolder ifTrue:[ |
|
1899 |
self selectionChanged. |
|
1900 |
^self. |
|
1901 |
]. |
|
1902 |
||
1903 |
sender == diffsetHolder ifTrue:[ |
|
1904 |
self diffsetChanged. |
|
1905 |
^self. |
|
1906 |
]. |
|
1907 |
||
12200
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1908 |
sender == diffInfoHolder ifTrue:[ |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1909 |
self diffInfoChanged. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1910 |
^self. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1911 |
]. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1912 |
|
12318
1dda95be3d40
Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12317
diff
changeset
|
1913 |
sender == mergeDataHolder ifTrue:[ |
12321
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1914 |
self mergeDataHolderChanged. |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1915 |
^self. |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1916 |
]. |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1917 |
|
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1918 |
sender == mergeData ifTrue:[ |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1919 |
"Resolution has been changed..." |
12318
1dda95be3d40
Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12317
diff
changeset
|
1920 |
self mergeDataChanged. |
1dda95be3d40
Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12317
diff
changeset
|
1921 |
^self. |
1dda95be3d40
Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12317
diff
changeset
|
1922 |
]. |
1dda95be3d40
Fixes in changeset merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12317
diff
changeset
|
1923 |
|
10194 | 1924 |
^super update: aspect with: param from: sender |
1925 |
||
1926 |
"Created: / 05-12-2009 / 11:02:57 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
12321
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1927 |
"Modified (format): / 17-01-2013 / 20:06:56 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10194 | 1928 |
! |
1929 |
||
1930 |
updateListMenu |
|
1931 |
|menu diffs loadA loadB| |
|
1932 |
||
1933 |
menu := self listMenuHolder value. |
|
1934 |
diffs := self selection ? #(). |
|
1935 |
loadA := menu atNameKey:#LoadVersionA. |
|
1936 |
loadA disable. |
|
1937 |
loadB := menu atNameKey:#LoadVersionB. |
|
1938 |
loadB disable. |
|
1939 |
(diffs select:[:e | true ]) do:[:diff | |
|
1940 |
diff versionA |
|
1941 |
ifNotNil:[ |
|
1942 |
loadA enable. |
|
1943 |
loadA label:'Load version ' , diff versionALabel |
|
1944 |
]. |
|
1945 |
diff versionB |
|
1946 |
ifNotNil:[ |
|
1947 |
loadB |
|
1948 |
label:'Load version ' , diff versionBLabel; |
|
1949 |
enable |
|
1950 |
]. |
|
1951 |
]. |
|
12200
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1952 |
! |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1953 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1954 |
updateViews |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1955 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1956 |
self diffInfo isNil ifTrue:[ ^ self ]. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1957 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1958 |
self diffInfo isDiff3 ifTrue:[ |
12321
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1959 |
self mergeHolder value: self diffInfo isMerge. |
12202
eaa1f6cb6ce8
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12201
diff
changeset
|
1960 |
self textDiffToolHolder value isDiff3 ifFalse:[ |
12200
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1961 |
textDiffToolHolder value: self textDiff3Tool. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1962 |
]. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1963 |
] ifFalse:[ |
12202
eaa1f6cb6ce8
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12201
diff
changeset
|
1964 |
self textDiffToolHolder value isDiff2 ifFalse:[ |
12200
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1965 |
textDiffToolHolder value: self textDiff2Tool. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1966 |
]. |
12276 | 1967 |
]. |
12200
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1968 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
1969 |
"Created: / 20-03-2012 / 10:21:22 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
12321
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
1970 |
"Modified: / 17-01-2013 / 20:16:50 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10194 | 1971 |
! ! |
1972 |
||
1973 |
!ChangeSetDiffTool methodsFor:'initialization'! |
|
1974 |
||
1975 |
initialize |
|
1976 |
||
1977 |
super initialize. |
|
1978 |
self createBuilder |
|
1979 |
||
1980 |
"Created: / 22-10-2008 / 12:37:14 / Jan Vrany <vranyj1@fel.cvut.cz>" |
|
1981 |
! ! |
|
1982 |
||
1983 |
!ChangeSetDiffTool methodsFor:'menu actions'! |
|
1984 |
||
12125 | 1985 |
changesetMenuBrowse: changeset |
1986 |
||
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1987 |
Tools::ChangeSetBrowser2 openOn: (changeset , self diffInfo same) |
12125 | 1988 |
|
1989 |
"Created: / 16-12-2011 / 14:31:18 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1990 |
! |
|
1991 |
||
1992 |
changesetMenuBrowseA |
|
1993 |
||
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
1994 |
self changesetMenuBrowse: self diffInfo diffset changesetA |
12125 | 1995 |
|
1996 |
"Created: / 16-12-2011 / 14:23:54 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
1997 |
! |
|
1998 |
||
1999 |
changesetMenuBrowseB |
|
2000 |
||
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2001 |
self changesetMenuBrowse: self diffInfo diffset changesetB |
12125 | 2002 |
|
2003 |
"Created: / 16-12-2011 / 14:27:07 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2004 |
! |
|
2005 |
||
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2006 |
changesetMenuBrowseBase |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2007 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2008 |
self changesetMenuBrowse: self diffInfo diffset changesetBase |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2009 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2010 |
"Created: / 20-03-2012 / 13:34:06 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2011 |
! |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2012 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2013 |
changesetMenuBrowseMerge |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2014 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2015 |
self changesetMenuBrowse: self diffInfo diffset changesetMerged |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2016 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2017 |
"Created: / 20-03-2012 / 14:34:33 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2018 |
! |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2019 |
|
10194 | 2020 |
fileMenuOpen |
2021 |
||
12200
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2022 |
| dlg info | |
10194 | 2023 |
dlg := OpenDialog new. |
12276 | 2024 |
info := LastDiffInfo. |
12295
893fad8d458a
- Tools::ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12277
diff
changeset
|
2025 |
info isNil ifFalse:[ |
12276 | 2026 |
info := ChangeSetDiffInfo new. |
12295
893fad8d458a
- Tools::ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12277
diff
changeset
|
2027 |
info specMerge: ChangeSetSpec changeSet |
12276 | 2028 |
]. |
2029 |
dlg diffInfo: info. |
|
10194 | 2030 |
dlg open ifFalse:[^self]. |
12274
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
2031 |
info := dlg diffInfo. |
12200
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2032 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2033 |
^self fileMenuOpenOnDiffInfo: info |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2034 |
|
12295
893fad8d458a
- Tools::ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12277
diff
changeset
|
2035 |
"Modified: / 18-09-2012 / 11:37:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
2036 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
2037 |
|
12200
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2038 |
fileMenuOpenOnDiffInfo: info |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2039 |
|
12274
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
2040 |
LastDiffInfo := info. |
12200
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2041 |
self diffInfoHolder value: info |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2042 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2043 |
"Created: / 20-03-2012 / 00:04:05 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10194 | 2044 |
! |
2045 |
||
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2046 |
fileMenuSave |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2047 |
self fileMenuSaveAs: self diffInfo specMergeFile. |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2048 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2049 |
"Modified: / 20-03-2012 / 15:07:28 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2050 |
! |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2051 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2052 |
fileMenuSaveAs |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2053 |
| info file suggestion | |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2054 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2055 |
info := self diffInfo. |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2056 |
suggestion := (info specMerge isFile ifTrue:['merged.chg'] ifFalse:[info specMergeFile]). |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2057 |
file := Dialog requestFileName:'Select File for Save' default: (suggestion) pattern:('*.chg;*.st'). |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2058 |
file isNil ifTrue:[^self]. |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2059 |
self fileMenuSaveAs: file. |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2060 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2061 |
"Modified: / 20-03-2012 / 15:07:05 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2062 |
! |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2063 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2064 |
fileMenuSaveAs: aFilename |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2065 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2066 |
self fileMenuSaveAs: aFilename format: #classSource |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2067 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2068 |
"Created: / 20-03-2012 / 15:07:28 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2069 |
! |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2070 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2071 |
fileMenuSaveAs: aFilename format: format |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2072 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2073 |
| changesToSave | |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2074 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2075 |
changesToSave := (self diffInfo diffset changesetMerged) , (self diffInfo same). |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2076 |
changesToSave := changesToSave reject:[:chg|chg isDoIt]. |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2077 |
changesToSave saveToFile: aFilename format: format. |
12317 | 2078 |
self mergeSavedHolder value: true |
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2079 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2080 |
"Created: / 20-03-2012 / 15:09:20 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
12317 | 2081 |
"Modified: / 15-01-2013 / 11:40:31 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2082 |
! |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2083 |
|
10194 | 2084 |
fileMenuSaveAsPatch |
2085 |
||
2086 |
| filename | |
|
2087 |
filename := Smalltalk::Dialog requestFileName: 'Enter filename' default:'patch.chg' ifFail:[^self]. |
|
2088 |
self patchset fileOutAs: filename. |
|
2089 |
||
2090 |
"Modified: / 05-12-2009 / 12:37:11 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2091 |
! |
|
2092 |
||
12276 | 2093 |
fileMenuSaveMergedAs |
2094 |
||
2095 |
self halt. |
|
2096 |
||
2097 |
"Modified: / 03-08-2012 / 15:39:26 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2098 |
! |
|
2099 |
||
12125 | 2100 |
listMenuBrowse |
2101 |
||
2102 |
| items | |
|
2103 |
items := self selection collect:[:e|e]. "/must do collect as selection is an iterator..." |
|
2104 |
items size == 1 ifTrue:[ |
|
2105 |
| item cls sel | |
|
2106 |
item:= items anElement. |
|
2107 |
cls := item changeClass. |
|
2108 |
sel := item changeSelector. |
|
2109 |
cls notNil ifTrue:[ |
|
2110 |
sel notNil ifTrue:[ |
|
2111 |
UserPreferences current systemBrowserClass |
|
2112 |
openInClass:cls selector:sel |
|
2113 |
||
2114 |
] ifFalse:[ |
|
2115 |
UserPreferences current systemBrowserClass |
|
2116 |
browseClass: cls |
|
2117 |
] |
|
2118 |
] ifFalse:[ |
|
2119 |
Dialog warn: (self class resources at: 'Oops, class is gone') |
|
2120 |
] |
|
2121 |
] ifFalse:[ |
|
2122 |
Dialog error: 'Not yet implemented (Tools::ChangeSetDiffTool>>listMenuBrowse)'. |
|
2123 |
] |
|
2124 |
||
2125 |
"Created: / 30-11-2011 / 11:30:54 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2126 |
! |
|
2127 |
||
10194 | 2128 |
listMenuInspect |
2129 |
||
2130 |
(self selection collect:[:e|e]) inspect |
|
2131 |
||
2132 |
"Modified: / 24-11-2009 / 12:51:00 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2133 |
! |
|
2134 |
||
2135 |
listMenuLoadVersionA |
|
2136 |
||
2137 |
self selection do: |
|
2138 |
[:diff|diff versionA apply] |
|
2139 |
||
2140 |
"Modified: / 09-12-2009 / 23:09:59 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2141 |
! |
|
2142 |
||
2143 |
listMenuLoadVersionB |
|
2144 |
||
2145 |
self selection do: |
|
2146 |
[:diff|diff versionB apply] |
|
2147 |
||
2148 |
"Modified: / 09-12-2009 / 23:10:07 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
12192
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
2149 |
! |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
2150 |
|
12320
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2151 |
listMenuMergeUsingA |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2152 |
self textDiffToolHolder value doMergeAllUsingA |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2153 |
|
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2154 |
"Modified: / 16-01-2013 / 15:57:28 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2155 |
! |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2156 |
|
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2157 |
listMenuMergeUsingB |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2158 |
self textDiffToolHolder value doMergeAllUsingB |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2159 |
|
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2160 |
"Created: / 16-01-2013 / 15:57:32 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2161 |
! |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2162 |
|
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2163 |
listMenuMergeUsingBase |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2164 |
self textDiffToolHolder value doMergeAllUsingBase |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2165 |
|
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2166 |
"Created: / 16-01-2013 / 15:57:36 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2167 |
! |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2168 |
|
12192
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
2169 |
listMenuOpenInExternal: command |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
2170 |
|
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
2171 |
(OperatingSystem canExecuteCommand: command) ifFalse:[ |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
2172 |
Dialog warn: 'Sorry. ', command , ' is not installed or not in PATH' |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
2173 |
]. |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
2174 |
|
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
2175 |
self selection do:[:item| |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
2176 |
| base a b cmd | |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
2177 |
item versionBase notNil ifTrue:[ |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
2178 |
base := Filename newTemporary. |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
2179 |
base writingFileDo:[:s|s nextPutAll: item versionBase source]. |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
2180 |
]. |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
2181 |
a := Filename newTemporary. |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
2182 |
a writingFileDo:[:s|s nextPutAll: item versionA source]. |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
2183 |
b := Filename newTemporary. |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
2184 |
b writingFileDo:[:s|s nextPutAll: item versionB source]. |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
2185 |
|
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
2186 |
base isNil ifTrue:[ |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
2187 |
cmd := '%1 %2 %3' bindWith: command with: a pathName with: b pathName |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
2188 |
] ifFalse:[ |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
2189 |
cmd := '%1 %4 %2 %3 ' bindWith: command with: a pathName with: b pathName with: base pathName. |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
2190 |
]. |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
2191 |
[ OperatingSystem executeCommand: cmd. |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
2192 |
a remove. |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
2193 |
b remove. |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
2194 |
base notNil ifTrue:[base remove]. ] fork |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
2195 |
] |
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
2196 |
|
15f47901fb64
Fixes in Diff2/Diff3 text views
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12179
diff
changeset
|
2197 |
"Modified: / 17-03-2012 / 08:55:11 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
12320
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2198 |
! |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2199 |
|
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2200 |
menuMoveDown |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2201 |
self menuMoveDownToSuchThat: [:entry|true] |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2202 |
|
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2203 |
"Modified: / 17-01-2013 / 16:53:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2204 |
! |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2205 |
|
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2206 |
menuMoveDownConflict |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2207 |
self menuMoveDownToSuchThat: [:entry|entry isMerged not] |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2208 |
|
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2209 |
"Modified: / 17-01-2013 / 16:53:31 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2210 |
! |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2211 |
|
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2212 |
menuMoveDownToSuchThat: aBlock |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2213 |
| oldSel newSel | |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2214 |
oldSel := self theLastSelectedEntry. |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2215 |
newSel := self diffsetHolderPrivate value nextEntryAfter: oldSel suchThat: aBlock. |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2216 |
self menuMoveTo: newSel. |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2217 |
|
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2218 |
"Created: / 17-01-2013 / 16:52:52 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2219 |
! |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2220 |
|
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2221 |
menuMoveTo: entry |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2222 |
|
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2223 |
"/ self window sensor pushUserEvent:#selection: for: self withArgument: entry |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2224 |
self selection: entry. |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2225 |
|
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2226 |
"Created: / 17-01-2013 / 13:03:25 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2227 |
"Modified: / 17-01-2013 / 16:27:19 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2228 |
! |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2229 |
|
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2230 |
menuMoveUp |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2231 |
self menuMoveUpToSuchThat: [:entry|true] |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2232 |
|
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2233 |
"Created: / 17-01-2013 / 16:58:38 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2234 |
! |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2235 |
|
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2236 |
menuMoveUpConflict |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2237 |
self menuMoveUpToSuchThat: [:entry|entry isMerged not] |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2238 |
|
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2239 |
"Created: / 17-01-2013 / 17:00:15 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2240 |
! |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2241 |
|
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2242 |
menuMoveUpToSuchThat: aBlock |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2243 |
| oldSel newSel | |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2244 |
oldSel := self theFirstSelectedEntry. |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2245 |
newSel := self diffsetHolderPrivate value nextEntryBefore: oldSel suchThat: aBlock. |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2246 |
self menuMoveTo: newSel. |
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2247 |
|
5b4ec70d83c1
UI fixes in ChangeSetDiffTool. More will come.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12318
diff
changeset
|
2248 |
"Created: / 17-01-2013 / 16:58:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10194 | 2249 |
! ! |
2250 |
||
2251 |
!ChangeSetDiffTool methodsFor:'queries'! |
|
2252 |
||
2253 |
canBrowse |
|
2254 |
||
2255 |
^true |
|
2256 |
||
2257 |
"^[self selection notNil |
|
2258 |
and:[self selection versionA notNil]]" |
|
2259 |
||
2260 |
"Created: / 02-11-2009 / 18:32:59 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2261 |
"Modified: / 21-11-2009 / 18:46:21 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2262 |
! |
|
2263 |
||
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2264 |
canSave |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2265 |
"Returns true, if a merged file can be saved" |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2266 |
|
12321
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
2267 |
^self canSaveAs and:[self diffInfo specMerge isFile] |
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2268 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2269 |
"Created: / 20-03-2012 / 15:00:12 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
12321
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
2270 |
"Modified: / 17-01-2013 / 21:09:53 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2271 |
! |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2272 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2273 |
canSaveAs |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2274 |
"Returns true, if a merged file can be saved" |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2275 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2276 |
| info | |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2277 |
info := self diffInfo. |
12216
5698c277f043
- Improvements in FileBrowserV2/V3
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12202
diff
changeset
|
2278 |
info isNil ifTrue:[^false]. |
12321
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
2279 |
^info isMerge and:[info diffset notNil and:[info diffset isMerged]] |
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2280 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2281 |
"Created: / 20-03-2012 / 15:03:26 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
12321
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
2282 |
"Modified: / 17-01-2013 / 20:57:55 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2283 |
! |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2284 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2285 |
canSaveAsPatch |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2286 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2287 |
^false |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2288 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2289 |
"Created: / 20-03-2012 / 14:55:55 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2290 |
! |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2291 |
|
12276 | 2292 |
canSaveMergedAs |
2293 |
"Returns true, if a merged file can be saved" |
|
2294 |
||
2295 |
| info | |
|
2296 |
info := self diffInfo. |
|
2297 |
info isNil ifTrue:[^false]. |
|
2298 |
^info isMerge |
|
2299 |
||
2300 |
"Created: / 03-08-2012 / 15:25:43 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2301 |
! |
|
2302 |
||
10194 | 2303 |
hasSelection |
2304 |
||
2305 |
^[self selection notNil] |
|
2306 |
||
2307 |
"Created: / 03-11-2009 / 10:48:08 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2308 |
! ! |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2309 |
|
12321
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
2310 |
!ChangeSetDiffTool methodsFor:'startup & release'! |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
2311 |
|
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
2312 |
closeRequest |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
2313 |
|
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
2314 |
"/Warn about unsaved merge..." |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
2315 |
(alreadyWarnedAboutUnsavedMerge not and:[self canSave and:[mergeSavedHolder value not]]) ifTrue:[ |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
2316 |
alreadyWarnedAboutUnsavedMerge := true. |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
2317 |
self infoPanel |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
2318 |
reset; |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
2319 |
beInformation; |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
2320 |
message: (self resources string:'Output file (merge) has not been saved. Save?'); |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
2321 |
addButtonWithLabel: (self resources string:'Save') action: [ |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
2322 |
self fileMenuSave. |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
2323 |
self closeDownViews. |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
2324 |
]; |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
2325 |
addButtonWithLabel: (self resources string:'Cancel') action:[self infoPanel hide]; |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
2326 |
show. |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
2327 |
^self. |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
2328 |
]. |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
2329 |
self closeDownViews. |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
2330 |
|
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
2331 |
"Created: / 17-01-2013 / 21:02:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
2332 |
! ! |
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
2333 |
|
12201
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2334 |
!ChangeSetDiffTool methodsFor:'testing'! |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2335 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2336 |
isDiff2 |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2337 |
^self diffInfo notNil and:[self diffInfo isDiff2] |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2338 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2339 |
"Created: / 20-03-2012 / 13:27:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2340 |
! |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2341 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2342 |
isDiff2Or3 |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2343 |
^self diffInfo notNil and:[self diffInfo isDiff2 or:[self diffInfo isDiff3]] |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2344 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2345 |
"Created: / 20-03-2012 / 13:29:20 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2346 |
! |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2347 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2348 |
isDiff3 |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2349 |
^self diffInfo notNil and:[self diffInfo isDiff3] |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2350 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2351 |
"Created: / 20-03-2012 / 13:27:31 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2352 |
! |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2353 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2354 |
isMerge |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2355 |
^self diffInfo notNil and:[self diffInfo isMerge] |
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2356 |
|
283826cb8bcc
Improvements in merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12200
diff
changeset
|
2357 |
"Created: / 19-03-2012 / 11:53:21 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10194 | 2358 |
! |
2359 |
||
2360 |
isOneColumnBrowser |
|
2361 |
||
2362 |
^self navigatorPanelSpecHolder value = #oneColumnNavigatorSpec |
|
2363 |
||
2364 |
"Created: / 05-12-2009 / 11:04:53 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2365 |
! ! |
|
2366 |
||
2367 |
!ChangeSetDiffTool::OpenDialog class methodsFor:'image specs'! |
|
2368 |
||
2369 |
versionA24x24 |
|
2370 |
||
2371 |
^ToolbarIconLibrary versionA24x24 |
|
2372 |
||
2373 |
"Created: / 24-03-2010 / 20:49:41 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
2374 |
! |
|
2375 |
||
2376 |
versionB24x24 |
|
2377 |
||
2378 |
^ToolbarIconLibrary versionB24x24 |
|
2379 |
||
2380 |
"Created: / 24-03-2010 / 20:50:38 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
12200
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2381 |
! |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2382 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2383 |
versionBase24x24 |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2384 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2385 |
^ToolbarIconLibrary versionBase24x24 |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2386 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2387 |
"Created: / 19-03-2012 / 23:11:55 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2388 |
! |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2389 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2390 |
versionMerged24x24 |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2391 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2392 |
^ToolbarIconLibrary versionMerged24x24 |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2393 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2394 |
"Created: / 19-03-2012 / 23:34:43 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10194 | 2395 |
! ! |
2396 |
||
2397 |
!ChangeSetDiffTool::OpenDialog class methodsFor:'interface specs'! |
|
2398 |
||
2399 |
windowSpec |
|
2400 |
"This resource specification was automatically generated |
|
2401 |
by the UIPainter of ST/X." |
|
2402 |
||
2403 |
"Do not manually edit this!! If it is corrupted, |
|
2404 |
the UIPainter may not be able to read the specification." |
|
2405 |
||
2406 |
" |
|
12200
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2407 |
UIPainter new openOnClass:Tools::ChangeSetDiffTool::OpenDialog andSelector:#windowSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2408 |
Tools::ChangeSetDiffTool::OpenDialog new openInterface:#windowSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2409 |
Tools::ChangeSetDiffTool::OpenDialog open |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2410 |
" |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2411 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2412 |
<resource: #canvas> |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2413 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2414 |
^ |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2415 |
#(FullSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2416 |
name: windowSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2417 |
window: |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2418 |
(WindowSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2419 |
label: 'Open...' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2420 |
name: 'Open...' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2421 |
min: (Point 10 10) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2422 |
bounds: (Rectangle 0 0 640 457) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2423 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2424 |
component: |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2425 |
(SpecCollection |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2426 |
collection: ( |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2427 |
(VerticalPanelViewSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2428 |
name: 'VerticalPanel1' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2429 |
layout: (LayoutFrame 0 0 0 0 0 1 -30 1) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2430 |
horizontalLayout: fit |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2431 |
verticalLayout: top |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2432 |
horizontalSpace: 3 |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2433 |
verticalSpace: 3 |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2434 |
component: |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2435 |
(SpecCollection |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2436 |
collection: ( |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2437 |
(ViewSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2438 |
name: 'B' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2439 |
component: |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2440 |
(SpecCollection |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2441 |
collection: ( |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2442 |
(UISubSpecification |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2443 |
name: 'SubSpecification2' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2444 |
layout: (LayoutFrame 0 0 0 0 0 1 30 0) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2445 |
minorKey: versionBLabelSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2446 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2447 |
(SubCanvasSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2448 |
name: 'SubCanvas1' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2449 |
layout: (LayoutFrame 30 0 30 0 0 1 0 1) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2450 |
level: 0 |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2451 |
hasHorizontalScrollBar: false |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2452 |
hasVerticalScrollBar: false |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2453 |
majorKey: #'Tools::ChangeSetSelectionDialog' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2454 |
minorKey: windowSpecForEmbedding |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2455 |
subAspectHolders: |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2456 |
(Array |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2457 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2458 |
(SubChannelInfoSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2459 |
subAspect: specHolder |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2460 |
aspect: changesetSpecBHolder |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2461 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2462 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2463 |
createNewApplication: true |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2464 |
createNewBuilder: true |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2465 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2466 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2467 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2468 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2469 |
extent: (Point 640 99) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2470 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2471 |
(ViewSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2472 |
name: 'A' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2473 |
component: |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2474 |
(SpecCollection |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2475 |
collection: ( |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2476 |
(UISubSpecification |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2477 |
name: 'SubSpecification1' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2478 |
layout: (LayoutFrame 0 0 0 0 0 1 30 0) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2479 |
minorKey: versionALabelSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2480 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2481 |
(SubCanvasSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2482 |
name: 'ChangesetASpec' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2483 |
layout: (LayoutFrame 30 0 30 0 0 1 0 1) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2484 |
level: 0 |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2485 |
hasHorizontalScrollBar: false |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2486 |
hasVerticalScrollBar: false |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2487 |
majorKey: #'Tools::ChangeSetSelectionDialog' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2488 |
minorKey: windowSpecForEmbedding |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2489 |
subAspectHolders: |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2490 |
(Array |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2491 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2492 |
(SubChannelInfoSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2493 |
subAspect: specHolder |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2494 |
aspect: changesetSpecAHolder |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2495 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2496 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2497 |
createNewApplication: true |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2498 |
createNewBuilder: true |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2499 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2500 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2501 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2502 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2503 |
extent: (Point 640 99) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2504 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2505 |
(ViewSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2506 |
name: 'Base' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2507 |
component: |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2508 |
(SpecCollection |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2509 |
collection: ( |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2510 |
(UISubSpecification |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2511 |
name: 'SubSpecification3' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2512 |
layout: (LayoutFrame 0 0 0 0 0 1 30 0) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2513 |
minorKey: versionBaseLabelSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2514 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2515 |
(SubCanvasSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2516 |
name: 'SubCanvas2' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2517 |
layout: (LayoutFrame 30 0 30 0 0 1 0 1) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2518 |
level: 0 |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2519 |
hasHorizontalScrollBar: false |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2520 |
hasVerticalScrollBar: false |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2521 |
majorKey: #'Tools::ChangeSetSelectionDialog' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2522 |
minorKey: windowSpecForEmbedding |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2523 |
subAspectHolders: |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2524 |
(Array |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2525 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2526 |
(SubChannelInfoSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2527 |
subAspect: enabledHolder |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2528 |
aspect: changesetSpecBaseEnabledHolder |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2529 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2530 |
(SubChannelInfoSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2531 |
subAspect: specHolder |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2532 |
aspect: changesetSpecBaseHolder |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2533 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2534 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2535 |
createNewApplication: true |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2536 |
createNewBuilder: true |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2537 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2538 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2539 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2540 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2541 |
extent: (Point 640 98) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2542 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2543 |
(ViewSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2544 |
name: 'Merge' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2545 |
component: |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2546 |
(SpecCollection |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2547 |
collection: ( |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2548 |
(UISubSpecification |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2549 |
name: 'SubSpecification4' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2550 |
layout: (LayoutFrame 0 0 0 0 0 1 30 0) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2551 |
minorKey: versionMergedLabelSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2552 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2553 |
(SubCanvasSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2554 |
name: 'SubCanvas3' |
12276 | 2555 |
layout: (LayoutFrame 30 0 30 0 0 1 -25 1) |
12200
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2556 |
level: 0 |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2557 |
hasHorizontalScrollBar: false |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2558 |
hasVerticalScrollBar: false |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2559 |
majorKey: #'Tools::ChangeSetSelectionDialog' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2560 |
minorKey: windowSpecForEmbedding |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2561 |
subAspectHolders: |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2562 |
(Array |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2563 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2564 |
(SubChannelInfoSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2565 |
subAspect: enabledHolder |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2566 |
aspect: changesetSpecMergedEnabledHolder |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2567 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2568 |
(SubChannelInfoSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2569 |
subAspect: specHolder |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2570 |
aspect: changesetSpecMergedHolder |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2571 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2572 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2573 |
createNewApplication: true |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2574 |
createNewBuilder: true |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2575 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2576 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2577 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2578 |
) |
12276 | 2579 |
extent: (Point 640 123) |
12200
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2580 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2581 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2582 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2583 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2584 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2585 |
(HorizontalPanelViewSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2586 |
name: 'ButtonPanel' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2587 |
layout: (LayoutFrame 3 0 -30 1 -3 1 0 1) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2588 |
horizontalLayout: right |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2589 |
verticalLayout: center |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2590 |
horizontalSpace: 3 |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2591 |
verticalSpace: 3 |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2592 |
reverseOrderIfOKAtLeft: true |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2593 |
component: |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2594 |
(SpecCollection |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2595 |
collection: ( |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2596 |
(ActionButtonSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2597 |
label: 'OK' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2598 |
name: 'Button1' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2599 |
translateLabel: true |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2600 |
model: doAccept |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2601 |
enableChannel: doAcceptEnabled |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2602 |
extent: (Point 125 22) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2603 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2604 |
(ActionButtonSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2605 |
label: 'Cancel' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2606 |
name: 'Button2' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2607 |
translateLabel: true |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2608 |
model: doCancel |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2609 |
extent: (Point 125 22) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2610 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2611 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2612 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2613 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2614 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2615 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2616 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2617 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2618 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2619 |
! |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2620 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2621 |
windowSpec_old |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2622 |
"This resource specification was automatically generated |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2623 |
by the UIPainter of ST/X." |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2624 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2625 |
"Do not manually edit this!! If it is corrupted, |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2626 |
the UIPainter may not be able to read the specification." |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2627 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2628 |
" |
10194 | 2629 |
UIPainter new openOnClass:Tools::ChangeSetDiffBrowser::OpenDialog andSelector:#windowSpec |
2630 |
Tools::ChangeSetDiffBrowser::OpenDialog new openInterface:#windowSpec |
|
2631 |
Tools::ChangeSetDiffBrowser::OpenDialog open |
|
2632 |
" |
|
2633 |
||
2634 |
<resource: #canvas> |
|
2635 |
||
2636 |
^ |
|
2637 |
#(FullSpec |
|
2638 |
name: windowSpec |
|
2639 |
window: |
|
2640 |
(WindowSpec |
|
2641 |
label: 'Open...' |
|
2642 |
name: 'Open...' |
|
2643 |
min: (Point 10 10) |
|
2644 |
bounds: (Rectangle 0 0 640 130) |
|
2645 |
) |
|
2646 |
component: |
|
2647 |
(SpecCollection |
|
2648 |
collection: ( |
|
2649 |
(VariableHorizontalPanelSpec |
|
2650 |
name: 'ChangeSetsSpecPanel' |
|
2651 |
layout: (LayoutFrame 0 0 0 0 0 1 -30 1) |
|
2652 |
barWidth: 3 |
|
2653 |
showHandle: true |
|
2654 |
component: |
|
2655 |
(SpecCollection |
|
2656 |
collection: ( |
|
2657 |
(ViewSpec |
|
2658 |
name: 'A' |
|
2659 |
component: |
|
2660 |
(SpecCollection |
|
2661 |
collection: ( |
|
2662 |
(UISubSpecification |
|
2663 |
name: 'SubSpecification1' |
|
2664 |
layout: (LayoutFrame 0 0 0 0 0 1 30 0) |
|
2665 |
minorKey: versionALabelSpec |
|
2666 |
) |
|
2667 |
(SubCanvasSpec |
|
2668 |
name: 'ChangesetASpec' |
|
2669 |
layout: (LayoutFrame 0 0 30 0 0 1 0 1) |
|
2670 |
hasHorizontalScrollBar: false |
|
2671 |
hasVerticalScrollBar: false |
|
2672 |
majorKey: #'Tools::ChangeSetSelectionDialog' |
|
2673 |
minorKey: windowSpecForEmbedding |
|
2674 |
subAspectHolders: |
|
2675 |
(Array |
|
2676 |
||
2677 |
(SubChannelInfoSpec |
|
2678 |
subAspect: specHolder |
|
2679 |
aspect: changesetSpecAHolder |
|
2680 |
) |
|
2681 |
) |
|
2682 |
createNewApplication: true |
|
2683 |
createNewBuilder: true |
|
2684 |
) |
|
2685 |
) |
|
2686 |
||
2687 |
) |
|
2688 |
) |
|
2689 |
(ViewSpec |
|
2690 |
name: 'B' |
|
2691 |
component: |
|
2692 |
(SpecCollection |
|
2693 |
collection: ( |
|
2694 |
(UISubSpecification |
|
2695 |
name: 'SubSpecification2' |
|
2696 |
layout: (LayoutFrame 0 0 0 0 0 1 30 0) |
|
2697 |
minorKey: versionBLabelSpec |
|
2698 |
) |
|
2699 |
(SubCanvasSpec |
|
2700 |
name: 'SubCanvas1' |
|
2701 |
layout: (LayoutFrame 0 0 30 0 0 1 0 1) |
|
2702 |
hasHorizontalScrollBar: false |
|
2703 |
hasVerticalScrollBar: false |
|
2704 |
majorKey: #'Tools::ChangeSetSelectionDialog' |
|
2705 |
minorKey: windowSpecForEmbedding |
|
2706 |
subAspectHolders: |
|
2707 |
(Array |
|
2708 |
||
2709 |
(SubChannelInfoSpec |
|
2710 |
subAspect: specHolder |
|
2711 |
aspect: changesetSpecBHolder |
|
2712 |
) |
|
2713 |
) |
|
2714 |
createNewApplication: true |
|
2715 |
createNewBuilder: true |
|
2716 |
) |
|
2717 |
) |
|
2718 |
||
2719 |
) |
|
2720 |
) |
|
2721 |
) |
|
2722 |
||
2723 |
) |
|
2724 |
handles: (Any 0.5 1.0) |
|
2725 |
) |
|
2726 |
(HorizontalPanelViewSpec |
|
2727 |
name: 'ButtonPanel' |
|
2728 |
layout: (LayoutFrame 3 0 -30 1 -3 1 0 1) |
|
2729 |
horizontalLayout: right |
|
2730 |
verticalLayout: center |
|
2731 |
horizontalSpace: 3 |
|
2732 |
verticalSpace: 3 |
|
2733 |
reverseOrderIfOKAtLeft: true |
|
2734 |
component: |
|
2735 |
(SpecCollection |
|
2736 |
collection: ( |
|
2737 |
(ActionButtonSpec |
|
2738 |
label: 'OK' |
|
2739 |
name: 'Button1' |
|
2740 |
translateLabel: true |
|
2741 |
model: doAccept |
|
2742 |
enableChannel: doAcceptEnabled |
|
2743 |
extent: (Point 125 22) |
|
2744 |
) |
|
2745 |
(ActionButtonSpec |
|
2746 |
label: 'Cancel' |
|
2747 |
name: 'Button2' |
|
2748 |
translateLabel: true |
|
2749 |
model: doCancel |
|
2750 |
extent: (Point 125 22) |
|
2751 |
) |
|
2752 |
) |
|
2753 |
||
2754 |
) |
|
2755 |
) |
|
2756 |
) |
|
2757 |
||
2758 |
) |
|
2759 |
) |
|
2760 |
||
2761 |
"Modified: / 06-07-2011 / 11:32:49 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
12200
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2762 |
"Created: / 19-03-2012 / 22:21:46 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10194 | 2763 |
! ! |
2764 |
||
2765 |
!ChangeSetDiffTool::OpenDialog class methodsFor:'interface specs - labels'! |
|
2766 |
||
2767 |
versionALabelSpec |
|
2768 |
"This resource specification was automatically generated |
|
2769 |
by the UIPainter of ST/X." |
|
2770 |
||
2771 |
"Do not manually edit this!! If it is corrupted, |
|
2772 |
the UIPainter may not be able to read the specification." |
|
2773 |
||
2774 |
" |
|
2775 |
UIPainter new openOnClass:Tools::ChangeSetDiffBrowser::OpenDialog andSelector:#versionALabelSpec |
|
2776 |
Tools::ChangeSetDiffBrowser::OpenDialog new openInterface:#versionALabelSpec |
|
2777 |
" |
|
2778 |
||
2779 |
<resource: #canvas> |
|
2780 |
||
2781 |
^ |
|
2782 |
#(FullSpec |
|
2783 |
name: versionALabelSpec |
|
2784 |
window: |
|
2785 |
(WindowSpec |
|
2786 |
label: 'Version A' |
|
2787 |
name: 'Changeset A' |
|
2788 |
min: (Point 10 10) |
|
2789 |
bounds: (Rectangle 0 0 300 30) |
|
2790 |
backgroundColor: (Color 79.6078431372549 90.5882352941177 69.4117647058823) |
|
2791 |
forceRecursiveBackground: true |
|
2792 |
) |
|
2793 |
component: |
|
2794 |
(SpecCollection |
|
2795 |
collection: ( |
|
2796 |
(LabelSpec |
|
2797 |
label: 'versionA24x24' |
|
2798 |
name: 'VersionAIcon' |
|
2799 |
layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5) |
|
2800 |
hasCharacterOrientedLabel: false |
|
2801 |
translateLabel: true |
|
2802 |
) |
|
2803 |
(LabelSpec |
|
12200
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2804 |
label: 'Version A (working copy)' |
10194 | 2805 |
name: 'VersionALabel' |
2806 |
layout: (LayoutFrame 30 0 5 0 0 1 0 1) |
|
2807 |
translateLabel: true |
|
2808 |
resizeForLabel: true |
|
2809 |
adjust: left |
|
2810 |
) |
|
2811 |
) |
|
2812 |
||
2813 |
) |
|
2814 |
) |
|
2815 |
||
12200
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2816 |
"Modified: / 19-03-2012 / 22:15:26 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10194 | 2817 |
! |
2818 |
||
2819 |
versionBLabelSpec |
|
2820 |
"This resource specification was automatically generated |
|
2821 |
by the UIPainter of ST/X." |
|
2822 |
||
2823 |
"Do not manually edit this!! If it is corrupted, |
|
2824 |
the UIPainter may not be able to read the specification." |
|
2825 |
||
2826 |
" |
|
2827 |
UIPainter new openOnClass:Tools::ChangeSetDiffBrowser::OpenDialog andSelector:#versionBLabelSpec |
|
2828 |
Tools::ChangeSetDiffBrowser::OpenDialog new openInterface:#versionBLabelSpec |
|
2829 |
" |
|
2830 |
||
2831 |
<resource: #canvas> |
|
2832 |
||
2833 |
^ |
|
2834 |
#(FullSpec |
|
2835 |
name: versionBLabelSpec |
|
2836 |
window: |
|
2837 |
(WindowSpec |
|
2838 |
label: 'Version B' |
|
2839 |
name: 'Changeset B' |
|
2840 |
min: (Point 10 10) |
|
2841 |
bounds: (Rectangle 0 0 300 30) |
|
2842 |
backgroundColor: (Color 100.0 90.5882352941177 60.0) |
|
2843 |
forceRecursiveBackground: true |
|
2844 |
) |
|
2845 |
component: |
|
2846 |
(SpecCollection |
|
2847 |
collection: ( |
|
2848 |
(LabelSpec |
|
2849 |
label: 'versionB24x24' |
|
2850 |
name: 'VersionBIcon' |
|
2851 |
layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5) |
|
2852 |
hasCharacterOrientedLabel: false |
|
2853 |
translateLabel: true |
|
2854 |
) |
|
2855 |
(LabelSpec |
|
12200
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2856 |
label: 'Version B (to be merged)' |
10194 | 2857 |
name: 'VersionBLabel' |
2858 |
layout: (LayoutFrame 30 0 5 0 97 0 0 1) |
|
2859 |
translateLabel: true |
|
2860 |
resizeForLabel: true |
|
2861 |
adjust: left |
|
2862 |
useDynamicPreferredWidth: true |
|
2863 |
usePreferredWidth: true |
|
2864 |
) |
|
2865 |
) |
|
2866 |
||
2867 |
) |
|
2868 |
) |
|
2869 |
||
12200
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2870 |
"Modified: / 19-03-2012 / 22:15:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2871 |
! |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2872 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2873 |
versionBaseLabelSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2874 |
"This resource specification was automatically generated |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2875 |
by the UIPainter of ST/X." |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2876 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2877 |
"Do not manually edit this!! If it is corrupted, |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2878 |
the UIPainter may not be able to read the specification." |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2879 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2880 |
" |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2881 |
UIPainter new openOnClass:Tools::ChangeSetDiffTool::OpenDialog andSelector:#versionBaseLabelSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2882 |
Tools::ChangeSetDiffTool::OpenDialog new openInterface:#versionBaseLabelSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2883 |
" |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2884 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2885 |
<resource: #canvas> |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2886 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2887 |
^ |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2888 |
#(FullSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2889 |
name: versionBaseLabelSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2890 |
window: |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2891 |
(WindowSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2892 |
label: 'Version B' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2893 |
name: 'Version B' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2894 |
min: (Point 10 10) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2895 |
bounds: (Rectangle 0 0 300 30) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2896 |
backgroundColor: (Color 57.2182803082322 81.2832837415122 91.0872053101396) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2897 |
forceRecursiveBackground: true |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2898 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2899 |
component: |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2900 |
(SpecCollection |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2901 |
collection: ( |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2902 |
(LabelSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2903 |
label: 'versionBase24x24' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2904 |
name: 'VersionBaseIcon' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2905 |
layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2906 |
hasCharacterOrientedLabel: false |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2907 |
translateLabel: true |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2908 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2909 |
(LabelSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2910 |
label: 'Base' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2911 |
name: 'VersionBLabel' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2912 |
layout: (LayoutFrame 30 0 5 0 68 0 0 1) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2913 |
translateLabel: true |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2914 |
resizeForLabel: true |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2915 |
adjust: left |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2916 |
useDynamicPreferredWidth: true |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2917 |
usePreferredWidth: true |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2918 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2919 |
(CheckBoxSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2920 |
label: '' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2921 |
name: 'CheckBox1' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2922 |
layout: (LayoutFrame -30 1 0 0 0 1 0 1) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2923 |
model: changesetSpecBaseEnabledHolder |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2924 |
translateLabel: true |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2925 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2926 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2927 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2928 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2929 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2930 |
! |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2931 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2932 |
versionMergedLabelSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2933 |
"This resource specification was automatically generated |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2934 |
by the UIPainter of ST/X." |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2935 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2936 |
"Do not manually edit this!! If it is corrupted, |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2937 |
the UIPainter may not be able to read the specification." |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2938 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2939 |
" |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2940 |
UIPainter new openOnClass:Tools::ChangeSetDiffTool::OpenDialog andSelector:#versionMergedLabelSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2941 |
Tools::ChangeSetDiffTool::OpenDialog new openInterface:#versionMergedLabelSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2942 |
" |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2943 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2944 |
<resource: #canvas> |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2945 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2946 |
^ |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2947 |
#(FullSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2948 |
name: versionMergedLabelSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2949 |
window: |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2950 |
(WindowSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2951 |
label: 'Merge' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2952 |
name: 'Merge' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2953 |
min: (Point 10 10) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2954 |
bounds: (Rectangle 0 0 300 30) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2955 |
backgroundColor: (Color 92.6909285114824 62.388036926833 93.2265201800565) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2956 |
forceRecursiveBackground: true |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2957 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2958 |
component: |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2959 |
(SpecCollection |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2960 |
collection: ( |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2961 |
(LabelSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2962 |
label: 'versionMerged24x24' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2963 |
name: 'VersionMergedIcon' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2964 |
layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2965 |
hasCharacterOrientedLabel: false |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2966 |
translateLabel: true |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2967 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2968 |
(LabelSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2969 |
label: 'Merge' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2970 |
name: 'VersionBLabel' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2971 |
layout: (LayoutFrame 30 0 5 0 68 0 0 1) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2972 |
translateLabel: true |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2973 |
resizeForLabel: true |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2974 |
adjust: left |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2975 |
useDynamicPreferredWidth: true |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2976 |
usePreferredWidth: true |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2977 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2978 |
(CheckBoxSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2979 |
label: '' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2980 |
name: 'CheckBox1' |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2981 |
layout: (LayoutFrame -30 1 0 0 0 1 0 1) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2982 |
model: changesetSpecMergedEnabledHolder |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2983 |
translateLabel: true |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2984 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2985 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2986 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2987 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2988 |
) |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2989 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
2990 |
"Modified: / 19-03-2012 / 23:36:48 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10194 | 2991 |
! ! |
2992 |
||
2993 |
!ChangeSetDiffTool::OpenDialog methodsFor:'accessing'! |
|
2994 |
||
2995 |
changeSetA |
|
2996 |
||
2997 |
| specA | |
|
2998 |
||
2999 |
specA := self changesetSpecAHolder value. |
|
3000 |
^specA ifNil:[nil] ifNotNil:[specA changeSet] |
|
3001 |
||
3002 |
"Created: / 06-07-2011 / 11:36:14 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3003 |
! |
|
3004 |
||
12200
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3005 |
changeSetASpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3006 |
^self changesetSpecAHolder value. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3007 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3008 |
"Created: / 20-03-2012 / 00:01:21 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3009 |
! |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3010 |
|
12275
a416cf8a4b50
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
3011 |
changeSetASpec: spec |
a416cf8a4b50
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
3012 |
^self changesetSpecAHolder value: spec |
a416cf8a4b50
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
3013 |
|
a416cf8a4b50
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
3014 |
"Created: / 01-08-2012 / 15:38:02 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
a416cf8a4b50
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
3015 |
! |
a416cf8a4b50
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
3016 |
|
10194 | 3017 |
changeSetB |
3018 |
||
3019 |
| specB | |
|
3020 |
||
3021 |
specB := self changesetSpecBHolder value. |
|
3022 |
^specB ifNil:[nil] ifNotNil:[specB changeSet] |
|
3023 |
||
3024 |
"Created: / 06-07-2011 / 11:36:18 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
3025 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
3026 |
|
12200
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3027 |
changeSetBSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3028 |
^self changesetSpecBHolder value. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3029 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3030 |
"Created: / 20-03-2012 / 00:01:27 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3031 |
! |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3032 |
|
12275
a416cf8a4b50
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
3033 |
changeSetBSpec: spec |
a416cf8a4b50
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
3034 |
^self changesetSpecBHolder value: spec |
a416cf8a4b50
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
3035 |
|
a416cf8a4b50
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
3036 |
"Created: / 01-08-2012 / 15:38:08 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
a416cf8a4b50
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
3037 |
! |
a416cf8a4b50
- Tools::ChangeSetDiffList
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12274
diff
changeset
|
3038 |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
3039 |
changeSetBase |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
3040 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
3041 |
| specBase | |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
3042 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
3043 |
specBase := self changesetSpecBaseHolder value. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
3044 |
^specBase ifNil:[nil] ifNotNil:[specBase changeSet] |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
3045 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
3046 |
"Created: / 16-03-2012 / 13:48:30 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
12200
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3047 |
! |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3048 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3049 |
changeSetBaseSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3050 |
^self changesetSpecBaseHolder value. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3051 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3052 |
"Created: / 20-03-2012 / 00:01:31 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3053 |
! |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3054 |
|
12274
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
3055 |
changeSetBaseSpec: spec |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
3056 |
^self changesetSpecBaseHolder value: spec |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
3057 |
|
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
3058 |
"Created: / 01-08-2012 / 15:38:15 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
3059 |
! |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
3060 |
|
12200
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3061 |
changeSetMerged |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3062 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3063 |
| specMerged | |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3064 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3065 |
specMerged := self changesetSpecMergedHolder value. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3066 |
^specMerged ifNil:[nil] ifNotNil:[specMerged changeSet] |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3067 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3068 |
"Created: / 20-03-2012 / 00:01:07 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3069 |
! |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3070 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3071 |
changeSetMergedSpec |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3072 |
^self changesetSpecMergedHolder value. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3073 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3074 |
"Created: / 20-03-2012 / 00:01:39 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
12274
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
3075 |
! |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
3076 |
|
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
3077 |
changeSetMergedSpec: spec |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
3078 |
^self changesetSpecMergedHolder value: spec |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
3079 |
|
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
3080 |
"Created: / 01-08-2012 / 15:38:26 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
3081 |
! |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
3082 |
|
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
3083 |
diffInfo |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
3084 |
"Returns a ChangeSetDiffInfo based on current data" |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
3085 |
|
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
3086 |
| info | |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
3087 |
info := ChangeSetDiffInfo new. |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
3088 |
info specA: self changeSetASpec. |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
3089 |
info specB: self changeSetBSpec. |
12276 | 3090 |
self changesetSpecBaseEnabledHolder value ifTrue:[ |
3091 |
info specBase: self changeSetBaseSpec. |
|
3092 |
]. |
|
3093 |
changesetSpecMergedEnabledHolder value ifTrue:[ |
|
3094 |
info specMerge: self changeSetMergedSpec. |
|
3095 |
]. |
|
12274
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
3096 |
^info |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
3097 |
|
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
3098 |
"Created: / 01-08-2012 / 15:41:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
3099 |
! |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
3100 |
|
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
3101 |
diffInfo: info |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
3102 |
"Sets up dialog for given diff info" |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
3103 |
|
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
3104 |
info isNil ifTrue:[ ^ self ]. |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
3105 |
|
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
3106 |
self changeSetASpec: info specA. |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
3107 |
self changeSetBSpec: info specB. |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
3108 |
self changeSetBaseSpec: info specBase. |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
3109 |
self changeSetMergedSpec: info specMerge. |
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
3110 |
|
1e0599b8a007
Improvements in changeset tools
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12256
diff
changeset
|
3111 |
"Created: / 01-08-2012 / 15:37:53 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
10194 | 3112 |
! ! |
3113 |
||
3114 |
!ChangeSetDiffTool::OpenDialog methodsFor:'aspects'! |
|
3115 |
||
3116 |
changesetSpecAHolder |
|
3117 |
"return/create the 'changesetSpecAHolder' value holder (automatically generated)" |
|
3118 |
||
3119 |
changesetSpecAHolder isNil ifTrue:[ |
|
3120 |
changesetSpecAHolder := ValueHolder new. |
|
3121 |
]. |
|
3122 |
^ changesetSpecAHolder |
|
3123 |
! |
|
3124 |
||
3125 |
changesetSpecAHolder:something |
|
3126 |
"set the 'changesetSpecAHolder' value holder (automatically generated)" |
|
3127 |
||
3128 |
changesetSpecAHolder := something. |
|
3129 |
! |
|
3130 |
||
3131 |
changesetSpecBHolder |
|
3132 |
"return/create the 'changesetSpecBHolder' value holder (automatically generated)" |
|
3133 |
||
3134 |
changesetSpecBHolder isNil ifTrue:[ |
|
3135 |
changesetSpecBHolder := ValueHolder new. |
|
3136 |
]. |
|
3137 |
^ changesetSpecBHolder |
|
3138 |
! |
|
3139 |
||
3140 |
changesetSpecBHolder:something |
|
3141 |
"set the 'changesetSpecBHolder' value holder (automatically generated)" |
|
3142 |
||
3143 |
changesetSpecBHolder := something. |
|
3144 |
! |
|
3145 |
||
12200
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3146 |
changesetSpecBaseEnabledHolder |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3147 |
"return/create the 'changesetSpecBaseEnabledHolder' value holder (automatically generated)" |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3148 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3149 |
changesetSpecBaseEnabledHolder isNil ifTrue:[ |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3150 |
changesetSpecBaseEnabledHolder := false asValue |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3151 |
]. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3152 |
^ changesetSpecBaseEnabledHolder |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3153 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3154 |
"Modified: / 19-03-2012 / 23:20:30 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3155 |
! |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3156 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3157 |
changesetSpecBaseEnabledHolder:something |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3158 |
"set the 'changesetSpecBaseEnabledHolder' value holder (automatically generated)" |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3159 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3160 |
changesetSpecBaseEnabledHolder := something. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3161 |
! |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3162 |
|
12179
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
3163 |
changesetSpecBaseHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
3164 |
"return/create the 'changesetSpecBHolder' value holder (automatically generated)" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
3165 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
3166 |
changesetSpecBaseHolder isNil ifTrue:[ |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
3167 |
changesetSpecBaseHolder := ValueHolder new. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
3168 |
]. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
3169 |
^ changesetSpecBaseHolder |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
3170 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
3171 |
"Created: / 16-03-2012 / 13:48:53 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
3172 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
3173 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
3174 |
changesetSpecBaseHolder:something |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
3175 |
"set the 'changesetSpecBHolder' value holder (automatically generated)" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
3176 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
3177 |
changesetSpecBaseHolder := something. |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
3178 |
|
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
3179 |
"Created: / 16-03-2012 / 13:49:08 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
3180 |
! |
47f98e7d6de1
Improvments towards merge tool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12128
diff
changeset
|
3181 |
|
12200
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3182 |
changesetSpecMergedEnabledHolder |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3183 |
"return/create the 'changesetSpecMergedEnabledHolder' value holder (automatically generated)" |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3184 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3185 |
changesetSpecMergedEnabledHolder isNil ifTrue:[ |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3186 |
changesetSpecMergedEnabledHolder := false asValue |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3187 |
]. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3188 |
^ changesetSpecMergedEnabledHolder |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3189 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3190 |
"Modified: / 19-03-2012 / 23:20:17 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3191 |
! |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3192 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3193 |
changesetSpecMergedEnabledHolder:something |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3194 |
"set the 'changesetSpecMergedEnabledHolder' value holder (automatically generated)" |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3195 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3196 |
changesetSpecMergedEnabledHolder := something. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3197 |
! |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3198 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3199 |
changesetSpecMergedHolder |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3200 |
"return/create the 'changesetSpecMergedHolder' value holder (automatically generated)" |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3201 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3202 |
changesetSpecMergedHolder isNil ifTrue:[ |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3203 |
changesetSpecMergedHolder := ValueHolder new. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3204 |
]. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3205 |
^ changesetSpecMergedHolder |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3206 |
! |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3207 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3208 |
changesetSpecMergedHolder:something |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3209 |
"set the 'changesetSpecMergedHolder' value holder (automatically generated)" |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3210 |
|
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3211 |
changesetSpecMergedHolder := something. |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3212 |
! |
807a52b94f2a
Further improvements in ChangeSetDiffTool
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12198
diff
changeset
|
3213 |
|
10194 | 3214 |
doAcceptEnabled |
3215 |
<resource: #uiAspect> |
|
3216 |
||
3217 |
^BlockValue |
|
3218 |
with:[:a :b|a value notNil and:[b value notNil]] |
|
3219 |
argument:self changesetSpecAHolder |
|
3220 |
argument:self changesetSpecAHolder. |
|
3221 |
||
3222 |
"Modified: / 06-07-2011 / 11:26:43 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3223 |
! ! |
|
3224 |
||
3225 |
!ChangeSetDiffTool::OpenDialog methodsFor:'events'! |
|
3226 |
||
3227 |
closeAccept |
|
3228 |
||
3229 |
^super closeAccept |
|
3230 |
||
3231 |
"Created: / 06-07-2011 / 12:09:39 / Jan Vrany <jan.vrany@fit.cvut.cz>" |
|
3232 |
! ! |
|
3233 |
||
3234 |
!ChangeSetDiffTool class methodsFor:'documentation'! |
|
3235 |
||
3236 |
version_CVS |
|
12125 | 3237 |
^ '§Header: /cvs/stx/stx/libtool/Tools__ChangeSetDiffTool.st,v 1.5 2011/12/19 08:39:53 vrany Exp §' |
10194 | 3238 |
! |
3239 |
||
3240 |
version_SVN |
|
12321
13d791d84a47
More improvements in ChangeSetDiffTool.
Jan Vrany <jan.vrany@fit.cvut.cz>
parents:
12320
diff
changeset
|
3241 |
^ '$Id: Tools__ChangeSetDiffTool.st 8090 2013-01-17 21:52:18Z vranyj1 $' |
12125 | 3242 |
! ! |