hg/stx-libtool: Tools__ChangeSetDiffTool.st@c9bf900fe729 (annotated)

10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	1	"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2	Copyright (c) 2007-2010 Jan Vrany
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3	Copyright (c) 2009-2010 eXept Software AG
ce5e1fc44d81 initial checkin vrany parents: diff changeset	4
ce5e1fc44d81 initial checkin vrany parents: diff changeset	5	Permission is hereby granted, free of charge, to any person
ce5e1fc44d81 initial checkin vrany parents: diff changeset	6	obtaining a copy of this software and associated documentation
ce5e1fc44d81 initial checkin vrany parents: diff changeset	7	files (the 'Software'), to deal in the Software without
ce5e1fc44d81 initial checkin vrany parents: diff changeset	8	restriction, including without limitation the rights to use,
ce5e1fc44d81 initial checkin vrany parents: diff changeset	9	copy, modify, merge, publish, distribute, sublicense, and/or sell
ce5e1fc44d81 initial checkin vrany parents: diff changeset	10	copies of the Software, and to permit persons to whom the
ce5e1fc44d81 initial checkin vrany parents: diff changeset	11	Software is furnished to do so, subject to the following
ce5e1fc44d81 initial checkin vrany parents: diff changeset	12	conditions:
ce5e1fc44d81 initial checkin vrany parents: diff changeset	13
ce5e1fc44d81 initial checkin vrany parents: diff changeset	14	The above copyright notice and this permission notice shall be
ce5e1fc44d81 initial checkin vrany parents: diff changeset	15	included in all copies or substantial portions of the Software.
ce5e1fc44d81 initial checkin vrany parents: diff changeset	16
ce5e1fc44d81 initial checkin vrany parents: diff changeset	17	THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
ce5e1fc44d81 initial checkin vrany parents: diff changeset	18	EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
ce5e1fc44d81 initial checkin vrany parents: diff changeset	19	OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
ce5e1fc44d81 initial checkin vrany parents: diff changeset	20	NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
ce5e1fc44d81 initial checkin vrany parents: diff changeset	21	HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
ce5e1fc44d81 initial checkin vrany parents: diff changeset	22	WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
ce5e1fc44d81 initial checkin vrany parents: diff changeset	23	FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
ce5e1fc44d81 initial checkin vrany parents: diff changeset	24	OTHER DEALINGS IN THE SOFTWARE.
ce5e1fc44d81 initial checkin vrany parents: diff changeset	25	"
10741 e4645cbb0958 Fix package def libbasic3->libtool Stefan Vogel <sv@exept.de> parents: 10194 diff changeset	26	"{ Package: 'stx:libtool' }"
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	27
ce5e1fc44d81 initial checkin vrany parents: diff changeset	28	"{ NameSpace: Tools }"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	29
ce5e1fc44d81 initial checkin vrany parents: diff changeset	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
12322 6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	41	list2App alreadyWarnedAboutUnsavedMerge labelSpecHolder
12650 e0f607754b9a Merged 18d06283743d and ff31bac2fd1b (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12329 diff changeset	42	labelsView navigatorAndDiffPanelView codeAspectHolder'
12321 13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	43	classVariableNames:'LastDiffInfo AutoMoveToNextConflict'
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	44	poolDictionaries:''
ce5e1fc44d81 initial checkin vrany parents: diff changeset	45	category:'Interface-Diff'
ce5e1fc44d81 initial checkin vrany parents: diff changeset	46	!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	47
ce5e1fc44d81 initial checkin vrany parents: diff changeset	48	SimpleDialog subclass:#OpenDialog
12179 47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	49	instanceVariableNames:'doAcceptEnabled changesetSpecAHolder changesetSpecBHolder
12200 807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	50	changesetSpecBaseHolder changesetSpecBaseEnabledHolder
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	51	changesetSpecMergedHolder changesetSpecMergedEnabledHolder'
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	52	classVariableNames:'LastDirectory'
ce5e1fc44d81 initial checkin vrany parents: diff changeset	53	poolDictionaries:''
ce5e1fc44d81 initial checkin vrany parents: diff changeset	54	privateIn:ChangeSetDiffTool
ce5e1fc44d81 initial checkin vrany parents: diff changeset	55	!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	56
ce5e1fc44d81 initial checkin vrany parents: diff changeset	57	!ChangeSetDiffTool class methodsFor:'documentation'!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	58
ce5e1fc44d81 initial checkin vrany parents: diff changeset	59	copyright
ce5e1fc44d81 initial checkin vrany parents: diff changeset	60	"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	61	Copyright (c) 2007-2010 Jan Vrany
ce5e1fc44d81 initial checkin vrany parents: diff changeset	62	Copyright (c) 2009-2010 eXept Software AG
ce5e1fc44d81 initial checkin vrany parents: diff changeset	63
ce5e1fc44d81 initial checkin vrany parents: diff changeset	64	Permission is hereby granted, free of charge, to any person
ce5e1fc44d81 initial checkin vrany parents: diff changeset	65	obtaining a copy of this software and associated documentation
ce5e1fc44d81 initial checkin vrany parents: diff changeset	66	files (the 'Software'), to deal in the Software without
ce5e1fc44d81 initial checkin vrany parents: diff changeset	67	restriction, including without limitation the rights to use,
ce5e1fc44d81 initial checkin vrany parents: diff changeset	68	copy, modify, merge, publish, distribute, sublicense, and/or sell
ce5e1fc44d81 initial checkin vrany parents: diff changeset	69	copies of the Software, and to permit persons to whom the
ce5e1fc44d81 initial checkin vrany parents: diff changeset	70	Software is furnished to do so, subject to the following
ce5e1fc44d81 initial checkin vrany parents: diff changeset	71	conditions:
ce5e1fc44d81 initial checkin vrany parents: diff changeset	72
ce5e1fc44d81 initial checkin vrany parents: diff changeset	73	The above copyright notice and this permission notice shall be
ce5e1fc44d81 initial checkin vrany parents: diff changeset	74	included in all copies or substantial portions of the Software.
ce5e1fc44d81 initial checkin vrany parents: diff changeset	75
ce5e1fc44d81 initial checkin vrany parents: diff changeset	76	THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
ce5e1fc44d81 initial checkin vrany parents: diff changeset	77	EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
ce5e1fc44d81 initial checkin vrany parents: diff changeset	78	OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
ce5e1fc44d81 initial checkin vrany parents: diff changeset	79	NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
ce5e1fc44d81 initial checkin vrany parents: diff changeset	80	HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
ce5e1fc44d81 initial checkin vrany parents: diff changeset	81	WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
ce5e1fc44d81 initial checkin vrany parents: diff changeset	82	FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
ce5e1fc44d81 initial checkin vrany parents: diff changeset	83	OTHER DEALINGS IN THE SOFTWARE.
ce5e1fc44d81 initial checkin vrany parents: diff changeset	84
ce5e1fc44d81 initial checkin vrany parents: diff changeset	85	"
12179 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
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	88	documentation
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	89	"
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	90	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	91
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	92	[author:]
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	93	Jan Vrany <jan.vrany@fit.cvut.cz>
12179 47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	94
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	95	[instance variables:]
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	96
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	97	[class variables:]
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	98
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	99	[see also:]
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
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	104	examples
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	105	"
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	106	Starting the application:
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	107	[exBegin]
12179 47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	108	Tools::ChangeSetDiffTool open
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	109
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	110	[exEnd]
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	111
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	112	Show differences between CVS HEAD and SVN jv-branch
12179 47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	113	NewSystemBrowser:
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	114	[exBegin]
12179 47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	115	\| cvsCs svnCs \|
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	116
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	117	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	118	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	119
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	120	Tools::ChangeSetDiffTool new
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	121	open;
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	122	fileMenuOpenOnDiffBetween: cvsCs and: svnCs.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	123
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	124	[exEnd]
12179 47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	125
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	126	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	127	base version of NewSystemBrowser:
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	128
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	129	[exBegin]
12179 47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	130	\| cvsBaseCs cvsCs svnCs \|
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	131
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	132	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	133	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	134	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	135
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	136	Tools::ChangeSetDiffTool new
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	137	open;
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	138	fileMenuOpenOnDiffBetween: cvsCs and: svnCs base: cvsBaseCs
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	139
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	140	[exEnd]
12179 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
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	144	"
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	145	! !
ce5e1fc44d81 initial checkin vrany parents: diff changeset	146
12321 13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	147	!ChangeSetDiffTool class methodsFor:'accessing'!
13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	148
13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	149	autoMoveToNextConflict
13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	150	^AutoMoveToNextConflict == true
13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	151
13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	152	"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	153	!
13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	154
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	AutoMoveToNextConflict := aBoolean
13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	157
13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	158	"Created: / 17-01-2013 / 19:49:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	159	! !
ce5e1fc44d81 initial checkin vrany parents: diff changeset	160
ce5e1fc44d81 initial checkin vrany parents: diff changeset	161	!ChangeSetDiffTool class methodsFor:'accessing - defaults'!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	162
ce5e1fc44d81 initial checkin vrany parents: diff changeset	163	versionAColor
ce5e1fc44d81 initial checkin vrany parents: diff changeset	164
ce5e1fc44d81 initial checkin vrany parents: diff changeset	165	^Color green lightened lightened
ce5e1fc44d81 initial checkin vrany parents: diff changeset	166
ce5e1fc44d81 initial checkin vrany parents: diff changeset	167	"Created: / 01-11-2009 / 10:14:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	168	!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	169
ce5e1fc44d81 initial checkin vrany parents: diff changeset	170	versionBColor
ce5e1fc44d81 initial checkin vrany parents: diff changeset	171
ce5e1fc44d81 initial checkin vrany parents: diff changeset	172	^Color blue lightened lightened
ce5e1fc44d81 initial checkin vrany parents: diff changeset	173
ce5e1fc44d81 initial checkin vrany parents: diff changeset	174	"Created: / 01-11-2009 / 10:14:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	175	!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	176
ce5e1fc44d81 initial checkin vrany parents: diff changeset	177	versionBaseColor
ce5e1fc44d81 initial checkin vrany parents: diff changeset	178
ce5e1fc44d81 initial checkin vrany parents: diff changeset	179	^Color yellow lightened lightened
ce5e1fc44d81 initial checkin vrany parents: diff changeset	180
ce5e1fc44d81 initial checkin vrany parents: diff changeset	181	"Created: / 01-11-2009 / 10:14:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	182	!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	183
ce5e1fc44d81 initial checkin vrany parents: diff changeset	184	versionNotPresentText
ce5e1fc44d81 initial checkin vrany parents: diff changeset	185	^ 'Not present' asText allItalic colorizeAllWith:Color gray lighter
ce5e1fc44d81 initial checkin vrany parents: diff changeset	186	! !
ce5e1fc44d81 initial checkin vrany parents: diff changeset	187
ce5e1fc44d81 initial checkin vrany parents: diff changeset	188	!ChangeSetDiffTool class methodsFor:'image specs'!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	189
12322 6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	190	mergeDiff3AToMergedArrow30x30
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	191
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	192	^ToolbarIconLibrary mergeDiff3AToMergedArrow30x30
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	193
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	194	"Created: / 17-01-2013 / 23:51:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	195	!
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	196
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	197	mergeDiff3BToMergedArrow30x30
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	198
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	199	^ToolbarIconLibrary mergeDiff3BToMergedArrow30x30
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	200
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	201	"Created: / 17-01-2013 / 23:51:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	202	!
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	203
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	204	mergeDiff3BaseToAArrow30x30
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	205
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	206	^ToolbarIconLibrary mergeDiff3BaseToAArrow30x30
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	207
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	208	"Created: / 17-01-2013 / 23:52:02 / Jan Vrany <jan.vrany@fit.cvut.cz>"
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	209	!
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	210
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	211	mergeDiff3BaseToBArrow30x30
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	212
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	213	^ToolbarIconLibrary mergeDiff3BaseToBArrow30x30
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	214
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	215	"Created: / 17-01-2013 / 23:51:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	216	!
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	217
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	218	versionA24x24
ce5e1fc44d81 initial checkin vrany parents: diff changeset	219
ce5e1fc44d81 initial checkin vrany parents: diff changeset	220	^ToolbarIconLibrary versionA24x24
ce5e1fc44d81 initial checkin vrany parents: diff changeset	221
ce5e1fc44d81 initial checkin vrany parents: diff changeset	222	"Created: / 24-03-2010 / 20:49:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	223	!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	224
ce5e1fc44d81 initial checkin vrany parents: diff changeset	225	versionB24x24
ce5e1fc44d81 initial checkin vrany parents: diff changeset	226
ce5e1fc44d81 initial checkin vrany parents: diff changeset	227	^ToolbarIconLibrary versionB24x24
ce5e1fc44d81 initial checkin vrany parents: diff changeset	228
ce5e1fc44d81 initial checkin vrany parents: diff changeset	229	"Created: / 24-03-2010 / 20:50:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
12322 6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	230	!
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	231
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	232	versionBase24x24
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	233
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	234	^ToolbarIconLibrary versionBase24x24
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	235
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	236	"Created: / 17-01-2013 / 22:53:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	237	!
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	238
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	239	versionMerged24x24
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	240
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	241	^ToolbarIconLibrary versionMerged24x24
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	242
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	243	"Created: / 17-01-2013 / 22:54:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	244	! !
ce5e1fc44d81 initial checkin vrany parents: diff changeset	245
12274 1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	246	!ChangeSetDiffTool class methodsFor:'interface opening'!
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	247
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	248	open
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	249	\| tool \|
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	250
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	251	tool := self new.
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	252	tool open.
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	253	tool window sensor pushUserEvent: #fileMenuOpen for: tool.
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	254
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	255	"Created: / 01-08-2012 / 15:13:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	256	! !
ce5e1fc44d81 initial checkin vrany parents: diff changeset	257
ce5e1fc44d81 initial checkin vrany parents: diff changeset	258	!ChangeSetDiffTool class methodsFor:'interface specs'!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	259
12322 6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	260	labelDiff2Spec
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	261	"This resource specification was automatically generated
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	262	by the UIPainter of ST/X."
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	263
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	264	"Do not manually edit this!! If it is corrupted,
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	265	the UIPainter may not be able to read the specification."
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	266
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	267	"
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	268	UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#labelDiff2Spec
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	269	Tools::ChangeSetDiffTool new openInterface:#labelDiff2Spec
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	270	"
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	271
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	272	<resource: #canvas>
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	273
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	274	^
12322 6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	275	#(FullSpec
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	276	name: labelDiff2Spec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	277	window:
12322 6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	278	(WindowSpec
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	279	label: 'Label'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	280	name: 'Label'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	281	min: (Point 10 10)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	282	bounds: (Rectangle 0 0 600 60)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	283	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	284	component:
12322 6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	285	(SpecCollection
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	286	collection: (
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	287	(UISubSpecification
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	288	name: 'LabelA'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	289	layout: (LayoutFrame 0 0 0 0 0 1 0 0.5)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	290	minorKey: versionALabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	291	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	292	(UISubSpecification
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	293	name: 'LabelB'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	294	layout: (LayoutFrame 0 0 0 0.5 0 1 0 1)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	295	minorKey: versionBLabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	296	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	297	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	298
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	299	)
12322 6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	300	)
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	301	!
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	302
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	303	labelDiff3Spec
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	304	"This resource specification was automatically generated
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	305	by the UIPainter of ST/X."
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	306
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	307	"Do not manually edit this!! If it is corrupted,
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	308	the UIPainter may not be able to read the specification."
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	309
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	310	"
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	311	UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#labelDiff3Spec
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	312	Tools::ChangeSetDiffTool new openInterface:#labelDiff3Spec
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	313	"
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	314
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	315	<resource: #canvas>
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	316
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	317	^
12322 6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	318	#(FullSpec
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	319	name: labelDiff3Spec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	320	window:
12322 6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	321	(WindowSpec
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	322	label: 'Label'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	323	name: 'Label'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	324	min: (Point 10 10)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	325	bounds: (Rectangle 0 0 600 90)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	326	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	327	component:
12322 6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	328	(SpecCollection
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	329	collection: (
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	330	(UISubSpecification
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	331	name: 'LabelBase'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	332	layout: (LayoutFrame 0 0 0 0 0 1 30 0)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	333	minorKey: versionBaseLabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	334	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	335	(UISubSpecification
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	336	name: 'LabelA'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	337	layout: (LayoutFrame 0 0 30 0 0 1 60 0)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	338	minorKey: versionALabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	339	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	340	(UISubSpecification
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	341	name: 'LabelB'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	342	layout: (LayoutFrame 0 0 60 0 0 1 0 1)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	343	minorKey: versionBLabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	344	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	345	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	346
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	347	)
12322 6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	348	)
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	349	!
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	350
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	351	labelMergeSpec
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	352	"This resource specification was automatically generated
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	353	by the UIPainter of ST/X."
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	354
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	355	"Do not manually edit this!! If it is corrupted,
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	356	the UIPainter may not be able to read the specification."
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	357
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	358	"
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	359	UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#labelMergeSpec
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	360	Tools::ChangeSetDiffTool new openInterface:#labelMergeSpec
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	361	"
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	362
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	363	<resource: #canvas>
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	364
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	365	^
12322 6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	366	#(FullSpec
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	367	name: labelMergeSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	368	window:
12322 6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	369	(WindowSpec
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	370	label: 'Label'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	371	name: 'Label'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	372	min: (Point 10 10)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	373	bounds: (Rectangle 0 0 600 120)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	374	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	375	component:
12322 6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	376	(SpecCollection
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	377	collection: (
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	378	(UISubSpecification
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	379	name: 'LabelBase'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	380	layout: (LayoutFrame 0 0 0 0 0 1 30 0)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	381	minorKey: mergeBaseLabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	382	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	383	(UISubSpecification
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	384	name: 'LabelA'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	385	layout: (LayoutFrame 0 0 30 0 0 1 60 0)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	386	minorKey: mergeALabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	387	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	388	(UISubSpecification
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	389	name: 'LabelB'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	390	layout: (LayoutFrame 0 0 60 0 0 1 90 0)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	391	minorKey: mergeBLabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	392	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	393	(UISubSpecification
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	394	name: 'SubSpecification1'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	395	layout: (LayoutFrame 0 0 90 0 0 1 0 1)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	396	minorKey: mergeMergeLabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	397	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	398	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	399
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	400	)
12322 6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	401	)
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	402
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	403	"Modified: / 17-01-2013 / 23:47:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	404	!
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	405
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	406	labelSpec
ce5e1fc44d81 initial checkin vrany parents: diff changeset	407	"This resource specification was automatically generated
ce5e1fc44d81 initial checkin vrany parents: diff changeset	408	by the UIPainter of ST/X."
ce5e1fc44d81 initial checkin vrany parents: diff changeset	409
ce5e1fc44d81 initial checkin vrany parents: diff changeset	410	"Do not manually edit this!! If it is corrupted,
ce5e1fc44d81 initial checkin vrany parents: diff changeset	411	the UIPainter may not be able to read the specification."
ce5e1fc44d81 initial checkin vrany parents: diff changeset	412
ce5e1fc44d81 initial checkin vrany parents: diff changeset	413	"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	414	UIPainter new openOnClass:SVN::DiffBrowser andSelector:#labelSpec
ce5e1fc44d81 initial checkin vrany parents: diff changeset	415	SVN::DiffBrowser new openInterface:#labelSpec
ce5e1fc44d81 initial checkin vrany parents: diff changeset	416	"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	417
ce5e1fc44d81 initial checkin vrany parents: diff changeset	418	<resource: #canvas>
ce5e1fc44d81 initial checkin vrany parents: diff changeset	419
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	420	^
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	421	#(FullSpec
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	422	name: labelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	423	window:
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	424	(WindowSpec
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	425	label: 'Label'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	426	name: 'Label'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	427	min: (Point 10 10)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	428	bounds: (Rectangle 0 0 600 48)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	429	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	430	component:
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	431	(SpecCollection
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	432	collection: (
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	433	(UISubSpecification
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	434	name: 'LabelA'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	435	layout: (LayoutFrame 0 0 0 0 0 1 0 0.5)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	436	minorKey: versionALabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	437	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	438	(UISubSpecification
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	439	name: 'LabelB'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	440	layout: (LayoutFrame 0 0 0 0.5 0 1 0 1)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	441	minorKey: versionBLabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	442	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	443	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	444
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	445	)
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	446	)
ce5e1fc44d81 initial checkin vrany parents: diff changeset	447	!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	448
ce5e1fc44d81 initial checkin vrany parents: diff changeset	449	oneColumnNavigatorSpec
ce5e1fc44d81 initial checkin vrany parents: diff changeset	450	"This resource specification was automatically generated
ce5e1fc44d81 initial checkin vrany parents: diff changeset	451	by the UIPainter of ST/X."
ce5e1fc44d81 initial checkin vrany parents: diff changeset	452
ce5e1fc44d81 initial checkin vrany parents: diff changeset	453	"Do not manually edit this!! If it is corrupted,
ce5e1fc44d81 initial checkin vrany parents: diff changeset	454	the UIPainter may not be able to read the specification."
ce5e1fc44d81 initial checkin vrany parents: diff changeset	455
ce5e1fc44d81 initial checkin vrany parents: diff changeset	456	"
12232 4d9b62c111fc - Tools::ChangeSetDiffList Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12216 diff changeset	457	UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#oneColumnNavigatorSpec
4d9b62c111fc - Tools::ChangeSetDiffList Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12216 diff changeset	458	Tools::ChangeSetDiffTool new openInterface:#oneColumnNavigatorSpec
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	459	"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	460
ce5e1fc44d81 initial checkin vrany parents: diff changeset	461	<resource: #canvas>
ce5e1fc44d81 initial checkin vrany parents: diff changeset	462
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	463	^
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	464	#(FullSpec
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	465	name: oneColumnNavigatorSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	466	window:
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	467	(WindowSpec
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	468	label: 'One Column Navigator'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	469	name: 'One Column Navigator'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	470	min: (Point 10 10)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	471	bounds: (Rectangle 0 0 300 300)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	472	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	473	component:
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	474	(SpecCollection
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	475	collection: (
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	476	(SubCanvasSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	477	name: 'DiffList'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	478	layout: (LayoutFrame 0 0 0 0 0 1 0 1)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	479	hasHorizontalScrollBar: false
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	480	hasVerticalScrollBar: false
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	481	majorKey: #'Tools::ChangeSetDiffList'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	482	subAspectHolders:
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	483	(Array
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	484
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	485	(SubChannelInfoSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	486	subAspect: highlightConflictsHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	487	aspect: highlightConflictsHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	488	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	489	(SubChannelInfoSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	490	subAspect: inGeneratorHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	491	aspect: diffsetHolderPrivate
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	492	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	493
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	494	(SubChannelInfoSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	495	subAspect: listEntryLabelGenerator
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	496	aspect: diffListEntryLabelGeneratorAspect
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	497	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	498	(SubChannelInfoSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	499	subAspect: menuHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	500	aspect: listMenuHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	501	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	502
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	503	(SubChannelInfoSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	504	subAspect: outGeneratorHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	505	aspect: selectionHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	506	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	507	(SubChannelInfoSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	508	subAspect: showCopyrightMethodDiffsHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	509	aspect: showCopyrightMethodDiffsHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	510	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	511
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	512	(SubChannelInfoSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	513	subAspect: showVersionMethodDiffsHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	514	aspect: showVersionMethodDiffsHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	515	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	516	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	517	createNewApplication: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	518	createNewBuilder: false
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	519	postBuildCallback: list1View:
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	520	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	521	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	522
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	523	)
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	524	)
ce5e1fc44d81 initial checkin vrany parents: diff changeset	525	!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	526
ce5e1fc44d81 initial checkin vrany parents: diff changeset	527	twoColumnNavigatorSpec
ce5e1fc44d81 initial checkin vrany parents: diff changeset	528	"This resource specification was automatically generated
ce5e1fc44d81 initial checkin vrany parents: diff changeset	529	by the UIPainter of ST/X."
ce5e1fc44d81 initial checkin vrany parents: diff changeset	530
ce5e1fc44d81 initial checkin vrany parents: diff changeset	531	"Do not manually edit this!! If it is corrupted,
ce5e1fc44d81 initial checkin vrany parents: diff changeset	532	the UIPainter may not be able to read the specification."
ce5e1fc44d81 initial checkin vrany parents: diff changeset	533
ce5e1fc44d81 initial checkin vrany parents: diff changeset	534	"
12232 4d9b62c111fc - Tools::ChangeSetDiffList Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12216 diff changeset	535	UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#twoColumnNavigatorSpec
4d9b62c111fc - Tools::ChangeSetDiffList Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12216 diff changeset	536	Tools::ChangeSetDiffTool new openInterface:#twoColumnNavigatorSpec
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	537	"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	538
ce5e1fc44d81 initial checkin vrany parents: diff changeset	539	<resource: #canvas>
ce5e1fc44d81 initial checkin vrany parents: diff changeset	540
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	541	^
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	542	#(FullSpec
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	543	name: twoColumnNavigatorSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	544	window:
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	545	(WindowSpec
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	546	label: 'Two Column Navigator'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	547	name: 'Two Column Navigator'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	548	min: (Point 10 10)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	549	bounds: (Rectangle 0 0 300 300)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	550	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	551	component:
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	552	(SpecCollection
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	553	collection: (
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	554	(VariableHorizontalPanelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	555	name: 'Columns'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	556	layout: (LayoutFrame 0 0 0 0 0 1 0 1)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	557	component:
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	558	(SpecCollection
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	559	collection: (
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	560	(SubCanvasSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	561	name: 'LeftList'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	562	hasHorizontalScrollBar: false
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	563	hasVerticalScrollBar: false
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	564	majorKey: #'Tools::ChangeSetDiffList'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	565	subAspectHolders:
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	566	(Array
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	567
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	568	(SubChannelInfoSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	569	subAspect: highlightConflictsHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	570	aspect: highlightConflictsHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	571	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	572	(SubChannelInfoSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	573	subAspect: inGeneratorHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	574	aspect: diffsetHolderPrivate
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	575	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	576
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	577	(SubChannelInfoSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	578	subAspect: listEntryLabelGenerator
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	579	aspect: diffListEntryLabelGeneratorAspect
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	580	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	581	(SubChannelInfoSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	582	subAspect: menuHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	583	aspect: listMenuHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	584	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	585
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	586	(SubChannelInfoSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	587	subAspect: outGeneratorHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	588	aspect: firstColSelectionHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	589	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	590	(SubChannelInfoSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	591	subAspect: showCopyrightMethodDiffsHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	592	aspect: showCopyrightMethodDiffsHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	593	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	594
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	595	(SubChannelInfoSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	596	subAspect: showVersionMethodDiffsHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	597	aspect: showVersionMethodDiffsHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	598	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	599	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	600	createNewApplication: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	601	createNewBuilder: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	602	postBuildCallback: list1View:
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	603	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	604	(SubCanvasSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	605	name: 'RightList'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	606	hasHorizontalScrollBar: false
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	607	hasVerticalScrollBar: false
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	608	majorKey: #'Tools::ChangeSetDiffList'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	609	subAspectHolders:
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	610	(Array
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	611
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	612	(SubChannelInfoSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	613	subAspect: highlightConflictsHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	614	aspect: highlightConflictsHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	615	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	616	(SubChannelInfoSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	617	subAspect: inGeneratorHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	618	aspect: firstColSelectionHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	619	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	620
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	621	(SubChannelInfoSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	622	subAspect: listEntryLabelGenerator
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	623	aspect: diffListEntryLabelGeneratorAspect
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	624	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	625	(SubChannelInfoSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	626	subAspect: menuHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	627	aspect: listMenuHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	628	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	629
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	630	(SubChannelInfoSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	631	subAspect: outGeneratorHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	632	aspect: selectionHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	633	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	634	(SubChannelInfoSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	635	subAspect: showCopyrightMethodDiffsHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	636	aspect: showCopyrightMethodDiffsHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	637	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	638
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	639	(SubChannelInfoSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	640	subAspect: showVersionMethodDiffsHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	641	aspect: showVersionMethodDiffsHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	642	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	643	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	644	createNewApplication: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	645	createNewBuilder: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	646	postBuildCallback: list2View:
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	647	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	648	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	649
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	650	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	651	handles: (Any 0.5 1.0)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	652	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	653	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	654
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	655	)
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	656	)
ce5e1fc44d81 initial checkin vrany parents: diff changeset	657	!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	658
ce5e1fc44d81 initial checkin vrany parents: diff changeset	659	windowSpec
ce5e1fc44d81 initial checkin vrany parents: diff changeset	660	"This resource specification was automatically generated
ce5e1fc44d81 initial checkin vrany parents: diff changeset	661	by the UIPainter of ST/X."
ce5e1fc44d81 initial checkin vrany parents: diff changeset	662
ce5e1fc44d81 initial checkin vrany parents: diff changeset	663	"Do not manually edit this!! If it is corrupted,
ce5e1fc44d81 initial checkin vrany parents: diff changeset	664	the UIPainter may not be able to read the specification."
ce5e1fc44d81 initial checkin vrany parents: diff changeset	665
ce5e1fc44d81 initial checkin vrany parents: diff changeset	666	"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	667	UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#windowSpec
ce5e1fc44d81 initial checkin vrany parents: diff changeset	668	Tools::ChangeSetDiffTool new openInterface:#windowSpec
ce5e1fc44d81 initial checkin vrany parents: diff changeset	669	Tools::ChangeSetDiffTool open
ce5e1fc44d81 initial checkin vrany parents: diff changeset	670	"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	671
ce5e1fc44d81 initial checkin vrany parents: diff changeset	672	<resource: #canvas>
ce5e1fc44d81 initial checkin vrany parents: diff changeset	673
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	674	^
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	675	#(FullSpec
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	676	name: windowSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	677	window:
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	678	(WindowSpec
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	679	label: 'Diff Browser'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	680	name: 'Diff Browser'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	681	min: (Point 10 10)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	682	bounds: (Rectangle 0 0 1024 768)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	683	menu: mainMenu
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	684	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	685	component:
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	686	(SpecCollection
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	687	collection: (
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	688	(MenuPanelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	689	name: 'ToolBar'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	690	layout: (LayoutFrame 0 0 0 0 0 1 30 0)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	691	menu: toolbarMenu
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	692	textDefault: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	693	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	694	(SubCanvasSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	695	name: 'InfoPanel'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	696	layout: (LayoutFrame 0 0 30 0 0 1 70 0)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	697	level: 0
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	698	initiallyInvisible: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	699	hasHorizontalScrollBar: false
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	700	hasVerticalScrollBar: false
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	701	clientKey: infoPanel
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	702	createNewBuilder: false
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	703	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	704	(ViewSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	705	name: 'Content'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	706	layout: (LayoutFrame 0 0 30 0 0 1 0 1)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	707	component:
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	708	(SpecCollection
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	709	collection: (
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	710	(SubCanvasSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	711	name: 'Labels'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	712	layout: (LayoutFrame 0 0 0 0 0 1 60 0)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	713	hasHorizontalScrollBar: false
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	714	hasVerticalScrollBar: false
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	715	specHolder: labelSpecHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	716	createNewBuilder: false
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	717	postBuildCallback: labelsView:
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	718	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	719	(VariableVerticalPanelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	720	name: 'NavigatorAndDiffPanel'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	721	layout: (LayoutFrame 0 0 60 0 0 1 0 1)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	722	initiallyInvisible: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	723	visibilityChannel: hasDiffsetHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	724	showHandle: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	725	component:
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	726	(SpecCollection
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	727	collection: (
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	728	(SubCanvasSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	729	name: 'NavigatorPanel'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	730	hasHorizontalScrollBar: false
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	731	hasVerticalScrollBar: false
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	732	specHolder: navigatorPanelSpecHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	733	createNewBuilder: false
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	734	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	735	(SubCanvasSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	736	name: 'SubCanvas1'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	737	specHolder: textDiffToolWindowSpecHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	738	clientHolder: textDiffToolHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	739	createNewBuilder: false
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	740	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	741	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	742
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	743	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	744	handles: (Any 0.3 1.0)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	745	postBuildCallback: navigatorAndDiffPanelView:
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	746	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	747	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	748
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	749	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	750	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	751	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	752
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	753	)
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	754	)
12323 76317ec5dc59 Minor fixes in UI Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12322 diff changeset	755
76317ec5dc59 Minor fixes in UI Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12322 diff changeset	756	"Modified: / 18-01-2013 / 00:07:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	757	! !
ce5e1fc44d81 initial checkin vrany parents: diff changeset	758
ce5e1fc44d81 initial checkin vrany parents: diff changeset	759	!ChangeSetDiffTool class methodsFor:'interface specs - labels'!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	760
12322 6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	761	mergeALabelSpec
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	762	"This resource specification was automatically generated
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	763	by the UIPainter of ST/X."
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	764
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	765	"Do not manually edit this!! If it is corrupted,
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	766	the UIPainter may not be able to read the specification."
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	767
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	768	"
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	769	UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#mergeALabelSpec
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	770	Tools::ChangeSetDiffTool new openInterface:#mergeALabelSpec
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	771	"
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	772
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	773	<resource: #canvas>
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	774
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	775	^
12322 6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	776	#(FullSpec
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	777	name: mergeALabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	778	window:
12322 6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	779	(WindowSpec
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	780	label: 'Version A'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	781	name: 'Version A'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	782	min: (Point 10 10)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	783	bounds: (Rectangle 0 0 300 30)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	784	backgroundColor: (Color 79.6078431372549 90.5882352941177 69.4117647058823)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	785	forceRecursiveBackground: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	786	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	787	component:
12322 6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	788	(SpecCollection
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	789	collection: (
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	790	(LabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	791	label: 'mergeDiff3BaseToAArrow30x30'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	792	name: 'Label1'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	793	layout: (LayoutFrame 0 0 0 0 30 0 0 1)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	794	hasCharacterOrientedLabel: false
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	795	translateLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	796	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	797	(LabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	798	label: 'versionA24x24'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	799	name: 'VersionAIcon'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	800	layout: (LayoutFrame 30 0 -12 0.5 57 0 12 0.5)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	801	hasCharacterOrientedLabel: false
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	802	translateLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	803	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	804	(LabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	805	label: 'mergeDiff3AToMergedArrow30x30'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	806	name: 'Label2'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	807	layout: (LayoutFrame 60 0 0 0 90 0 0 1)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	808	hasCharacterOrientedLabel: false
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	809	translateLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	810	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	811	(LabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	812	label: 'Version A'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	813	name: 'VersionALabel'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	814	layout: (LayoutFrame 90 0 0 0 0 1 0 1)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	815	translateLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	816	labelChannel: versionALabelHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	817	resizeForLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	818	adjust: left
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	819	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	820	(LabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	821	label: '(A)'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	822	name: 'ALabel'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	823	layout: (LayoutFrame -30 1 0 0 0 1 0 1)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	824	translateLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	825	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	826	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	827
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	828	)
12322 6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	829	)
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	830	!
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	831
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	832	mergeBLabelSpec
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	833	"This resource specification was automatically generated
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	834	by the UIPainter of ST/X."
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	835
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	836	"Do not manually edit this!! If it is corrupted,
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	837	the UIPainter may not be able to read the specification."
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	838
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	839	"
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	840	UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#versionBLabelSpec
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	841	Tools::ChangeSetDiffTool new openInterface:#versionBLabelSpec
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	842	"
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	843
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	844	<resource: #canvas>
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	845
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	846	^
12322 6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	847	#(FullSpec
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	848	name: versionBLabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	849	window:
12322 6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	850	(WindowSpec
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	851	label: 'Version B'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	852	name: 'Version B'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	853	min: (Point 10 10)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	854	bounds: (Rectangle 0 0 300 30)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	855	backgroundColor: (Color 100.0 90.5882352941177 60.0)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	856	forceRecursiveBackground: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	857	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	858	component:
12322 6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	859	(SpecCollection
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	860	collection: (
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	861	(LabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	862	label: 'mergeDiff3BaseToBArrow30x30'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	863	name: 'Label1'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	864	layout: (LayoutFrame 0 0 0 0 30 0 0 1)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	865	hasCharacterOrientedLabel: false
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	866	translateLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	867	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	868	(LabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	869	label: 'versionB24x24'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	870	name: 'VersionBIcon'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	871	layout: (LayoutFrame 30 0 -12 0.5 57 0 12 0.5)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	872	hasCharacterOrientedLabel: false
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	873	translateLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	874	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	875	(LabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	876	label: 'mergeDiff3BToMergedArrow30x30'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	877	name: 'Label2'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	878	layout: (LayoutFrame 60 0 0 0 90 0 0 1)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	879	hasCharacterOrientedLabel: false
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	880	translateLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	881	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	882	(LabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	883	label: 'Version B'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	884	name: 'VersionBLabel'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	885	layout: (LayoutFrame 90 0 0 0 167 0 0 1)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	886	translateLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	887	labelChannel: versionBLabelHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	888	resizeForLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	889	adjust: left
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	890	useDynamicPreferredWidth: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	891	usePreferredWidth: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	892	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	893	(LabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	894	label: '(B)'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	895	name: 'BLabel'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	896	layout: (LayoutFrame -30 1 0 0 0 1 0 1)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	897	translateLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	898	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	899	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	900
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	901	)
12322 6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	902	)
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	903
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	904	"Created: / 17-01-2013 / 23:44:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	905	!
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	906
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	907	mergeBaseLabelSpec
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	908	"This resource specification was automatically generated
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	909	by the UIPainter of ST/X."
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	910
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	911	"Do not manually edit this!! If it is corrupted,
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	912	the UIPainter may not be able to read the specification."
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	913
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	914	"
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	915	UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#versionBaseLabelSpec
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	916	Tools::ChangeSetDiffTool new openInterface:#versionBaseLabelSpec
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	917	"
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	918
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	919	<resource: #canvas>
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	920
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	921	^
12322 6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	922	#(FullSpec
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	923	name: versionBaseLabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	924	window:
12322 6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	925	(WindowSpec
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	926	label: 'Version Base'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	927	name: 'Version Base'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	928	min: (Point 10 10)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	929	bounds: (Rectangle 0 0 300 30)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	930	backgroundColor: (Color 67.843137254902 87.843137254902 96.4705882352941)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	931	forceRecursiveBackground: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	932	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	933	component:
12322 6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	934	(SpecCollection
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	935	collection: (
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	936	(LabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	937	label: 'versionBase24x24'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	938	name: 'VersionBIcon'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	939	layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	940	hasCharacterOrientedLabel: false
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	941	translateLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	942	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	943	(LabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	944	label: 'Version B'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	945	name: 'VersionBLabel'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	946	layout: (LayoutFrame 90 0 0 0 190 0 0 1)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	947	translateLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	948	labelChannel: versionBaseLabelHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	949	resizeForLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	950	adjust: left
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	951	useDynamicPreferredWidth: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	952	usePreferredWidth: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	953	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	954	(LabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	955	label: '(Base)'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	956	name: 'BaseLabel'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	957	layout: (LayoutFrame -50 1 0 0 0 1 0 1)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	958	translateLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	959	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	960	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	961
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	962	)
12322 6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	963	)
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	964
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	965	"Created: / 17-01-2013 / 23:44:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	966	!
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	967
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	968	mergeMergeLabelSpec
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	969	"This resource specification was automatically generated
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	970	by the UIPainter of ST/X."
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	971
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	972	"Do not manually edit this!! If it is corrupted,
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	973	the UIPainter may not be able to read the specification."
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	974
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	975	"
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	976	UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#mergeMergeLabelSpec
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	977	Tools::ChangeSetDiffTool new openInterface:#mergeMergeLabelSpec
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	978	"
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	979
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	980	<resource: #canvas>
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	981
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	982	^
12322 6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	983	#(FullSpec
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	984	name: mergeMergeLabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	985	window:
12322 6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	986	(WindowSpec
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	987	label: 'Version Merged'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	988	name: 'Version Merged'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	989	min: (Point 10 10)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	990	bounds: (Rectangle 0 0 300 30)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	991	backgroundColor: (Color 96.2554360265507 72.7275501640345 95.8999008163577)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	992	forceRecursiveBackground: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	993	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	994	component:
12322 6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	995	(SpecCollection
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	996	collection: (
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	997	(LabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	998	label: 'versionMerged24x24'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	999	name: 'VersionMergedIcon'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1000	layout: (LayoutFrame 60 0 -12 0.5 87 0 12 0.5)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1001	hasCharacterOrientedLabel: false
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1002	translateLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1003	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1004	(LabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1005	label: 'Version B'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1006	name: 'VersionMergedLabel'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1007	layout: (LayoutFrame 90 0 0 0 267 0 0 1)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1008	translateLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1009	labelChannel: versionMergedLabelHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1010	resizeForLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1011	adjust: left
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1012	useDynamicPreferredWidth: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1013	usePreferredWidth: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1014	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1015	(LabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1016	label: '(Merge)'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1017	name: 'MergedLabel'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1018	layout: (LayoutFrame -70 1 0 0 0 1 0 1)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1019	translateLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1020	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1021	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1022
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1023	)
12322 6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1024	)
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1025	!
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1026
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	1027	versionALabelSpec
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1028	"This resource specification was automatically generated
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1029	by the UIPainter of ST/X."
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1030
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1031	"Do not manually edit this!! If it is corrupted,
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1032	the UIPainter may not be able to read the specification."
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1033
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1034	"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1035	UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#versionALabelSpec
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1036	Tools::ChangeSetDiffTool new openInterface:#versionALabelSpec
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1037	"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1038
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1039	<resource: #canvas>
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1040
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1041	^
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	1042	#(FullSpec
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1043	name: versionALabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1044	window:
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	1045	(WindowSpec
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1046	label: 'Version A'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1047	name: 'Version A'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1048	min: (Point 10 10)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1049	bounds: (Rectangle 0 0 300 30)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1050	backgroundColor: (Color 79.6078431372549 90.5882352941177 69.4117647058823)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1051	forceRecursiveBackground: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1052	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1053	component:
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	1054	(SpecCollection
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1055	collection: (
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1056	(LabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1057	label: 'versionA24x24'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1058	name: 'VersionAIcon'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1059	layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1060	hasCharacterOrientedLabel: false
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1061	translateLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1062	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1063	(LabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1064	label: 'Version A'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1065	name: 'VersionALabel'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1066	layout: (LayoutFrame 30 0 0 0 0 1 0 1)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1067	translateLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1068	labelChannel: versionALabelHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1069	resizeForLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1070	adjust: left
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1071	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1072	(LabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1073	label: '(A)'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1074	name: 'ALabel'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1075	layout: (LayoutFrame -30 1 0 0 0 1 0 1)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1076	translateLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1077	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1078	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1079
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1080	)
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	1081	)
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1082	!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1083
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1084	versionBLabelSpec
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1085	"This resource specification was automatically generated
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1086	by the UIPainter of ST/X."
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1087
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1088	"Do not manually edit this!! If it is corrupted,
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1089	the UIPainter may not be able to read the specification."
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1090
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1091	"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1092	UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#versionBLabelSpec
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1093	Tools::ChangeSetDiffTool new openInterface:#versionBLabelSpec
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1094	"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1095
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1096	<resource: #canvas>
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1097
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1098	^
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	1099	#(FullSpec
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1100	name: versionBLabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1101	window:
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	1102	(WindowSpec
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1103	label: 'Version B'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1104	name: 'Version B'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1105	min: (Point 10 10)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1106	bounds: (Rectangle 0 0 300 30)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1107	backgroundColor: (Color 100.0 90.5882352941177 60.0)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1108	forceRecursiveBackground: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1109	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1110	component:
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	1111	(SpecCollection
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1112	collection: (
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1113	(LabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1114	label: 'versionB24x24'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1115	name: 'VersionBIcon'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1116	layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1117	hasCharacterOrientedLabel: false
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1118	translateLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1119	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1120	(LabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1121	label: 'Version B'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1122	name: 'VersionBLabel'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1123	layout: (LayoutFrame 30 0 0 0 167 0 0 1)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1124	translateLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1125	labelChannel: versionBLabelHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1126	resizeForLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1127	adjust: left
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1128	useDynamicPreferredWidth: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1129	usePreferredWidth: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1130	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1131	(LabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1132	label: '(B)'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1133	name: 'BLabel'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1134	layout: (LayoutFrame -30 1 0 0 0 1 0 1)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1135	translateLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1136	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1137	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1138
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1139	)
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	1140	)
10975 1d7029646c90 added: vrany parents: 10939 diff changeset	1141
1d7029646c90 added: vrany parents: 10939 diff changeset	1142	"Modified: / 16-12-2011 / 14:17:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
12322 6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1143	!
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1144
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1145	versionBaseLabelSpec
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1146	"This resource specification was automatically generated
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1147	by the UIPainter of ST/X."
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1148
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1149	"Do not manually edit this!! If it is corrupted,
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1150	the UIPainter may not be able to read the specification."
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1151
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1152	"
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1153	UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#versionBaseLabelSpec
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1154	Tools::ChangeSetDiffTool new openInterface:#versionBaseLabelSpec
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1155	"
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1156
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1157	<resource: #canvas>
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1158
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1159	^
12322 6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1160	#(FullSpec
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1161	name: versionBaseLabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1162	window:
12322 6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1163	(WindowSpec
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1164	label: 'Version Base'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1165	name: 'Version Base'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1166	min: (Point 10 10)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1167	bounds: (Rectangle 0 0 300 30)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1168	backgroundColor: (Color 67.843137254902 87.843137254902 96.4705882352941)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1169	forceRecursiveBackground: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1170	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1171	component:
12322 6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1172	(SpecCollection
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1173	collection: (
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1174	(LabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1175	label: 'versionBase24x24'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1176	name: 'VersionBIcon'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1177	layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1178	hasCharacterOrientedLabel: false
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1179	translateLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1180	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1181	(LabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1182	label: 'Version B'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1183	name: 'VersionBLabel'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1184	layout: (LayoutFrame 30 0 0 0 190 0 0 1)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1185	translateLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1186	labelChannel: versionBaseLabelHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1187	resizeForLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1188	adjust: left
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1189	useDynamicPreferredWidth: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1190	usePreferredWidth: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1191	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1192	(LabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1193	label: '(Base)'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1194	name: 'BaseLabel'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1195	layout: (LayoutFrame -50 1 0 0 0 1 0 1)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1196	translateLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1197	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1198	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1199
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1200	)
12322 6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1201	)
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1202	!
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1203
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1204	versionMergeLabelSpec
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1205	"This resource specification was automatically generated
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1206	by the UIPainter of ST/X."
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1207
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1208	"Do not manually edit this!! If it is corrupted,
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1209	the UIPainter may not be able to read the specification."
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1210
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1211	"
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1212	UIPainter new openOnClass:Tools::ChangeSetDiffTool andSelector:#versionBaseLabelSpec
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1213	Tools::ChangeSetDiffTool new openInterface:#versionBaseLabelSpec
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1214	"
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1215
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1216	<resource: #canvas>
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1217
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1218	^
12322 6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1219	#(FullSpec
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1220	name: versionBaseLabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1221	window:
12322 6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1222	(WindowSpec
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1223	label: 'Version Merged'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1224	name: 'Version Merged'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1225	min: (Point 10 10)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1226	bounds: (Rectangle 0 0 300 30)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1227	backgroundColor: (Color 96.2554360265507 72.7275501640345 95.8999008163577)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1228	forceRecursiveBackground: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1229	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1230	component:
12322 6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1231	(SpecCollection
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1232	collection: (
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1233	(LabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1234	label: 'versionMerged24x24'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1235	name: 'VersionMergedIcon'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1236	layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1237	hasCharacterOrientedLabel: false
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1238	translateLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1239	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1240	(LabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1241	label: 'Version B'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1242	name: 'VersionMergedLabel'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1243	layout: (LayoutFrame 30 0 0 0 190 0 0 1)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1244	translateLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1245	labelChannel: versionMergedLabelHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1246	resizeForLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1247	adjust: left
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1248	useDynamicPreferredWidth: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1249	usePreferredWidth: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1250	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1251	(LabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1252	label: '(Merge)'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1253	name: 'MergedLabel'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1254	layout: (LayoutFrame -70 1 0 0 0 1 0 1)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1255	translateLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1256	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1257	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1258
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1259	)
12322 6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1260	)
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1261
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1262	"Created: / 17-01-2013 / 22:53:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	1263	! !
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1264
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1265	!ChangeSetDiffTool class methodsFor:'menu specs'!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1266
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1267
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1268
12320 5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1269	listMenuDiff
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	1270	"This resource specification was automatically generated
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1271	by the MenuEditor of ST/X."
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1272
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1273	"Do not manually edit this!! If it is corrupted,
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1274	the MenuEditor may not be able to read the specification."
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1275
12192 15f47901fb64 Fixes in Diff2/Diff3 text views Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12179 diff changeset	1276
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	1277	"
12192 15f47901fb64 Fixes in Diff2/Diff3 text views Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12179 diff changeset	1278	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	1279	(Menu new fromLiteralArrayEncoding:(Tools::ChangeSetDiffTool listMenu)) startUp
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	1280	"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1281
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1282	<resource: #menu>
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1283
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1284	^
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	1285	#(Menu
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1286	(
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1287	(MenuItem
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1288	enabled: hasSelection
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1289	label: 'Browse'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1290	itemValue: listMenuBrowse
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1291	translateLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1292	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1293	(MenuItem
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1294	label: '-'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1295	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1296	(MenuItem
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1297	enabled: hasSelection
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1298	label: 'Load version A'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1299	itemValue: listMenuLoadVersionA
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1300	nameKey: LoadVersionA
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1301	translateLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1302	labelImage: (ResourceRetriever #'SVN::IconLibrary' versionA16x16 'Load version A')
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1303	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1304	(MenuItem
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1305	enabled: hasSelection
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1306	label: 'Load version B'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1307	itemValue: listMenuLoadVersionB
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1308	nameKey: LoadVersionB
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1309	translateLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1310	labelImage: (ResourceRetriever #'SVN::IconLibrary' versionB16x16 'Load version B')
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1311	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1312	(MenuItem
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1313	label: '-'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1314	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1315	(MenuItem
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1316	label: 'Open in...'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1317	translateLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1318	submenu:
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1319	(Menu
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1320	(
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1321	(MenuItem
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1322	enabled: hasSelection
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1323	label: 'Inspector'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1324	itemValue: listMenuInspect
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1325	translateLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1326	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1327	(MenuItem
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1328	enabled: hasSelection
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1329	label: 'kdiff3'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1330	itemValue: listMenuOpenInExternal:
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1331	translateLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1332	argument: 'kdiff3'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1333	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1334	(MenuItem
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1335	enabled: hasSelection
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1336	label: 'meld'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1337	itemValue: listMenuOpenInExternal:
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1338	translateLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1339	argument: 'meld'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1340	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1341	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1342	nil
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1343	nil
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1344	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1345	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1346	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1347	nil
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1348	nil
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	1349	)
12320 5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1350
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1351	"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	1352	!
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1353
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1354	listMenuMerge
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1355	"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	1356	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	1357
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1358	"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	1359	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	1360
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1361
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1362	"
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1363	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	1364	(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	1365	"
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1366
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1367	<resource: #menu>
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1368
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1369	^
12320 5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1370	#(Menu
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1371	(
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1372	(MenuItem
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1373	enabled: hasSelection
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1374	label: 'Browse'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1375	itemValue: listMenuBrowse
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1376	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1377	(MenuItem
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1378	label: '-'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1379	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1380	(MenuItem
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1381	enabled: hasSelection
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1382	label: 'Merge using A'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1383	itemValue: listMenuMergeUsingA
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1384	shortcutKey: Cmd2
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1385	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1386	(MenuItem
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1387	enabled: hasSelection
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1388	label: 'Merge using B'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1389	itemValue: listMenuMergeUsingB
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1390	shortcutKey: Cmd3
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1391	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1392	(MenuItem
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1393	enabled: hasSelection
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1394	label: 'Merge using Base'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1395	itemValue: listMenuMergeUsingBase
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1396	shortcutKey: Cmd1
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1397	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1398	(MenuItem
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1399	label: '-'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1400	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1401	(MenuItem
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1402	label: 'Open in...'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1403	submenu:
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1404	(Menu
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1405	(
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1406	(MenuItem
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1407	enabled: hasSelection
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1408	label: 'Inspector'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1409	itemValue: listMenuInspect
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1410	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1411	(MenuItem
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1412	enabled: hasSelection
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1413	label: 'kdiff3'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1414	itemValue: listMenuOpenInExternal:
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1415	argument: 'kdiff3'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1416	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1417	(MenuItem
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1418	enabled: hasSelection
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1419	label: 'meld'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1420	itemValue: listMenuOpenInExternal:
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1421	argument: 'meld'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1422	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1423	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1424	nil
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1425	nil
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1426	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1427	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1428	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1429	nil
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1430	nil
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	1431	)
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1432	!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1433
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1434	mainMenu
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1435	"This resource specification was automatically generated
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1436	by the MenuEditor of ST/X."
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1437
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1438	"Do not manually edit this!! If it is corrupted,
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1439	the MenuEditor may not be able to read the specification."
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1440
10975 1d7029646c90 added: vrany parents: 10939 diff changeset	1441
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	1442	"
10975 1d7029646c90 added: vrany parents: 10939 diff changeset	1443	MenuEditor new openOnClass:Tools::ChangeSetDiffTool andSelector:#mainMenu
1d7029646c90 added: vrany parents: 10939 diff changeset	1444	(Menu new fromLiteralArrayEncoding:(Tools::ChangeSetDiffTool mainMenu)) startUp
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	1445	"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1446
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1447	<resource: #menu>
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1448
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1449	^
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	1450	#(Menu
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1451	(
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1452	(MenuItem
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1453	label: 'File'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1454	submenu:
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1455	(Menu
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1456	(
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1457	(MenuItem
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1458	label: 'Open...'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1459	itemValue: fileMenuOpen
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1460	shortcutKey: Ctrlo
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1461	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1462	(MenuItem
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1463	enabled: canSave
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1464	label: 'Save'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1465	itemValue: fileMenuSave
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1466	shortcutKey: Ctrls
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1467	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1468	(MenuItem
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1469	enabled: canSaveAs
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1470	label: 'Save As...'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1471	itemValue: fileMenuSaveAs
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1472	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1473	(MenuItem
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1474	enabled: canSaveAsPatch
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1475	label: 'Save As Patch '
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1476	itemValue: fileMenuSaveAsPatch
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1477	isVisible: false
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1478	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1479	(MenuItem
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1480	enabled: canSaveMergedAs
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1481	label: 'Save Merged as... '
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1482	itemValue: fileMenuSaveMergedAs
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1483	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1484	(MenuItem
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1485	label: '-'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1486	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1487	(MenuItem
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1488	label: 'Exit'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1489	itemValue: closeRequest
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1490	shortcutKey: Ctrlq
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1491	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1492	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1493	nil
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1494	nil
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1495	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1496	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1497	(MenuItem
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1498	label: 'Changeset'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1499	submenu:
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1500	(Menu
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1501	(
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1502	(MenuItem
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1503	enabled: isDiff2Or3
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1504	label: 'Browse changes (A)'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1505	itemValue: changesetMenuBrowseA
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1506	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1507	(MenuItem
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1508	enabled: isDiff2Or3
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1509	label: 'Browse changes (B)'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1510	itemValue: changesetMenuBrowseB
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1511	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1512	(MenuItem
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1513	enabled: isDiff3
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1514	label: 'Browse changes (Base)'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1515	itemValue: changesetMenuBrowseBase
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1516	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1517	(MenuItem
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1518	enabled: isMerge
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1519	label: 'Browse changes (Merge)'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1520	itemValue: changesetMenuBrowseMerge
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1521	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1522	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1523	nil
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1524	nil
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1525	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1526	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1527	(MenuItem
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1528	label: 'Movement'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1529	submenu:
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1530	(Menu
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1531	(
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1532	(MenuItem
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1533	label: 'Go to Previous Delta'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1534	itemValue: menuMoveUp
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1535	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1536	(MenuItem
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1537	label: 'Go To Next Delta'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1538	itemValue: menuMoveDown
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1539	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1540	(MenuItem
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1541	label: 'Go to Previous Conflict'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1542	itemValue: menuMoveUpConflict
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1543	shortcutKey: CmdCursorUp
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1544	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1545	(MenuItem
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1546	label: 'Go to Next Conflict'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1547	itemValue: menuMoveDownConflict
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1548	shortcutKey: CmdCursorDown
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1549	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1550	(MenuItem
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1551	label: '-'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1552	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1553	(MenuItem
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1554	label: 'Automatically Go to Next Conflict'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1555	indication: autoMoveToNextConflictHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1556	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1557	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1558	nil
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1559	nil
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1560	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1561	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1562	(MenuItem
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1563	label: 'Change'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1564	submenuChannel: listMenu
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1565	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1566	(MenuItem
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1567	label: 'View'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1568	submenu:
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1569	(Menu
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1570	(
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1571	(MenuItem
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1572	label: 'Show Diffs in Version Methods'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1573	indication: showVersionMethodDiffsHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1574	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1575	(MenuItem
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1576	label: 'Show Diff in #copyright Methods'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1577	indication: showCopyrightMethodDiffsHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1578	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1579	(MenuItem
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1580	label: 'Highlight Conflicts'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1581	indication: highlightConflictsHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1582	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1583	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1584	nil
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1585	nil
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1586	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1587	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1588	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1589	nil
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1590	nil
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	1591	)
12320 5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1592	!
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1593
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1594	toolbarMenu
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1595	"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	1596	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	1597
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1598	"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	1599	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	1600
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1601
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1602	"
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1603	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	1604	(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	1605	"
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1606
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1607	<resource: #menu>
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1608
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1609	^
12320 5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1610	#(Menu
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1611	(
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1612	(MenuItem
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1613	label: 'Open'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1614	itemValue: fileMenuOpen
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1615	isButton: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1616	labelImage: (ResourceRetriever ToolbarIconLibrary loadFromFile22x22Icon)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1617	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1618	(MenuItem
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1619	enabled: canSaveHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1620	label: 'Save'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1621	itemValue: fileMenuSave
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1622	isButton: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1623	labelImage: (ResourceRetriever ToolbarIconLibrary saveImageIcon)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1624	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1625	(MenuItem
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1626	label: '-'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1627	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1628	(MenuItem
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1629	label: 'Go to Previous Delta'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1630	itemValue: menuMoveUp
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1631	isButton: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1632	labelImage: (ResourceRetriever ToolbarIconLibrary mergePrev24x24)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1633	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1634	(MenuItem
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1635	label: 'Go to Next Delta'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1636	itemValue: menuMoveDown
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1637	isButton: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1638	labelImage: (ResourceRetriever ToolbarIconLibrary mergeNext24x24)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1639	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1640	(MenuItem
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1641	label: 'Go to Previous Conflict'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1642	itemValue: menuMoveUpConflict
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1643	isButton: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1644	isVisible: mergeHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1645	labelImage: (ResourceRetriever ToolbarIconLibrary mergePrevConflict24x24)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1646	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1647	(MenuItem
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1648	label: 'Go to Next Conflict'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1649	itemValue: menuMoveDownConflict
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1650	isButton: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1651	isVisible: mergeHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1652	labelImage: (ResourceRetriever ToolbarIconLibrary mergeNextConflict24x24)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1653	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1654	(MenuItem
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1655	label: '-'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1656	isVisible: mergeHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1657	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1658	(MenuItem
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1659	label: 'Merge using Base'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1660	itemValue: listMenuMergeUsingBase
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1661	isButton: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1662	isVisible: mergeHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1663	labelImage: (ResourceRetriever ToolbarIconLibrary mergeUsingBaseAll24x24)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1664	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1665	(MenuItem
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1666	label: 'Merge using A'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1667	itemValue: listMenuMergeUsingA
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1668	isButton: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1669	isVisible: mergeHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1670	labelImage: (ResourceRetriever ToolbarIconLibrary mergeUsingAAll24x24)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1671	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1672	(MenuItem
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1673	label: 'Merge using B'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1674	itemValue: listMenuMergeUsingB
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1675	isButton: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1676	isVisible: mergeHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1677	labelImage: (ResourceRetriever ToolbarIconLibrary mergeUsingBAll24x24)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1678	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1679	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1680	nil
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1681	nil
12320 5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1682	)
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	1683	! !
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1684
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1685	!ChangeSetDiffTool class methodsFor:'plugIn spec'!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1686
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1687	aspectSelectors
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1688	"This resource specification was automatically generated
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1689	by the UIPainter of ST/X."
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1690
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1691	"Do not manually edit this. If it is corrupted,
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1692	the UIPainter may not be able to read the specification."
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1693
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1694	"Return a description of exported aspects;
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1695	these can be connected to aspects of an embedding application
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1696	(if this app is embedded in a subCanvas)."
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1697
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1698	^ #(
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1699	#diffsetHolder
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	1700	).
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1701
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1702	! !
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1703
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1704	!ChangeSetDiffTool methodsFor:'accessing'!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1705
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1706	beSingleColumn
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1707
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1708	self navigatorPanelSpecHolder value: #oneColumnNavigatorSpec
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1709
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1710	"Created: / 20-11-2009 / 20:41:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1711	!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1712
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1713	beTwoColumn
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1714
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1715	self navigatorPanelSpecHolder value: #twoColumnNavigatorSpec
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1716
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1717	"Created: / 20-11-2009 / 20:42:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1718	!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1719
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1720	beTwoColumn: aBoolean
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1721
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1722	aBoolean
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1723	ifTrue:[self beTwoColumn]
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1724	ifFalse:[self beSingleColumn]
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	1725
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1726	"Created: / 20-11-2009 / 20:43:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1727	!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1728
12650 e0f607754b9a Merged 18d06283743d and ff31bac2fd1b (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12329 diff changeset	1729	codeAspect
e0f607754b9a Merged 18d06283743d and ff31bac2fd1b (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12329 diff changeset	1730	^self codeAspectHolder value
e0f607754b9a Merged 18d06283743d and ff31bac2fd1b (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12329 diff changeset	1731
e0f607754b9a Merged 18d06283743d and ff31bac2fd1b (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12329 diff changeset	1732	"Created: / 04-04-2013 / 18:23:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
e0f607754b9a Merged 18d06283743d and ff31bac2fd1b (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12329 diff changeset	1733	!
e0f607754b9a Merged 18d06283743d and ff31bac2fd1b (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12329 diff changeset	1734
12200 807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	1735	diffInfo
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	1736
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	1737	^self diffInfoHolder value
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	1738
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	1739	"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	1740	!
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	1741
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	1742	diffset
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1743
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	1744	^self diffsetHolder value
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1745
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1746	"Created: / 05-12-2009 / 11:53:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1747	!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1748
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1749	diffset: aDiff3Set
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1750
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1751	self diffsetHolder value: aDiff3Set
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1752
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1753	"Created: / 01-11-2009 / 09:33:24 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1754	!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1755
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1756	patchset
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1757
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1758	\| patchset \|
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1759	patchset := ChangeSet new.
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1760	self diffset do:
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1761	[:diff\|patchset add:diff versionA].
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	1762	^patchset
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1763
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1764	"Created: / 05-12-2009 / 11:54:12 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1765	!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1766
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1767	selection
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1768
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1769	^self selectionHolder value
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1770
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1771	"Created: / 22-10-2008 / 11:30:03 / Jan Vrany <vranyj1@fel.cvut.cz>"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1772	!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1773
12277 46aea706fdb7 - Tools::ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12276 diff changeset	1774	showCopyrightMethodDiffs
46aea706fdb7 - Tools::ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12276 diff changeset	1775	^self showCopyrightMethodDiffsHolder value
46aea706fdb7 - Tools::ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12276 diff changeset	1776
46aea706fdb7 - Tools::ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12276 diff changeset	1777	"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	1778	!
46aea706fdb7 - Tools::ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12276 diff changeset	1779
46aea706fdb7 - Tools::ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12276 diff changeset	1780	showCopyrightMethodDiffs: aBoolean
46aea706fdb7 - Tools::ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12276 diff changeset	1781	self showCopyrightMethodDiffsHolder value: aBoolean
46aea706fdb7 - Tools::ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12276 diff changeset	1782
46aea706fdb7 - Tools::ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12276 diff changeset	1783	"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	1784	!
46aea706fdb7 - Tools::ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12276 diff changeset	1785
46aea706fdb7 - Tools::ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12276 diff changeset	1786	showVersionMethodDiffs
46aea706fdb7 - Tools::ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12276 diff changeset	1787	^ self showVersionMethodDiffsHolder value
46aea706fdb7 - Tools::ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12276 diff changeset	1788
46aea706fdb7 - Tools::ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12276 diff changeset	1789	"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	1790	!
46aea706fdb7 - Tools::ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12276 diff changeset	1791
46aea706fdb7 - Tools::ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12276 diff changeset	1792	showVersionMethodDiffs: aBoolean
46aea706fdb7 - Tools::ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12276 diff changeset	1793	self showVersionMethodDiffsHolder value: aBoolean
46aea706fdb7 - Tools::ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12276 diff changeset	1794
46aea706fdb7 - Tools::ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12276 diff changeset	1795	"Created: / 10-08-2012 / 16:08:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	1796	!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1797
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1798	title: aString
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1799
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1800	self titleHolder value: aString
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1801
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1802	"Created: / 19-11-2009 / 15:44:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1803	! !
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1804
12320 5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1805	!ChangeSetDiffTool methodsFor:'accessing-menus'!
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1806
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1807	listMenu
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1808	\| spec \|
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1809
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1810	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	1811	^Menu decodeFromLiteralArray: spec.
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1812
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1813	"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	1814	! !
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1815
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1816	!ChangeSetDiffTool methodsFor:'accessing-selection'!
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1817
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1818	selection: entry
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1819
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1820
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1821	self isOneColumnBrowser ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1822	list1App selection: entry
12320 5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1823	] ifFalse:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1824	\| parent \|
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1825
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1826	parent := self diffsetHolderPrivate value diffs
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1827	detect:[:each\|each diffs includes: entry] ifNone:[nil].
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1828	parent notNil ifTrue:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1829	list1App selection: parent.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1830	list1App updateOutputGenerator.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1831	list2App updateList.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1832	list2App selection: entry.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1833
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1834	]
12320 5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1835	]
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1836
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1837	"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	1838	"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	1839	!
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1840
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1841	theFirstSelectedEntry
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1842	\| selection \|
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1843
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1844	selection := self selectionHolder value.
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1845	selection isNil ifTrue:[ ^ nil ].
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1846	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	1847	selection isEmpty ifTrue:[ ^nil ].
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1848	^selection first
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1849
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1850	"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	1851	!
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1852
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1853	theLastSelectedEntry
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1854	\| selection \|
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1855
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1856	selection := self selectionHolder value.
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1857	selection isNil ifTrue:[ ^ nil ].
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1858	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	1859	selection isEmpty ifTrue:[ ^nil ].
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1860	^selection last
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1861
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1862	"Created: / 17-01-2013 / 13:22:45 / Jan Vrany <jan.vrany@fit.cvut.cz>"
12322 6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1863	!
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	1864
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1865	theSingleSelectedObject
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1866
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1867	\| sel selSize obj \|
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1868	sel := self selection.
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1869
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1870	(sel isCollection and:[self isString not])
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1871	ifFalse:[^sel].
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	1872
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1873	selSize := 0.
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1874	obj := nil.
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	1875	sel do:
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1876	[:each\|
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1877	selSize := selSize + 1.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1878	selSize > 1 ifTrue:[^nil].
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1879	obj := each].
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	1880	^obj
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1881
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1882	"Created: / 10-11-2009 / 11:12:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1883	"Modified: / 20-11-2009 / 19:54:36 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1884	! !
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1885
12322 6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1886	!ChangeSetDiffTool methodsFor:'accessing-subapps'!
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1887
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1888	textDiff2Tool
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1889	textDiff2App isNil ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1890	textDiff2App := TextDiff2Tool new
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1891	labelAHolder: self versionALabelHolder;
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1892	textAHolder: self versionATextHolder;
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1893
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1894	labelBHolder: self versionBLabelHolder;
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1895	textBHolder: self versionBTextHolder;
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1896
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1897	codeAspectHolder: self codeAspectHolder;
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1898
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1899	yourself
12322 6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1900	].
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1901	^textDiff2App
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1902
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1903	"Created: / 16-03-2012 / 13:58:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
12650 e0f607754b9a Merged 18d06283743d and ff31bac2fd1b (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12329 diff changeset	1904	"Modified: / 04-04-2013 / 18:17:03 / Jan Vrany <jan.vrany@fit.cvut.cz>"
12322 6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1905	!
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1906
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1907	textDiff3Tool
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1908	textDiff3App isNil ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1909	textDiff3App := TextDiff3Tool new
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1910	mergeHolder: self mergeHolder;
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1911	mergeDataHolder: self mergeDataHolder;
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1912
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1913	labelCHolder: self versionBaseLabelHolder;
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1914	textCHolder: self versionBaseTextHolder;
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1915
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1916	labelBHolder: self versionBLabelHolder;
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1917	textBHolder: self versionBTextHolder;
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1918
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1919	labelAHolder: self versionALabelHolder;
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1920	textAHolder: self versionATextHolder;
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1921
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1922	codeAspectHolder: self codeAspectHolder;
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1923
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1924
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1925	yourself
12322 6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1926	].
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1927	^textDiff3App
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1928
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1929	"Created: / 16-03-2012 / 15:16:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
12650 e0f607754b9a Merged 18d06283743d and ff31bac2fd1b (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12329 diff changeset	1930	"Modified: / 04-04-2013 / 18:17:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
12322 6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1931	! !
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1932
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1933	!ChangeSetDiffTool methodsFor:'accessing-subviews'!
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1934
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1935	labelsView:something
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1936	labelsView := something.
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1937	!
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1938
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1939	list1View: aView
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1940	list1App := aView application.
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1941
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1942	"Created: / 17-01-2013 / 13:44:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1943	!
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1944
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1945	list2View: aView
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1946	list2App := aView application.
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1947
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1948	"Created: / 17-01-2013 / 13:44:34 / Jan Vrany <jan.vrany@fit.cvut.cz>"
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1949	!
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1950
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1951	navigatorAndDiffPanelView:something
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	1952	navigatorAndDiffPanelView := something.
12320 5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1953	! !
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	1954
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	1955	!ChangeSetDiffTool methodsFor:'aspects'!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	1956
12321 13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	1957	autoMoveToNextConflictHolder
13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	1958
13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	1959	autoMoveToNextConflictHolder isNil ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1960	autoMoveToNextConflictHolder := AspectAdaptor forAspect: #autoMoveToNextConflict.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1961	autoMoveToNextConflictHolder subject: self class.
12321 13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	1962	].
13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	1963	^autoMoveToNextConflictHolder
13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	1964
13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	1965	"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	1966	!
13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	1967
13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	1968	canSaveHolder
13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	1969	"return/create the 'canSaveHolder' value holder (automatically generated)"
13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	1970
13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	1971	canSaveHolder isNil ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1972	canSaveHolder := false asValue
12321 13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	1973	].
13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	1974	^ canSaveHolder
13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	1975
13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	1976	"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	1977	!
13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	1978
12650 e0f607754b9a Merged 18d06283743d and ff31bac2fd1b (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12329 diff changeset	1979	codeAspectHolder
e0f607754b9a Merged 18d06283743d and ff31bac2fd1b (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12329 diff changeset	1980	"return/create the valueHolder 'codeAspectHolder'"
e0f607754b9a Merged 18d06283743d and ff31bac2fd1b (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12329 diff changeset	1981
e0f607754b9a Merged 18d06283743d and ff31bac2fd1b (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12329 diff changeset	1982	codeAspectHolder isNil ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1983	codeAspectHolder := ValueHolder with:nil "defaultValue here".
12650 e0f607754b9a Merged 18d06283743d and ff31bac2fd1b (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12329 diff changeset	1984	].
e0f607754b9a Merged 18d06283743d and ff31bac2fd1b (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12329 diff changeset	1985	^ codeAspectHolder
e0f607754b9a Merged 18d06283743d and ff31bac2fd1b (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12329 diff changeset	1986	!
e0f607754b9a Merged 18d06283743d and ff31bac2fd1b (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12329 diff changeset	1987
12200 807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	1988	diffInfoHolder
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	1989	"return/create the 'diffInfoHolder' value holder (automatically generated)"
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	1990
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	1991	diffInfoHolder isNil ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1992	diffInfoHolder := ValueHolder new.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	1993	diffInfoHolder addDependent:self.
12200 807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	1994	].
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	1995	^ diffInfoHolder
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	1996	!
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	1997
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	1998	diffInfoHolder:something
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	1999	"set the 'diffInfoHolder' value holder (automatically generated)"
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	2000
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	2001	\|oldValue newValue\|
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	2002
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	2003	diffInfoHolder notNil ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2004	oldValue := diffInfoHolder value.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2005	diffInfoHolder removeDependent:self.
12200 807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	2006	].
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	2007	diffInfoHolder := something.
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	2008	diffInfoHolder notNil ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2009	diffInfoHolder addDependent:self.
12200 807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	2010	].
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	2011	newValue := diffInfoHolder value.
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	2012	oldValue ~~ newValue ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2013	self update:#value with:newValue from:diffInfoHolder.
12200 807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	2014	].
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	2015	!
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	2016
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	2017	diffListEntryLabelGeneratorAspect
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2018
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2019	^nil
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2020
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2021	"Created: / 24-11-2009 / 10:01:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2022	!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2023
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2024	diffsetHolder
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2025	"return/create the 'diffsetHolder' value holder (automatically generated)"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2026
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2027	diffsetHolder isNil ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2028	diffsetHolder := ValueHolder new.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2029	diffsetHolder addDependent:self.
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	2030	].
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2031	^ diffsetHolder
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2032	!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2033
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2034	diffsetHolder:aValueHolder
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2035	"set the 'diffsetHolder' value holder (automatically generated)"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2036
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2037	\|oldValue newValue\|
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2038
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2039	diffsetHolder notNil ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2040	oldValue := diffsetHolder value.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2041	diffsetHolder removeDependent:self.
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	2042	].
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2043	diffsetHolder := aValueHolder.
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2044	diffsetHolder notNil ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2045	diffsetHolder addDependent:self.
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	2046	].
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2047	newValue := diffsetHolder value.
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2048	oldValue ~~ newValue ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2049	self update:#value with:newValue from:diffsetHolder.
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	2050	].
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2051	!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2052
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2053	diffsetHolderPrivate
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2054	"return/create the 'diffSetHolderPrivate' value holder (automatically generated)"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2055
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2056	diffsetHolderPrivate isNil ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2057	diffsetHolderPrivate := ValueHolder with: (self diffsetHolder value).
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	2058	].
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2059	^ diffsetHolderPrivate
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2060
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2061	"Created: / 05-12-2009 / 11:03:49 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2062	!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2063
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2064	firstColSelectionHolder
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2065	"return/create the valueHolder 'firstColSelectionHolder'"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2066
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2067	firstColSelectionHolder isNil ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2068	firstColSelectionHolder := ValueHolder with:nil "defaultValue here".
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	2069	].
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2070	^ firstColSelectionHolder
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2071	!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2072
12274 1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	2073	hasDiffsetHolder
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	2074	"return/create the 'hasDiffsetHolder' value holder (automatically generated)"
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	2075
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	2076	hasDiffsetHolder isNil ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2077	hasDiffsetHolder := false asValue
12274 1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	2078	].
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	2079	^ hasDiffsetHolder
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	2080
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	2081	"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	2082	!
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	2083
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	2084	hasDiffsetHolder:something
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	2085	"set the 'hasDiffsetHolder' value holder (automatically generated)"
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	2086
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	2087	hasDiffsetHolder := something.
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	2088	!
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	2089
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	2090	hasSelectionHolder
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2091
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2092	\|holder\|
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2093
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2094	(holder := builder bindingAt:#hasSelectionHolder) isNil ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2095	holder := (AspectAdaptor forAspect: #notEmptyOrNil)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2096	subjectChannel: self selectionHolder.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2097	builder aspectAt:#hasSelectionHolder put: holder
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	2098	].
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2099	^ holder.
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2100
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2101	"Created: / 22-10-2008 / 11:34:36 / Jan Vrany <vranyj1@fel.cvut.cz>"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2102	"Modified: / 22-10-2008 / 12:38:47 / Jan Vrany <vranyj1@fel.cvut.cz>"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2103	!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2104
12274 1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	2105	highlightConflictsHolder
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	2106	"return/create the 'highlightConflictsHolder' value holder (automatically generated)"
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	2107
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	2108	highlightConflictsHolder isNil ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2109	highlightConflictsHolder := true asValue
12274 1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	2110	].
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	2111	^ highlightConflictsHolder
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	2112
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	2113	"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	2114	!
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	2115
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	2116	highlightConflictsHolder:something
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	2117	"set the 'highlightConflictsHolder' value holder (automatically generated)"
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	2118
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	2119	highlightConflictsHolder := something.
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	2120	!
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	2121
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	2122	infoPanel
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	2123	infoPanel isNil ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2124	infoPanel := InlineMessageDialog new
12274 1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	2125	].
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	2126	^ infoPanel
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	2127
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	2128	"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	2129	!
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	2130
12322 6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	2131	labelSpecHolder
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	2132	"return/create the 'labelSpecHolder' value holder (automatically generated)"
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	2133
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	2134	labelSpecHolder isNil ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2135	labelSpecHolder := nil asValue
12322 6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	2136
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	2137	].
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	2138	^ labelSpecHolder
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	2139
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	2140	"Modified: / 17-01-2013 / 23:32:44 / Jan Vrany <jan.vrany@fit.cvut.cz>"
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	2141	!
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	2142
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	2143	listHolder
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2144	"return/create the 'listHolder' value holder (automatically generated)"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2145
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2146	listHolder isNil ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2147	listHolder := ValueHolder new.
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	2148	].
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2149	^ listHolder
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2150
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2151	"Modified: / 01-11-2009 / 16:57:37 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2152	!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2153
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2154	listMenuHolder
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2155	diffMenuHolder isNil ifTrue:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2156	"/ diffMenuHolder := ValueHolder with:self listMenu
12320 5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2157	diffMenuHolder := BlockValue with:[:v\|self listMenu] argument: self mergeHolder
10879 0dc2095adecf changed: Claus Gittinger <cg@exept.de> parents: 10741 diff changeset	2158	].
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	2159	^ diffMenuHolder
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2160
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2161	"Created: / 21-11-2009 / 18:52:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10879 0dc2095adecf changed: Claus Gittinger <cg@exept.de> parents: 10741 diff changeset	2162	"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	2163	"Modified: / 16-01-2013 / 15:59:50 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	2164	!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2165
12198 414e7b69ecda Text/ChangeSet diff improved Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12192 diff changeset	2166	mergeDataHolder
414e7b69ecda Text/ChangeSet diff improved Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12192 diff changeset	2167	"return/create the 'mergeDataHolder' value holder (automatically generated)"
414e7b69ecda Text/ChangeSet diff improved Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12192 diff changeset	2168
414e7b69ecda Text/ChangeSet diff improved Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12192 diff changeset	2169	mergeDataHolder isNil ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2170	mergeDataHolder := ValueHolder new.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2171	mergeDataHolder addDependent:self.
12198 414e7b69ecda Text/ChangeSet diff improved Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12192 diff changeset	2172	].
414e7b69ecda Text/ChangeSet diff improved Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12192 diff changeset	2173	^ mergeDataHolder
414e7b69ecda Text/ChangeSet diff improved Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12192 diff changeset	2174	!
414e7b69ecda Text/ChangeSet diff improved Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12192 diff changeset	2175
414e7b69ecda Text/ChangeSet diff improved Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12192 diff changeset	2176	mergeDataHolder:something
414e7b69ecda Text/ChangeSet diff improved Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12192 diff changeset	2177	"set the 'mergeDataHolder' value holder (automatically generated)"
414e7b69ecda Text/ChangeSet diff improved Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12192 diff changeset	2178
12318 1dda95be3d40 Fixes in changeset merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12317 diff changeset	2179	\|oldValue newValue\|
1dda95be3d40 Fixes in changeset merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12317 diff changeset	2180
1dda95be3d40 Fixes in changeset merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12317 diff changeset	2181	mergeDataHolder notNil ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2182	oldValue := mergeDataHolder value.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2183	mergeDataHolder removeDependent:self.
12318 1dda95be3d40 Fixes in changeset merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12317 diff changeset	2184	].
12198 414e7b69ecda Text/ChangeSet diff improved Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12192 diff changeset	2185	mergeDataHolder := something.
12318 1dda95be3d40 Fixes in changeset merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12317 diff changeset	2186	mergeDataHolder notNil ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2187	mergeDataHolder addDependent:self.
12318 1dda95be3d40 Fixes in changeset merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12317 diff changeset	2188	].
1dda95be3d40 Fixes in changeset merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12317 diff changeset	2189	newValue := mergeDataHolder value.
1dda95be3d40 Fixes in changeset merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12317 diff changeset	2190	oldValue ~~ newValue ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2191	self update:#value with:newValue from:mergeDataHolder.
12318 1dda95be3d40 Fixes in changeset merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12317 diff changeset	2192	].
12198 414e7b69ecda Text/ChangeSet diff improved Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12192 diff changeset	2193	!
414e7b69ecda Text/ChangeSet diff improved Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12192 diff changeset	2194
414e7b69ecda Text/ChangeSet diff improved Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12192 diff changeset	2195	mergeHolder
414e7b69ecda Text/ChangeSet diff improved Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12192 diff changeset	2196	"return/create the 'mergeHolder' value holder (automatically generated)"
414e7b69ecda Text/ChangeSet diff improved Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12192 diff changeset	2197
414e7b69ecda Text/ChangeSet diff improved Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12192 diff changeset	2198	mergeHolder isNil ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2199	mergeHolder := ValueHolder with: false.
12198 414e7b69ecda Text/ChangeSet diff improved Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12192 diff changeset	2200	].
414e7b69ecda Text/ChangeSet diff improved Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12192 diff changeset	2201	^ mergeHolder
414e7b69ecda Text/ChangeSet diff improved Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12192 diff changeset	2202
414e7b69ecda Text/ChangeSet diff improved Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12192 diff changeset	2203	"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	2204	!
414e7b69ecda Text/ChangeSet diff improved Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12192 diff changeset	2205
414e7b69ecda Text/ChangeSet diff improved Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12192 diff changeset	2206	mergeHolder:something
414e7b69ecda Text/ChangeSet diff improved Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12192 diff changeset	2207	"set the 'mergeHolder' value holder (automatically generated)"
414e7b69ecda Text/ChangeSet diff improved Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12192 diff changeset	2208
414e7b69ecda Text/ChangeSet diff improved Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12192 diff changeset	2209	mergeHolder := something.
414e7b69ecda Text/ChangeSet diff improved Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12192 diff changeset	2210	!
414e7b69ecda Text/ChangeSet diff improved Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12192 diff changeset	2211
12317 aac0f12a3327 Updates in mergetool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12295 diff changeset	2212	mergeSavedHolder
aac0f12a3327 Updates in mergetool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12295 diff changeset	2213	"return/create the 'mergeSavedHolder' value holder (automatically generated)"
aac0f12a3327 Updates in mergetool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12295 diff changeset	2214
aac0f12a3327 Updates in mergetool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12295 diff changeset	2215	mergeSavedHolder isNil ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2216	mergeSavedHolder := false asValue
12317 aac0f12a3327 Updates in mergetool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12295 diff changeset	2217	].
aac0f12a3327 Updates in mergetool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12295 diff changeset	2218	^ mergeSavedHolder
aac0f12a3327 Updates in mergetool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12295 diff changeset	2219
aac0f12a3327 Updates in mergetool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12295 diff changeset	2220	"Modified: / 15-01-2013 / 11:39:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	2221	!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2222
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2223	nameAspect
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2224
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2225	^(AspectAdaptor forAspect: #name)
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2226	subjectChannel: self diffsetHolder
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	2227
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2228	"Created: / 01-11-2009 / 11:14:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2229	!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2230
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2231	navigatorPanelSpecHolder
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2232	<resource: #uiAspect>
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2233
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2234	navigatorPanelSpecHolder isNil ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2235	navigatorPanelSpecHolder := ValueHolder with: #twoColumnNavigatorSpec.
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	2236	].
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2237	^ navigatorPanelSpecHolder.
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2238
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2239	"Modified: / 20-11-2009 / 20:12:06 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2240	!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2241
12320 5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2242	secondColSelectionHolder
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2243	"return/create the valueHolder 'firstColSelectionHolder'"
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2244
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2245	^self selectionHolder
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2246
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2247	"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	2248	!
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2249
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	2250	selectionHolder
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2251	"return/create the 'selectionHolder' value holder (automatically generated)"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2252
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2253	selectionHolder isNil ifTrue:[
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2254
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2255	selectionHolder := ValueHolder new.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2256	selectionHolder addDependent:self.
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	2257	].
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2258	^ selectionHolder
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2259
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2260	"Modified (format): / 06-07-2011 / 12:25:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2261	!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2262
12274 1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	2263	showCopyrightMethodDiffsHolder
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	2264	"return/create the 'showCopyrightMethodDiffsHolder' value holder (automatically generated)"
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	2265
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	2266	showCopyrightMethodDiffsHolder isNil ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2267	showCopyrightMethodDiffsHolder := true asValue
12274 1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	2268	].
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	2269	^ showCopyrightMethodDiffsHolder
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	2270
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	2271	"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	2272	!
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	2273
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	2274	showCopyrightMethodDiffsHolder:something
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	2275	"set the 'showCopyrightMethodDiffsHolder' value holder (automatically generated)"
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	2276
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	2277	showCopyrightMethodDiffsHolder := something.
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	2278	!
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	2279
12232 4d9b62c111fc - Tools::ChangeSetDiffList Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12216 diff changeset	2280	showVersionMethodDiffsHolder
4d9b62c111fc - Tools::ChangeSetDiffList Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12216 diff changeset	2281	"return/create the 'showVersionMethodDiffsHolder' value holder (automatically generated)"
4d9b62c111fc - Tools::ChangeSetDiffList Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12216 diff changeset	2282
4d9b62c111fc - Tools::ChangeSetDiffList Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12216 diff changeset	2283	showVersionMethodDiffsHolder isNil ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2284	showVersionMethodDiffsHolder := true asValue.
12232 4d9b62c111fc - Tools::ChangeSetDiffList Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12216 diff changeset	2285	].
4d9b62c111fc - Tools::ChangeSetDiffList Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12216 diff changeset	2286	^ showVersionMethodDiffsHolder
4d9b62c111fc - Tools::ChangeSetDiffList Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12216 diff changeset	2287
4d9b62c111fc - Tools::ChangeSetDiffList Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12216 diff changeset	2288	"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	2289	!
4d9b62c111fc - Tools::ChangeSetDiffList Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12216 diff changeset	2290
4d9b62c111fc - Tools::ChangeSetDiffList Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12216 diff changeset	2291	showVersionMethodDiffsHolder:something
4d9b62c111fc - Tools::ChangeSetDiffList Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12216 diff changeset	2292	"set the 'showVersionMethodDiffsHolder' value holder (automatically generated)"
4d9b62c111fc - Tools::ChangeSetDiffList Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12216 diff changeset	2293
4d9b62c111fc - Tools::ChangeSetDiffList Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12216 diff changeset	2294	showVersionMethodDiffsHolder := something.
4d9b62c111fc - Tools::ChangeSetDiffList Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12216 diff changeset	2295	!
4d9b62c111fc - Tools::ChangeSetDiffList Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12216 diff changeset	2296
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	2297	singleSelectionHolder
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2298	"return/create the 'singleSelectionHolder' value holder (automatically generated)"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2299
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2300	singleSelectionHolder isNil ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2301	singleSelectionHolder := ValueHolder new.
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	2302	].
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2303	^ singleSelectionHolder
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2304
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2305	"Modified: / 10-11-2009 / 11:09:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2306	!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2307
12179 47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	2308	textDiffToolHolder
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	2309	"return/create the 'textDiffToolHolder' value holder (automatically generated)"
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	2310
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	2311	textDiffToolHolder isNil ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2312	textDiffToolHolder := ValueHolder with: self textDiff2Tool.
12179 47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	2313	].
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	2314	^ textDiffToolHolder
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	2315
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	2316	"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	2317	!
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	2318
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	2319	textDiffToolHolder:something
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	2320	"set the 'textDiffToolHolder' value holder (automatically generated)"
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	2321
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	2322	textDiffToolHolder := something.
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	2323	!
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	2324
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	2325	textDiffToolWindowSpecHolder
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	2326	"return/create the 'textDiffToolWindowSpecHolder' value holder (automatically generated)"
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	2327
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	2328	textDiffToolWindowSpecHolder isNil ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2329	textDiffToolWindowSpecHolder := #windowSpecForEmbedding asValue.
12179 47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	2330	].
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	2331	^ textDiffToolWindowSpecHolder
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	2332
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	2333	"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	2334	!
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	2335
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	2336	textDiffToolWindowSpecHolder:something
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	2337	"set the 'textDiffToolWindowSpecHolder' value holder (automatically generated)"
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	2338
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	2339	textDiffToolWindowSpecHolder := something.
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	2340	!
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	2341
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	2342	titleHolder
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2343	"return/create the 'titleHolder' value holder (automatically generated)"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2344
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2345	titleHolder isNil ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2346	titleHolder := ValueHolder with: 'Diff Browser'.
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	2347	].
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2348	^ titleHolder
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2349
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2350	"Modified: / 01-11-2009 / 14:04:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2351	!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2352
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2353	versionALabelHolder
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2354
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2355	^(AspectAdaptor forAspect: #versionALabel)
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2356	subjectChannel: self diffsetHolder
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	2357
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2358	"Created: / 09-04-2011 / 23:30:35 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2359	!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2360
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2361	versionATextHolder
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2362
10879 0dc2095adecf changed: Claus Gittinger <cg@exept.de> parents: 10741 diff changeset	2363	versionATextHolder isNil ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2364	versionATextHolder := ValueHolder new
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	2365	].
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2366	^versionATextHolder
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2367
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2368	"Created: / 06-07-2011 / 12:05:25 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10879 0dc2095adecf changed: Claus Gittinger <cg@exept.de> parents: 10741 diff changeset	2369	"Modified: / 18-11-2011 / 14:57:56 / cg"
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	2370	!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2371
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2372	versionBLabelHolder
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2373
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2374	^(AspectAdaptor forAspect: #versionBLabel)
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2375	subjectChannel: self diffsetHolder
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	2376
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2377	"Created: / 09-04-2011 / 23:30:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2378	!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2379
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2380	versionBTextHolder
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2381
10879 0dc2095adecf changed: Claus Gittinger <cg@exept.de> parents: 10741 diff changeset	2382	versionBTextHolder isNil ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2383	versionBTextHolder := ValueHolder new
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	2384	].
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2385	^versionBTextHolder
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2386
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2387	"Created: / 06-07-2011 / 12:05:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10879 0dc2095adecf changed: Claus Gittinger <cg@exept.de> parents: 10741 diff changeset	2388	"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	2389	!
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	2390
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	2391	versionBaseLabelHolder
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	2392
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	2393	^(AspectAdaptor forAspect: #versionBaseLabel)
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2394	subjectChannel: self diffsetHolder
12179 47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	2395
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	2396	"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	2397	!
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	2398
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	2399	versionBaseTextHolder
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	2400
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	2401	versionBaseTextHolder isNil ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2402	versionBaseTextHolder := ValueHolder new
12179 47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	2403	].
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	2404	^versionBaseTextHolder
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	2405
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	2406	"Modified: / 18-11-2011 / 14:57:59 / cg"
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	2407	"Created: / 16-03-2012 / 15:19:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	2408	! !
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2409
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2410	!ChangeSetDiffTool methodsFor:'change & update'!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2411
12200 807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	2412	diffInfoChanged
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	\| info \|
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	2415	info := self diffInfoHolder value.
12274 1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	2416	self hasDiffsetHolder value: false.
12317 aac0f12a3327 Updates in mergetool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12295 diff changeset	2417	self mergeSavedHolder value: false.
12321 13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	2418	self canSaveHolder value: false.
12274 1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	2419	info notNil ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2420	self infoPanel showProgressLabeled: (resources string:'Reading changesets') while: [
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2421	info read.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2422	self diffset: info diffset.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2423	].
12321 13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	2424	].
12200 807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	2425
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	2426	"Created: / 19-03-2012 / 23:40:23 / Jan Vrany <jan.vrany@fit.cvut.cz>"
12329 9fc078cd44ab Bugfix in ChangeSetDiffTool: update UI after open to show correct labels. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12323 diff changeset	2427	"Modified: / 21-01-2013 / 21:12:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
12200 807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	2428	!
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	2429
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	2430	diffsetChanged
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2431
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2432	\| ds \|
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2433
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2434	ds := self diffsetHolder value.
12317 aac0f12a3327 Updates in mergetool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12295 diff changeset	2435	ds depth = 2 ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2436	self beTwoColumn.
12317 aac0f12a3327 Updates in mergetool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12295 diff changeset	2437	] ifFalse:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2438	self beSingleColumn.
12317 aac0f12a3327 Updates in mergetool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12295 diff changeset	2439	].
12277 46aea706fdb7 - Tools::ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12276 diff changeset	2440	self hasDiffsetHolder value: ds notNil.
12321 13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	2441	self canSaveHolder value: self canSave.
13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	2442	alreadyWarnedAboutUnsavedMerge := false.
13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	2443
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	2444
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2445	self diffsetHolderPrivate value:
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2446	(self isOneColumnBrowser
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2447	ifTrue:[ds flattened sort]
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2448	ifFalse:[ds value sort]).
12321 13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	2449	self autoMoveToNextConflictHolder value ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2450	self menuMoveDownConflict.
12321 13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	2451	].
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	2452	self versionALabelHolder value: ds versionALabel.
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2453	self versionBLabelHolder value: ds versionBLabel.
12179 47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	2454	self versionBaseLabelHolder value: ds versionBaseLabel.
12329 9fc078cd44ab Bugfix in ChangeSetDiffTool: update UI after open to show correct labels. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12323 diff changeset	2455	self updateViews.
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	2456
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2457	"Created: / 05-12-2009 / 11:03:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2458	"Modified: / 29-06-2011 / 08:24:18 / Jan Vrany <enter your email here>"
12329 9fc078cd44ab Bugfix in ChangeSetDiffTool: update UI after open to show correct labels. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12323 diff changeset	2459	"Modified: / 21-01-2013 / 21:13:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	2460	!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2461
12318 1dda95be3d40 Fixes in changeset merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12317 diff changeset	2462	mergeDataChanged
12321 13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	2463	"Resolution has been changed..."
13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	2464
13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	2465	self canSaveHolder value: self canSave.
13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	2466	alreadyWarnedAboutUnsavedMerge := false.
13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	2467	(self autoMoveToNextConflictHolder value and:[mergeData isMerged]) ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2468	self menuMoveDownConflict
12321 13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	2469	]
13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	2470
13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	2471	"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	2472	"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	2473	!
13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	2474
13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	2475	mergeDataHolderChanged
13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	2476	mergeData notNil ifTrue:[mergeData removeDependent: self].
13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	2477	mergeData := self mergeDataHolder value.
13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	2478	mergeData notNil ifTrue:[mergeData addDependent: self].
12318 1dda95be3d40 Fixes in changeset merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12317 diff changeset	2479
1dda95be3d40 Fixes in changeset merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12317 diff changeset	2480	"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	2481	"Modified: / 17-01-2013 / 20:06:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	2482	!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2483
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2484	selectionChanged
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2485
12198 414e7b69ecda Text/ChangeSet diff improved Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12192 diff changeset	2486	\| diffItem mergeData \|
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	2487
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2488	diffItem := self theSingleSelectedObject.
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2489	self singleSelectionHolder value: diffItem.
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2490	diffItem isNil ifTrue:[^self].
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2491
12198 414e7b69ecda Text/ChangeSet diff improved Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12192 diff changeset	2492	self isMerge ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2493	self mergeDataHolder setValue: (mergeData := diffItem mergeInfo).
12198 414e7b69ecda Text/ChangeSet diff improved Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12192 diff changeset	2494	].
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	2495	self versionATextHolder setValue: diffItem versionAText.
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2496	self versionBTextHolder setValue: diffItem versionBText.
12179 47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	2497	self versionBaseTextHolder setValue: diffItem versionBaseText.
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	2498
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2499
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2500	self versionATextHolder changed: #value.
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2501	self versionBTextHolder changed: #value.
12198 414e7b69ecda Text/ChangeSet diff improved Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12192 diff changeset	2502	self versionBaseTextHolder changed: #value.
414e7b69ecda Text/ChangeSet diff improved Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12192 diff changeset	2503	self isMerge ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2504	self mergeDataHolder changed: #value.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2505	"Maybe, there was no merge data beforehand. In that case,
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2506	update"
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2507	mergeData isNil ifTrue:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2508	diffItem mergeInfo: (self mergeDataHolder value).
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2509	]
12198 414e7b69ecda Text/ChangeSet diff improved Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12192 diff changeset	2510	]
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	2511
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2512	"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	2513	"Modified: / 19-03-2012 / 14:59:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	2514	!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2515
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2516	update: aspect with: param from: sender
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2517
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2518	sender == selectionHolder ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2519	self selectionChanged.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2520	^self.
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	2521	].
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2522
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2523	sender == diffsetHolder ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2524	self diffsetChanged.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2525	^self.
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	2526	].
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2527
12200 807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	2528	sender == diffInfoHolder ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2529	self diffInfoChanged.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2530	^self.
12200 807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	2531	].
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	2532
12318 1dda95be3d40 Fixes in changeset merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12317 diff changeset	2533	sender == mergeDataHolder ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2534	self mergeDataHolderChanged.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2535	^self.
12321 13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	2536	].
13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	2537
13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	2538	sender == mergeData ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2539	"Resolution has been changed..."
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2540	self mergeDataChanged.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2541	^self.
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	2542	].
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2543
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2544	^super update: aspect with: param from: sender
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2545
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2546	"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	2547	"Modified (format): / 17-01-2013 / 20:06:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	2548	!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2549
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2550	updateListMenu
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2551	\|menu diffs loadA loadB\|
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2552
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2553	menu := self listMenuHolder value.
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2554	diffs := self selection ? #().
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2555	loadA := menu atNameKey:#LoadVersionA.
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2556	loadA disable.
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2557	loadB := menu atNameKey:#LoadVersionB.
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2558	loadB disable.
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2559	(diffs select:[:e \| true ]) do:[:diff \|
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2560	diff versionA
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2561	ifNotNil:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2562	loadA enable.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2563	loadA label:'Load version ' , diff versionALabel
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2564	].
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2565	diff versionB
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2566	ifNotNil:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2567	loadB
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2568	label:'Load version ' , diff versionBLabel;
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2569	enable
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2570	].
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	2571	].
12200 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
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	2574	updateViews
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	2575
12329 9fc078cd44ab Bugfix in ChangeSetDiffTool: update UI after open to show correct labels. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12323 diff changeset	2576	(self diffInfo notNil and:[self diffInfo isDiff3]) ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2577	self diffInfo isMerge ifTrue:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2578	self mergeHolder value: true.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2579	self labelSpecHolder value: #labelMergeSpec.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2580	self labelHeight: 120.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2581	] ifFalse:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2582	self mergeHolder value: false.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2583	self labelSpecHolder value: #labelDiff3Spec.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2584	self labelHeight: 90.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2585	].
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2586	self textDiffToolHolder value isDiff3 ifFalse:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2587	textDiffToolHolder value: self textDiff3Tool.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2588	].
12322 6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	2589
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	2590
12200 807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	2591	] ifFalse:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2592	self mergeHolder value: false.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2593	self labelSpecHolder value: #labelDiff2Spec.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2594	self labelHeight: 60.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2595
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2596	self textDiffToolHolder value isDiff2 ifFalse:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2597	textDiffToolHolder value: self textDiff2Tool.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2598	].
12276 415495417f39 - Tools::ChangeSetSpec Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12275 diff changeset	2599	].
12200 807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	2600
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	2601	"Created: / 20-03-2012 / 10:21:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
12329 9fc078cd44ab Bugfix in ChangeSetDiffTool: update UI after open to show correct labels. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12323 diff changeset	2602	"Modified: / 21-01-2013 / 21:16:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
9fc078cd44ab Bugfix in ChangeSetDiffTool: update UI after open to show correct labels. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12323 diff changeset	2603	! !
9fc078cd44ab Bugfix in ChangeSetDiffTool: update UI after open to show correct labels. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12323 diff changeset	2604
9fc078cd44ab Bugfix in ChangeSetDiffTool: update UI after open to show correct labels. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12323 diff changeset	2605	!ChangeSetDiffTool methodsFor:'hooks'!
9fc078cd44ab Bugfix in ChangeSetDiffTool: update UI after open to show correct labels. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12323 diff changeset	2606
9fc078cd44ab Bugfix in ChangeSetDiffTool: update UI after open to show correct labels. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12323 diff changeset	2607	commonPostOpen
9fc078cd44ab Bugfix in ChangeSetDiffTool: update UI after open to show correct labels. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12323 diff changeset	2608	self updateViews
9fc078cd44ab Bugfix in ChangeSetDiffTool: update UI after open to show correct labels. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12323 diff changeset	2609
9fc078cd44ab Bugfix in ChangeSetDiffTool: update UI after open to show correct labels. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12323 diff changeset	2610	"Created: / 21-01-2013 / 21:18:32 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	2611	! !
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2612
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2613	!ChangeSetDiffTool methodsFor:'initialization'!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2614
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2615	initialize
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2616
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2617	super initialize.
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2618	self createBuilder
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2619
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2620	"Created: / 22-10-2008 / 12:37:14 / Jan Vrany <vranyj1@fel.cvut.cz>"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2621	! !
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2622
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2623	!ChangeSetDiffTool methodsFor:'menu actions'!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2624
10975 1d7029646c90 added: vrany parents: 10939 diff changeset	2625	changesetMenuBrowse: changeset
1d7029646c90 added: vrany parents: 10939 diff changeset	2626
12201 283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2627	Tools::ChangeSetBrowser2 openOn: (changeset , self diffInfo same)
10975 1d7029646c90 added: vrany parents: 10939 diff changeset	2628
1d7029646c90 added: vrany parents: 10939 diff changeset	2629	"Created: / 16-12-2011 / 14:31:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1d7029646c90 added: vrany parents: 10939 diff changeset	2630	!
1d7029646c90 added: vrany parents: 10939 diff changeset	2631
1d7029646c90 added: vrany parents: 10939 diff changeset	2632	changesetMenuBrowseA
1d7029646c90 added: vrany parents: 10939 diff changeset	2633
12201 283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2634	self changesetMenuBrowse: self diffInfo diffset changesetA
10975 1d7029646c90 added: vrany parents: 10939 diff changeset	2635
1d7029646c90 added: vrany parents: 10939 diff changeset	2636	"Created: / 16-12-2011 / 14:23:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1d7029646c90 added: vrany parents: 10939 diff changeset	2637	!
1d7029646c90 added: vrany parents: 10939 diff changeset	2638
1d7029646c90 added: vrany parents: 10939 diff changeset	2639	changesetMenuBrowseB
1d7029646c90 added: vrany parents: 10939 diff changeset	2640
12201 283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2641	self changesetMenuBrowse: self diffInfo diffset changesetB
10975 1d7029646c90 added: vrany parents: 10939 diff changeset	2642
1d7029646c90 added: vrany parents: 10939 diff changeset	2643	"Created: / 16-12-2011 / 14:27:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
1d7029646c90 added: vrany parents: 10939 diff changeset	2644	!
1d7029646c90 added: vrany parents: 10939 diff changeset	2645
12201 283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2646	changesetMenuBrowseBase
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2647
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2648	self changesetMenuBrowse: self diffInfo diffset changesetBase
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2649
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2650	"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	2651	!
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2652
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2653	changesetMenuBrowseMerge
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2654
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2655	self changesetMenuBrowse: self diffInfo diffset changesetMerged
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2656
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2657	"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	2658	!
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2659
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	2660	fileMenuOpen
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2661
12200 807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	2662	\| dlg info \|
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	2663	dlg := OpenDialog new.
12276 415495417f39 - Tools::ChangeSetSpec Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12275 diff changeset	2664	info := LastDiffInfo.
12295 893fad8d458a - Tools::ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12277 diff changeset	2665	info isNil ifFalse:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2666	info := ChangeSetDiffInfo new.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2667	info specMerge: ChangeSetSpec changeSet
12276 415495417f39 - Tools::ChangeSetSpec Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12275 diff changeset	2668	].
415495417f39 - Tools::ChangeSetSpec Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12275 diff changeset	2669	dlg diffInfo: info.
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	2670	dlg open ifFalse:[^self].
12274 1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	2671	info := dlg diffInfo.
12200 807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	2672
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	2673	^self fileMenuOpenOnDiffInfo: info
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	2674
12295 893fad8d458a - Tools::ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12277 diff changeset	2675	"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	2676	!
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	2677
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2678
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2679
12200 807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	2680	fileMenuOpenOnDiffInfo: info
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	2681
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2682	LastDiffInfo := info.
12200 807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	2683	self diffInfoHolder value: info
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	2684
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	2685	"Created: / 20-03-2012 / 00:04:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	2686	!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2687
12201 283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2688	fileMenuSave
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2689	self fileMenuSaveAs: self diffInfo specMergeFile.
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2690
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2691	"Modified: / 20-03-2012 / 15:07:28 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	2692	!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2693
12201 283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2694	fileMenuSaveAs
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2695	\| info file suggestion \|
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2696
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2697	info := self diffInfo.
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2698	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	2699	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	2700	file isNil ifTrue:[^self].
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2701	self fileMenuSaveAs: file.
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2702
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2703	"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	2704	!
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2705
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2706	fileMenuSaveAs: aFilename
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2707
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2708	self fileMenuSaveAs: aFilename format: #classSource
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2709
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2710	"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	2711	!
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2712
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2713	fileMenuSaveAs: aFilename format: format
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2714
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2715	\| changesToSave \|
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2716
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2717	changesToSave := (self diffInfo diffset changesetMerged) , (self diffInfo same).
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2718	changesToSave := changesToSave reject:[:chg\|chg isDoIt].
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2719	changesToSave saveToFile: aFilename format: format.
12317 aac0f12a3327 Updates in mergetool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12295 diff changeset	2720	self mergeSavedHolder value: true
12201 283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2721
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2722	"Created: / 20-03-2012 / 15:09:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
12317 aac0f12a3327 Updates in mergetool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12295 diff changeset	2723	"Modified: / 15-01-2013 / 11:40:31 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	2724	!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2725
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2726	fileMenuSaveAsPatch
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2727
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2728	\| filename \|
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2729	filename := Smalltalk::Dialog requestFileName: 'Enter filename' default:'patch.chg' ifFail:[^self].
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2730	self patchset fileOutAs: filename.
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2731
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2732	"Modified: / 05-12-2009 / 12:37:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2733	!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2734
12276 415495417f39 - Tools::ChangeSetSpec Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12275 diff changeset	2735	fileMenuSaveMergedAs
415495417f39 - Tools::ChangeSetSpec Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12275 diff changeset	2736
415495417f39 - Tools::ChangeSetSpec Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12275 diff changeset	2737	self halt.
415495417f39 - Tools::ChangeSetSpec Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12275 diff changeset	2738
415495417f39 - Tools::ChangeSetSpec Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12275 diff changeset	2739	"Modified: / 03-08-2012 / 15:39:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
415495417f39 - Tools::ChangeSetSpec Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12275 diff changeset	2740	!
415495417f39 - Tools::ChangeSetSpec Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12275 diff changeset	2741
10939 e8a439fbd82d - added filter support vrany parents: 10879 diff changeset	2742	listMenuBrowse
e8a439fbd82d - added filter support vrany parents: 10879 diff changeset	2743
e8a439fbd82d - added filter support vrany parents: 10879 diff changeset	2744	\| items \|
e8a439fbd82d - added filter support vrany parents: 10879 diff changeset	2745	items := self selection collect:[:e\|e]. "/must do collect as selection is an iterator..."
e8a439fbd82d - added filter support vrany parents: 10879 diff changeset	2746	items size == 1 ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2747	\| item cls sel \|
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2748	item:= items anElement.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2749	cls := item changeClass.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2750	sel := item changeSelector.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2751	cls notNil ifTrue:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2752	sel notNil ifTrue:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2753	UserPreferences systemBrowserClass
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2754	openInClass:cls selector:sel
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2755
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2756	] ifFalse:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2757	UserPreferences systemBrowserClass
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2758	browseClass: cls
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2759	]
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2760	] ifFalse:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2761	Dialog warn: (self class resources at: 'Oops, class is gone')
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2762	]
10939 e8a439fbd82d - added filter support vrany parents: 10879 diff changeset	2763	] ifFalse:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2764	Dialog error: 'Not yet implemented (Tools::ChangeSetDiffTool>>listMenuBrowse)'.
10939 e8a439fbd82d - added filter support vrany parents: 10879 diff changeset	2765	]
e8a439fbd82d - added filter support vrany parents: 10879 diff changeset	2766
e8a439fbd82d - added filter support vrany parents: 10879 diff changeset	2767	"Created: / 30-11-2011 / 11:30:54 / Jan Vrany <jan.vrany@fit.cvut.cz>"
e8a439fbd82d - added filter support vrany parents: 10879 diff changeset	2768	!
e8a439fbd82d - added filter support vrany parents: 10879 diff changeset	2769
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	2770	listMenuInspect
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2771
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2772	(self selection collect:[:e\|e]) inspect
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2773
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2774	"Modified: / 24-11-2009 / 12:51:00 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2775	!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2776
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2777	listMenuLoadVersionA
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2778
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2779	self selection do:
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2780	[:diff\|diff versionA apply]
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	2781
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2782	"Modified: / 09-12-2009 / 23:09:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2783	!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2784
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2785	listMenuLoadVersionB
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2786
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2787	self selection do:
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2788	[:diff\|diff versionB apply]
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	2789
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2790	"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	2791	!
15f47901fb64 Fixes in Diff2/Diff3 text views Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12179 diff changeset	2792
12320 5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2793	listMenuMergeUsingA
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2794	self textDiffToolHolder value doMergeAllUsingA
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2795
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2796	"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	2797	!
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2798
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2799	listMenuMergeUsingB
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2800	self textDiffToolHolder value doMergeAllUsingB
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2801
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2802	"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	2803	!
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2804
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2805	listMenuMergeUsingBase
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2806	self textDiffToolHolder value doMergeAllUsingBase
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2807
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2808	"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	2809	!
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2810
12192 15f47901fb64 Fixes in Diff2/Diff3 text views Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12179 diff changeset	2811	listMenuOpenInExternal: command
15f47901fb64 Fixes in Diff2/Diff3 text views Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12179 diff changeset	2812
15f47901fb64 Fixes in Diff2/Diff3 text views Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12179 diff changeset	2813	(OperatingSystem canExecuteCommand: command) ifFalse:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2814	Dialog warn: 'Sorry. ', command , ' is not installed or not in PATH'
12192 15f47901fb64 Fixes in Diff2/Diff3 text views Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12179 diff changeset	2815	].
15f47901fb64 Fixes in Diff2/Diff3 text views Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12179 diff changeset	2816
15f47901fb64 Fixes in Diff2/Diff3 text views Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12179 diff changeset	2817	self selection do:[:item\|
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2818	\| base a b cmd \|
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2819	item versionBase notNil ifTrue:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2820	base := Filename newTemporary.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2821	base writingFileDo:[:s\|s nextPutAll: item versionBase source].
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2822	].
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2823	a := Filename newTemporary.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2824	a writingFileDo:[:s\|s nextPutAll: item versionA source].
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2825	b := Filename newTemporary.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2826	b writingFileDo:[:s\|s nextPutAll: item versionB source].
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2827
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2828	base isNil ifTrue:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2829	cmd := '%1 %2 %3' bindWith: command with: a pathName with: b pathName
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2830	] ifFalse:[
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2831	cmd := '%1 %4 %2 %3 ' bindWith: command with: a pathName with: b pathName with: base pathName.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2832	].
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2833	[ OperatingSystem executeCommand: cmd.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2834	a remove.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2835	b remove.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2836	base notNil ifTrue:[base remove]. ] fork
12192 15f47901fb64 Fixes in Diff2/Diff3 text views Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12179 diff changeset	2837	]
15f47901fb64 Fixes in Diff2/Diff3 text views Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12179 diff changeset	2838
15f47901fb64 Fixes in Diff2/Diff3 text views Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12179 diff changeset	2839	"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	2840	!
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2841
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2842	menuMoveDown
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2843	self menuMoveDownToSuchThat: [:entry\|true]
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2844
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2845	"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	2846	!
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2847
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2848	menuMoveDownConflict
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2849	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	2850
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2851	"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	2852	!
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2853
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2854	menuMoveDownToSuchThat: aBlock
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2855	\| oldSel newSel \|
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2856	oldSel := self theLastSelectedEntry.
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2857	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	2858	self menuMoveTo: newSel.
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2859
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2860	"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	2861	!
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2862
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2863	menuMoveTo: entry
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2864
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2865	"/ 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	2866	self selection: entry.
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2867
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2868	"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	2869	"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	2870	!
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2871
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2872	menuMoveUp
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2873	self menuMoveUpToSuchThat: [:entry\|true]
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2874
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2875	"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	2876	!
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2877
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2878	menuMoveUpConflict
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2879	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	2880
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2881	"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	2882	!
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2883
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2884	menuMoveUpToSuchThat: aBlock
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2885	\| oldSel newSel \|
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2886	oldSel := self theFirstSelectedEntry.
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2887	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	2888	self menuMoveTo: newSel.
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2889
5b4ec70d83c1 UI fixes in ChangeSetDiffTool. More will come. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12318 diff changeset	2890	"Created: / 17-01-2013 / 16:58:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	2891	! !
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2892
12322 6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	2893	!ChangeSetDiffTool methodsFor:'private'!
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	2894
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	2895	labelHeight: height
12329 9fc078cd44ab Bugfix in ChangeSetDiffTool: update UI after open to show correct labels. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12323 diff changeset	2896	(labelsView notNil and:[navigatorAndDiffPanelView notNil]) ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2897	labelsView layout: (labelsView layout copy bottomOffset: height).
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2898	navigatorAndDiffPanelView layout: (navigatorAndDiffPanelView layout copy topOffset: height).
12329 9fc078cd44ab Bugfix in ChangeSetDiffTool: update UI after open to show correct labels. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12323 diff changeset	2899	].
12322 6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	2900
6ca193e20c8e More UI imporovements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12321 diff changeset	2901	"Created: / 17-01-2013 / 23:38:18 / Jan Vrany <jan.vrany@fit.cvut.cz>"
12329 9fc078cd44ab Bugfix in ChangeSetDiffTool: update UI after open to show correct labels. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12323 diff changeset	2902	"Modified: / 21-01-2013 / 21:17:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	2903	! !
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2904
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2905	!ChangeSetDiffTool methodsFor:'queries'!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2906
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2907	canBrowse
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2908
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2909	^true
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2910
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2911	"^[self selection notNil
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2912	and:[self selection versionA notNil]]"
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	2913
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2914	"Created: / 02-11-2009 / 18:32:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2915	"Modified: / 21-11-2009 / 18:46:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2916	!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2917
12201 283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2918	canSave
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2919	"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	2920
12321 13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	2921	^self canSaveAs and:[self diffInfo specMerge isFile]
12201 283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2922
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2923	"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	2924	"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	2925	!
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2926
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2927	canSaveAs
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2928	"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	2929
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2930	\| info \|
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2931	info := self diffInfo.
12216 5698c277f043 - Improvements in FileBrowserV2/V3 Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12202 diff changeset	2932	info isNil ifTrue:[^false].
12321 13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	2933	^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	2934
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2935	"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	2936	"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	2937	!
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2938
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2939	canSaveAsPatch
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2940
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2941	^false
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2942
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2943	"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	2944	!
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2945
12276 415495417f39 - Tools::ChangeSetSpec Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12275 diff changeset	2946	canSaveMergedAs
415495417f39 - Tools::ChangeSetSpec Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12275 diff changeset	2947	"Returns true, if a merged file can be saved"
415495417f39 - Tools::ChangeSetSpec Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12275 diff changeset	2948
415495417f39 - Tools::ChangeSetSpec Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12275 diff changeset	2949	\| info \|
415495417f39 - Tools::ChangeSetSpec Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12275 diff changeset	2950	info := self diffInfo.
415495417f39 - Tools::ChangeSetSpec Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12275 diff changeset	2951	info isNil ifTrue:[^false].
415495417f39 - Tools::ChangeSetSpec Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12275 diff changeset	2952	^info isMerge
415495417f39 - Tools::ChangeSetSpec Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12275 diff changeset	2953
415495417f39 - Tools::ChangeSetSpec Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12275 diff changeset	2954	"Created: / 03-08-2012 / 15:25:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
415495417f39 - Tools::ChangeSetSpec Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12275 diff changeset	2955	!
415495417f39 - Tools::ChangeSetSpec Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12275 diff changeset	2956
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	2957	hasSelection
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2958
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2959	^[self selection notNil]
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2960
ce5e1fc44d81 initial checkin vrany parents: diff changeset	2961	"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	2962	! !
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2963
12321 13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	2964	!ChangeSetDiffTool methodsFor:'startup & release'!
13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	2965
13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	2966	closeRequest
13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	2967
13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	2968	"/Warn about unsaved merge..."
13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	2969	(alreadyWarnedAboutUnsavedMerge not and:[self canSave and:[mergeSavedHolder value not]]) ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2970	alreadyWarnedAboutUnsavedMerge := true.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2971	self infoPanel
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2972	reset;
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2973	beInformation;
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2974	message: (self resources string:'Output file (merge) has not been saved. Save?');
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2975	addButtonWithLabel: (self resources string:'Save') action: [
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2976	self fileMenuSave.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2977	self closeDownViews.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2978	];
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2979	addButtonWithLabel: (self resources string:'Cancel') action:[self infoPanel hide];
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2980	show.
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	2981	^self.
12321 13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	2982	].
13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	2983	self closeDownViews.
13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	2984
13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	2985	"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	2986	! !
13d791d84a47 More improvements in ChangeSetDiffTool. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12320 diff changeset	2987
12201 283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2988	!ChangeSetDiffTool methodsFor:'testing'!
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2989
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2990	isDiff2
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2991	^self diffInfo notNil and:[self diffInfo isDiff2]
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2992
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2993	"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	2994	!
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2995
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2996	isDiff2Or3
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2997	^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	2998
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	2999	"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	3000	!
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	3001
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	3002	isDiff3
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	3003	^self diffInfo notNil and:[self diffInfo isDiff3]
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	3004
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	3005	"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	3006	!
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	3007
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	3008	isMerge
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	3009	^self diffInfo notNil and:[self diffInfo isMerge]
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	3010
283826cb8bcc Improvements in merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12200 diff changeset	3011	"Created: / 19-03-2012 / 11:53:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	3012	!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3013
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3014	isOneColumnBrowser
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3015
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3016	^self navigatorPanelSpecHolder value = #oneColumnNavigatorSpec
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3017
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3018	"Created: / 05-12-2009 / 11:04:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3019	! !
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3020
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3021	!ChangeSetDiffTool::OpenDialog class methodsFor:'image specs'!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3022
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3023	versionA24x24
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3024
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3025	^ToolbarIconLibrary versionA24x24
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3026
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3027	"Created: / 24-03-2010 / 20:49:41 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3028	!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3029
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3030	versionB24x24
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3031
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3032	^ToolbarIconLibrary versionB24x24
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3033
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3034	"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	3035	!
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3036
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3037	versionBase24x24
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3038
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3039	^ToolbarIconLibrary versionBase24x24
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3040
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3041	"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	3042	!
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3043
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3044	versionMerged24x24
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3045
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3046	^ToolbarIconLibrary versionMerged24x24
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	"Created: / 19-03-2012 / 23:34:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	3049	! !
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3050
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3051	!ChangeSetDiffTool::OpenDialog class methodsFor:'interface specs'!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3052
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3053	windowSpec
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3054	"This resource specification was automatically generated
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3055	by the UIPainter of ST/X."
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3056
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3057	"Do not manually edit this!! If it is corrupted,
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3058	the UIPainter may not be able to read the specification."
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3059
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3060	"
12200 807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3061	UIPainter new openOnClass:Tools::ChangeSetDiffTool::OpenDialog andSelector:#windowSpec
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3062	Tools::ChangeSetDiffTool::OpenDialog new openInterface:#windowSpec
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3063	Tools::ChangeSetDiffTool::OpenDialog open
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
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3066	<resource: #canvas>
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3067
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3068	^
12200 807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3069	#(FullSpec
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3070	name: windowSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3071	window:
12200 807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3072	(WindowSpec
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3073	label: 'Open...'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3074	name: 'Open...'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3075	min: (Point 10 10)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3076	bounds: (Rectangle 0 0 640 457)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3077	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3078	component:
12200 807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3079	(SpecCollection
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3080	collection: (
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3081	(VerticalPanelViewSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3082	name: 'VerticalPanel1'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3083	layout: (LayoutFrame 0 0 0 0 0 1 -30 1)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3084	horizontalLayout: fit
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3085	verticalLayout: top
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3086	horizontalSpace: 3
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3087	verticalSpace: 3
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3088	component:
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3089	(SpecCollection
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3090	collection: (
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3091	(ViewSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3092	name: 'B'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3093	component:
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3094	(SpecCollection
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3095	collection: (
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3096	(UISubSpecification
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3097	name: 'SubSpecification2'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3098	layout: (LayoutFrame 0 0 0 0 0 1 30 0)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3099	minorKey: versionBLabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3100	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3101	(SubCanvasSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3102	name: 'SubCanvas1'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3103	layout: (LayoutFrame 30 0 30 0 0 1 0 1)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3104	level: 0
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3105	hasHorizontalScrollBar: false
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3106	hasVerticalScrollBar: false
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3107	majorKey: #'Tools::ChangeSetSelectionDialog'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3108	minorKey: windowSpecForEmbedding
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3109	subAspectHolders:
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3110	(Array
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3111
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3112	(SubChannelInfoSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3113	subAspect: specHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3114	aspect: changesetSpecBHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3115	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3116	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3117	createNewApplication: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3118	createNewBuilder: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3119	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3120	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3121
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3122	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3123	extent: (Point 640 99)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3124	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3125	(ViewSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3126	name: 'A'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3127	component:
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3128	(SpecCollection
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3129	collection: (
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3130	(UISubSpecification
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3131	name: 'SubSpecification1'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3132	layout: (LayoutFrame 0 0 0 0 0 1 30 0)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3133	minorKey: versionALabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3134	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3135	(SubCanvasSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3136	name: 'ChangesetASpec'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3137	layout: (LayoutFrame 30 0 30 0 0 1 0 1)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3138	level: 0
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3139	hasHorizontalScrollBar: false
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3140	hasVerticalScrollBar: false
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3141	majorKey: #'Tools::ChangeSetSelectionDialog'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3142	minorKey: windowSpecForEmbedding
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3143	subAspectHolders:
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3144	(Array
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3145
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3146	(SubChannelInfoSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3147	subAspect: specHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3148	aspect: changesetSpecAHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3149	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3150	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3151	createNewApplication: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3152	createNewBuilder: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3153	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3154	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3155
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3156	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3157	extent: (Point 640 99)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3158	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3159	(ViewSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3160	name: 'Base'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3161	component:
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3162	(SpecCollection
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3163	collection: (
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3164	(UISubSpecification
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3165	name: 'SubSpecification3'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3166	layout: (LayoutFrame 0 0 0 0 0 1 30 0)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3167	minorKey: versionBaseLabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3168	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3169	(SubCanvasSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3170	name: 'SubCanvas2'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3171	layout: (LayoutFrame 30 0 30 0 0 1 0 1)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3172	level: 0
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3173	hasHorizontalScrollBar: false
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3174	hasVerticalScrollBar: false
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3175	majorKey: #'Tools::ChangeSetSelectionDialog'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3176	minorKey: windowSpecForEmbedding
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3177	subAspectHolders:
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3178	(Array
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3179
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3180	(SubChannelInfoSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3181	subAspect: enabledHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3182	aspect: changesetSpecBaseEnabledHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3183	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3184	(SubChannelInfoSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3185	subAspect: specHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3186	aspect: changesetSpecBaseHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3187	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3188	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3189	createNewApplication: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3190	createNewBuilder: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3191	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3192	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3193
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3194	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3195	extent: (Point 640 98)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3196	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3197	(ViewSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3198	name: 'Merge'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3199	component:
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3200	(SpecCollection
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3201	collection: (
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3202	(UISubSpecification
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3203	name: 'SubSpecification4'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3204	layout: (LayoutFrame 0 0 0 0 0 1 30 0)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3205	minorKey: versionMergedLabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3206	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3207	(SubCanvasSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3208	name: 'SubCanvas3'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3209	layout: (LayoutFrame 30 0 30 0 0 1 -25 1)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3210	level: 0
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3211	hasHorizontalScrollBar: false
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3212	hasVerticalScrollBar: false
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3213	majorKey: #'Tools::ChangeSetSelectionDialog'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3214	minorKey: windowSpecForEmbedding
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3215	subAspectHolders:
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3216	(Array
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3217
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3218	(SubChannelInfoSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3219	subAspect: enabledHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3220	aspect: changesetSpecMergedEnabledHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3221	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3222	(SubChannelInfoSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3223	subAspect: specHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3224	aspect: changesetSpecMergedHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3225	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3226	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3227	createNewApplication: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3228	createNewBuilder: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3229	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3230	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3231
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3232	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3233	extent: (Point 640 123)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3234	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3235	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3236
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3237	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3238	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3239	(HorizontalPanelViewSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3240	name: 'ButtonPanel'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3241	layout: (LayoutFrame 3 0 -30 1 -3 1 0 1)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3242	horizontalLayout: right
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3243	verticalLayout: center
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3244	horizontalSpace: 3
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3245	verticalSpace: 3
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3246	reverseOrderIfOKAtLeft: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3247	component:
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3248	(SpecCollection
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3249	collection: (
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3250	(ActionButtonSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3251	label: 'OK'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3252	name: 'Button1'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3253	translateLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3254	model: doAccept
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3255	enableChannel: doAcceptEnabled
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3256	extent: (Point 125 22)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3257	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3258	(ActionButtonSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3259	label: 'Cancel'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3260	name: 'Button2'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3261	translateLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3262	model: doCancel
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3263	extent: (Point 125 22)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3264	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3265	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3266
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3267	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3268	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3269	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3270
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3271	)
12200 807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3272	)
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3273	!
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3274
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3275	windowSpec_old
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3276	"This resource specification was automatically generated
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3277	by the UIPainter of ST/X."
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3278
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3279	"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	3280	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	3281
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3282	"
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	3283	UIPainter new openOnClass:Tools::ChangeSetDiffBrowser::OpenDialog andSelector:#windowSpec
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3284	Tools::ChangeSetDiffBrowser::OpenDialog new openInterface:#windowSpec
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3285	Tools::ChangeSetDiffBrowser::OpenDialog open
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3286	"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3287
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3288	<resource: #canvas>
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3289
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3290	^
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	3291	#(FullSpec
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3292	name: windowSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3293	window:
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	3294	(WindowSpec
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3295	label: 'Open...'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3296	name: 'Open...'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3297	min: (Point 10 10)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3298	bounds: (Rectangle 0 0 640 130)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3299	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3300	component:
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	3301	(SpecCollection
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3302	collection: (
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3303	(VariableHorizontalPanelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3304	name: 'ChangeSetsSpecPanel'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3305	layout: (LayoutFrame 0 0 0 0 0 1 -30 1)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3306	barWidth: 3
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3307	showHandle: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3308	component:
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3309	(SpecCollection
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3310	collection: (
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3311	(ViewSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3312	name: 'A'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3313	component:
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3314	(SpecCollection
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3315	collection: (
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3316	(UISubSpecification
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3317	name: 'SubSpecification1'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3318	layout: (LayoutFrame 0 0 0 0 0 1 30 0)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3319	minorKey: versionALabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3320	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3321	(SubCanvasSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3322	name: 'ChangesetASpec'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3323	layout: (LayoutFrame 0 0 30 0 0 1 0 1)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3324	hasHorizontalScrollBar: false
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3325	hasVerticalScrollBar: false
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3326	majorKey: #'Tools::ChangeSetSelectionDialog'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3327	minorKey: windowSpecForEmbedding
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3328	subAspectHolders:
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3329	(Array
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3330
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3331	(SubChannelInfoSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3332	subAspect: specHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3333	aspect: changesetSpecAHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3334	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3335	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3336	createNewApplication: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3337	createNewBuilder: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3338	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3339	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3340
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3341	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3342	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3343	(ViewSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3344	name: 'B'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3345	component:
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3346	(SpecCollection
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3347	collection: (
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3348	(UISubSpecification
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3349	name: 'SubSpecification2'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3350	layout: (LayoutFrame 0 0 0 0 0 1 30 0)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3351	minorKey: versionBLabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3352	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3353	(SubCanvasSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3354	name: 'SubCanvas1'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3355	layout: (LayoutFrame 0 0 30 0 0 1 0 1)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3356	hasHorizontalScrollBar: false
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3357	hasVerticalScrollBar: false
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3358	majorKey: #'Tools::ChangeSetSelectionDialog'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3359	minorKey: windowSpecForEmbedding
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3360	subAspectHolders:
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3361	(Array
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3362
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3363	(SubChannelInfoSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3364	subAspect: specHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3365	aspect: changesetSpecBHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3366	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3367	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3368	createNewApplication: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3369	createNewBuilder: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3370	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3371	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3372
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3373	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3374	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3375	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3376
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3377	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3378	handles: (Any 0.5 1.0)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3379	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3380	(HorizontalPanelViewSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3381	name: 'ButtonPanel'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3382	layout: (LayoutFrame 3 0 -30 1 -3 1 0 1)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3383	horizontalLayout: right
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3384	verticalLayout: center
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3385	horizontalSpace: 3
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3386	verticalSpace: 3
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3387	reverseOrderIfOKAtLeft: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3388	component:
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3389	(SpecCollection
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3390	collection: (
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3391	(ActionButtonSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3392	label: 'OK'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3393	name: 'Button1'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3394	translateLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3395	model: doAccept
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3396	enableChannel: doAcceptEnabled
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3397	extent: (Point 125 22)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3398	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3399	(ActionButtonSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3400	label: 'Cancel'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3401	name: 'Button2'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3402	translateLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3403	model: doCancel
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3404	extent: (Point 125 22)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3405	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3406	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3407
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3408	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3409	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3410	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3411
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3412	)
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	3413	)
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3414
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3415	"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	3416	"Created: / 19-03-2012 / 22:21:46 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	3417	! !
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3418
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3419	!ChangeSetDiffTool::OpenDialog class methodsFor:'interface specs - labels'!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3420
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3421	versionALabelSpec
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3422	"This resource specification was automatically generated
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3423	by the UIPainter of ST/X."
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3424
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3425	"Do not manually edit this!! If it is corrupted,
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3426	the UIPainter may not be able to read the specification."
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3427
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3428	"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3429	UIPainter new openOnClass:Tools::ChangeSetDiffBrowser::OpenDialog andSelector:#versionALabelSpec
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3430	Tools::ChangeSetDiffBrowser::OpenDialog new openInterface:#versionALabelSpec
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3431	"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3432
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3433	<resource: #canvas>
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3434
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3435	^
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	3436	#(FullSpec
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3437	name: versionALabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3438	window:
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	3439	(WindowSpec
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3440	label: 'Version A'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3441	name: 'Changeset A'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3442	min: (Point 10 10)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3443	bounds: (Rectangle 0 0 300 30)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3444	backgroundColor: (Color 79.6078431372549 90.5882352941177 69.4117647058823)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3445	forceRecursiveBackground: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3446	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3447	component:
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	3448	(SpecCollection
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3449	collection: (
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3450	(LabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3451	label: 'versionA24x24'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3452	name: 'VersionAIcon'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3453	layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3454	hasCharacterOrientedLabel: false
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3455	translateLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3456	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3457	(LabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3458	label: 'Version A (working copy)'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3459	name: 'VersionALabel'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3460	layout: (LayoutFrame 30 0 5 0 0 1 0 1)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3461	translateLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3462	resizeForLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3463	adjust: left
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3464	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3465	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3466
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3467	)
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	3468	)
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3469
12200 807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3470	"Modified: / 19-03-2012 / 22:15:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	3471	!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3472
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3473	versionBLabelSpec
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3474	"This resource specification was automatically generated
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3475	by the UIPainter of ST/X."
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3476
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3477	"Do not manually edit this!! If it is corrupted,
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3478	the UIPainter may not be able to read the specification."
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3479
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3480	"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3481	UIPainter new openOnClass:Tools::ChangeSetDiffBrowser::OpenDialog andSelector:#versionBLabelSpec
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3482	Tools::ChangeSetDiffBrowser::OpenDialog new openInterface:#versionBLabelSpec
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3483	"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3484
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3485	<resource: #canvas>
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3486
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3487	^
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	3488	#(FullSpec
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3489	name: versionBLabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3490	window:
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	3491	(WindowSpec
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3492	label: 'Version B'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3493	name: 'Changeset B'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3494	min: (Point 10 10)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3495	bounds: (Rectangle 0 0 300 30)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3496	backgroundColor: (Color 100.0 90.5882352941177 60.0)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3497	forceRecursiveBackground: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3498	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3499	component:
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	3500	(SpecCollection
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3501	collection: (
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3502	(LabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3503	label: 'versionB24x24'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3504	name: 'VersionBIcon'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3505	layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3506	hasCharacterOrientedLabel: false
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3507	translateLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3508	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3509	(LabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3510	label: 'Version B (to be merged)'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3511	name: 'VersionBLabel'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3512	layout: (LayoutFrame 30 0 5 0 97 0 0 1)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3513	translateLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3514	resizeForLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3515	adjust: left
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3516	useDynamicPreferredWidth: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3517	usePreferredWidth: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3518	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3519	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3520
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3521	)
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	3522	)
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3523
12200 807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3524	"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	3525	!
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3526
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3527	versionBaseLabelSpec
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3528	"This resource specification was automatically generated
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3529	by the UIPainter of ST/X."
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3530
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3531	"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	3532	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	3533
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3534	"
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3535	UIPainter new openOnClass:Tools::ChangeSetDiffTool::OpenDialog andSelector:#versionBaseLabelSpec
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3536	Tools::ChangeSetDiffTool::OpenDialog new openInterface:#versionBaseLabelSpec
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3537	"
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3538
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3539	<resource: #canvas>
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3540
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3541	^
12200 807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3542	#(FullSpec
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3543	name: versionBaseLabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3544	window:
12200 807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3545	(WindowSpec
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3546	label: 'Version B'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3547	name: 'Version B'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3548	min: (Point 10 10)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3549	bounds: (Rectangle 0 0 300 30)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3550	backgroundColor: (Color 57.2182803082322 81.2832837415122 91.0872053101396)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3551	forceRecursiveBackground: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3552	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3553	component:
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	3554	(SpecCollection
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3555	collection: (
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3556	(LabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3557	label: 'versionBase24x24'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3558	name: 'VersionBaseIcon'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3559	layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3560	hasCharacterOrientedLabel: false
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3561	translateLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3562	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3563	(LabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3564	label: 'Base'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3565	name: 'VersionBLabel'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3566	layout: (LayoutFrame 30 0 5 0 68 0 0 1)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3567	translateLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3568	resizeForLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3569	adjust: left
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3570	useDynamicPreferredWidth: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3571	usePreferredWidth: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3572	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3573	(CheckBoxSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3574	label: ''
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3575	name: 'CheckBox1'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3576	layout: (LayoutFrame -30 1 0 0 0 1 0 1)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3577	model: changesetSpecBaseEnabledHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3578	translateLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3579	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3580	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3581
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3582	)
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	3583	)
12200 807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3584	!
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3585
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3586	versionMergedLabelSpec
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3587	"This resource specification was automatically generated
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3588	by the UIPainter of ST/X."
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3589
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3590	"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	3591	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	3592
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3593	"
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3594	UIPainter new openOnClass:Tools::ChangeSetDiffTool::OpenDialog andSelector:#versionMergedLabelSpec
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3595	Tools::ChangeSetDiffTool::OpenDialog new openInterface:#versionMergedLabelSpec
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3596	"
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3597
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3598	<resource: #canvas>
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3599
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3600	^
12200 807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3601	#(FullSpec
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3602	name: versionMergedLabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3603	window:
12200 807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3604	(WindowSpec
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3605	label: 'Merge'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3606	name: 'Merge'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3607	min: (Point 10 10)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3608	bounds: (Rectangle 0 0 300 30)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3609	backgroundColor: (Color 92.6909285114824 62.388036926833 93.2265201800565)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3610	forceRecursiveBackground: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3611	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3612	component:
12200 807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3613	(SpecCollection
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3614	collection: (
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3615	(LabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3616	label: 'versionMerged24x24'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3617	name: 'VersionMergedIcon'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3618	layout: (LayoutFrame 0 0 -12 0.5 27 0 12 0.5)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3619	hasCharacterOrientedLabel: false
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3620	translateLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3621	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3622	(LabelSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3623	label: 'Merge'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3624	name: 'VersionBLabel'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3625	layout: (LayoutFrame 30 0 5 0 68 0 0 1)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3626	translateLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3627	resizeForLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3628	adjust: left
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3629	useDynamicPreferredWidth: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3630	usePreferredWidth: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3631	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3632	(CheckBoxSpec
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3633	label: ''
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3634	name: 'CheckBox1'
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3635	layout: (LayoutFrame -30 1 0 0 0 1 0 1)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3636	model: changesetSpecMergedEnabledHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3637	translateLabel: true
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3638	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3639	)
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3640
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3641	)
12200 807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3642	)
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3643
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3644	"Modified: / 19-03-2012 / 23:36:48 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	3645	! !
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3646
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3647	!ChangeSetDiffTool::OpenDialog methodsFor:'accessing'!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3648
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3649	changeSetA
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3650
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3651	\| specA \|
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3652
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3653	specA := self changesetSpecAHolder value.
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3654	^specA ifNil:[nil] ifNotNil:[specA changeSet]
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3655
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3656	"Created: / 06-07-2011 / 11:36:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3657	!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3658
12200 807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3659	changeSetASpec
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3660	^self changesetSpecAHolder value.
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3661
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3662	"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	3663	!
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3664
12275 a416cf8a4b50 - Tools::ChangeSetDiffList Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12274 diff changeset	3665	changeSetASpec: spec
a416cf8a4b50 - Tools::ChangeSetDiffList Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12274 diff changeset	3666	^self changesetSpecAHolder value: spec
a416cf8a4b50 - Tools::ChangeSetDiffList Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12274 diff changeset	3667
a416cf8a4b50 - Tools::ChangeSetDiffList Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12274 diff changeset	3668	"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	3669	!
a416cf8a4b50 - Tools::ChangeSetDiffList Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12274 diff changeset	3670
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	3671	changeSetB
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3672
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3673	\| specB \|
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3674
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3675	specB := self changesetSpecBHolder value.
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3676	^specB ifNil:[nil] ifNotNil:[specB changeSet]
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3677
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3678	"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	3679	!
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	3680
12200 807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3681	changeSetBSpec
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3682	^self changesetSpecBHolder value.
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3683
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3684	"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	3685	!
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3686
12275 a416cf8a4b50 - Tools::ChangeSetDiffList Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12274 diff changeset	3687	changeSetBSpec: spec
a416cf8a4b50 - Tools::ChangeSetDiffList Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12274 diff changeset	3688	^self changesetSpecBHolder value: spec
a416cf8a4b50 - Tools::ChangeSetDiffList Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12274 diff changeset	3689
a416cf8a4b50 - Tools::ChangeSetDiffList Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12274 diff changeset	3690	"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	3691	!
a416cf8a4b50 - Tools::ChangeSetDiffList Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12274 diff changeset	3692
12179 47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	3693	changeSetBase
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	3694
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	3695	\| specBase \|
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	3696
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	3697	specBase := self changesetSpecBaseHolder value.
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	3698	^specBase ifNil:[nil] ifNotNil:[specBase changeSet]
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	3699
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	3700	"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	3701	!
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3702
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3703	changeSetBaseSpec
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3704	^self changesetSpecBaseHolder value.
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3705
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3706	"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	3707	!
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3708
12274 1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	3709	changeSetBaseSpec: spec
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	3710	^self changesetSpecBaseHolder value: spec
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	3711
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	3712	"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	3713	!
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	3714
12200 807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3715	changeSetMerged
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3716
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3717	\| specMerged \|
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3718
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3719	specMerged := self changesetSpecMergedHolder value.
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3720	^specMerged ifNil:[nil] ifNotNil:[specMerged changeSet]
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3721
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3722	"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	3723	!
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3724
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3725	changeSetMergedSpec
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3726	^self changesetSpecMergedHolder value.
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3727
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3728	"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	3729	!
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	3730
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	3731	changeSetMergedSpec: spec
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	3732	^self changesetSpecMergedHolder value: spec
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	3733
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	3734	"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	3735	!
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	3736
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3737	diffInfo
12274 1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	3738	"Returns a ChangeSetDiffInfo based on current data"
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	3739
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	3740	\| info \|
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	3741	info := ChangeSetDiffInfo new.
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	3742	info specA: self changeSetASpec.
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	3743	info specB: self changeSetBSpec.
12276 415495417f39 - Tools::ChangeSetSpec Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12275 diff changeset	3744	self changesetSpecBaseEnabledHolder value ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3745	info specBase: self changeSetBaseSpec.
12276 415495417f39 - Tools::ChangeSetSpec Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12275 diff changeset	3746	].
415495417f39 - Tools::ChangeSetSpec Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12275 diff changeset	3747	changesetSpecMergedEnabledHolder value ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3748	info specMerge: self changeSetMergedSpec.
12276 415495417f39 - Tools::ChangeSetSpec Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12275 diff changeset	3749	].
12274 1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	3750	^info
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	3751
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	3752	"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	3753	!
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	3754
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	3755	diffInfo: info
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	3756	"Sets up dialog for given diff info"
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	3757
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	3758	info isNil ifTrue:[ ^ self ].
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	3759
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3760	self changeSetASpec: info specA.
12274 1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	3761	self changeSetBSpec: info specB.
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	3762	self changeSetBaseSpec: info specBase.
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	3763	self changeSetMergedSpec: info specMerge.
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	3764
1e0599b8a007 Improvements in changeset tools Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12256 diff changeset	3765	"Created: / 01-08-2012 / 15:37:53 / Jan Vrany <jan.vrany@fit.cvut.cz>"
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	3766	! !
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3767
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3768	!ChangeSetDiffTool::OpenDialog methodsFor:'aspects'!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3769
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3770	changesetSpecAHolder
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3771	"return/create the 'changesetSpecAHolder' value holder (automatically generated)"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3772
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3773	changesetSpecAHolder isNil ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3774	changesetSpecAHolder := ValueHolder new.
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	3775	].
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3776	^ changesetSpecAHolder
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3777	!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3778
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3779	changesetSpecAHolder:something
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3780	"set the 'changesetSpecAHolder' value holder (automatically generated)"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3781
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3782	changesetSpecAHolder := something.
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3783	!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3784
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3785	changesetSpecBHolder
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3786	"return/create the 'changesetSpecBHolder' value holder (automatically generated)"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3787
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3788	changesetSpecBHolder isNil ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3789	changesetSpecBHolder := ValueHolder new.
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	3790	].
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3791	^ changesetSpecBHolder
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3792	!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3793
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3794	changesetSpecBHolder:something
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3795	"set the 'changesetSpecBHolder' value holder (automatically generated)"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3796
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3797	changesetSpecBHolder := something.
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3798	!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3799
12200 807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3800	changesetSpecBaseEnabledHolder
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3801	"return/create the 'changesetSpecBaseEnabledHolder' value holder (automatically generated)"
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3802
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3803	changesetSpecBaseEnabledHolder isNil ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3804	changesetSpecBaseEnabledHolder := false asValue
12200 807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3805	].
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3806	^ changesetSpecBaseEnabledHolder
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3807
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3808	"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	3809	!
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3810
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3811	changesetSpecBaseEnabledHolder:something
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3812	"set the 'changesetSpecBaseEnabledHolder' value holder (automatically generated)"
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3813
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3814	changesetSpecBaseEnabledHolder := something.
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3815	!
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3816
12179 47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	3817	changesetSpecBaseHolder
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	3818	"return/create the 'changesetSpecBHolder' value holder (automatically generated)"
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	3819
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	3820	changesetSpecBaseHolder isNil ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3821	changesetSpecBaseHolder := ValueHolder new.
12179 47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	3822	].
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	3823	^ changesetSpecBaseHolder
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	3824
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	3825	"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	3826	!
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	3827
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	3828	changesetSpecBaseHolder:something
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	3829	"set the 'changesetSpecBHolder' value holder (automatically generated)"
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	3830
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	3831	changesetSpecBaseHolder := something.
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	3832
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	3833	"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	3834	!
47f98e7d6de1 Improvments towards merge tool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12128 diff changeset	3835
12200 807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3836	changesetSpecMergedEnabledHolder
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3837	"return/create the 'changesetSpecMergedEnabledHolder' value holder (automatically generated)"
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3838
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3839	changesetSpecMergedEnabledHolder isNil ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3840	changesetSpecMergedEnabledHolder := false asValue
12200 807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3841	].
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3842	^ changesetSpecMergedEnabledHolder
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3843
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3844	"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	3845	!
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3846
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3847	changesetSpecMergedEnabledHolder:something
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3848	"set the 'changesetSpecMergedEnabledHolder' value holder (automatically generated)"
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3849
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3850	changesetSpecMergedEnabledHolder := something.
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3851	!
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3852
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3853	changesetSpecMergedHolder
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3854	"return/create the 'changesetSpecMergedHolder' value holder (automatically generated)"
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3855
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3856	changesetSpecMergedHolder isNil ifTrue:[
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3857	changesetSpecMergedHolder := ValueHolder new.
12200 807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3858	].
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3859	^ changesetSpecMergedHolder
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3860	!
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3861
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3862	changesetSpecMergedHolder:something
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3863	"set the 'changesetSpecMergedHolder' value holder (automatically generated)"
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3864
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3865	changesetSpecMergedHolder := something.
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3866	!
807a52b94f2a Further improvements in ChangeSetDiffTool Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12198 diff changeset	3867
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	3868	doAcceptEnabled
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3869	<resource: #uiAspect>
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3870
13178 c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3871	^BlockValue
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3872	with:[:a :b\|a value notNil and:[b value notNil]]
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3873	argument:self changesetSpecAHolder
c9bf900fe729 Merged f8f283ea3f4c and 131bed1fbee2 (branch default - CVS HEAD) Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12650 13017 diff changeset	3874	argument:self changesetSpecAHolder.
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	3875
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3876	"Modified: / 06-07-2011 / 11:26:43 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3877	! !
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3878
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3879	!ChangeSetDiffTool::OpenDialog methodsFor:'events'!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3880
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3881	closeAccept
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3882
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3883	^super closeAccept
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3884
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3885	"Created: / 06-07-2011 / 12:09:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3886	! !
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3887
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3888	!ChangeSetDiffTool class methodsFor:'documentation'!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3889
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3890	version_CVS
13017 62a2cd2d8b70 class: Tools::ChangeSetDiffTool Claus Gittinger <cg@exept.de> parents: 10975 diff changeset	3891	^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetDiffTool.st,v 1.6 2013-06-25 17:12:36 cg Exp $'
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	3892	!
ce5e1fc44d81 initial checkin vrany parents: diff changeset	3893
12329 9fc078cd44ab Bugfix in ChangeSetDiffTool: update UI after open to show correct labels. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12323 diff changeset	3894	version_HG
9fc078cd44ab Bugfix in ChangeSetDiffTool: update UI after open to show correct labels. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12323 diff changeset	3895
9fc078cd44ab Bugfix in ChangeSetDiffTool: update UI after open to show correct labels. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12323 diff changeset	3896	^ '$Changeset: <not expanded> $'
9fc078cd44ab Bugfix in ChangeSetDiffTool: update UI after open to show correct labels. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12323 diff changeset	3897	!
9fc078cd44ab Bugfix in ChangeSetDiffTool: update UI after open to show correct labels. Jan Vrany <jan.vrany@fit.cvut.cz> parents: 12323 diff changeset	3898
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	3899	version_SVN
13017 62a2cd2d8b70 class: Tools::ChangeSetDiffTool Claus Gittinger <cg@exept.de> parents: 10975 diff changeset	3900	^ '$Id: Tools__ChangeSetDiffTool.st,v 1.6 2013-06-25 17:12:36 cg Exp $'
10194 ce5e1fc44d81 initial checkin vrany parents: diff changeset	3901	! !

author	Jan Vrany <jan.vrany@fit.cvut.cz>
	Mon, 01 Jul 2013 22:15:23 +0100
branch	jv
changeset 13178	c9bf900fe729
parent 12650	e0f607754b9a
parent 13017	62a2cd2d8b70
child 13673	0e02e5ca25cd
permissions	-rw-r--r--