Squashed 'src/ted2go/' changes from f088e87..d84196b

d84196b Fixed shortcuts info for toolbars - now they taken directly from actions (not all yet, only with ctrl/cmd). Ctrl+n  -> ctrl+t for macos (again, that was not a bug). Bump version 2.2.3.

git-subtree-dir: src/ted2go
git-subtree-split: d84196b4e32677a84eced45a9a2613a809cb54c1

actions/fileactions.monkey2

@@ -22,7 +22,7 @@ Class FileActions
 		
 		new_=New Action( "New" )
 #if __TARGET__="macos"
-		new_.HotKey=Key.N
+		new_.HotKey=Key.T
 		new_.HotKeyModifiers=Modifier.Menu
 #else
 		new_.HotKey=Key.N

codedocument.monkey2

@@ -651,7 +651,7 @@ Class CodeDocument Extends Ted2Document
 		End
 
 		_view=New DockingView
-				
+		
 		' Editor
 		_codeView=New CodeDocumentView( Self )
 		_codeView.LineChanged += Lambda( prev:Int,cur:Int )
@@ -659,13 +659,10 @@ Class CodeDocument Extends Ted2Document
 		End
 		_codeView.LineChanged += OnLineChanged
 		
-#If __TARGET__="macos"
-		Local commentTitle:="Comment block (Ctrl+/)"
-		Local uncommentTitle:="Uncomment block (Ctrl+Shist+/)"
-#Else
-		Local commentTitle:="Comment block (Ctrl+')"
-		Local uncommentTitle:="Uncomment block (Ctrl+Shist+')"
-#Endif
+		Local commentTitle:=GetActionTextWithShortcut( MainWindow.GetActionComment() )
+		Local uncommentTitle:=GetActionTextWithShortcut( MainWindow.GetActionUncomment() )
+		Local findTitle:=GetActionTextWithShortcut( MainWindow.GetActionFind() )
+
 		' Toolbar
 		Local bar:ToolBarExt=Null
 		If Prefs.EditorToolBarVisible
@@ -683,7 +680,7 @@ Class CodeDocument Extends Ted2Document
 				Lambda()
 					OnFindSelection()
 				End,
-				"Find selection (Ctrl+F)" )
+				findTitle )
 			bar.AddIconicButton(
 				ThemeImages.Get( "editorbar/find_previous.png" ),
 				Lambda()

mainwindow.monkey2

@@ -304,30 +304,27 @@ Class MainWindowInstance Extends Window
 		
 		'Tool Bar
 		'
-		#If __TARGET__="macos"
-		Local newTitle:="New file (Ctrl+T)"
-		Local redoTitle:="Redo (Shish+Ctrl+Z)"
-		Local runTitle:="Run (Ctrl+R)"
-		Local buildTitle:="Build (Ctrl+B)"
-		Local checkTitle:="Check errors (Shift+Ctrl+R)"
-		#Else
-		Local newTitle:="New file (Ctrl+N)"
-		Local redoTitle:="Redo (Ctrl+Y)"
-		Local runTitle:="Run (F5)"
-		Local buildTitle:="Build (F6)"
-		Local checkTitle:="Check errors (F7)"
-		#Endif
+		Local newTitle:=GetActionTextWithShortcut( _fileActions.new_ )
+		Local openTitle:=GetActionTextWithShortcut( _fileActions.open )
+		Local saveAllTitle:=GetActionTextWithShortcut( _fileActions.saveAll )
+		Local undoTitle:=GetActionTextWithShortcut( _editActions.undo )
+		Local redoTitle:=GetActionTextWithShortcut( _editActions.redo )
+		Local runTitle:=GetActionTextWithShortcut( _buildActions.buildAndRun )
+		Local buildTitle:=GetActionTextWithShortcut( _buildActions.build )
+		Local checkTitle:=GetActionTextWithShortcut( _buildActions.semant )
+		Local findTitle:=GetActionTextWithShortcut( _findActions.find )
+		
 		If Prefs.MainToolBarVisible
 			_toolBar=New ToolBarExt
 			_toolBar.Style=GetStyle( "MainToolBar" )
 			_toolBar.MaxSize=New Vec2i( 10000,40 )
 			
 			_toolBar.AddIconicButton( ThemeImages.Get( "toolbar/new_file.png" ),_fileActions.new_.Triggered,newTitle )
-			_toolBar.AddIconicButton( ThemeImages.Get( "toolbar/open_file.png" ),_fileActions.open.Triggered,"Open file... (Ctrl+O)" )
+			_toolBar.AddIconicButton( ThemeImages.Get( "toolbar/open_file.png" ),_fileActions.open.Triggered,openTitle )
 			_toolBar.AddIconicButton( ThemeImages.Get( "toolbar/open_project.png" ),_projectView.openProject.Triggered,"Open project..." )
-			_toolBar.AddIconicButton( ThemeImages.Get( "toolbar/save_all.png" ),_fileActions.saveAll.Triggered,"Save all (Ctrl+Shift+S)" )
+			_toolBar.AddIconicButton( ThemeImages.Get( "toolbar/save_all.png" ),_fileActions.saveAll.Triggered,saveAllTitle )
 			_toolBar.AddSeparator()
-			_toolBar.AddIconicButton( ThemeImages.Get( "toolbar/undo.png" ),_editActions.undo.Triggered,"Undo (Ctrl+Z)" )
+			_toolBar.AddIconicButton( ThemeImages.Get( "toolbar/undo.png" ),_editActions.undo.Triggered,undoTitle )
 			_toolBar.AddIconicButton( ThemeImages.Get( "toolbar/redo.png" ),_editActions.redo.Triggered,redoTitle )
 			_toolBar.AddSeparator()
 			_toolBar.AddIconicButton( ThemeImages.Get( "toolbar/check.png" ),_buildActions.semant.Triggered,checkTitle )
@@ -340,7 +337,7 @@ Class MainWindowInstance Extends Window
 			End
 			_toolBar.AddIconicButton( ThemeImages.Get( "toolbar/options.png" ),act,"Target settings" )
 			_toolBar.AddSeparator()
-			_toolBar.AddIconicButton( ThemeImages.Get( "toolbar/find.png" ),_findActions.find.Triggered,"Find (Ctrl+F)" )
+			_toolBar.AddIconicButton( ThemeImages.Get( "toolbar/find.png" ),_findActions.find.Triggered,findTitle )
 			_toolBar.AddSeparator()
 			
 			Local goBack:=Lambda()
@@ -720,6 +717,21 @@ Class MainWindowInstance Extends Window
 		_docsManager.OpenDocument( path,True )
 	End
 	
+	Method GetActionFind:Action()
+	
+		Return _findActions.find
+	End
+	
+	Method GetActionComment:Action()
+	
+		Return _viewActions.comment
+	End
+	
+	Method GetActionUncomment:Action()
+	
+		Return _viewActions.uncomment
+	End
+	
 
 	Private
 	
@@ -793,6 +805,7 @@ Class MainWindowInstance Extends Window
 		DeleteTmps()
 	End
 	
+	
 	Protected
 	
 	Method OnKeyEvent( event:KeyEvent ) Override

ted2.monkey2

@@ -109,7 +109,7 @@ Using mojox..
 Using tinyxml2..
 
 
-Global AppTitle:="Ted2Go v2.2.2"
+Global AppTitle:="Ted2Go v2.2.3"
 
 
 Function Main()
@@ -182,3 +182,9 @@ Function Main()
 		
 End
 
+
+Function GetActionTextWithShortcut:String( action:Action )
+
+	Return action.Text+" ("+action.HotKeyText+")"
+End
+