Merge branch 'release/1.2'

ktekinay · Aug 24, 2015 · 29acf1e · 29acf1e
2 parents 9d48478 + e327f74
commit 29acf1e
Show file tree

Hide file tree

Showing 14 changed files with 969 additions and 97 deletions.
diff --git a/App.xojo_code b/App.xojo_code
@@ -14,6 +14,8 @@ Inherits Application
 		    FileClose.Text = "Close"
 		    FileClose.KeyboardShortcut = "cmd-W"
 		  end if
+
+		  FileSaveWithIndents.Checked = Prefs.SaveWithIndents
 		End Sub
 	#tag EndEvent
 
@@ -126,6 +128,15 @@ Inherits Application
 		End Function
 	#tag EndMenuHandler
 
+	#tag MenuHandler
+		Function FileSaveWithIndents() As Boolean Handles FileSaveWithIndents.Action
+			Prefs.SaveWithIndents = not Prefs.SaveWithIndents
+
+			Return True
+
+		End Function
+	#tag EndMenuHandler
+
 	#tag MenuHandler
 		Function HelpAbout() As Boolean Handles HelpAbout.Action
 			WndAbout.Show
@@ -203,10 +214,10 @@ Inherits Application
 		#Tag Instance, Platform = Linux, Language = Default, Definition  = \"&Delete"
 	#tag EndConstant
 
-	#tag Constant, Name = kEditComment, Type = String, Dynamic = False, Default = \"Comment", Scope = Public
+	#tag Constant, Name = kEditComment, Type = String, Dynamic = False, Default = \"Co&mment", Scope = Public
 	#tag EndConstant
 
-	#tag Constant, Name = kEditUncomment, Type = String, Dynamic = False, Default = \"Uncomment", Scope = Public
+	#tag Constant, Name = kEditUncomment, Type = String, Dynamic = False, Default = \"Unco&mment", Scope = Public
 	#tag EndConstant
 
 	#tag Constant, Name = kFileQuit, Type = String, Dynamic = False, Default = \"&Quit", Scope = Public
@@ -218,10 +229,10 @@ Inherits Application
 		#Tag Instance, Platform = Linux, Language = Default, Definition  = \"Ctrl+Q"
 	#tag EndConstant
 
-	#tag Constant, Name = kViewHideToolbar, Type = String, Dynamic = False, Default = \"Hide Toolbar", Scope = Public
+	#tag Constant, Name = kViewHideToolbar, Type = String, Dynamic = False, Default = \"Hide &Toolbar", Scope = Public
 	#tag EndConstant
 
-	#tag Constant, Name = kViewShowToolbar, Type = String, Dynamic = False, Default = \"Show Toolbar", Scope = Public
+	#tag Constant, Name = kViewShowToolbar, Type = String, Dynamic = False, Default = \"Show &Toolbar", Scope = Public
 	#tag EndConstant
 
 

diff --git a/Classes/IDEEmulator.xojo_code b/Classes/IDEEmulator.xojo_code
@@ -65,7 +65,7 @@ Protected Class IDEEmulator
 	#tag EndMethod
 
 	#tag Method, Flags = &h1
-		Protected Function CurrentBuildTarget() As String
+		Protected Function CurrentBuildTarget() As Integer
 		  Extras.ShowWarning
 		End Function
 	#tag EndMethod
@@ -585,16 +585,6 @@ Protected Class IDEEmulator
 			Group="Behavior"
 			Type="Boolean"
 		#tag EndViewProperty
-		#tag ViewProperty
-			Name="BuildWebProtocol"
-			Group="Behavior"
-			Type="Integer"
-		#tag EndViewProperty
-		#tag ViewProperty
-			Name="BuildWin32"
-			Group="Behavior"
-			Type="Boolean"
-		#tag EndViewProperty
 		#tag ViewProperty
 			Name="Index"
 			Visible=true
@@ -609,11 +599,6 @@ Protected Class IDEEmulator
 			InitialValue="0"
 			Type="Integer"
 		#tag EndViewProperty
-		#tag ViewProperty
-			Name="Location"
-			Group="Behavior"
-			Type="String"
-		#tag EndViewProperty
 		#tag ViewProperty
 			Name="Name"
 			Visible=true