Skip to content

Commit a19bc27

Browse files
MeychiMeychi
committed
Merge branch 'development' of https://github.com/fdorg/flashdevelop into development
2 parents 327f378 + abde46f commit a19bc27

Some content is hidden

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

61 files changed

+7583
-536
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,3 +24,4 @@ PluginCore/Bin
2424
/FlashDevelop/Bin/Debug/Exceptions.log
2525
/FlashDevelop/Bin/Debug/Tools/fdbuild/fdbuild.exe
2626
FlashDevelop/Bin/Debug/Settings/Themes/CURRENT
27+
packages/

‎External/Plugins/AS3Context/PluginMain.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ private void CreateMenuItems()
372372

373373
viewButton = new ToolStripButton(pluginIcon);
374374
viewButton.Name = "ShowProfiler";
375-
viewButton.ToolTipText = TextHelper.GetString("Label.ViewMenuItem").Replace("&", "");
375+
viewButton.ToolTipText = TextHelper.GetStringWithoutMnemonics("Label.ViewMenuItem");
376376
PluginBase.MainForm.RegisterSecondaryItem("ViewMenu.ShowProfiler", viewButton);
377377
viewButton.Click += OpenPanel;
378378
}

‎External/Plugins/ASCompletion/ASCompletion.csproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,7 @@
8484
<Compile Include="Completion\ASDocumentation.cs" />
8585
<Compile Include="Completion\ContextFeatures.cs" />
8686
<Compile Include="Context\IASContext.cs" />
87-
<Compile Include="CustomControls\StateSavingTreeView.cs">
88-
<SubType>Component</SubType>
89-
</Compile>
87+
<Compile Include="CustomControls\StateSavingTreeView.cs" />
9088
<Compile Include="CustomControls\ModelsExplorer.cs">
9189
<SubType>UserControl</SubType>
9290
</Compile>

‎External/Plugins/ASCompletion/CustomControls/ModelsExplorer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ private void InitializeLocalization()
153153
this.filterLabel.Text = TextHelper.GetString("Info.FindType");
154154
this.searchButton.ToolTipText = TextHelper.GetString("ToolTip.Search");
155155
this.refreshButton.ToolTipText = TextHelper.GetString("ToolTip.Refresh");
156-
this.rebuildButton.ToolTipText = TextHelper.GetString("Label.RebuildClasspathCache").Replace("&", "");
156+
this.rebuildButton.ToolTipText = TextHelper.GetStringWithoutMnemonics("Label.RebuildClasspathCache");
157157
this.editToolStripMenuItem.Text = TextHelper.GetString("Label.ModelEdit");
158158
this.exploreToolStripMenuItem.Text = TextHelper.GetString("Label.ModelExplore");
159159
this.convertToolStripMenuItem.Text = TextHelper.GetString("Label.ModelConvert");

‎External/Plugins/ASCompletion/PluginMain.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -691,7 +691,7 @@ private void CreateMenuItems()
691691
image = pluginUI.GetIcon(PluginUI.ICON_CHECK_SYNTAX);
692692
button = new ToolStripButton(image);
693693
button.Name = "CheckSyntax";
694-
button.ToolTipText = TextHelper.GetString("Label.CheckSyntax").Replace("&", "");
694+
button.ToolTipText = TextHelper.GetStringWithoutMnemonics("Label.CheckSyntax");
695695
button.Click += new EventHandler(CheckSyntax);
696696
PluginBase.MainForm.RegisterSecondaryItem("FlashToolsMenu.CheckSyntax", button);
697697
toolStrip.Items.Add(button);

‎External/Plugins/ASCompletion/PluginUI.cs

Lines changed: 42 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ private void InitializeControls()
113113
InitializeComponent();
114114
treeIcons.ColorDepth = ColorDepth.Depth32Bit;
115115
treeIcons.ImageSize = ScaleHelper.Scale(new Size(16, 16));
116-
treeIcons.Initialize(TreeIcons_OnInitialize);
116+
treeIcons.Initialize(TreeIcons_Populate);
117117

118118
toolStrip.Renderer = new DockPanelStripRenderer();
119119
toolStrip.ImageScalingSize = ScaleHelper.Scale(new Size(16, 16));
@@ -140,48 +140,53 @@ private void InitializeControls()
140140
outlineTree.BringToFront();
141141
}
142142

143-
private void TreeIcons_OnInitialize(object sender, EventArgs e)
143+
private void TreeIcons_Populate(object sender, EventArgs e)
144144
{
145145
treeIcons.Images.AddRange(new Image[]
146146
{
147-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("FilePlain.png"))),
148-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("FolderClosed.png"))),
149-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("FolderOpen.png"))),
150-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("CheckAS.png"))),
151-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("QuickBuild.png"))),
152-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("Package.png"))),
153-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("Interface.png"))),
154-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("Intrinsic.png"))),
155-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("Class.png"))),
156-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("Variable.png"))),
157-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("VariableProtected.png"))),
158-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("VariablePrivate.png"))),
159-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("VariableStatic.png"))),
160-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("VariableStaticProtected.png"))),
161-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("VariableStaticPrivate.png"))),
162-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("Const.png"))),
163-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("ConstProtected.png"))),
164-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("ConstPrivate.png"))),
165-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("Const.png"))),
166-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("ConstProtected.png"))),
167-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("ConstPrivate.png"))),
168-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("Method.png"))),
169-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("MethodProtected.png"))),
170-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("MethodPrivate.png"))),
171-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("MethodStatic.png"))),
172-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("MethodStaticProtected.png"))),
173-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("MethodStaticPrivate.png"))),
174-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("Property.png"))),
175-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("PropertyProtected.png"))),
176-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("PropertyPrivate.png"))),
177-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("PropertyStatic.png"))),
178-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("PropertyStaticProtected.png"))),
179-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("PropertyStaticPrivate.png"))),
180-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("Template.png"))),
181-
PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream("Declaration.png")))
147+
GetImage("FilePlain.png"),
148+
GetImage("FolderClosed.png"),
149+
GetImage("FolderOpen.png"),
150+
GetImage("CheckAS.png"),
151+
GetImage("QuickBuild.png"),
152+
GetImage("Package.png"),
153+
GetImage("Interface.png"),
154+
GetImage("Intrinsic.png"),
155+
GetImage("Class.png"),
156+
GetImage("Variable.png"),
157+
GetImage("VariableProtected.png"),
158+
GetImage("VariablePrivate.png"),
159+
GetImage("VariableStatic.png"),
160+
GetImage("VariableStaticProtected.png"),
161+
GetImage("VariableStaticPrivate.png"),
162+
GetImage("Const.png"),
163+
GetImage("ConstProtected.png"),
164+
GetImage("ConstPrivate.png"),
165+
GetImage("Const.png"),
166+
GetImage("ConstProtected.png"),
167+
GetImage("ConstPrivate.png"),
168+
GetImage("Method.png"),
169+
GetImage("MethodProtected.png"),
170+
GetImage("MethodPrivate.png"),
171+
GetImage("MethodStatic.png"),
172+
GetImage("MethodStaticProtected.png"),
173+
GetImage("MethodStaticPrivate.png"),
174+
GetImage("Property.png"),
175+
GetImage("PropertyProtected.png"),
176+
GetImage("PropertyPrivate.png"),
177+
GetImage("PropertyStatic.png"),
178+
GetImage("PropertyStaticProtected.png"),
179+
GetImage("PropertyStaticPrivate.png"),
180+
GetImage("Template.png"),
181+
GetImage("Declaration.png")
182182
});
183183
}
184184

185+
public static Image GetImage(String name)
186+
{
187+
return PluginBase.MainForm.ImageSetAdjust(Image.FromStream(GetStream(name)));
188+
}
189+
185190
public static System.IO.Stream GetStream(String name)
186191
{
187192
String prefix = "ASCompletion.Icons.";

‎External/Plugins/AirProperties/PluginMain.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ private void AddToolBarItems(ToolStrip toolStrip)
194194
{
195195
this.pmMenuButton = new ToolStripButton();
196196
this.pmMenuButton.Image = this.pluginMenuItem.Image;
197-
this.pmMenuButton.Text = TextHelper.GetString("Label.ProjectMenuItem").Replace("&", "").Replace("...", "");
197+
this.pmMenuButton.Text = TextHelper.GetStringWithoutMnemonicsOrEllipsis("Label.ProjectMenuItem");
198198
this.pmMenuButton.DisplayStyle = ToolStripItemDisplayStyle.Image;
199199
this.pmMenuButton.Click += new EventHandler(this.OpenWizard);
200200
PluginBase.MainForm.RegisterSecondaryItem("ProjectMenu.AirApplicationProperties", this.pmMenuButton);

‎External/Plugins/BookmarkPanel/PluginUI.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,13 +231,13 @@ private void InitializeGraphics()
231231
this.imageList = new ImageListManager();
232232
this.imageList.ImageSize = ScaleHelper.Scale(new Size(16, 16));
233233
this.imageList.ColorDepth = ColorDepth.Depth32Bit;
234-
this.imageList.Initialize(ImageList_OnInitialize);
234+
this.imageList.Initialize(ImageList_Populate);
235235
this.listView.SmallImageList = this.imageList;
236236
this.removeBookmarksItem.Image = PluginBase.MainForm.FindImage("402|4|4|4");
237237
this.searchButton.Image = PluginBase.MainForm.FindImage("484|26|-4|4");
238238
}
239239

240-
private void ImageList_OnInitialize(object sender, EventArgs e)
240+
private void ImageList_Populate(object sender, EventArgs e)
241241
{
242242
this.imageList.Images.Add("Bookmark", PluginBase.MainForm.FindImageAndSetAdjust("559|26|0|1"));
243243
this.imageList.Images.Add("Info", PluginBase.MainForm.FindImageAndSetAdjust("229"));

‎External/Plugins/CodeRefactor/CodeRefactor.csproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,12 @@
9898
<Compile Include="Controls\DividedCheckedListBox.cs">
9999
<SubType>Component</SubType>
100100
</Compile>
101+
<Compile Include="Controls\MoveDialog.cs">
102+
<SubType>Form</SubType>
103+
</Compile>
104+
<Compile Include="Controls\MoveDialog.Designer.cs">
105+
<DependentUpon>MoveDialog.cs</DependentUpon>
106+
</Compile>
101107
<Compile Include="Controls\ProgressDialog.cs">
102108
<SubType>Form</SubType>
103109
</Compile>

‎External/Plugins/CodeRefactor/Commands/Move.cs

Lines changed: 45 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,14 @@ namespace CodeRefactor.Commands
3636
{
3737
class Move : RefactorCommand<IDictionary<string, List<SearchMatch>>>
3838
{
39-
4039
public Dictionary<string, string> OldPathToNewPath;
4140
public bool OutputResults;
42-
private bool renaming;
41+
private readonly bool renaming;
42+
private readonly bool updatePackages;
4343
private List<MoveTargetHelper> targets;
4444
private List<string> filesToReopen;
4545
private int currentTargetIndex;
4646
private ASResult currentTargetResult;
47-
4847
private bool targetsOutsideClasspath;
4948

5049
#region Constructors
@@ -56,15 +55,32 @@ public Move(Dictionary<string, string>oldPathToNewPath) : this(oldPathToNewPath,
5655
{
5756
}
5857

58+
/// <summary>
59+
/// A new Move refactoring command.
60+
/// </summary>
61+
/// <param name="outputResults">If true, will send the found results to the trace log and results panel</param>
5962
public Move(Dictionary<string, string> oldPathToNewPath, bool outputResults) : this(oldPathToNewPath, outputResults, false)
6063
{
6164
}
6265

63-
public Move(Dictionary<string, string> oldPathToNewPath, bool outputResults, bool renaming)
66+
/// <summary>
67+
/// A new Move refactoring command.
68+
/// </summary>
69+
/// <param name="outputResults">If true, will send the found results to the trace log and results panel</param>
70+
public Move(Dictionary<string, string> oldPathToNewPath, bool outputResults, bool renaming) : this(oldPathToNewPath, outputResults, renaming, false)
71+
{
72+
}
73+
74+
/// <summary>
75+
/// A new Move refactoring command.
76+
/// </summary>
77+
/// <param name="outputResults">If true, will send the found results to the trace log and results panel</param>
78+
public Move(Dictionary<string, string> oldPathToNewPath, bool outputResults, bool renaming, bool updatePackages)
6479
{
6580
OldPathToNewPath = oldPathToNewPath;
6681
OutputResults = outputResults;
6782
this.renaming = renaming;
83+
this.updatePackages = updatePackages;
6884
Results = new Dictionary<string, List<SearchMatch>>();
6985
}
7086

@@ -82,35 +98,43 @@ protected override void ExecutionImplementation()
8298
RegisterDocumentHelper(AssociatedDocumentHelper);
8399

84100
CreateListOfMoveTargets();
85-
101+
DialogResult dialogResult;
86102
if (targetsOutsideClasspath)
87103
{
88-
msg = TextHelper.GetString("Info.MovingOutsideClasspath");
89-
title = TextHelper.GetString("FlashDevelop.Title.WarningDialog");
90-
if (MessageBox.Show(msg, title, MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes)
104+
if (updatePackages) dialogResult = DialogResult.Yes;
105+
else
106+
{
107+
msg = TextHelper.GetString("Info.MovingOutsideClasspath");
108+
title = TextHelper.GetString("FlashDevelop.Title.WarningDialog");
109+
dialogResult = MessageBox.Show(msg, title, MessageBoxButtons.YesNo, MessageBoxIcon.Question);
110+
}
111+
if (dialogResult == DialogResult.Yes)
91112
{
92113
MoveTargets();
93114
ReopenInitialFiles();
94115
}
95116
FireOnRefactorComplete();
96117
return;
97118
}
98-
99-
if (renaming)
119+
if (updatePackages) dialogResult = DialogResult.Yes;
120+
else
100121
{
101-
msg = TextHelper.GetString("Info.RenamingDirectory");
102-
foreach (string path in OldPathToNewPath.Keys)
122+
if (renaming)
103123
{
104-
title = string.Format(TextHelper.GetString("Title.RenameDialog"), Path.GetFileName(path));
105-
break;
124+
msg = TextHelper.GetString("Info.RenamingDirectory");
125+
foreach (string path in OldPathToNewPath.Keys)
126+
{
127+
title = string.Format(TextHelper.GetString("Title.RenameDialog"), Path.GetFileName(path));
128+
break;
129+
}
106130
}
131+
else
132+
{
133+
msg = TextHelper.GetString("Info.MovingFile");
134+
title = TextHelper.GetString("Title.MoveDialog");
135+
}
136+
dialogResult = MessageBox.Show(msg, title, MessageBoxButtons.YesNoCancel);
107137
}
108-
else
109-
{
110-
msg = TextHelper.GetString("Info.MovingFile");
111-
title = TextHelper.GetString("Title.MoveDialog");
112-
}
113-
var dialogResult = MessageBox.Show(msg, title, MessageBoxButtons.YesNoCancel);
114138
if (dialogResult == DialogResult.Cancel)
115139
{
116140
FireOnRefactorComplete();
@@ -150,11 +174,11 @@ private void CreateListOfMoveTargets()
150174
{
151175
string oldPath = item.Key;
152176
string newPath = item.Value;
153-
ITabbedDocument doc;
154177
if (File.Exists(oldPath))
155178
{
156179
newPath = Path.Combine(newPath, Path.GetFileName(oldPath));
157180

181+
ITabbedDocument doc;
158182
if (AssociatedDocumentHelper.InitiallyOpenedFiles.TryGetValue(oldPath, out doc))
159183
{
160184
doc.Save();

0 commit comments

Comments
 (0)