--- a/Tools__ChangeSetBrowser2.st Sat Feb 11 22:16:34 2012 +0000
+++ b/Tools__ChangeSetBrowser2.st Sun Feb 12 00:06:21 2012 +0000
@@ -33,8 +33,8 @@
selection1Holder list2 list2Holder selection2Holder classHolder
languageHolder codeAspectHolder showRemovedAspect showSameAspect
sourceView changeSourceHolder imageSourceHolder targetPackage
- targetNamespace updateChangefileHolder allowRemoveHolder
- allowAcceptHolder infoPanel'
+ targetNamespace allowRemoveHolder allowAcceptHolder infoPanel
+ updateChangeFileHolder showFilterHolder'
classVariableNames:'ShowRemoved LastSelectionConditionString'
poolDictionaries:''
category:'Interface-Browsers-ChangeSet'
@@ -254,17 +254,17 @@
<resource: #canvas>
- ^
+ ^
#(FullSpec
name: hierarchicalNavigatorSpec
- window:
+ window:
(WindowSpec
label: 'Hierarchical Navigator'
name: 'Hierarchical Navigator'
min: (Point 10 10)
bounds: (Rectangle 0 0 300 300)
)
- component:
+ component:
(SpecCollection
collection: (
(SubCanvasSpec
@@ -273,10 +273,10 @@
hasHorizontalScrollBar: false
hasVerticalScrollBar: false
majorKey: #'Tools::HierarchicalChangeList'
- subAspectHolders:
+ subAspectHolders:
(Array
-
- (SubChannelInfoSpec
+
+ (SubChannelInfoSpec
subAspect: allowAcceptHolder
aspect: allowAcceptHolder
)
@@ -284,40 +284,42 @@
subAspect: allowRemoveHolder
aspect: allowRemoveHolder
)
+
(SubChannelInfoSpec
subAspect: inGeneratorHolder
aspect: list1Holder
- )
-
+ )
(SubChannelInfoSpec
subAspect: menuHolder
aspect: list1MenuHolder
)
+
(SubChannelInfoSpec
subAspect: selectionHolder
aspect: selection1Holder
+ )
+ (SubChannelInfoSpec
+ subAspect: showFilterHolder
+ aspect: showFilterHolder
)
-
+
(SubChannelInfoSpec
subAspect: showRemovedHolder
aspect: showRemovedAspect
- )
+ )
(SubChannelInfoSpec
subAspect: showSameHolder
aspect: showSameAspect
)
-
)
createNewApplication: true
createNewBuilder: true
postBuildCallback: list1View:
)
)
-
+
)
)
-
- "Modified: / 24-01-2012 / 19:57:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
oneColumnNavigatorSpec
@@ -379,10 +381,14 @@
aspect: selection1Holder
)
(SubChannelInfoSpec
+ subAspect: showFilterHolder
+ aspect: showFilterHolder
+ )
+
+ (SubChannelInfoSpec
subAspect: showRemovedHolder
aspect: showRemovedAspect
- )
-
+ )
(SubChannelInfoSpec
subAspect: showSameHolder
aspect: showSameAspect
@@ -412,23 +418,23 @@
<resource: #canvas>
- ^
+ ^
#(FullSpec
name: twoColumnNavigatorSpec
- window:
+ window:
(WindowSpec
label: 'Two Column Navigator'
name: 'Two Column Navigator'
min: (Point 10 10)
bounds: (Rectangle 0 0 300 300)
)
- component:
+ component:
(SpecCollection
collection: (
(VariableHorizontalPanelSpec
name: 'Columns'
layout: (LayoutFrame 0 0 0 0 0 1 0 1)
- component:
+ component:
(SpecCollection
collection: (
(SubCanvasSpec
@@ -436,40 +442,46 @@
hasHorizontalScrollBar: false
hasVerticalScrollBar: false
majorKey: #'Tools::ChangeList'
- subAspectHolders:
+ subAspectHolders:
(Array
-
+
(SubChannelInfoSpec
subAspect: allowAcceptHolder
aspect: allowAcceptHolder
- )
+ )
(SubChannelInfoSpec
subAspect: allowRemoveHolder
aspect: allowRemoveHolder
- )
+ )
+
(SubChannelInfoSpec
subAspect: inGeneratorHolder
aspect: list1Holder
- )
-
+ )
(SubChannelInfoSpec
subAspect: menuHolder
aspect: list1MenuHolder
)
+
(SubChannelInfoSpec
subAspect: outGeneratorHolder
aspect: list2Holder
- )
-
+ )
(SubChannelInfoSpec
subAspect: selectionHolder
aspect: selection1Holder
)
+
+ (SubChannelInfoSpec
+ subAspect: showFilterHolder
+ aspect: showFilterHolder
+ )
(SubChannelInfoSpec
subAspect: showRemovedHolder
aspect: showRemovedAspect
)
- (SubChannelInfoSpec
+
+ (SubChannelInfoSpec
subAspect: showSameHolder
aspect: showSameAspect
)
@@ -483,36 +495,41 @@
hasHorizontalScrollBar: false
hasVerticalScrollBar: false
majorKey: #'Tools::ChangeList'
- subAspectHolders:
+ subAspectHolders:
(Array
-
+
(SubChannelInfoSpec
subAspect: allowAcceptHolder
aspect: allowAcceptHolder
- )
+ )
(SubChannelInfoSpec
subAspect: allowRemoveHolder
aspect: allowRemoveHolder
- )
+ )
+
(SubChannelInfoSpec
subAspect: inGeneratorHolder
aspect: list2Holder
- )
-
+ )
(SubChannelInfoSpec
subAspect: menuHolder
aspect: list2MenuHolder
)
+
(SubChannelInfoSpec
subAspect: selectionHolder
aspect: selection2Holder
+ )
+ (SubChannelInfoSpec
+ subAspect: showFilterHolder
+ aspect: showFilterHolder
)
-
+
(SubChannelInfoSpec
subAspect: showRemovedHolder
aspect: showRemovedAspect
- )
- (SubChannelInfoSpec
+ )
+ (SubChannelInfoSpec
subAspect: showSameHolder
aspect: showSameAspect
)
@@ -522,16 +539,14 @@
postBuildCallback: list2View:
)
)
-
+
)
handles: (Any 0.5 1.0)
)
)
-
+
)
)
-
- "Modified: / 24-01-2012 / 19:57:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
windowSpec
@@ -571,7 +586,7 @@
textDefault: true
)
(SubCanvasSpec
- name: 'InlineMessageDialog'
+ name: 'InfoPanel'
layout: (LayoutFrame 0 0 30 0 0 1 70 0)
level: 0
initiallyInvisible: true
@@ -589,8 +604,6 @@
)
)
-
- "Modified: / 10-02-2012 / 10:24:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
windowSpecForEmbedding
@@ -1410,6 +1423,12 @@
"Created: / 20-07-2010 / 09:48:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
+showFilter: aBoolean
+ self showFilterHolder value: aBoolean
+
+ "Created: / 11-02-2012 / 22:47:42 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
targetNamespace:something
targetNamespace := something.
!
@@ -1775,6 +1794,23 @@
].
!
+showFilterHolder
+ "return/create the 'showFilterHolder' value holder (automatically generated)"
+
+ showFilterHolder isNil ifTrue:[
+ showFilterHolder := false asValue.
+ ].
+ ^ showFilterHolder
+
+ "Modified: / 11-02-2012 / 22:46:10 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
+showFilterHolder:something
+ "set the 'showFilterHolder' value holder (automatically generated)"
+
+ showFilterHolder := something.
+!
+
showRemovedAspect
"return/create the 'showDeletedAspect' value holder (automatically generated)"
@@ -1816,13 +1852,14 @@
"Modified: / 26-10-2010 / 22:54:38 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
-updateChangefileHolder
- updateChangefileHolder isNil ifTrue:[
- updateChangefileHolder := false asValue.
+updateChangeFileHolder
+ updateChangeFileHolder isNil ifTrue:[
+ updateChangeFileHolder := false asValue.
].
- ^ updateChangefileHolder
+ ^ updateChangeFileHolder
"Created: / 07-09-2011 / 15:54:03 / cg"
+ "Created: / 11-02-2012 / 22:40:27 / Jan Vrany <jan.vrany@fit.cvut.cz>"
! !
!ChangeSetBrowser2 methodsFor:'change & update'!
@@ -1910,7 +1947,8 @@
doOpenCurrent
- self doOpenFile: ObjectMemory nameForChanges
+ self doOpenFile: ObjectMemory nameForChanges.
+ self showFilter: true.
"Created: / 05-12-2009 / 13:44:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
@@ -2354,7 +2392,7 @@
answer: self targetPackage
do: [
MCInteractiveLoadingQuery answer: true do:[
- updateChangefileHolder value ifTrue:[
+ updateChangeFileHolder value ifTrue:[
aChange apply
] ifFalse:[
Class withoutUpdatingChangesDo:[
@@ -2805,7 +2843,7 @@
!ChangeSetBrowser2 class methodsFor:'documentation'!
version
- ^ '$Id: Tools__ChangeSetBrowser2.st 7879 2012-02-10 11:02:29Z vranyj1 $'
+ ^ '$Id: Tools__ChangeSetBrowser2.st 7882 2012-02-12 00:06:21Z vranyj1 $'
!
version_CVS
@@ -2813,5 +2851,5 @@
!
version_SVN
- ^ '$Id: Tools__ChangeSetBrowser2.st 7879 2012-02-10 11:02:29Z vranyj1 $'
+ ^ '$Id: Tools__ChangeSetBrowser2.st 7882 2012-02-12 00:06:21Z vranyj1 $'
! !