Fixed context menu icons, version info improvements

OpenPonk · Nov 13, 2024 · bdbf5e7 · bdbf5e7
1 parent e6e7f1e
commit bdbf5e7
Show file tree

Hide file tree

Showing 23 changed files with 220 additions and 215 deletions.
diff --git a/repository/OpenPonk-Core/OPVersion.class.st b/repository/OpenPonk-Core/OPVersion.class.st
@@ -328,31 +328,43 @@ OPVersion >> releaseName: aString [
 	releaseName := aString
 ]
 
+{ #category : 'accessing' }
+OPVersion >> repositoryLink [
+
+	^ self isRepositoryNameKnown
+		  ifTrue: [ 'https://github.com/OpenPonk/' , self repositoryName ]
+		  ifFalse: [ 'https://openponk.org' ]
+]
+
 { #category : 'accessing' }
 OPVersion >> repositoryName [
 
-	^ repositoryName ifNil: [ 
-		  | activePlugins |
-		  activePlugins := { 
-			                   ((Smalltalk globals includesKey:
-				                     #BaselineOfOpenPonkClassEditor) ifTrue: [ 
-				                    #'class-editor' ]).
-			                   ((Smalltalk globals includesKey:
-				                     #BaselineOfOpenPonkBormEditor) ifTrue: [ 
-				                    #'borm-editor' ]).
-			                   ((Smalltalk globals includesKey:
-				                     #BaselineOfOpenPonkFsmEditor) ifTrue: [ 
-				                    #'fsm-editor' ]).
-			                   ((Smalltalk globals includesKey:
-				                     #BaselineOfOpenPonkPetriNets) ifTrue: [ #petrinets ]).
-			                   ((Smalltalk globals includesKey: #BaselineOfOpenPonkBPMN) 
-				                    ifTrue: [ #'BPMN' ]) } reject: #isNil.
-		  repositoryName := activePlugins size >= 4
-			                    ifTrue: [ #plugins ]
-			                    ifFalse: [ 
-				                    activePlugins size = 1
-					                    ifTrue: [ activePlugins first ]
-					                    ifFalse: [ self class unknownRepositoryName ] ] ]
+	| activePlugins repositoriesOfBaselines |
+	repositoryName ifNotNil: [ ^ repositoryName ].
+	repositoriesOfBaselines := {
+		                           (#BaselineOfOpenPonkClassEditor
+		                            -> #'class-editor').
+		                           (#BaselineOfOpenPonkBormEditor
+		                            -> #'borm-editor').
+		                           (#BaselineOfOpenPonkFsmEditor
+		                            -> #'fsm-editor').
+		                           (#BaselineOfOpenPonkPetriNets
+		                            -> #petrinets).
+		                           (#BaselineOfOpenPonkBPMN -> #BPMN).
+		                           (#BaselineOfOpenPonkMarkovChains
+		                            -> #'markov-chains') }.
+
+	activePlugins := repositoriesOfBaselines
+		                 select: [ :each |
+		                 Smalltalk hasClassNamed: each key ]
+		                 thenCollect: [ :each | each value ].
+	^ repositoryName := activePlugins size
+	                    >= repositoriesOfBaselines size
+		                    ifTrue: [ #plugins ]
+		                    ifFalse: [
+			                    activePlugins size = 1
+				                    ifTrue: [ activePlugins anyOne ]
+				                    ifFalse: [ self class unknownRepositoryName ] ]
 ]
 
 { #category : 'accessing' }

diff --git a/repository/OpenPonk-Spec/OPDiagramInspectControllerFigureCommand.class.st b/repository/OpenPonk-Spec/OPDiagramInspectControllerFigureCommand.class.st
@@ -13,9 +13,9 @@ OPDiagramInspectControllerFigureCommand class >> canvasShortcutActivation [
 ]
 
 { #category : 'accessing' }
-OPDiagramInspectControllerFigureCommand >> defaultMenuIcon [
+OPDiagramInspectControllerFigureCommand >> defaultMenuIconName [
 
-	^ self iconNamed: #glamorousInspect
+	^ #glamorousInspect
 ]
 
 { #category : 'accessing' }

diff --git a/repository/OpenPonk-Spec/OPDiagramInspectDiagramElementCommand.class.st b/repository/OpenPonk-Spec/OPDiagramInspectDiagramElementCommand.class.st
@@ -7,9 +7,9 @@ Class {
 }
 
 { #category : 'accessing' }
-OPDiagramInspectDiagramElementCommand >> defaultMenuIcon [
+OPDiagramInspectDiagramElementCommand >> defaultMenuIconName [
 
-	^ self iconNamed: #glamorousInspect
+	^ #glamorousInspect
 ]
 
 { #category : 'accessing' }

diff --git a/repository/OpenPonk-Spec/OPDiagramInspectFigureCommand.class.st b/repository/OpenPonk-Spec/OPDiagramInspectFigureCommand.class.st
@@ -7,9 +7,9 @@ Class {
 }
 
 { #category : 'accessing' }
-OPDiagramInspectFigureCommand >> defaultMenuIcon [
+OPDiagramInspectFigureCommand >> defaultMenuIconName [
 
-	^ self iconNamed: #glamorousInspect
+	^ #glamorousInspect
 ]
 
 { #category : 'accessing' }

diff --git a/repository/OpenPonk-Spec/OPDiagramInspectModelFigureCommand.class.st b/repository/OpenPonk-Spec/OPDiagramInspectModelFigureCommand.class.st
@@ -13,9 +13,9 @@ OPDiagramInspectModelFigureCommand class >> canvasShortcutActivation [
 ]
 
 { #category : 'accessing' }
-OPDiagramInspectModelFigureCommand >> defaultMenuIcon [
+OPDiagramInspectModelFigureCommand >> defaultMenuIconName [
 
-	^ self iconNamed: #glamorousInspect
+	^  #glamorousInspect
 ]
 
 { #category : 'accessing' }

diff --git a/repository/OpenPonk-Spec/OPDiagramRemoveFigureCommand.class.st b/repository/OpenPonk-Spec/OPDiagramRemoveFigureCommand.class.st
@@ -52,8 +52,9 @@ OPDiagramRemoveFigureCommand class >> skipConfirmationModifier [
 ]
 
 { #category : 'accessing' }
-OPDiagramRemoveFigureCommand >> defaultMenuIcon [
-	^ self iconNamed: #glamorousTrash
+OPDiagramRemoveFigureCommand >> defaultMenuIconName [
+
+	^ #glamorousTrash
 ]
 
 { #category : 'accessing' }

diff --git a/repository/OpenPonk-Spec/OPFitContentDiagramCommand.class.st b/repository/OpenPonk-Spec/OPFitContentDiagramCommand.class.st
@@ -15,12 +15,13 @@ OPFitContentDiagramCommand class >> toolbarMenuActivation [
 		for: OPCanvasPresenter
 ]
 
-{ #category : 'execution' }
-OPFitContentDiagramCommand >> defaultMenuIcon [
-	^ OPIdeaGraphIcons fitContentIcon
+{ #category : 'accessing' }
+OPFitContentDiagramCommand >> defaultMenuIconFormSet [
+
+	^ FormSet form: OPIdeaGraphIcons fitContentIcon
 ]
 
-{ #category : 'execution' }
+{ #category : 'accessing' }
 OPFitContentDiagramCommand >> defaultMenuItemName [
 	^ 'Fit All'
 ]

diff --git a/repository/OpenPonk-Spec/OPProjectExitCommand.class.st b/repository/OpenPonk-Spec/OPProjectExitCommand.class.st
@@ -19,8 +19,9 @@ OPProjectExitCommand class >> toolbarMenuActivation [
 ]
 
 { #category : 'accessing' }
-OPProjectExitCommand >> defaultMenuIcon [
-	^ self iconNamed: #smallQuit
+OPProjectExitCommand >> defaultMenuIconName [
+
+	^ #smallQuit
 ]
 
 { #category : 'accessing' }

diff --git a/repository/OpenPonk-Spec/OPProjectMergeCommand.class.st b/repository/OpenPonk-Spec/OPProjectMergeCommand.class.st
@@ -13,9 +13,9 @@ OPProjectMergeCommand class >> toolbarMenuActivation [
 ]
 
 { #category : 'accessing' }
-OPProjectMergeCommand >> defaultMenuIcon [
+OPProjectMergeCommand >> defaultMenuIconName [
 
-	^ self iconNamed: #merge
+	^ #merge
 ]
 
 { #category : 'accessing' }

diff --git a/repository/OpenPonk-Spec/OPProjectMergeModelsCommand.class.st b/repository/OpenPonk-Spec/OPProjectMergeModelsCommand.class.st
@@ -25,9 +25,9 @@ OPProjectMergeModelsCommand class >> toolbarMenuActivation [
 ]
 
 { #category : 'accessing' }
-OPProjectMergeModelsCommand >> defaultMenuIcon [
+OPProjectMergeModelsCommand >> defaultMenuIconName [
 
-	^ self iconNamed: #hierarchy
+	^ #hierarchy
 ]
 
 { #category : 'accessing' }

diff --git a/repository/OpenPonk-Spec/OPProjectNewModelCommand.class.st b/repository/OpenPonk-Spec/OPProjectNewModelCommand.class.st
@@ -13,8 +13,9 @@ OPProjectNewModelCommand class >> toolbarMenuActivation [
 ]
 
 { #category : 'accessing' }
-OPProjectNewModelCommand >> defaultMenuIcon [
-	^ self iconNamed: #glamorousAdd
+OPProjectNewModelCommand >> defaultMenuIconName [
+
+	^ #glamorousAdd
 ]
 
 { #category : 'accessing' }

diff --git a/repository/OpenPonk-Spec/OPProjectOpenCommand.class.st b/repository/OpenPonk-Spec/OPProjectOpenCommand.class.st
@@ -13,8 +13,9 @@ OPProjectOpenCommand class >> toolbarMenuActivation [
 ]
 
 { #category : 'accessing' }
-OPProjectOpenCommand >> defaultMenuIcon [
-	^ self iconNamed: #smallOpen
+OPProjectOpenCommand >> defaultMenuIconName [
+
+	^ #smallOpen
 ]
 
 { #category : 'accessing' }

diff --git a/repository/OpenPonk-Spec/OPProjectSaveAsCommand.class.st b/repository/OpenPonk-Spec/OPProjectSaveAsCommand.class.st
@@ -13,8 +13,9 @@ OPProjectSaveAsCommand class >> toolbarMenuActivation [
 ]
 
 { #category : 'accessing' }
-OPProjectSaveAsCommand >> defaultMenuIcon [
-	^ self iconNamed: #smallSaveAs
+OPProjectSaveAsCommand >> defaultMenuIconName [
+
+	^ #smallSaveAs
 ]
 
 { #category : 'accessing' }

diff --git a/repository/OpenPonk-Spec/OPProjectSaveCommand.class.st b/repository/OpenPonk-Spec/OPProjectSaveCommand.class.st
@@ -13,8 +13,9 @@ OPProjectSaveCommand class >> toolbarMenuActivation [
 ]
 
 { #category : 'accessing' }
-OPProjectSaveCommand >> defaultMenuIcon [
-	^ self iconNamed: #smallSave
+OPProjectSaveCommand >> defaultMenuIconName [
+
+	^ #smallSave
 ]
 
 { #category : 'accessing' }

diff --git a/repository/OpenPonk-Spec/OPRedoDiagramCommand.class.st b/repository/OpenPonk-Spec/OPRedoDiagramCommand.class.st
@@ -12,10 +12,10 @@ OPRedoDiagramCommand class >> toolbarMenuActivation [
 	^ OPDiagramToolbarActivation byRootGroupItemOrder: 11 for: OPCanvasModel"
 ]
 
-{ #category : 'execution' }
-OPRedoDiagramCommand >> defaultMenuIcon [
+{ #category : 'accessing' }
+OPRedoDiagramCommand >> defaultMenuIconName [
 
-	^ self iconNamed: #smallRedo
+	^ #smallRedo
 ]
 
 { #category : 'accessing' }

diff --git a/repository/OpenPonk-Spec/OPShowHideElementsInDiagramCommand.class.st b/repository/OpenPonk-Spec/OPShowHideElementsInDiagramCommand.class.st
@@ -11,12 +11,13 @@ OPShowHideElementsInDiagramCommand class >> canBeExecutedInContext: aToolContext
 	^ aToolContext editor plugin supportsHidingElements
 ]
 
-{ #category : 'execution' }
-OPShowHideElementsInDiagramCommand >> defaultMenuIcon [
-	^ OPIdeaActionsIcons propertiesIcon
+{ #category : 'accessing' }
+OPShowHideElementsInDiagramCommand >> defaultMenuIconFormSet [
+
+	^ FormSet form: OPIdeaActionsIcons propertiesIcon
 ]
 
-{ #category : 'execution' }
+{ #category : 'accessing' }
 OPShowHideElementsInDiagramCommand >> defaultMenuItemName [
 	^ 'Show/Hide Elements'
 ]

diff --git a/repository/OpenPonk-Spec/OPUndoDiagramCommand.class.st b/repository/OpenPonk-Spec/OPUndoDiagramCommand.class.st
@@ -14,10 +14,10 @@ OPUndoDiagramCommand class >> toolbarMenuActivation [
 
 ]
 
-{ #category : 'execution' }
-OPUndoDiagramCommand >> defaultMenuIcon [
+{ #category : 'accessing' }
+OPUndoDiagramCommand >> defaultMenuIconName [
 
-	^ self iconNamed: #smallUndo
+	^ #smallUndo
 ]
 
 { #category : 'accessing' }