Tools__ChangeSetBrowser2.st
changeset 15198 f73c2d210abb
parent 15056 3bb24efd9fa7
child 15199 9c150c84fdc9
equal deleted inserted replaced
15197:31b529bd7222 15198:f73c2d210abb
    36 		imageSourceHolder targetPackage allowRemoveHolder
    36 		imageSourceHolder targetPackage allowRemoveHolder
    37 		allowAcceptHolder infoPanel updateChangeFileHolder
    37 		allowAcceptHolder infoPanel updateChangeFileHolder
    38 		showFilterHolder showingRegularChangesetHolder isWorkingHolder
    38 		showFilterHolder showingRegularChangesetHolder isWorkingHolder
    39 		isWorkingNotHolder hasSelectionHolder showConflictsOnlyAspect
    39 		isWorkingNotHolder hasSelectionHolder showConflictsOnlyAspect
    40 		targetNameSpaceName showDefinitionsOnlyAspect'
    40 		targetNameSpaceName showDefinitionsOnlyAspect'
    41 	classVariableNames:'ShowRemoved LastSelectionConditionString RecentTargetPackages'
    41 	classVariableNames:'ShowRemoved LastSelectionConditionString RecentTargetPackages
       
    42 		LastConfirmersExtent'
    42 	poolDictionaries:''
    43 	poolDictionaries:''
    43 	category:'Interface-Browsers-ChangeSet'
    44 	category:'Interface-Browsers-ChangeSet'
    44 !
    45 !
    45 
    46 
    46 ApplicationModel subclass:#ChangeEditor
    47 ApplicationModel subclass:#ChangeEditor
   797     browser allowAccept: false.
   798     browser allowAccept: false.
   798     browser allowRemove: true.
   799     browser allowRemove: true.
   799     browser showRemovedAspect: true asValue.
   800     browser showRemovedAspect: true asValue.
   800     browser beHierarchical.
   801     browser beHierarchical.
   801     browserView := ApplicationSubView new
   802     browserView := ApplicationSubView new
   802 		client:browser
   803                 client:browser
   803 		spec:#windowSpecForEmbedding.
   804                 spec:#windowSpecForEmbedding.
   804     dialog := (Dialog new)
   805     dialog := (Dialog new)
   805 		addComponent:browserView withHeight: 300;
   806                 addComponent:browserView withHeight: 600;
   806 		addAbortAndOkButtons;
   807                 addAbortAndOkButtons;
   807 		yourself.
   808                 yourself.
   808     dialog label: aString.
   809     dialog label: aString.
   809     dialog buttonPanel
   810 "/    dialog buttonPanel
   810 	layout:(LayoutFrame fractions:(0.0 @ 1.0 corner:1.0 @ 1.0)
   811 "/        layout:(LayoutFrame fractions:(0.0 @ 1.0 corner:1.0 @ 1.0)
   811 		offsets:(0 @ -30 corner:0 @ 0)).
   812 "/                offsets:(0 @ -30 corner:0 @ 0)).
   812     browserView layout:(LayoutFrame fractions:(0.0 @ 0.0 corner:1.0 @ 1.0)
   813 "/    browserView layout:(LayoutFrame fractions:(0.0 @ 0.0 corner:1.0 @ 1.0)
   813 		offsets:(0 @ 0 corner:0 @ -30)).
   814 "/                offsets:(0 @ 0 corner:0 @ -30)).
       
   815     dialog stickAtBottomWithVariableHeight:browserView.
   814     dialog
   816     dialog
   815 	okAction:
   817         okAction:
   816 	    [^browser list1Holder value condenseChangesForRemoved];
   818             [LastConfirmersExtent := dialog window extent. 
   817 	abortAction:
   819              ^browser list1Holder value condenseChangesForRemoved];
   818 	    [^#()].
   820         abortAction:
   819     dialog openWithExtent: 800@700.
   821             [^#()].
       
   822 
       
   823     dialog openWithExtent: (LastConfirmersExtent ? (800@700)).
   820     ^#()
   824     ^#()
   821 
   825 
   822     "
   826     "
   823 	 Tools::ChangeSetBrowser2
   827          Tools::ChangeSetBrowser2
   824 	    confirmChanges:
   828             confirmChanges:
   825 		(ChangeSet current copyFrom: ((ChangeSet current size - 10) max: 1) to: ChangeSet current size)
   829                 (ChangeSet current copyFrom: ((ChangeSet current size - 10) max: 1) to: ChangeSet current size)
   826 	    label: 'Last 10 changes...'
   830             label: 'Last 10 changes...'
   827     "
   831     "
   828 
   832 
   829     "Created: / 08-11-2010 / 17:59:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
   833     "Created: / 08-11-2010 / 17:59:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
   830     "Modified: / 07-09-2011 / 20:19:44 / cg"
   834     "Modified: / 07-09-2011 / 20:19:44 / cg"
   831     "Modified: / 27-07-2012 / 17:12:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
   835     "Modified: / 27-07-2012 / 17:12:56 / Jan Vrany <jan.vrany@fit.cvut.cz>"
  1319      Tools::ChangeSetBrowser2 new openInterface:#windowSpecWithoutToolbar
  1323      Tools::ChangeSetBrowser2 new openInterface:#windowSpecWithoutToolbar
  1320     "
  1324     "
  1321 
  1325 
  1322     <resource: #canvas>
  1326     <resource: #canvas>
  1323 
  1327 
  1324     ^
  1328     ^ 
  1325      #(FullSpec
  1329     #(FullSpec
  1326 	name: windowSpecWithoutToolbar
  1330        name: windowSpecWithoutToolbar
  1327 	window:
  1331        window: 
  1328        (WindowSpec
  1332       (WindowSpec
  1329 	  label: 'ChangeSet browser'
  1333          label: 'ChangeSet browser'
  1330 	  name: 'ChangeSet browser'
  1334          name: 'ChangeSet browser'
  1331 	  min: (Point 10 10)
  1335          min: (Point 10 10)
  1332 	  bounds: (Rectangle 0 0 653 488)
  1336          bounds: (Rectangle 0 0 653 488)
  1333 	  menu: mainMenu
  1337          menu: mainMenu
  1334 	)
  1338        )
  1335 	component:
  1339        component: 
  1336        (SpecCollection
  1340       (SpecCollection
  1337 	  collection: (
  1341          collection: (
  1338 	   (VariableVerticalPanelSpec
  1342           (VariableVerticalPanelSpec
  1339 	      name: 'VerticalPanel'
  1343              name: 'VerticalPanel'
  1340 	      layout: (LayoutFrame 0 0 0 0 0 1 0 1)
  1344              layout: (LayoutFrame 0 0 0 0 0 1 0 1)
  1341 	      component:
  1345              component: 
  1342 	     (SpecCollection
  1346             (SpecCollection
  1343 		collection: (
  1347                collection: (
  1344 		 (SubCanvasSpec
  1348                 (SubCanvasSpec
  1345 		    name: 'NavigatorPanel'
  1349                    name: 'NavigatorPanel'
  1346 		    hasHorizontalScrollBar: false
  1350                    hasHorizontalScrollBar: false
  1347 		    hasVerticalScrollBar: false
  1351                    hasVerticalScrollBar: false
  1348 		    specHolder: navigatorSpecHolder
  1352                    specHolder: navigatorSpecHolder
  1349 		    createNewBuilder: false
  1353                    createNewBuilder: false
  1350 		  )
  1354                  )
  1351 		 (SubCanvasSpec
  1355                 (SubCanvasSpec
  1352 		    name: 'TextDiffTool'
  1356                    name: 'TextDiffTool'
  1353 		    hasHorizontalScrollBar: false
  1357                    hasHorizontalScrollBar: false
  1354 		    hasVerticalScrollBar: false
  1358                    hasVerticalScrollBar: false
  1355 		    majorKey: #'Tools::TextDiff2Tool'
  1359                    majorKey: #'Tools::TextDiff2Tool'
  1356 		    minorKey: windowSpecForEmbedding
  1360                    minorKey: windowSpecForEmbedding
  1357 		    subAspectHolders:
  1361                    subAspectHolders: 
  1358 		   (Array
  1362                   (Array
  1359 
  1363                      
  1360 		     (SubChannelInfoSpec
  1364                     (SubChannelInfoSpec
  1361 			subAspect: classHolder
  1365                        subAspect: classHolder
  1362 			aspect: classHolder
  1366                        aspect: classHolder
  1363 		      )
  1367                      ) 
  1364 		     (SubChannelInfoSpec
  1368                     (SubChannelInfoSpec
  1365 			subAspect: languageHolder
  1369                        subAspect: languageHolder
  1366 			aspect: languageHolder
  1370                        aspect: languageHolder
  1367 		      )
  1371                      )
  1368 		     (SubChannelInfoSpec
  1372                      
  1369 			subAspect: codeAspectHolder
  1373                     (SubChannelInfoSpec
  1370 			aspect: codeAspectHolder
  1374                        subAspect: codeAspectHolder
  1371 		      )
  1375                        aspect: codeAspectHolder
  1372 
  1376                      ) 
  1373 		     (SubChannelInfoSpec
  1377                     (SubChannelInfoSpec
  1374 			subAspect: labelAHolder
  1378                        subAspect: labelAHolder
  1375 			aspect: labelAHolder
  1379                        aspect: labelAHolder
  1376 		      )
  1380                      )
  1377 		     (SubChannelInfoSpec
  1381                      
  1378 			subAspect: labelBHolder
  1382                     (SubChannelInfoSpec
  1379 			aspect: labelBHolder
  1383                        subAspect: labelBHolder
  1380 		      )
  1384                        aspect: labelBHolder
  1381 
  1385                      ) 
  1382 		     (SubChannelInfoSpec
  1386                     (SubChannelInfoSpec
  1383 			subAspect: textAHolder
  1387                        subAspect: textAHolder
  1384 			aspect: changeSourceHolder
  1388                        aspect: changeSourceHolder
  1385 		      )
  1389                      )
  1386 		     (SubChannelInfoSpec
  1390                      
  1387 			subAspect: textBHolder
  1391                     (SubChannelInfoSpec
  1388 			aspect: imageSourceHolder
  1392                        subAspect: textBHolder
  1389 		      )
  1393                        aspect: imageSourceHolder
  1390 		    )
  1394                      )
  1391 		    createNewApplication: true
  1395                    )
  1392 		    createNewBuilder: true
  1396                    createNewApplication: true
  1393 		  )
  1397                    createNewBuilder: true
  1394 		 )
  1398                  )
  1395 
  1399                 )
  1396 	      )
  1400               
  1397 	      handles: (Any 0.5 1.0)
  1401              )
  1398 	    )
  1402              handles: (Any 0.32581967213114754 1.0)
  1399 	   )
  1403            )
  1400 
  1404           )
  1401 	)
  1405         
  1402       )
  1406        )
  1403 
  1407      )
  1404     "Modified: / 03-12-2011 / 10:36:40 / cg"
       
  1405     "Modified: / 16-03-2012 / 13:09:44 / Jan Vrany <jan.vrany@fit.cvut.cz>"
       
  1406 ! !
  1408 ! !
  1407 
  1409 
  1408 !ChangeSetBrowser2 class methodsFor:'menu specs'!
  1410 !ChangeSetBrowser2 class methodsFor:'menu specs'!
  1409 
  1411 
  1410 changeMenu
  1412 changeMenu
  1989     "Return a description of exported aspects;
  1991     "Return a description of exported aspects;
  1990      these can be connected to aspects of an embedding application
  1992      these can be connected to aspects of an embedding application
  1991      (if this app is embedded in a subCanvas)."
  1993      (if this app is embedded in a subCanvas)."
  1992 
  1994 
  1993     ^ #(
  1995     ^ #(
  1994 	#changesetHolder
  1996         #changesetHolder
  1995       ).
  1997       ).
  1996 
  1998 
  1997 ! !
  1999 ! !
  1998 
  2000 
  1999 !ChangeSetBrowser2 methodsFor:'accessing'!
  2001 !ChangeSetBrowser2 methodsFor:'accessing'!
  4210 ! !
  4212 ! !
  4211 
  4213 
  4212 !ChangeSetBrowser2 class methodsFor:'documentation'!
  4214 !ChangeSetBrowser2 class methodsFor:'documentation'!
  4213 
  4215 
  4214 version
  4216 version
  4215     ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.61 2014-12-19 14:57:06 cg Exp $'
  4217     ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.62 2015-02-04 22:04:53 cg Exp $'
  4216 !
  4218 !
  4217 
  4219 
  4218 version_CVS
  4220 version_CVS
  4219     ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.61 2014-12-19 14:57:06 cg Exp $'
  4221     ^ '$Header: /cvs/stx/stx/libtool/Tools__ChangeSetBrowser2.st,v 1.62 2015-02-04 22:04:53 cg Exp $'
  4220 !
  4222 !
  4221 
  4223 
  4222 version_HG
  4224 version_HG
  4223 
  4225 
  4224     ^ '$Changeset: <not expanded> $'
  4226     ^ '$Changeset: <not expanded> $'
  4225 !
  4227 !
  4226 
  4228 
  4227 version_SVN
  4229 version_SVN
  4228     ^ '$Id: Tools__ChangeSetBrowser2.st,v 1.61 2014-12-19 14:57:06 cg Exp $'
  4230     ^ '$Id: Tools__ChangeSetBrowser2.st,v 1.62 2015-02-04 22:04:53 cg Exp $'
  4229 ! !
  4231 ! !
  4230 
  4232