--- a/Tools__ChangeSetBrowser2.st Thu Feb 09 15:37:12 2012 +0000
+++ b/Tools__ChangeSetBrowser2.st Fri Feb 10 11:02:29 2012 +0000
@@ -34,7 +34,7 @@
languageHolder codeAspectHolder showRemovedAspect showSameAspect
sourceView changeSourceHolder imageSourceHolder targetPackage
targetNamespace updateChangefileHolder allowRemoveHolder
- allowAcceptHolder'
+ allowAcceptHolder infoPanel'
classVariableNames:'ShowRemoved LastSelectionConditionString'
poolDictionaries:''
category:'Interface-Browsers-ChangeSet'
@@ -202,7 +202,12 @@
open
"Open browser and load current changefile"
- super open application doOpenCurrent
+ | browser |
+
+ browser := self new.
+ browser open.
+ browser builder window sensor
+ pushUserEvent: #doOpenCurrent for: browser.
"Created: / 25-01-2012 / 17:16:20 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
@@ -537,26 +542,26 @@
the UIPainter may not be able to read the specification."
"
- UIPainter new openOnClass:Tools::ChangeSetBrowser andSelector:#windowSpec
- Tools::ChangeSetBrowser new openInterface:#windowSpec
- Tools::ChangeSetBrowser open
+ UIPainter new openOnClass:Tools::ChangeSetBrowser2 andSelector:#windowSpec
+ Tools::ChangeSetBrowser2 new openInterface:#windowSpec
+ Tools::ChangeSetBrowser2 open
"
<resource: #canvas>
- ^
+ ^
#(FullSpec
name: windowSpec
- window:
+ window:
(WindowSpec
label: 'ChangeSet browser'
name: 'ChangeSet browser'
labelChannel: titleHolder
min: (Point 10 10)
- bounds: (Rectangle 0 0 653 488)
+ bounds: (Rectangle 0 0 800 600)
menu: mainMenu
)
- component:
+ component:
(SpecCollection
collection: (
(MenuPanelSpec
@@ -565,15 +570,27 @@
menu: toolbarMenu
textDefault: true
)
+ (SubCanvasSpec
+ name: 'InlineMessageDialog'
+ layout: (LayoutFrame 0 0 30 0 0 1 70 0)
+ level: 0
+ initiallyInvisible: true
+ hasHorizontalScrollBar: false
+ hasVerticalScrollBar: false
+ clientKey: infoPanel
+ createNewBuilder: false
+ )
(UISubSpecification
name: 'Contents'
layout: (LayoutFrame 0 0 30 0 0 1 0 1)
minorKey: windowSpecWithoutToolbar
)
)
-
+
)
)
+
+ "Modified: / 10-02-2012 / 10:24:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
windowSpecForEmbedding
@@ -1612,6 +1629,15 @@
"Created: / 19-07-2011 / 11:54:29 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
+infoPanel
+ infoPanel isNil ifTrue:[
+ infoPanel := InlineMessageDialog new
+ ].
+ ^ infoPanel
+
+ "Created: / 09-02-2012 / 19:23:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
labelAHolder
^'Change' asValue
@@ -1884,11 +1910,22 @@
doOpenCurrent
- self doOpen: (ChangeSet fromFile: ObjectMemory nameForChanges)
+ self doOpenFile: ObjectMemory nameForChanges
"Created: / 05-12-2009 / 13:44:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
!
+doOpenFile: aStringOrFilename
+ | cs |
+
+ self showProgress: 'Reading ' , aStringOrFilename asFilename baseName while:[
+ cs := ChangeSet fromFile: aStringOrFilename.
+ self doOpen: cs.
+ ].
+
+ "Created: / 09-02-2012 / 19:11:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
doSave
changesetFile
@@ -2418,6 +2455,13 @@
"Modified: / 04-08-2011 / 19:06:31 / cg"
!
+showProgress: label while: block
+
+ self infoPanel progress: label while: block
+
+ "Created: / 10-02-2012 / 10:35:04 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+!
+
showSource: aBoolean
| panel |
@@ -2761,7 +2805,7 @@
!ChangeSetBrowser2 class methodsFor:'documentation'!
version
- ^ '$Id: Tools__ChangeSetBrowser2.st 7871 2012-02-05 01:49:41Z vranyj1 $'
+ ^ '$Id: Tools__ChangeSetBrowser2.st 7879 2012-02-10 11:02:29Z vranyj1 $'
!
version_CVS
@@ -2769,5 +2813,5 @@
!
version_SVN
- ^ '$Id: Tools__ChangeSetBrowser2.st 7871 2012-02-05 01:49:41Z vranyj1 $'
+ ^ '$Id: Tools__ChangeSetBrowser2.st 7879 2012-02-10 11:02:29Z vranyj1 $'
! !