Skip to content

Commit faeaeb5

Browse files
committed
Fixes and improvements:
- Do not copy or cut empty lines - Contrast and color improved static method and var icons - Find in files with <Project> should ignore hidden files - ASCompletion empty resources file removed
1 parent 5176055 commit faeaeb5

14 files changed

+48
-202
lines changed

External/Plugins/ASCompletion/ASCompletion.csproj

+1-13
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,6 @@
105105
<SubType>UserControl</SubType>
106106
</Compile>
107107
<Compile Include="Properties\AssemblyInfo.cs" />
108-
<Compile Include="Properties\Resources.Designer.cs">
109-
<AutoGen>True</AutoGen>
110-
<DesignTime>True</DesignTime>
111-
<DependentUpon>Resources.resx</DependentUpon>
112-
</Compile>
113108
<Compile Include="Settings\GeneralSettings.cs" />
114109
<Compile Include="Settings\IContextSettings.cs" />
115110
<Compile Include="Win32\FixedTreeView.cs">
@@ -136,11 +131,6 @@
136131
<EmbeddedResource Include="Icons\Template.png" />
137132
<EmbeddedResource Include="Icons\Variable.png" />
138133
<EmbeddedResource Include="Icons\VariablePrivate.png" />
139-
<EmbeddedResource Include="Properties\Resources.resx">
140-
<SubType>Designer</SubType>
141-
<Generator>ResXFileCodeGenerator</Generator>
142-
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
143-
</EmbeddedResource>
144134
</ItemGroup>
145135
<ItemGroup>
146136
<Reference Include="Accessibility" />
@@ -159,9 +149,7 @@
159149
<Private>False</Private>
160150
</ProjectReference>
161151
</ItemGroup>
162-
<ItemGroup>
163-
<Folder Include="Resources\" />
164-
</ItemGroup>
152+
<ItemGroup />
165153
<ItemGroup>
166154
<BootstrapperPackage Include=".NETFramework,Version=v4.0">
167155
<Visible>False</Visible>
Loading
Loading
Loading
Loading
Loading
Loading

External/Plugins/ASCompletion/PluginUI.cs

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
using ASCompletion.Settings;
2020
using PluginCore.Localization;
2121
using System.Drawing;
22-
using ASCompletion.Properties;
2322
using System.Reflection;
2423

2524
namespace ASCompletion

External/Plugins/ASCompletion/Properties/Resources.Designer.cs

-63
This file was deleted.

External/Plugins/ASCompletion/Properties/Resources.resx

-120
This file was deleted.

FlashDevelop/Bin/Debug/Settings/MainMenu.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@
7373
<button label="Label.Undo" click="ScintillaCommand" tag="Undo" shortcut="Control|Z" image="73" flags="Enable:IsEditable|CanUndo" />
7474
<button label="Label.Redo" click="ScintillaCommand" tag="Redo" shortcut="Control|Y" image="65" flags="Enable:IsEditable|CanRedo" />
7575
<separator />
76-
<button label="Label.Cut" click="ScintillaCommand" tag="CutAllowLine" shortcut="Control|X" image="158" flags="Enable:IsEditable" />
77-
<button label="Label.Copy" click="ScintillaCommand" tag="CopyAllowLine" shortcut="Control|C" image="278" flags="Enable:IsEditable" />
76+
<button label="Label.Cut" click="ScintillaCommand" tag="CutAllowLineEx" shortcut="Control|X" image="158" flags="Enable:IsEditable" />
77+
<button label="Label.Copy" click="ScintillaCommand" tag="CopyAllowLineEx" shortcut="Control|C" image="278" flags="Enable:IsEditable" />
7878
<button label="Label.Paste" click="ScintillaCommand" tag="Paste" shortcut="Control|V" image="283" flags="Enable:IsEditable|CanPaste" />
7979
<button label="Label.SmartPaste" click="SmartPaste" shortcut="Control|Alt|V" flags="Enable:IsEditable|CanPaste" />
8080
<button label="Label.SelectAll" click="ScintillaCommand" tag="SelectAll" shortcut="Control|A" flags="Enable:IsEditable" />

FlashDevelop/Bin/Debug/Settings/ScintillaMenu.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
<button label="Label.Undo" click="ScintillaCommand" tag="Undo" image="73" flags="Enable:CanUndo" />
4545
<button label="Label.Redo" click="ScintillaCommand" tag="Redo" image="65" flags="Enable:CanRedo" />
4646
<separator />
47-
<button label="Label.Cut" click="ScintillaCommand" tag="CutAllowLine" image="158" />
48-
<button label="Label.Copy" click="ScintillaCommand" tag="CopyAllowLine" image="278" />
47+
<button label="Label.Cut" click="ScintillaCommand" tag="CutAllowLineEx" image="158" />
48+
<button label="Label.Copy" click="ScintillaCommand" tag="CopyAllowLineEx" image="278" />
4949
<button label="Label.Paste" click="SmartPaste" image="283" flags="Enable:CanPaste" />
5050
<separator />
5151
<button label="Label.SelectAll" click="ScintillaCommand" tag="SelectAll" />

FlashDevelop/Dialogs/FRInFilesDialog.cs

+19-1
Original file line numberDiff line numberDiff line change
@@ -935,7 +935,11 @@ private FRConfiguration GetFRConfig(String path, String mask, Boolean recursive)
935935
IProject project = PluginBase.CurrentProject;
936936
String projPath = Path.GetDirectoryName(project.ProjectPath);
937937
walker = new PathWalker(projPath, mask, recursive);
938-
allFiles.AddRange(walker.GetFiles());
938+
List<String> projFiles = walker.GetFiles();
939+
foreach (String file in projFiles)
940+
{
941+
if (!IsFileHidden(file, project)) allFiles.Add(file);
942+
}
939943
for (var i = 0; i < project.SourcePaths.Length; i++)
940944
{
941945
String sourcePath = project.GetAbsolutePath(project.SourcePaths[i]);
@@ -952,6 +956,20 @@ private FRConfiguration GetFRConfig(String path, String mask, Boolean recursive)
952956
else return new FRConfiguration(path, mask, recursive, this.GetFRSearch());
953957
}
954958

959+
/// <summary>
960+
///
961+
/// </summary>
962+
private Boolean IsFileHidden(String file, IProject project)
963+
{
964+
String[] hiddenPaths = project.GetHiddenPaths();
965+
foreach (String hiddenPath in hiddenPaths)
966+
{
967+
String absHiddenPath = project.GetAbsolutePath(hiddenPath);
968+
if (Directory.Exists(absHiddenPath) && file.StartsWith(absHiddenPath)) return true;
969+
}
970+
return false;
971+
}
972+
955973
/// <summary>
956974
/// Gets search object for find and replace
957975
/// </summary>

PluginCore/ScintillaNet/ScintillaControl.cs

+24
Original file line numberDiff line numberDiff line change
@@ -6471,6 +6471,30 @@ public void CutAllowLine()
64716471
else this.Cut();
64726472
}
64736473

6474+
/// <summary>
6475+
/// Cut the selection, if selection empty cut the line with the caret
6476+
/// </summary>
6477+
public void CutAllowLineEx()
6478+
{
6479+
if (this.SelTextSize == 0 && this.GetLine(this.LineFromPosition(this.CurrentPos)).Trim() != "")
6480+
{
6481+
this.LineCut();
6482+
}
6483+
else this.Cut();
6484+
}
6485+
6486+
/// <summary>
6487+
/// Cut the selection, if selection empty cut the line with the caret
6488+
/// </summary>
6489+
public void CopyAllowLineEx()
6490+
{
6491+
if (this.SelTextSize == 0 && this.GetLine(this.LineFromPosition(this.CurrentPos)).Trim() != "")
6492+
{
6493+
this.CopyAllowLine();
6494+
}
6495+
else this.Copy();
6496+
}
6497+
64746498
/// <summary>
64756499
/// Gets the word to the left of the cursor
64766500
/// </summary>

0 commit comments

Comments
 (0)