Skip to content

Commit c3947fe

Browse files
committed
Reformat code.
1 parent 3fc1735 commit c3947fe

File tree

1 file changed

+46
-72
lines changed

1 file changed

+46
-72
lines changed

src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ExternalToolPanel.xaml.cs

Lines changed: 46 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
1-
/*
2-
* Created by SharpDevelop.
3-
* User: Peter Forstmeier
4-
* Date: 28.10.2012
5-
* Time: 18:35
6-
* To change this template use Tools | Options | Coding | Edit Standard Headers.
7-
*/
1+
// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
2+
// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
3+
84
using System;
95
using System.Collections.Generic;
106
using System.Text.RegularExpressions;
@@ -17,15 +13,11 @@
1713

1814
namespace ICSharpCode.SharpDevelop.Gui.OptionPanels
1915
{
20-
/// <summary>
21-
/// Interaction logic for ExternalToolPanelXaml.xaml
22-
/// </summary>
2316
public partial class ExternalToolPanel : OptionPanel
2417
{
2518
internal const string ExecutableFilesFilter = "${res:SharpDevelop.FileFilter.ExecutableFiles}|*.exe;*.com;*.pif;*.bat;*.cmd|${res:SharpDevelop.FileFilter.AllFiles}|*.*";
2619

2720
static string[,] argumentQuickInsertMenu = new string[,] {
28-
2921
{"${res:Dialog.Options.ExternalTool.QuickInsertMenu.FullItemPath}", "${ItemPath}"},
3022
{"${res:Dialog.Options.ExternalTool.QuickInsertMenu.FullItemDirectory}", "${ItemDir}"},
3123
{"${res:Dialog.Options.ExternalTool.QuickInsertMenu.ItemFileName}", "${ItemFileName}"},
@@ -46,7 +38,7 @@ public partial class ExternalToolPanel : OptionPanel
4638
{"${res:Dialog.Options.ExternalTool.QuickInsertMenu.CombineDirectory}", "${SolutionDir}"},
4739
{"${res:Dialog.Options.ExternalTool.QuickInsertMenu.CombineFileName}", "${SolutionFileName}"},
4840
{"-", ""},
49-
{"${res:Dialog.Options.ExternalTool.QuickInsertMenu.SharpDevelopStartupPath}", "${StartupPath}"},
41+
{"${res:Dialog.Options.ExternalTool.QuickInsertMenu.SharpDevelopStartupPath}", "${StartupPath}"},
5042
};
5143

5244
static string[,] workingDirInsertMenu = new string[,] {
@@ -59,10 +51,9 @@ public partial class ExternalToolPanel : OptionPanel
5951
{"-", ""},
6052
{"${res:Dialog.Options.ExternalTool.QuickInsertMenu.CombineDirectory}", "${SolutionDir}"},
6153
{"-", ""},
62-
{"${res:Dialog.Options.ExternalTool.QuickInsertMenu.SharpDevelopStartupPath}", "${StartupPath}"},
54+
{"${res:Dialog.Options.ExternalTool.QuickInsertMenu.SharpDevelopStartupPath}", "${StartupPath}"},
6355
};
6456

65-
6657
public ExternalToolPanel()
6758
{
6859
InitializeComponent();
@@ -72,7 +63,7 @@ public ExternalToolPanel()
7263
WorkingDirContextMenu = FillArgumentContextMenu(workingDirInsertMenu);
7364
this.DataContext = this;
7465
}
75-
66+
7667
private List<UIElement> FillArgumentContextMenu(string[,] menuArray)
7768
{
7869
var list = new List<UIElement>();
@@ -87,10 +78,7 @@ private List<UIElement> FillArgumentContextMenu(string[,] menuArray)
8778
}
8879
}
8980
return list;
90-
}
91-
92-
93-
#region overrides
81+
}
9482

9583
public override void LoadOptions()
9684
{
@@ -101,10 +89,9 @@ public override void LoadOptions()
10189
SelectedTool = null;
10290
}
10391

104-
10592
public override bool SaveOptions()
10693
{
107-
List<ExternalTool> newlist = new List<ExternalTool>();
94+
var newlist = new List<ExternalTool>();
10895
foreach (ExternalTool tool in listBox.Items) {
10996
if (!FileUtility.IsValidPath(StringParser.Parse(tool.Command))) {
11097
if (!Regex.IsMatch(tool.Command, @"^\$\{SdkToolPath:[\w\d]+\.exe\}$")) {
@@ -127,59 +114,54 @@ public override bool SaveOptions()
127114
return true;
128115
}
129116

130-
131-
#endregion
132-
133-
#region properties
134-
135-
private ExternalTool selectedTool;
117+
ExternalTool selectedTool;
136118

137119
public ExternalTool SelectedTool {
138120
get { return selectedTool; }
139-
set { selectedTool = value;
121+
set {
122+
selectedTool = value;
140123
Console.WriteLine("selected {0}",listBox.SelectedItems.Count.ToString());
141-
base.RaisePropertyChanged(() => SelectedTool); }
124+
base.RaisePropertyChanged(() => SelectedTool);
125+
}
142126
}
143-
144127

145-
private bool editEnable;
128+
bool editEnable;
146129

147130
public bool EditEnable {
148-
get { return editEnable;}
149-
set {editEnable = value;
150-
base.RaisePropertyChanged(() => EditEnable);}
131+
get { return editEnable; }
132+
set {
133+
editEnable = value;
134+
base.RaisePropertyChanged(() => EditEnable);
135+
}
151136
}
152137

153-
private bool buttonsEnable;
138+
bool buttonsEnable;
154139

155140
public bool ButtonsEnable {
156141
get { return buttonsEnable; }
157-
set { buttonsEnable = value;
158-
base.RaisePropertyChanged(() => ButtonsEnable); }
142+
set {
143+
buttonsEnable = value;
144+
base.RaisePropertyChanged(() => ButtonsEnable);
145+
}
159146
}
160147

161-
public List<UIElement> ArgumentContextMenu {get; private set;}
162-
163-
public List<UIElement> WorkingDirContextMenu {get; private set;}
164-
165-
#endregion
148+
public List<UIElement> ArgumentContextMenu { get; private set; }
149+
public List<UIElement> WorkingDirContextMenu { get; private set; }
166150

167-
168-
private void AddButton_Click(object sender, RoutedEventArgs e)
151+
void AddButton_Click(object sender, RoutedEventArgs e)
169152
{
170153
EditEnable = true;
171154
ButtonsEnable = true;
172155
var newTool = new ExternalTool();
173156
listBox.Items.Add(newTool);
174157
SelectedTool = newTool;
175-
var i = listBox.SelectedIndex;
158+
int i = listBox.SelectedIndex;
176159
listBox.SelectedIndex = listBox.Items.Count -1;
177160
}
178161

179-
180-
private void RemoveButton_Click(object sender, RoutedEventArgs e)
162+
void RemoveButton_Click(object sender, RoutedEventArgs e)
181163
{
182-
for (int i =listBox.SelectedItems.Count -1 ; i >= 0; i--) {
164+
for (int i = listBox.SelectedItems.Count -1; i >= 0; i--) {
183165
listBox.Items.Remove(listBox.SelectedItems[i]);
184166
}
185167

@@ -192,21 +174,19 @@ private void RemoveButton_Click(object sender, RoutedEventArgs e)
192174
listBox.SelectedItems.Clear();
193175
}
194176

195-
196-
private void UpButton_Click(object sender, RoutedEventArgs e)
177+
void UpButton_Click(object sender, RoutedEventArgs e)
197178
{
198-
var index = listBox.SelectedIndex;
179+
int index = listBox.SelectedIndex;
199180
if (index > 0) {
200-
object tmp = listBox.Items[index];
201-
listBox.Items[index] = listBox.Items[index - 1];
202-
listBox.Items[index - 1] = tmp;
203-
listBox.SelectedIndex = index - 1;
204-
base.RaisePropertyChanged(null);
181+
object tmp = listBox.Items[index];
182+
listBox.Items[index] = listBox.Items[index - 1];
183+
listBox.Items[index - 1] = tmp;
184+
listBox.SelectedIndex = index - 1;
185+
base.RaisePropertyChanged(null);
205186
}
206187
}
207188

208-
209-
private void DownButton_Click(object sender, RoutedEventArgs e)
189+
void DownButton_Click(object sender, RoutedEventArgs e)
210190
{
211191
int index = listBox.SelectedIndex;
212192
if (index < listBox.Items.Count -1) {
@@ -218,42 +198,37 @@ private void DownButton_Click(object sender, RoutedEventArgs e)
218198
}
219199
}
220200

221-
222-
private void ArgumentQuickInsertButton_Click(object sender, RoutedEventArgs e)
201+
void ArgumentQuickInsertButton_Click(object sender, RoutedEventArgs e)
223202
{
224203
argumentTextBox.ContextMenu.PlacementTarget = argumentTextBox;
225204
argumentTextBox.ContextMenu.IsOpen = true;
226205
}
227206

228-
229-
private void ArgumentTextBoxMenuItem_Click(object sender, RoutedEventArgs e)
207+
void ArgumentTextBoxMenuItem_Click(object sender, RoutedEventArgs e)
230208
{
231209
var menuItem = e.OriginalSource as MenuItem;
232210
if (menuItem != null) {
233211
argumentTextBox.Text = menuItem.Tag.ToString() + argumentTextBox.Text;
234212
}
235213
}
236214

237-
238-
private void WorkingDirQuickInsertButton_Click(object sender, RoutedEventArgs e)
215+
void WorkingDirQuickInsertButton_Click(object sender, RoutedEventArgs e)
239216
{
240217
workingDirTextBox.ContextMenu.PlacementTarget = argumentTextBox;
241218
workingDirTextBox.ContextMenu.IsOpen = true;
242219
}
243220

244-
245-
private void WorkingDirTextBoxMenuItem_Click(object sender, RoutedEventArgs e)
221+
void WorkingDirTextBoxMenuItem_Click(object sender, RoutedEventArgs e)
246222
{
247223
var menuItem = e.OriginalSource as MenuItem;
248224
if (menuItem != null) {
249225
workingDirTextBox.Text = menuItem.Tag.ToString() + workingDirTextBox.Text;
250226
}
251227
}
252228

253-
254-
private void ListBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
229+
void ListBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
255230
{
256-
if (listBox.SelectedItems.Count == 0 ) {
231+
if (listBox.SelectedItems.Count == 0) {
257232
EnableFields(false);
258233
ButtonsEnable = false;
259234
} else {
@@ -267,15 +242,14 @@ private void ListBox_SelectionChanged(object sender, SelectionChangedEventArgs e
267242
}
268243
}
269244

270-
271-
private void EnableFields (bool enable)
245+
void EnableFields (bool enable)
272246
{
273247
EditEnable = enable;
274248
this.upButton.IsEnabled = enable;
275249
this.downButton.IsEnabled = enable;
276250
}
277251

278-
private void BrowseButton_Click(object sender, RoutedEventArgs e)
252+
void BrowseButton_Click(object sender, RoutedEventArgs e)
279253
{
280254
var dialog = new OpenFileDialog();
281255
dialog.CheckFileExists = true;

0 commit comments

Comments
 (0)