瀏覽代碼

Squashed 'src/ted2go/' changes from 5d3be9da..051ead01

051ead01 Replaced all references of 'monkey2.monkey-x.com' with 'monkeycoder.co.nz'.

git-subtree-dir: src/ted2go
git-subtree-split: 051ead01e55e9bd4c4d523b156ed0fe1ba5879c7
Mark Sibly 8 年之前
父節點
當前提交
477cd8abfb
共有 7 個文件被更改,包括 26 次插入17 次删除
  1. 11 2
      MainWindow.monkey2
  2. 1 1
      README.md
  3. 6 0
      Ted2.monkey2
  4. 5 5
      action/HelpActions.monkey2
  5. 1 1
      assets/about.html
  6. 1 1
      assets/aboutTed2Go.html
  7. 1 7
      product/ModuleManager.monkey2

+ 11 - 2
MainWindow.monkey2

@@ -122,7 +122,7 @@ Class MainWindowInstance Extends Window
 			ThemeImages.Get( "docbar/home.png" ),
 			Lambda()
 				_helpView.ClearHistory()
-				_helpView.Navigate( "asset::ted2/about.html" )
+				_helpView.Navigate( AboutPagePath )
 			End,
 			"Home" )
 		bar.AddIconicButton(
@@ -150,7 +150,7 @@ Class MainWindowInstance Extends Window
 		_helpConsole.AddView( bar,"top" )
 		_helpConsole.ContentView=_helpView
 		
-		_helpView.Navigate( "asset::ted2/about.html" )
+		_helpView.Navigate( AboutPagePath )
 		
 		_helpTree=New HelpTreeView( _helpView )
 		
@@ -474,6 +474,15 @@ Class MainWindowInstance Extends Window
 		_theme=value
 	End
 	
+	Property AboutPagePath:String()
+		
+		Local path:=Prefs.MonkeyRootPath+"About.html"
+		If Not IsFileExists( path )
+			path="asset::ted2/about.html"
+		Endif
+		Return path
+	End
+	
 	Method Terminate()
 	
 		_isTerminating=True

+ 1 - 1
README.md

@@ -10,7 +10,7 @@ An IDE for Monkey2 programming language.
 * Doc's hints directly inside of code area (todo).
 
 ## More info
-Discussion page: http://monkey2.monkey-x.com/forums/topic/ted2go-fork/
+Discussion page: http://monkeycoder.co.nz/forums/topic/ted2go-fork/
 
 ## Monkey <-> money :)
 Support me if you like this project: https://paypal.me/engor

+ 6 - 0
Ted2.monkey2

@@ -109,6 +109,8 @@ Using mojox..
 Using tinyxml2..
 
 
+Const MONKEY2_DOMAIN:="http://monkeycoder.co.nz"
+
 Global AppTitle:="Ted2Go v2.3.2"
 
 
@@ -227,3 +229,7 @@ Function GetActionTextWithShortcut:String( action:Action )
 	Return action.Text+" ("+action.HotKeyText+")"
 End
 
+Function IsFileExists:Bool( path:String )
+	
+	Return GetFileType( path ) = FileType.File
+End

+ 5 - 5
action/HelpActions.monkey2

@@ -23,7 +23,7 @@ Class HelpActions
 		onlineHelp=New Action( "Online help" )
 		onlineHelp.Triggered=lambda()
 		
-			OpenUrl( "http://monkey2.monkey-x.com/monkey2-docs/" )
+			OpenUrl( MONKEY2_DOMAIN+"/monkey2-docs/" )
 		End
 		
 		viewManuals=New Action( "Browse manuals" )
@@ -35,16 +35,16 @@ Class HelpActions
 		uploadModules=New Action( "Upload module" )
 		uploadModules.Triggered=Lambda()
 		
-			Alert( "Now taking you to the module manager page at monkey2.monkey-x.com~n~nNote: You must have an account at monkey2.monkey-x.com and be logged in to upload modules" )
+			Alert( "Now taking you to the module manager page at "+MONKEY2_DOMAIN+".~n~nNote: You must have an account at "+MONKEY2_DOMAIN+" and be logged in to upload modules." )
 		
-			OpenUrl( RealPath( "http://monkey2.monkey-x.com/module-manager/" ) )
+			OpenUrl( RealPath( MONKEY2_DOMAIN+"/module-manager/" ) )
 		End
 
 		about=New Action( "About monkey2" )
 		about.Triggered=Lambda()
 		
 			Local htmlView:=New HtmlView
-			htmlView.Go( "asset::ted2/about.html" )
+			htmlView.Go( MainWindow.AboutPagePath )
 	
 			Local dialog:=New Dialog( "About monkey2" )
 			dialog.ContentView=htmlView
@@ -81,7 +81,7 @@ Class HelpActions
 		mx2homepage=New Action( "Monkey2 homepage" )
 		mx2homepage.Triggered=lambda()
 		
-			OpenUrl( "http://monkey2.monkey-x.com/" )
+			OpenUrl( MONKEY2_DOMAIN )
 		End
 	End
 

+ 1 - 1
assets/about.html

@@ -50,7 +50,7 @@ a:hover{
 
 <p>Please post any bug reports or feature requests to the monkey2 github repository: <a href="https://github.com/blitz-research/monkey2">https://github.com/blitz-research/monkey2</a>.
 
-<p>For monkey2 discussion and programming help, feel free to drop by the monkey2 forums: <a href="http://monkey2.monkey-x.com/forums">http://monkey2.monkey-x.com/forums</a>.
+<p>For monkey2 discussion and programming help, feel free to drop by the monkey2 forums: <a href="http://monkeycoder.co.nz/forums">http://monkeycoder.co.nz/forums</a>.
 
 <p>Monkey2 is a crowd funded project. If you like what you see, please consider contributing to development either via paypal donation or by becoming a Patreon supporter.
 

+ 1 - 1
assets/aboutTed2Go.html

@@ -46,7 +46,7 @@ a:hover{
 
 <h2>Ted2Go is a fork of an official Ted2 IDE.</h2>
 
-<a href="https://github.com/engor/Ted2Go">Sources on Github</a> | <a href="https://trello.com/b/6FHUXCBF/ted2go">Todo on Trello</a> | <a href="http://monkey2.monkey-x.com/forums/topic/ted2go-fork/">Discuss on Forum</a> | <a href="https://paypal.me/engor/10">Donate</a><br>
+<a href="https://github.com/engor/Ted2Go">Sources on Github</a> | <a href="https://trello.com/b/6FHUXCBF/ted2go">Todo on Trello</a> | <a href="http://monkeycoder.co.nz/forums/topic/ted2go-fork/">Discuss on Forum</a> | <a href="https://paypal.me/engor/10">Donate</a><br>
 
 <h3>Features</h3>
 

+ 1 - 7
product/ModuleManager.monkey2

@@ -4,9 +4,6 @@ Namespace ted2go
 
 Private
 
-Const MONKEY2_DOMAIN:="http://monkeycoder.co.nz"
-
-
 Class Module
 	Field name:String
 	Field about:String
@@ -101,8 +98,6 @@ Class ModuleManager Extends Dialog
 	
 	Private
 	
-	'Const downloadUrl:="http://monkey2.monkey-x.com/wp-content/uploads/mx2-modules/public/"
-    'Const downloadUrl:="http://monkey2.monkey-x.com/send-file?file="
     Const downloadUrl:=MONKEY2_DOMAIN+"/send-file?file="
 	
 	Const downloadDir:="modules/module-manager/downloads/"
@@ -416,8 +411,7 @@ Class ModuleManager Extends Dialog
 	
 	Method EnumRemoteModules:Bool()
 	
-'		Local src:="http://localhost/monkey2/module-manager/?modules=1"
-		Local src:="http://monkey2.monkey-x.com/module-manager/?modules=1"
+		Local src:=MONKEY2_DOMAIN+"/module-manager/?modules=1"
 		
 		Local tmp:="tmp/modules.json"