added:
authorClaus Gittinger <cg@exept.de>
Fri, 01 Jun 2012 13:07:23 +0200
changeset 11542 ee8d1edf2ce5
parent 11541 38db4600d050
child 11543 34da620321f9
added: #classMenuCheckInP4 #classMenuPerforceSubmit changed: #classMenuRename #classMenuSCMSlice_old #classPerforceMenu
Tools__NewSystemBrowser.st
--- a/Tools__NewSystemBrowser.st	Fri Jun 01 12:44:51 2012 +0200
+++ b/Tools__NewSystemBrowser.st	Fri Jun 01 13:07:23 2012 +0200
@@ -14,38 +14,38 @@
 "{ NameSpace: Tools }"
 
 SystemBrowser subclass:#NewSystemBrowser
-        instanceVariableNames:'navigationState bufferNameList selectedBuffer buffers
-                bufferUsageOrder browserCanvas immediateUpdate showClassPackages
-                lastMethodCategory lastMethodMoveClass browserCanvasType
-                syntaxColoringProcessRunning syntaxColoringProcess
-                methodInfoProcess browsletShowHideLabelHolder browserPageCanvas'
-        classVariableNames:'LastNewProtocols LastProtocolRenames LastCategoryRenames
-                LastCategoryRenameOld LastCategoryRenameNew LastProjectMoves
-                LastNameSpaceMove LastMethodMoveOrCopyTargetClass
-                LastClassFilterBlockString LastMethodFilterBlockString
-                LastBreakPointConditionString LastIndividualChecks
-                LastAcceptPackage LastVariableRenames LastVisitorClassName
-                LastTemporaryVariableName BookMarks FindHistory
-                CheckForInstancesWhenRemovingClasses SynchronousUpdate
-                DoubleClickIsOpenBrowser ShowMethodTemplateWhenProtocolIsSelected
-                DefaultShowMethodTemplate DefaultShowMethodInheritance
-                DefaultEmphasizeUnloadedClasses DefaultImmediateSyntaxColoring
-                DefaultImmediateExplaining DefaultSyntaxColoring
-                DefaultToolBarVisible DefaultCodeInfoVisible
-                DefaultShortNameInTabs DefaultHideUnloadedClasses
-                DefaultMarkApplications DefaultAutoFormat
-                DefaultShowMethodComplexity DefaultShowMethodTypeIcon
-                DefaultShowSpecialResourceEditors SharedMethodCategoryCache
-                LastMethodProcessingBlockString LastLoadedPackages
-                DefaultShortAllClassesInNameSpaceOrganisation LastTag
-                LastBaseVersionTag DefaultShowPseudoProtocols
-                DefaultShowMultitabMode LastRenamedOld LastRenamedNew
-                LastImportedPackage LastLintRules NewNavigationHistory
-                DefaultSortByNameAndInheritance LastLiteralReplacementType
-                LastLiteralReplacementNewName LastLiteralReplacementOldLiteral
-                LastNewProjectType'
-        poolDictionaries:''
-        category:'Interface-Browsers-New'
+	instanceVariableNames:'navigationState bufferNameList selectedBuffer buffers
+		bufferUsageOrder browserCanvas immediateUpdate showClassPackages
+		lastMethodCategory lastMethodMoveClass browserCanvasType
+		syntaxColoringProcessRunning syntaxColoringProcess
+		methodInfoProcess browsletShowHideLabelHolder browserPageCanvas'
+	classVariableNames:'LastNewProtocols LastProtocolRenames LastCategoryRenames
+		LastCategoryRenameOld LastCategoryRenameNew LastProjectMoves
+		LastNameSpaceMove LastMethodMoveOrCopyTargetClass
+		LastClassFilterBlockString LastMethodFilterBlockString
+		LastBreakPointConditionString LastIndividualChecks
+		LastAcceptPackage LastVariableRenames LastVisitorClassName
+		LastTemporaryVariableName BookMarks FindHistory
+		CheckForInstancesWhenRemovingClasses SynchronousUpdate
+		DoubleClickIsOpenBrowser ShowMethodTemplateWhenProtocolIsSelected
+		DefaultShowMethodTemplate DefaultShowMethodInheritance
+		DefaultEmphasizeUnloadedClasses DefaultImmediateSyntaxColoring
+		DefaultImmediateExplaining DefaultSyntaxColoring
+		DefaultToolBarVisible DefaultCodeInfoVisible
+		DefaultShortNameInTabs DefaultHideUnloadedClasses
+		DefaultMarkApplications DefaultAutoFormat
+		DefaultShowMethodComplexity DefaultShowMethodTypeIcon
+		DefaultShowSpecialResourceEditors SharedMethodCategoryCache
+		LastMethodProcessingBlockString LastLoadedPackages
+		DefaultShortAllClassesInNameSpaceOrganisation LastTag
+		LastBaseVersionTag DefaultShowPseudoProtocols
+		DefaultShowMultitabMode LastRenamedOld LastRenamedNew
+		LastImportedPackage LastLintRules NewNavigationHistory
+		DefaultSortByNameAndInheritance LastLiteralReplacementType
+		LastLiteralReplacementNewName LastLiteralReplacementOldLiteral
+		LastNewProjectType'
+	poolDictionaries:''
+	category:'Interface-Browsers-New'
 !
 
 !NewSystemBrowser class methodsFor:'documentation'!
@@ -14413,7 +14413,7 @@
             label: 'Perforce'
             translateLabel: true
             submenuChannel: classPerforceMenu
-            labelImage: (ResourceRetriever ToolbarIconLibrary repositorySVNIcon 'Perforce')
+            labelImage: (ResourceRetriever ToolbarIconLibrary repositoryP4Icon 'Perforce')
           )
          (MenuItem
             enabled: hasClassesSelectedAndFileBasedRepositoryExistsHolder
@@ -14640,7 +14640,7 @@
          (MenuItem
             enabled: hasClassSelectedHolderAndSourceCodeManagerHolder
             label: 'CheckIn...'
-            itemValue: classMenuCheckIn
+            itemValue: classMenuCheckInP4
             translateLabel: true
             labelImage: (ResourceRetriever ToolbarIconLibrary repositoryCheckIn 'CheckIn...')
             showBusyCursorWhilePerforming: true
@@ -14674,6 +14674,13 @@
             showBusyCursorWhilePerforming: true
           )
          (MenuItem
+            enabled: hasClassSelectedHolderAndSourceCodeManagerHolder
+            label: 'Submit...'
+            itemValue: classMenuPerforceSubmit
+            translateLabel: true
+            showBusyCursorWhilePerforming: true
+          )
+         (MenuItem
             label: '-'
           )
          (MenuItem
@@ -16263,7 +16270,6 @@
     "Modified: / 29-09-2006 / 16:11:08 / cg"
 ! !
 
-
 !NewSystemBrowser class methodsFor:'menu specs-popup'!
 
 categoryPopUpMenu
@@ -28838,7 +28844,7 @@
                           onCancel:false.
         ].
 
-        (answer == #browse or:[answer == #renameAndBrowse]) ifTrue:[
+        (answer == #browse) ifTrue:[
             browser := self 
                             spawnMethodBrowserFor:referingMethods 
                             in:#newBuffer 
@@ -28846,10 +28852,12 @@
         ].
         (answer == #rename or:[answer == #renameAndBrowse]) ifTrue:[
             Smalltalk renameClass:currentClass to:newNameString.
-            browser := self 
+            answer == #renameAndBrowse ifTrue:[
+                browser := self 
                             spawnMethodBrowserFor:referingMethods 
                             in:#newBuffer 
                             label:(resources string:'Methods referring to %1 which was renamed to %2' with:oldSym with:newNameString)
+            ].
         ].
         answer == #renameAndRewrite ifTrue:[
             refactoring := RenameClassRefactoring renameClassNamed:oldSym to:newNameString.
@@ -28877,7 +28885,7 @@
         ]
     ].
 
-    "Modified: / 30-05-2012 / 09:47:53 / cg"
+    "Modified: / 01-06-2012 / 10:30:08 / cg"
 !
 
 classMenuRewrite
@@ -31253,6 +31261,16 @@
     "Modified: / 08-09-2011 / 04:07:58 / cg"
 !
 
+classMenuCheckInP4
+    "check a class into the source repository (with checks)"
+
+    PerforceSourceCodeManager notNil ifTrue:[
+        self classMenuCheckInUsingManager:PerforceSourceCodeManager
+    ].
+
+    "Modified: / 21-12-2011 / 18:20:40 / cg"
+!
+
 classMenuCheckInUsingManager:aManagerOrNil
     "check a class into the source repository (with checks)"
 
@@ -35855,7 +35873,6 @@
     "Modified: / 28-02-2012 / 16:27:44 / cg"
 ! !
 
-
 !NewSystemBrowser methodsFor:'menu actions-namespace'!
 
 nameSpaceMenuCheckOut
@@ -36097,6 +36114,21 @@
     ]
 !
 
+classMenuPerforceSubmit
+
+    |utilities|
+
+    PerforceSourceCodeManager notNil ifTrue:[
+        utilities := PerforceSourceCodeManager utilities.
+
+        self withActivityNotificationsRedirectedToInfoLabelDo:[
+            utilities submit.
+        ].
+    ]
+    "Created: / 09-08-2006 / 19:04:52 / fm"
+    "Modified: / 12-09-2006 / 13:53:28 / cg"
+!
+
 generatePatchSetForClasses:classes
     "ask for two tags, generate a patchSet to bring a baseSystem (tag1) to the
      level of the tag2 version"
@@ -56762,11 +56794,11 @@
 !NewSystemBrowser class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1747 2012-05-31 10:15:15 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1748 2012-06-01 11:07:23 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1747 2012-05-31 10:15:15 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__NewSystemBrowser.st,v 1.1748 2012-06-01 11:07:23 cg Exp $'
 !
 
 version_SVN