Merge branch 'next' into next

retailcoder · web-flow · commit 4a36e12867e6 · 2017-03-10T23:14:03.000-05:00
diff --git a/RetailCoder.VBE/UI/Controls/BindableTextEditor.cs b/RetailCoder.VBE/UI/Controls/BindableTextEditor.cs
@@ -24,7 +24,8 @@ public BindableTextEditor()
             TextArea.TextView.LinkTextUnderline = false;
             TextArea.TextView.LinkTextForegroundBrush = new SolidColorBrush(Colors.Green);
             Options.RequireControlModifierForHyperlinkClick = false;
-            Options.EnableHyperlinks = true;
+            //This needs some work if hyperlinks need to open in an external browser.
+            Options.EnableHyperlinks = false;
             Options.EnableEmailHyperlinks = true;
         }
 
diff --git a/RetailCoder.VBE/UI/Settings/IndenterSettings.xaml b/RetailCoder.VBE/UI/Settings/IndenterSettings.xaml
@@ -296,7 +296,7 @@
                     </StackPanel>
                 </Expander>
                 <Expander Grid.Row="4"
-                         IsExpanded="False"
+                         IsExpanded="True"
                          Background="#FFFFFFFF"
                          BorderBrush="#FFA9A9A9"
                          Margin="0,0,0,3">

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,8 @@ public BindableTextEditor()`
`24`	`24`	`TextArea.TextView.LinkTextUnderline = false;`
`25`	`25`	`TextArea.TextView.LinkTextForegroundBrush = new SolidColorBrush(Colors.Green);`
`26`	`26`	`Options.RequireControlModifierForHyperlinkClick = false;`
`27`		`- Options.EnableHyperlinks = true;`
	`27`	`+ //This needs some work if hyperlinks need to open in an external browser.`
	`28`	`+ Options.EnableHyperlinks = false;`
`28`	`29`	`Options.EnableEmailHyperlinks = true;`
`29`	`30`	`}`
`30`	`31`