Skip to content

Commit af33c44

Browse files
wise0704wise0704
committed
Merge branch 'development' of https://github.com/fdorg/flashdevelop into ImageManager
# Conflicts: # External/Plugins/AirProperties/PluginMain.cs # FlashDevelop/Dialogs/ShortcutDialog.cs
2 parents c7dd8e2 + 5aa9cd4 commit af33c44

File tree

324 files changed

+15375
-952
lines changed

Some content is hidden

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

324 files changed

+15375
-952
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/

‎CI/build.cmd

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ git clean -f -x -d FlashDevelop\Bin\Debug
4646
:: Remove bad files
4747
del FlashDevelop\Bin\Debug\FlashDevelop.exe.config
4848
del FlashDevelop\Bin\Debug\StartPage\images\*.* /Q
49+
for /d %%G in ("FlashDevelop\Bin\Debug\Projects\*ActionScript 3*") do rd /s /q "%%~G"
4950

5051
:: Copy distro files
5152
xcopy Distros\HaxeDevelop /s /e /y

‎CI/buildl.cmd

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ git clean -f -x -d FlashDevelop\Bin\Debug
5656
:: Remove bad files
5757
del FlashDevelop\Bin\Debug\FlashDevelop.exe.config
5858
del FlashDevelop\Bin\Debug\StartPage\images\*.* /Q
59+
for /d %%G in ("FlashDevelop\Bin\Debug\Projects\*ActionScript 3*") do rd /s /q "%%~G"
5960

6061
:: Copy distro files
6162
xcopy Distros\HaxeDevelop /s /e /y

‎Distros/HaxeDevelop/FlashDevelop/Bin/Debug/Docs/index.html

Lines changed: 73 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,73 @@
1+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
2+
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
3+
<head>
4+
<title>HaxeDevelop</title>
5+
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
6+
<link href="styles.css" rel="stylesheet" type="text/css" title="styles" media="all" />
7+
</head>
8+
<body>
9+
<div id="header">
10+
<div class="innerContent">
11+
<img src="../StartPage/images/haxedevelop.gif" alt="HaxeDevelop" height=120 />
12+
</div>
13+
</div>
14+
15+
<div id="content">
16+
<div class="innerContent">
17+
18+
<h4>Description</h4>
19+
<p>HaxeDevelop is a highly customizable lightweight script editor with extended support for class
20+
based languages. Altought the program is designed mostly for Haxe, other languages can
21+
be implemented quite easily too. HaxeDevelop requires the Microsoft.NET 3.5 Framework. You can support us by
22+
<a href="http://www.flashdevelop.org/wikidocs/index.php?title=FlashDevelop:Site_support">donating for the project via PayPal</a>. Any donation, even 1$, is good for the project. Code contributions are also welcome.</p>
23+
<p>You can find more info about HaxeDevelop from the project website <a href="http://www.haxedevelop.org/">www.haxedevelop.org</a>.
24+
25+
<p><em>HaxeDevelop is a custom distribution of <a href="http://www.flashdevelop.org/">FlashDevelop</a>.</em></p>
26+
27+
<h4>Used Icons</h4>
28+
<p>Current smooth HaxeDevelop icons are free icons downloaded from <a href="http://www.famfamfam.com/lab/icons/silk/">
29+
famfamfam.com</a>, <a href="http://www.visualpharm.com/free_icons.html">visualfarm.com</a> and <a href="http://www.fatcow.com/free-icons">fatcow.com</a>.
30+
The icons are released under Creative Commons Attribution 2.5 and 3 Licenses. Some of the used icons are modified from the original ones.</p>
31+
32+
<h4>Used Tools</h4>
33+
<p>HaxeDevelop includes few third party tools by default. The listed tools are copyright of their respective owners.</p>
34+
<ul>
35+
<li>SwfOp library by <a href="http://www.kruesch.de/">Florian Kruesch</a> (code library)</li>
36+
<li>AS2API documentation tool by <a href="http://www.badgers-in-foil.co.uk/projects/as2api/">David Holroyd</a> (console application)</li>
37+
<li>Motion-Twin ActionScript Compiler by <a href="http://www.mtasc.org/">Motion-Twin</a> (console application)</li>
38+
<li>Swfmill XML/SWF processor by <a href="http://swfmill.org/">Daniel Fischer</a> (console application)</li>
39+
<li>Flex PMD tool by <a href="http://opensource.adobe.com/wiki/display/flexpmd/FlexPMD">Adobe Systems Inc.</a> (console application)</li>
40+
</ul>
41+
42+
<h4>Components</h4>
43+
<p>HaxeDevelop is programmed with C# and it includes misc. modified and unmodified components. DockPanel
44+
Suite is used for docking windows and ScintillaNET wrapper is used for providing the Scintilla editor control for C#.
45+
The listed components are copyright of their respective owners.</p>
46+
<ul>
47+
<li><a href="#">Flex SDK port by Robert Nelson</a></li>
48+
<li><a href="http://sourceforge.net/projects/dockpanelsuite/">DockPanel Suite by Weifen Luo</a></li>
49+
<li><a href="http://www.scintilla.org/">Scintilla component by Neil Hodgson</a></li>
50+
<li><a href="http://scintillanet.codeplex.com/">Scintilla.NET wrapper by Garrett Serack</a></li>
51+
<li><a href="http://sourceforge.net/projects/treeviewadv/">Aga controls by Andrey Gliznetsov</a></li>
52+
<li><a href="http://www.csscript.net/">CSScriptLibrary by Oleg Shilo</a></li>
53+
<li><a href="http://www.icsharpcode.net/">SharpZipLib by ISharpCode</a></li>
54+
</ul>
55+
56+
<h4>Licence</h4>
57+
<p>Copyright (c) 2015 Haxe Foundation - HaxeDevelop.org</p>
58+
<p>Portions copyright Philippe Elsass and all helpful contributors.</p>
59+
<p>Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
60+
documentation files (the "Software"), to deal in the Software without restriction, including without limitation
61+
the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and
62+
to permit persons to whom the Software is furnished to do so, subject to the following conditions:</p>
63+
<p>The above copyright notice and this permission notice shall be included in all copies or portions of the Software.</p>
64+
<p>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
65+
TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
66+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
67+
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</p>
68+
</div>
69+
</div>
70+
71+
72+
</body>
73+
</html>

‎Distros/HaxeDevelop/FlashDevelop/Bin/Debug/Docs/styles.css

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
body, html
2+
{
3+
font-size:14px;
4+
font-family:"Segoe UI", "Trebuchet MS", Georgia, Arial, sans-serif;
5+
padding:0;
6+
margin:0;
7+
}
8+
h4
9+
{
10+
font-size: 24px;
11+
}
12+
ul
13+
{
14+
margin: 0px;
15+
padding: 0px;
16+
margin-left: 3px;
17+
}
18+
a
19+
{
20+
color:#257fc2;
21+
text-decoration:none;
22+
}
23+
24+
a:hover
25+
{
26+
color:#257fc2;
27+
text-decoration:underline;
28+
}
29+
#header
30+
{
31+
width: 100%;
32+
text-align:center;
33+
background:#257fc2 url('../StartPage/images/pattern.png') center top;
34+
margin:0;
35+
}
36+
#header h3
37+
{
38+
color: #eea21a;
39+
}
40+
#header h3 img
41+
{
42+
margin-right: 5px;
43+
margin-bottom: -3px;
44+
}
45+
.innerContent
46+
{
47+
padding: 20px;
48+
}
49+
#content
50+
{
51+
width: 100%;
52+
}
53+
#content ul
54+
{
55+
padding: 5px;
56+
padding-bottom: 0px;
57+
padding-left: 15px;
58+
}
59+
#footer
60+
{
61+
width: 100%;
62+
border-top: 1px dotted grey;
63+
padding-top: 11px;
64+
margin-top: 11px;
65+
}

‎Distros/HaxeDevelop/FlashDevelop/Bin/Debug/Tools/appman/Config.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
<Settings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
33
<!-- Distro directory name -->
44
<Name>HaxeDevelop</Name>
5+
<!-- Exposed app list groups -->
6+
<Groups>FD5,HD5</Groups>
57
<!-- Directory where the archives should be stored -->
68
<Archive>$(BaseDir)\Apps</Archive>
79
<!-- Entry config file, can be an URL or a file path -->

‎Distros/HaxeDevelop/PluginCore/PluginCore/DistroConfig.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ public class DistroConfig
1111
public const String DISTRIBUTION_ABOUT = "HaxeDevelop logo, domain and the name are copyright of Haxe Foundation.\r\nHaxeDevelop is a custom distribution of FlashDevelop.\r\nDevelopment: Mika Palmu, Philippe Elsass and all helpful contributors.";
1212
public const String DISTRIBUTION_COPYRIGHT = "HaxeDevelop.org 2015-2016";
1313
public const String DISTRIBUTION_COMPANY = "HaxeDevelop.org";
14+
public const String DISTRIBUTION_RSS = "http://www.flashdevelop.org/community/rss.php?f=15";
1415
}
1516

1617
}

‎External/3rdParty/Scintilla/additional_keywords.patch

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,65 @@
1-
diff -r 1092d3d24959 include/SciLexer.h
2-
--- a/include/SciLexer.h Tue Jan 15 09:51:15 2013 +1100
3-
+++ b/include/SciLexer.h Wed Feb 06 22:13:27 2013 +0100
4-
@@ -161,6 +161,9 @@
5-
#define SCE_C_TRIPLEVERBATIM 21
6-
#define SCE_C_HASHQUOTEDSTRING 22
7-
#define SCE_C_PREPROCESSORCOMMENT 23
8-
+#define SCE_C_WORD3 24
9-
+#define SCE_C_WORD4 25
10-
+#define SCE_C_WORD5 26
1+
diff --git a/include/SciLexer.h b/include/SciLexer.h
2+
--- a/include/SciLexer.h
3+
+++ b/include/SciLexer.h
4+
@@ -177,6 +177,9 @@
5+
#define SCE_C_USERLITERAL 25
6+
#define SCE_C_TASKMARKER 26
7+
#define SCE_C_ESCAPESEQUENCE 27
8+
+#define SCE_C_WORD3 100
9+
+#define SCE_C_WORD4 101
10+
+#define SCE_C_WORD5 102
1111
#define SCE_D_DEFAULT 0
1212
#define SCE_D_COMMENT 1
1313
#define SCE_D_COMMENTLINE 2
14-
diff -r 1092d3d24959 lexers/LexCPP.cxx
15-
--- a/lexers/LexCPP.cxx Tue Jan 15 09:51:15 2013 +1100
16-
+++ b/lexers/LexCPP.cxx Wed Feb 06 22:13:27 2013 +0100
17-
@@ -247,6 +247,9 @@
18-
"Documentation comment keywords",
14+
diff --git a/lexers/LexCPP.cxx b/lexers/LexCPP.cxx
15+
--- a/lexers/LexCPP.cxx
16+
+++ b/lexers/LexCPP.cxx
17+
@@ -353,6 +353,9 @@
1918
"Global classes and typedefs",
2019
"Preprocessor definitions",
20+
"Task marker and error marker keywords",
2121
+ "Extended(1) keywords and identifiers",
2222
+ "Extended(2) keywords and identifiers",
2323
+ "Extended(3) keywords and identifiers",
2424
0,
2525
};
2626

27-
@@ -323,6 +326,9 @@
27+
@@ -443,6 +446,9 @@
2828
WordList keywords2;
2929
WordList keywords3;
3030
WordList keywords4;
31-
+ WordList keywords5;
32-
+ WordList keywords6;
33-
+ WordList keywords7;
31+
+ WordList keywords5;
32+
+ WordList keywords6;
33+
+ WordList keywords7;
3434
WordList ppDefinitions;
35-
std::map<std::string, std::string> preprocessorDefinitionsStart;
36-
OptionsCPP options;
37-
@@ -411,6 +417,15 @@
38-
case 4:
35+
WordList markerList;
36+
struct SymbolValue {
37+
@@ -587,6 +593,15 @@
3938
wordListN = &ppDefinitions;
4039
break;
41-
+ case 5:
42-
+ wordListN = &keywords5;
43-
+ break;
44-
+ case 6:
45-
+ wordListN = &keywords6;
46-
+ break;
47-
+ case 7:
48-
+ wordListN = &keywords7;
49-
+ break;
40+
case 5:
41+
+ wordListN = &keywords5;
42+
+ break;
43+
+ case 6:
44+
+ wordListN = &keywords6;
45+
+ break;
46+
+ case 7:
47+
+ wordListN = &keywords7;
48+
+ break;
49+
+ case 8:
50+
wordListN = &markerList;
51+
break;
5052
}
51-
int firstModification = -1;
52-
if (wordListN) {
53-
@@ -605,6 +620,12 @@
53+
@@ -809,6 +824,12 @@
5454
sc.ChangeState(SCE_C_WORD2|activitySet);
5555
} else if (keywords4.InList(s)) {
5656
sc.ChangeState(SCE_C_GLOBALCLASS|activitySet);
5757
+ } else if (keywords5.InList(s)) {
58-
+ sc.ChangeState(SCE_C_WORD3|activitySet);
59-
+ } else if (keywords6.InList(s)) {
60-
+ sc.ChangeState(SCE_C_WORD4|activitySet);
61-
+ } else if (keywords7.InList(s)) {
62-
+ sc.ChangeState(SCE_C_WORD5|activitySet);
63-
}
64-
const bool literalString = sc.ch == '\"';
65-
if (literalString || sc.ch == '\'') {
58+
+ sc.ChangeState(SCE_C_WORD3|activitySet);
59+
+ } else if (keywords6.InList(s)) {
60+
+ sc.ChangeState(SCE_C_WORD4|activitySet);
61+
+ } else if (keywords7.InList(s)) {
62+
+ sc.ChangeState(SCE_C_WORD5|activitySet);
63+
} else {
64+
int subStyle = classifierIdentifiers.ValueFor(s);
65+
if (subStyle >= 0) {

‎External/Extensions/AS3Templates/$(BaseDir)/Projects/110 ActionScript 3 - Flash IDE Project/Project.as3proj

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<project version="2">
3+
<!-- Output SWF options -->
4+
<output>
5+
<movie outputType="OtherIDE" />
6+
<movie input="" />
7+
<movie path="" />
8+
<movie fps="30" />
9+
<movie width="800" />
10+
<movie height="600" />
11+
<movie version="17" />
12+
<movie minorVersion="0" />
13+
<movie platform="Flash Player" />
14+
<movie background="#FFFFFF" />
15+
</output>
16+
<!-- Other classes to be compiled into your SWF -->
17+
<classpaths>
18+
<class path="." />
19+
</classpaths>
20+
<!-- Intrinsic Libraries -->
21+
<intrinsics>
22+
<element path="Library\AS3\frameworks\FlashIDE" />
23+
</intrinsics>
24+
<!-- Class files to compile (other referenced classes will automatically be included) -->
25+
<compileTargets>
26+
<!-- example: <compile path="classes\Main.as" /> -->
27+
</compileTargets>
28+
<!-- Paths to exclude from the Project Explorer tree -->
29+
<hiddenPaths>
30+
<!-- example: <hidden path="..." /> -->
31+
</hiddenPaths>
32+
<!-- Executed before build -->
33+
<preBuildCommand />
34+
<!-- Executed after build -->
35+
<postBuildCommand alwaysRun="False" />
36+
<!-- Other project options -->
37+
<options>
38+
<option showHiddenPaths="False" />
39+
<option testMovie="Default" />
40+
</options>
41+
</project>

‎External/Extensions/AS3Templates/$(BaseDir)/Projects/110 ActionScript 3 - Flash IDE Project/Project.png

23.8 KB
Loading

0 commit comments

Comments
 (0)