Skip to content

Commit d6faba0

Browse files
MeychiMeychi
committed
Merge branch 'development' into fd5
2 parents 8405a81 + ec44e43 commit d6faba0

102 files changed

Lines changed: 475 additions & 384 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎CI/build.cmd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
:: Set paths
44
set PATH=%PATH%;C:\Windows\Microsoft.NET\Framework\v4.0.30319\
55
set PATH=%PATH%;C:\Program Files (x86)\Git\bin\
6-
set PATH=%PATH%;C:\Program Files\NSIS\
6+
set PATH=%PATH%;C:\Program Files (x86)\NSIS
77
set PATH=%PATH%;C:\Program Files\7-Zip\
88

99
:: Reset bin files

‎External/Plugins/AS2Context/Properties/AssemblyInfo.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
// Information about this assembly is defined by the following attributes.
66
// Change them to the information which is associated with the assembly you compile.
77
[assembly: AssemblyTitle("AS2Context")]
8-
[assembly: AssemblyDescription("AS2Context Plugin For ASCompletion In FlashDevelop.")]
8+
[assembly: AssemblyDescription("AS2Context Plugin For ASCompletion In " + PluginCore.DistroConfig.DISTRIBUTION_NAME)]
99
[assembly: AssemblyConfiguration("")]
10-
[assembly: AssemblyCompany("FlashDevelop.org")]
10+
[assembly: AssemblyCompany(PluginCore.DistroConfig.DISTRIBUTION_COMPANY)]
1111
[assembly: AssemblyProduct("AS2Context")]
12-
[assembly: AssemblyCopyright("FlashDevelop.org 2005-2015")]
12+
[assembly: AssemblyCopyright(PluginCore.DistroConfig.DISTRIBUTION_COPYRIGHT)]
1313
[assembly: AssemblyTrademark("")]
1414
[assembly: AssemblyCulture("")]
1515
[assembly: AssemblyVersion("1.0.0.0")]

‎External/Plugins/AS3Context/Properties/AssemblyInfo.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
// Information about this assembly is defined by the following attributes.
66
// Change them to the information which is associated with the assembly you compile.
77
[assembly: AssemblyTitle("AS3Context")]
8-
[assembly: AssemblyDescription("AS3Context Plugin For ASCompletion In FlashDevelop.")]
8+
[assembly: AssemblyDescription("AS3Context Plugin For ASCompletion In " + PluginCore.DistroConfig.DISTRIBUTION_NAME)]
99
[assembly: AssemblyConfiguration("")]
10-
[assembly: AssemblyCompany("FlashDevelop.org")]
10+
[assembly: AssemblyCompany(PluginCore.DistroConfig.DISTRIBUTION_COMPANY)]
1111
[assembly: AssemblyProduct("AS3Context")]
12-
[assembly: AssemblyCopyright("FlashDevelop.org 2005-2015")]
12+
[assembly: AssemblyCopyright(PluginCore.DistroConfig.DISTRIBUTION_COPYRIGHT)]
1313
[assembly: AssemblyTrademark("")]
1414
[assembly: AssemblyCulture("")]
1515
[assembly: AssemblyVersion("1.0.0.0")]

‎External/Plugins/ASClassWizard/Controls/TreeView/SimpleDirectoryNode.cs‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Text;
4-
using System.IO;
1+
using System.IO;
52
using System.Windows.Forms;
6-
using System.Diagnostics;
73

84
namespace ASClassWizard.Controls.TreeView
95
{

‎External/Plugins/ASClassWizard/PluginMain.cs‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,20 @@
1-
#region imports
2-
31
using System;
42
using System.IO;
5-
using System.Drawing;
63
using System.Windows.Forms;
74
using System.ComponentModel;
8-
using System.Diagnostics;
95
using System.Collections;
10-
116
using PluginCore.Localization;
127
using PluginCore.Utilities;
138
using PluginCore.Managers;
14-
using PluginCore.Helpers;
159
using PluginCore;
16-
1710
using ProjectManager.Projects;
18-
using ProjectManager.Projects.AS3;
19-
using ProjectManager.Projects.AS2;
20-
2111
using ASCompletion.Model;
2212
using ASCompletion.Context;
23-
2413
using ASClassWizard.Resources;
2514
using ASClassWizard.Wizards;
26-
27-
using System.Text.RegularExpressions;
2815
using ASCompletion.Completion;
2916
using System.Collections.Generic;
3017

31-
#endregion
32-
3318
namespace ASClassWizard
3419
{
3520
public class PluginMain : IPlugin
@@ -464,7 +449,5 @@ private void AddImport(List<string> imports, String cname, ClassModel inClass)
464449
}
465450

466451
#endregion
467-
468452
}
469-
470453
}

‎External/Plugins/ASClassWizard/Properties/AssemblyInfo.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
// Information about this assembly is defined by the following attributes.
66
// Change them to the information which is associated with the assembly you compile.
77
[assembly: AssemblyTitle("ASClassWizard")]
8-
[assembly: AssemblyDescription("ActionScript Class Wizard Plugin For FlashDevelop.")]
8+
[assembly: AssemblyDescription("ActionScript Class Wizard Plugin For " + PluginCore.DistroConfig.DISTRIBUTION_NAME)]
99
[assembly: AssemblyConfiguration("")]
10-
[assembly: AssemblyCompany("FlashDevelop.org")]
10+
[assembly: AssemblyCompany(PluginCore.DistroConfig.DISTRIBUTION_COMPANY)]
1111
[assembly: AssemblyProduct("ASClassWizard")]
12-
[assembly: AssemblyCopyright("FlashDevelop.org 2005-2015")]
12+
[assembly: AssemblyCopyright(PluginCore.DistroConfig.DISTRIBUTION_COPYRIGHT)]
1313
[assembly: AssemblyTrademark("")]
1414
[assembly: AssemblyCulture("")]
1515
[assembly: AssemblyVersion("1.0.0.0")]

‎External/Plugins/ASClassWizard/Resources/ASClassOptions.cs‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Text;
4-
using System.IO;
5-
using System.Diagnostics;
1+
using System.Collections.Generic;
62

73
namespace ASClassWizard.Resources
84
{
@@ -38,7 +34,6 @@ public AS3ClassOptions(
3834
isPublic = is_public;
3935
isDynamic = is_dynamic;
4036
isFinal = is_final;
41-
4237
}
4338
}
4439
}

‎External/Plugins/ASClassWizard/Wizards/AS3ClassWizard.cs‎

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,16 @@
1-

2-
#region Imports
3-
using System;
4-
using System.Collections;
1+
using System;
52
using System.Collections.Generic;
6-
using System.ComponentModel;
7-
using System.Data;
83
using System.Drawing;
9-
using System.Text;
104
using System.IO;
115
using System.Windows.Forms;
126
using System.Text.RegularExpressions;
13-
147
using PluginCore;
158
using PluginCore.Localization;
169
using ProjectManager.Projects;
17-
18-
using ASClassWizard.Wizards;
19-
using ASClassWizard.Resources;
20-
2110
using ASCompletion.Context;
2211
using ASCompletion.Model;
23-
24-
using AS3Context;
25-
using AS2Context;
2612
using System.Reflection;
2713
using System.Diagnostics;
28-
#endregion
29-
3014

3115
namespace ASClassWizard.Wizards
3216
{
@@ -139,8 +123,6 @@ private void ValidateClass()
139123
/// <summary>
140124
/// Browse project packages
141125
/// </summary>
142-
/// <param name="sender"></param>
143-
/// <param name="e"></param>
144126
private void packageBrowse_Click(object sender, EventArgs e)
145127
{
146128

@@ -200,8 +182,6 @@ private void baseBrowse_Click(object sender, EventArgs e)
200182
/// <summary>
201183
/// Added interface
202184
/// </summary>
203-
/// <param name="sender"></param>
204-
/// <param name="e"></param>
205185
private void implementBrowse_Click(object sender, EventArgs e)
206186
{
207187
using (ClassBrowser browser = new ClassBrowser())
@@ -240,8 +220,6 @@ private void implementBrowse_Click(object sender, EventArgs e)
240220
/// <summary>
241221
/// Remove interface
242222
/// </summary>
243-
/// <param name="sender"></param>
244-
/// <param name="e"></param>
245223
private void interfaceRemove_Click(object sender, EventArgs e)
246224
{
247225
if (this.implementList.SelectedItem != null)
@@ -275,7 +253,7 @@ private void baseBox_TextChanged(object sender, EventArgs e)
275253

276254
#endregion
277255

278-
public static Image GetResource( string resourceID )
256+
public static Image GetResource(string resourceID)
279257
{
280258
resourceID = "ASClassWizard." + resourceID;
281259
Assembly assembly = Assembly.GetExecutingAssembly();

‎External/Plugins/ASClassWizard/Wizards/ClassBrowser.cs‎

Lines changed: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,15 @@
11
using System;
22
using System.Collections.Generic;
3-
using System.ComponentModel;
4-
using System.Data;
5-
using System.Drawing;
6-
using System.Text;
73
using System.Windows.Forms;
8-
using System.Reflection;
94
using PluginCore;
105
using PluginCore.Localization;
116
using ASCompletion.Model;
12-
using ASClassWizard.Wizards;
13-
using ASClassWizard.Resources;
147
using PluginCore.Controls;
158

169
namespace ASClassWizard.Wizards
1710
{
1811
public partial class ClassBrowser : SmartForm
1912
{
20-
2113
private MemberList all;
2214
private List<GListBox.GListBoxItem> dataProvider;
2315
private FlagType invalidFlag;
@@ -78,20 +70,22 @@ private void InitializeLocalization()
7870

7971
private void ClassBrowser_Load(object sender, EventArgs e)
8072
{
81-
ASClassWizard.Wizards.GListBox.GListBoxItem node;
73+
GListBox.GListBoxItem node;
8274
this.itemList.BeginUpdate();
8375
this.itemList.Items.Clear();
8476
if (this.ClassList != null)
8577
{
8678
foreach (MemberModel item in this.ClassList)
8779
{
80+
// exclude types imported in the current file
81+
if (item.Name != item.Type) continue;
8882
if (ExcludeFlag > 0) if ((item.Flags & ExcludeFlag) > 0) continue;
8983
if (IncludeFlag > 0)
9084
{
9185
if (!((item.Flags & IncludeFlag) > 0)) continue;
9286
}
9387
if (this.itemList.Items.Count > 0 && item.Name == this.itemList.Items[this.itemList.Items.Count - 1].ToString()) continue;
94-
node = new ASClassWizard.Wizards.GListBox.GListBoxItem(item.Name, (item.Flags & FlagType.Interface) > 0 ? 6 : 8);
88+
node = new GListBox.GListBoxItem(item.Name, (item.Flags & FlagType.Interface) > 0 ? 6 : 8);
9589
this.itemList.Items.Add(node);
9690
this.DataProvider.Add(node);
9791
}
@@ -106,9 +100,9 @@ private void ClassBrowser_Load(object sender, EventArgs e)
106100
}
107101

108102
/// <summary>
109-
/// Filder the list
103+
/// Filter the list
110104
/// </summary>
111-
private void filterBox_TextChanged( Object sender, EventArgs e)
105+
private void filterBox_TextChanged(Object sender, EventArgs e)
112106
{
113107
string text = this.filterBox.Text;
114108
this.itemList.BeginUpdate();
@@ -138,11 +132,9 @@ private void filterBox_TextChanged( Object sender, EventArgs e)
138132
}
139133

140134
/// <summary>
141-
/// Filder the results
135+
/// Filter the results
142136
/// </summary>
143-
/// <param name="item"></param>
144-
/// <returns></returns>
145-
private bool FindAllItems( GListBox.GListBoxItem item )
137+
private bool FindAllItems(GListBox.GListBoxItem item)
146138
{
147139
if (matchLen == 0) return true;
148140
int score = PluginCore.Controls.CompletionList.SmartMatch(item.Text, matchToken, matchLen);
@@ -162,15 +154,12 @@ private bool FindAllItems( GListBox.GListBoxItem item )
162154
/// <summary>
163155
/// Select None button click
164156
/// </summary>
165-
/// <param name="sender"></param>
166-
/// <param name="e"></param>
167157
private void cancelButton_Click(object sender, EventArgs e)
168158
{
169159
this.itemList.SelectedItem = null;
170160
}
171161

172-
173-
private void itemList_DoubleClick( object sender, EventArgs e )
162+
private void itemList_DoubleClick(object sender, EventArgs e)
174163
{
175164
this.DialogResult = DialogResult.OK;
176165
this.Close();

‎External/Plugins/ASClassWizard/Wizards/GListBox.cs‎

Lines changed: 29 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Collections;
4-
using System.Text;
5-
using System.Drawing;
1+
using System.Drawing;
62
using System.Windows.Forms;
73

84
namespace ASClassWizard.Wizards
95
{
10-
11-
// GListBox class
126
public class GListBox : ListBox
137
{
148
private ImageList _myImageList;
@@ -62,40 +56,36 @@ protected override void OnDrawItem( System.Windows.Forms.DrawItemEventArgs e )
6256
base.OnDrawItem(e);
6357
}
6458

65-
66-
public class GListBoxItem
67-
{
68-
public int matchScore;
59+
public class GListBoxItem
60+
{
61+
public int matchScore;
6962

70-
private string _myText;
71-
private int _myImageIndex;
63+
private string _myText;
64+
private int _myImageIndex;
7265

73-
// properties
74-
public string Text
75-
{
76-
get { return _myText; }
77-
set { _myText = value; }
78-
}
79-
public int ImageIndex
80-
{
81-
get { return _myImageIndex; }
82-
set { _myImageIndex = value; }
83-
}
66+
// properties
67+
public string Text
68+
{
69+
get { return _myText; }
70+
set { _myText = value; }
71+
}
72+
public int ImageIndex
73+
{
74+
get { return _myImageIndex; }
75+
set { _myImageIndex = value; }
76+
}
8477

85-
//constructor
86-
public GListBoxItem(string text, int index)
87-
{
88-
_myText = text;
89-
_myImageIndex = index;
90-
}
91-
public GListBoxItem(string text) : this(text, -1) { }
92-
public GListBoxItem() : this("") { }
93-
public override string ToString()
94-
{
95-
return _myText;
78+
public GListBoxItem(string text, int index)
79+
{
80+
_myText = text;
81+
_myImageIndex = index;
82+
}
83+
public GListBoxItem(string text) : this(text, -1) { }
84+
public GListBoxItem() : this("") { }
85+
public override string ToString()
86+
{
87+
return _myText;
88+
}
9689
}
97-
98-
99-
}//End of GListBoxItem class
100-
}//End of GListBox class
90+
}
10191
}

0 commit comments

Comments
 (0)