From f172cffef7029468d62ada116b6b9c5f4d30a3b6 Mon Sep 17 00:00:00 2001
From: illa4257 <48959534+illa4257@users.noreply.github.com>
Date: Sat, 6 Feb 2021 21:52:43 +0200
Subject: [PATCH] dev-0.0.1.4
---
dn-project/.dn/backup.conf | 2 +-
...xt.bundle.httpclient.HttpClientBundle.conf | 2 +-
.../develnext.bundle.zip.ZipBundle.conf | 2 +-
...ide.bundle.std.JPHPDesktopDebugBundle.conf | 2 +-
.../ide.bundle.std.UIDesktopBundle.conf | 2 +-
.../src/editor/forms/editor.php.conf | 2 +-
.../src/editor/forms/newproject.php.conf | 4 ++--
.../src/editor/forms/openProject.php.conf | 4 ++--
.../src/editor/forms/projectManager.php.conf | 2 +-
.../src/editor/forms/settings.php.conf | 4 ++--
.../src/editor/modules/AppModule.php.conf | 2 +-
.../src/editor/modules/aboutModule.php.conf | 2 +-
.../src/editor/modules/editorModule.php.conf | 2 +-
.../behaviours/BundleProjectBehaviour.conf | 2 +-
.../behaviours/PhpProjectBehaviour.conf | 2 +-
dn-project/.dn/library.conf | 2 +-
dn-project/.dn/project.ws | 2 +-
.../Bundle Editor for DevelNext.dnproject | 9 ++------
dn-project/docs/php.json | 3 +--
dn-project/src/.theme/dark-theme.css | 22 ++++++++++++++-----
dn-project/src/.theme/style.fx.css | 13 ++++++++---
dn-project/src/editor/forms/newproject.conf | 4 ++--
dn-project/src/editor/forms/openProject.conf | 2 +-
dn-project/src/editor/forms/openProject.fxml | 4 ++--
dn-project/src/editor/forms/openProject.php | 2 ++
dn-project/src/editor/forms/settings.conf | 2 +-
dn-project/src/editor/modules/AppModule.php | 2 +-
27 files changed, 59 insertions(+), 44 deletions(-)
diff --git a/dn-project/.dn/backup.conf b/dn-project/.dn/backup.conf
index 433af47..a8eb2a9 100644
--- a/dn-project/.dn/backup.conf
+++ b/dn-project/.dn/backup.conf
@@ -1,4 +1,4 @@
-#Sat Jul 25 20:56:26 EEST 2020
+#Sat Feb 06 21:31:32 EET 2021
autoOpenTrigger=
autoCloseTrigger=1
autoIntervalTriggerTime=240000
diff --git a/dn-project/.dn/bundles/develnext.bundle.httpclient.HttpClientBundle.conf b/dn-project/.dn/bundles/develnext.bundle.httpclient.HttpClientBundle.conf
index 80305dc..ad74d49 100644
--- a/dn-project/.dn/bundles/develnext.bundle.httpclient.HttpClientBundle.conf
+++ b/dn-project/.dn/bundles/develnext.bundle.httpclient.HttpClientBundle.conf
@@ -1,4 +1,4 @@
-#Sat Jul 25 20:56:26 EEST 2020
+#Sat Feb 06 21:31:32 EET 2021
version=1.0
name=HTTP Client
env=all
diff --git a/dn-project/.dn/bundles/develnext.bundle.zip.ZipBundle.conf b/dn-project/.dn/bundles/develnext.bundle.zip.ZipBundle.conf
index b22f0d5..a04bf69 100644
--- a/dn-project/.dn/bundles/develnext.bundle.zip.ZipBundle.conf
+++ b/dn-project/.dn/bundles/develnext.bundle.zip.ZipBundle.conf
@@ -1,4 +1,4 @@
-#Sat Jul 25 20:56:26 EEST 2020
+#Sat Feb 06 21:31:32 EET 2021
version=1.0
name=ZIP
env=all
diff --git a/dn-project/.dn/bundles/ide.bundle.std.JPHPDesktopDebugBundle.conf b/dn-project/.dn/bundles/ide.bundle.std.JPHPDesktopDebugBundle.conf
index 4fceef1..f8fc4cd 100644
--- a/dn-project/.dn/bundles/ide.bundle.std.JPHPDesktopDebugBundle.conf
+++ b/dn-project/.dn/bundles/ide.bundle.std.JPHPDesktopDebugBundle.conf
@@ -1,2 +1,2 @@
-#Sat Jul 25 20:56:26 EEST 2020
+#Sat Feb 06 21:31:32 EET 2021
env=dev
diff --git a/dn-project/.dn/bundles/ide.bundle.std.UIDesktopBundle.conf b/dn-project/.dn/bundles/ide.bundle.std.UIDesktopBundle.conf
index 1045694..9be6e44 100644
--- a/dn-project/.dn/bundles/ide.bundle.std.UIDesktopBundle.conf
+++ b/dn-project/.dn/bundles/ide.bundle.std.UIDesktopBundle.conf
@@ -1,2 +1,2 @@
-#Sat Jul 25 20:56:26 EEST 2020
+#Sat Feb 06 21:31:32 EET 2021
env=all
diff --git a/dn-project/.dn/ide/editors/FormEditor/src/editor/forms/editor.php.conf b/dn-project/.dn/ide/editors/FormEditor/src/editor/forms/editor.php.conf
index cc1b40d..38d2597 100644
--- a/dn-project/.dn/ide/editors/FormEditor/src/editor/forms/editor.php.conf
+++ b/dn-project/.dn/ide/editors/FormEditor/src/editor/forms/editor.php.conf
@@ -1,4 +1,4 @@
-#Sun Jul 26 21:26:56 EEST 2020
+#Sun Jul 26 21:57:02 EEST 2020
snapType=HIDDEN
blockedNodes=
snapSizeY=8
diff --git a/dn-project/.dn/ide/editors/FormEditor/src/editor/forms/newproject.php.conf b/dn-project/.dn/ide/editors/FormEditor/src/editor/forms/newproject.php.conf
index d111ea9..b7f69b8 100644
--- a/dn-project/.dn/ide/editors/FormEditor/src/editor/forms/newproject.php.conf
+++ b/dn-project/.dn/ide/editors/FormEditor/src/editor/forms/newproject.php.conf
@@ -1,6 +1,6 @@
-#Sun Jul 05 23:16:17 EEST 2020
+#Sat Feb 06 21:31:32 EET 2021
snapType=HIDDEN
blockedNodes=
-snapSizeY=8
zoom=100
+snapSizeY=8
snapSizeX=8
diff --git a/dn-project/.dn/ide/editors/FormEditor/src/editor/forms/openProject.php.conf b/dn-project/.dn/ide/editors/FormEditor/src/editor/forms/openProject.php.conf
index 2881546..6a4f415 100644
--- a/dn-project/.dn/ide/editors/FormEditor/src/editor/forms/openProject.php.conf
+++ b/dn-project/.dn/ide/editors/FormEditor/src/editor/forms/openProject.php.conf
@@ -1,6 +1,6 @@
-#Mon Jul 06 23:29:43 EEST 2020
+#Sat Feb 06 21:31:32 EET 2021
snapType=HIDDEN
blockedNodes=
-zoom=100
snapSizeY=8
+zoom=100
snapSizeX=8
diff --git a/dn-project/.dn/ide/editors/FormEditor/src/editor/forms/projectManager.php.conf b/dn-project/.dn/ide/editors/FormEditor/src/editor/forms/projectManager.php.conf
index 89e3bb8..08d30ae 100644
--- a/dn-project/.dn/ide/editors/FormEditor/src/editor/forms/projectManager.php.conf
+++ b/dn-project/.dn/ide/editors/FormEditor/src/editor/forms/projectManager.php.conf
@@ -1,4 +1,4 @@
-#Sun Jul 26 21:39:49 EEST 2020
+#Sun Jul 26 21:57:02 EEST 2020
snapType=HIDDEN
blockedNodes=
zoom=100
diff --git a/dn-project/.dn/ide/editors/FormEditor/src/editor/forms/settings.php.conf b/dn-project/.dn/ide/editors/FormEditor/src/editor/forms/settings.php.conf
index 52d7073..6a4f415 100644
--- a/dn-project/.dn/ide/editors/FormEditor/src/editor/forms/settings.php.conf
+++ b/dn-project/.dn/ide/editors/FormEditor/src/editor/forms/settings.php.conf
@@ -1,6 +1,6 @@
-#Wed Jul 15 22:02:04 EEST 2020
+#Sat Feb 06 21:31:32 EET 2021
snapType=HIDDEN
blockedNodes=
-zoom=100
snapSizeY=8
+zoom=100
snapSizeX=8
diff --git a/dn-project/.dn/ide/editors/ScriptModuleEditor/src/editor/modules/AppModule.php.conf b/dn-project/.dn/ide/editors/ScriptModuleEditor/src/editor/modules/AppModule.php.conf
index fe8847a..76fdccd 100644
--- a/dn-project/.dn/ide/editors/ScriptModuleEditor/src/editor/modules/AppModule.php.conf
+++ b/dn-project/.dn/ide/editors/ScriptModuleEditor/src/editor/modules/AppModule.php.conf
@@ -1,2 +1,2 @@
-#Sun Jul 26 21:49:06 EEST 2020
+#Sat Feb 06 21:31:32 EET 2021
blockedNodes=
diff --git a/dn-project/.dn/ide/editors/ScriptModuleEditor/src/editor/modules/aboutModule.php.conf b/dn-project/.dn/ide/editors/ScriptModuleEditor/src/editor/modules/aboutModule.php.conf
index e039c4c..4612536 100644
--- a/dn-project/.dn/ide/editors/ScriptModuleEditor/src/editor/modules/aboutModule.php.conf
+++ b/dn-project/.dn/ide/editors/ScriptModuleEditor/src/editor/modules/aboutModule.php.conf
@@ -1,2 +1,2 @@
-#Sun Jul 26 21:45:00 EEST 2020
+#Sun Jul 26 21:57:02 EEST 2020
blockedNodes=
diff --git a/dn-project/.dn/ide/editors/ScriptModuleEditor/src/editor/modules/editorModule.php.conf b/dn-project/.dn/ide/editors/ScriptModuleEditor/src/editor/modules/editorModule.php.conf
index 831d8ad..4612536 100644
--- a/dn-project/.dn/ide/editors/ScriptModuleEditor/src/editor/modules/editorModule.php.conf
+++ b/dn-project/.dn/ide/editors/ScriptModuleEditor/src/editor/modules/editorModule.php.conf
@@ -1,2 +1,2 @@
-#Sun Jul 26 21:44:02 EEST 2020
+#Sun Jul 26 21:57:02 EEST 2020
blockedNodes=
diff --git a/dn-project/.dn/ide/project/behaviours/BundleProjectBehaviour.conf b/dn-project/.dn/ide/project/behaviours/BundleProjectBehaviour.conf
index 7171acc..be17134 100644
--- a/dn-project/.dn/ide/project/behaviours/BundleProjectBehaviour.conf
+++ b/dn-project/.dn/ide/project/behaviours/BundleProjectBehaviour.conf
@@ -1,2 +1,2 @@
-#Sat Jul 25 20:56:26 EEST 2020
+#Sat Feb 06 21:31:32 EET 2021
useImports=
diff --git a/dn-project/.dn/ide/project/behaviours/PhpProjectBehaviour.conf b/dn-project/.dn/ide/project/behaviours/PhpProjectBehaviour.conf
index 75198a3..f7f3864 100644
--- a/dn-project/.dn/ide/project/behaviours/PhpProjectBehaviour.conf
+++ b/dn-project/.dn/ide/project/behaviours/PhpProjectBehaviour.conf
@@ -1,3 +1,3 @@
-#Sat Jul 25 20:56:26 EEST 2020
+#Sat Feb 06 21:31:32 EET 2021
compileByteCode=
importType=package
diff --git a/dn-project/.dn/library.conf b/dn-project/.dn/library.conf
index dd108b0..1298aed 100644
--- a/dn-project/.dn/library.conf
+++ b/dn-project/.dn/library.conf
@@ -1 +1 @@
-#Sat Jul 25 20:56:26 EEST 2020
+#Sat Feb 06 21:31:32 EET 2021
diff --git a/dn-project/.dn/project.ws b/dn-project/.dn/project.ws
index 280f356..43d1806 100644
--- a/dn-project/.dn/project.ws
+++ b/dn-project/.dn/project.ws
@@ -1,2 +1,2 @@
-#Sat Jul 25 20:56:26 EEST 2020
+#Sat Feb 06 21:31:32 EET 2021
projectArchive.uid=IsqmQSoAnPaz
diff --git a/dn-project/Bundle Editor for DevelNext.dnproject b/dn-project/Bundle Editor for DevelNext.dnproject
index b7f1726..139f964 100644
--- a/dn-project/Bundle Editor for DevelNext.dnproject
+++ b/dn-project/Bundle Editor for DevelNext.dnproject
@@ -1,23 +1,18 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project author="illa4257" authorOS="Windows 10" createdAt="1591649614784" ideName="DevelNext" ideVersion="16.7.0" ideVersionHash="2017103112" name="Bundle Editor for DevelNext" packageName="editor" template="ide\project\templates\DefaultGuiProjectTemplate" updatedAt="1595699786999">
+<project author="illa4257" authorOS="Windows 10" createdAt="1591649614784" ideName="DevelNext" ideVersion="16.7.0" ideVersionHash="2017103112" name="Bundle Editor for DevelNext" packageName="editor" template="ide\project\templates\DefaultGuiProjectTemplate" updatedAt="1612639892132">
<tree>
<expanded>
<path src=""/>
- <path src="/docs"/>
<path src="/src"/>
<path src="/src/.theme"/>
<path src="/src/editor"/>
<path src="/src/editor/forms"/>
<path src="/src/editor/modules"/>
<path src="/src/scripts"/>
- <path src="/vendor"/>
</expanded>
</tree>
<openedFiles>
- <file src="Bundle Editor for DevelNext.dnproject"/>
- <file src="src/editor/forms/editor.php"/>
- <file selected="1" src="src/editor/modules/editorModule.php"/>
- <file src="src/.theme/dark-theme.css"/>
+ <file selected="1" src="Bundle Editor for DevelNext.dnproject"/>
</openedFiles>
<files/>
<behaviours>
diff --git a/dn-project/docs/php.json b/dn-project/docs/php.json
index 66f08f7..b618758 100644
--- a/dn-project/docs/php.json
+++ b/dn-project/docs/php.json
@@ -201,5 +201,4 @@
"&",
"|"
]
-}
-
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/dn-project/src/.theme/dark-theme.css b/dn-project/src/.theme/dark-theme.css
index 18c8829..73b6822 100644
--- a/dn-project/src/.theme/dark-theme.css
+++ b/dn-project/src/.theme/dark-theme.css
@@ -1,4 +1,4 @@
-.FormEditor, .root {
+.FormEditor, .root, :hover {
-fx-base: rgb(60, 60, 60);
-fx-background: rgb(60, 60, 60);
-fx-color: derive(-fx-base, 10%);
@@ -7,7 +7,7 @@
-fx-light-text-color: rgb(220, 220, 220);
-fx-mid-text-color: rgb(100, 100, 100);
-fx-dark-text-color: rgb(20, 20, 20);
- -fx-accent:rgb(70, 70, 90);
+ -fx-accent:rgb(70, 70, 70);
-fx-selection-bar-non-focused: rgb(60, 60, 60);
}
@@ -28,12 +28,24 @@
-fx-text-fill:#4789f5;
}
-.flat-panel {
+.check-box .box,
+.text-input,
+.combo-box,
+.button,
+.flat-panel,
+.text-area .content,
+.menu-bar {
-fx-background-color:#4d4d4d;
}
-.menu-bar {
- -fx-background-color:#4d4d4d;
+.check-box:hover .box,
+.combo-box:hover,
+.button:hover {
+ -fx-background-color:#666;
+}
+
+.check-box:selected .mark {
+ -fx-background-color: white;
}
.text-input {
diff --git a/dn-project/src/.theme/style.fx.css b/dn-project/src/.theme/style.fx.css
index 543cb78..8c8f285 100644
--- a/dn-project/src/.theme/style.fx.css
+++ b/dn-project/src/.theme/style.fx.css
@@ -6,12 +6,19 @@
-fx-effect: dropshadow(three-pass-box, rgba(0,0,0,0.8), 2, 0, 0, 2);
}
-.flat-panel {
+.check-box .box,
+.text-input,
+.combo-box,
+.button,
+.flat-panel,
+.text-area .content,
+.menu-bar {
-fx-background-color:#e6e6e6;
}
-.menu-bar {
- -fx-background-color:#e6e6e6;
+.combo-box:hover,
+.button:hover {
+ -fx-background-color:#ccc;
}
.progress-bar {
diff --git a/dn-project/src/editor/forms/newproject.conf b/dn-project/src/editor/forms/newproject.conf
index e409230..96ef576 100644
--- a/dn-project/src/editor/forms/newproject.conf
+++ b/dn-project/src/editor/forms/newproject.conf
@@ -1,5 +1,5 @@
-#Sun Jul 05 23:16:17 EEST 2020
-form.style=DECORATED
+#Sat Feb 06 21:29:41 EET 2021
form.resizable=
+form.style=DECORATED
form.title=Bundle Editor
form.icon=.data/img/icon.png
diff --git a/dn-project/src/editor/forms/openProject.conf b/dn-project/src/editor/forms/openProject.conf
index 0343e1b..4d7ca59 100644
--- a/dn-project/src/editor/forms/openProject.conf
+++ b/dn-project/src/editor/forms/openProject.conf
@@ -1,4 +1,4 @@
-#Mon Jul 06 19:14:33 EEST 2020
+#Sat Feb 06 21:08:31 EET 2021
form.style=DECORATED
form.resizable=
form.title=Bundle Editor
diff --git a/dn-project/src/editor/forms/openProject.fxml b/dn-project/src/editor/forms/openProject.fxml
index da61be1..46cdf17 100644
--- a/dn-project/src/editor/forms/openProject.fxml
+++ b/dn-project/src/editor/forms/openProject.fxml
@@ -11,13 +11,13 @@
<Data cursor="DEFAULT" enabled="1" id="data-container" visible="1"/>
<ProgressIndicator AnchorPane.rightAnchor="7.9342041015625" focusTraversable="false" id="loading" layoutX="600.06579589844" layoutY="8" prefHeight="32" prefWidth="32" progress="-1" styleClass="progress-indicator "/>
<Data cursor="DEFAULT" enabled="1" id="data-loading" visible="1"/>
- <TextField AnchorPane.leftAnchor="8" AnchorPane.rightAnchor="80" alignment="CENTER_LEFT" editable="true" focusTraversable="true" id="findEdit" layoutX="8" layoutY="8" prefColumnCount="12" prefHeight="32" prefWidth="552" promptText="Looking for something?" styleClass="text-input text-field " text="">
+ <TextField AnchorPane.leftAnchor="8" AnchorPane.rightAnchor="82" alignment="CENTER_LEFT" editable="true" focusTraversable="true" id="findEdit" layoutX="8" layoutY="8" prefColumnCount="12" prefHeight="33" prefWidth="550" promptText="Looking for something?" styleClass="text-input text-field " text="">
<font>
<Font name="System Regular" size="12"/>
</font>
</TextField>
<Data cursor="DEFAULT" enabled="1" id="data-findEdit" visible="1"/>
- <Button AnchorPane.rightAnchor="44" alignment="CENTER" contentDisplay="LEFT" ellipsisString="..." focusTraversable="true" graphicTextGap="4" id="find" layoutX="560" layoutY="8" prefHeight="32" prefWidth="32" styleClass="button " text="" textAlignment="CENTER" underline="false" wrapText="false">
+ <Button AnchorPane.rightAnchor="45" alignment="CENTER" contentDisplay="LEFT" ellipsisString="..." focusTraversable="true" graphicTextGap="4" id="find" layoutX="559" layoutY="8" prefHeight="32" prefWidth="32" styleClass="button " text="" textAlignment="CENTER" underline="false" wrapText="false">
<font>
<Font name="System Regular" size="12"/>
</font>
diff --git a/dn-project/src/editor/forms/openProject.php b/dn-project/src/editor/forms/openProject.php
index 5e6f128..0247818 100644
--- a/dn-project/src/editor/forms/openProject.php
+++ b/dn-project/src/editor/forms/openProject.php
@@ -90,6 +90,8 @@ public function refind(){
(new Thread(function (){
$find = $this->findEdit->text;
$content = new UXTilePane;
+ $content->hgap = 5;
+ $content->vgap = 5;
foreach ($this->list as $p){
if(str::contains($p['name'], $find)){
$btn = new UXButton($p['name']);
diff --git a/dn-project/src/editor/forms/settings.conf b/dn-project/src/editor/forms/settings.conf
index 413218b..38e2d63 100644
--- a/dn-project/src/editor/forms/settings.conf
+++ b/dn-project/src/editor/forms/settings.conf
@@ -1,4 +1,4 @@
-#Wed Jul 15 21:45:12 EEST 2020
+#Sat Feb 06 21:29:43 EET 2021
form.resizable=
form.style=DECORATED
form.title=Settings
diff --git a/dn-project/src/editor/modules/AppModule.php b/dn-project/src/editor/modules/AppModule.php
index 4486474..faa59f1 100644
--- a/dn-project/src/editor/modules/AppModule.php
+++ b/dn-project/src/editor/modules/AppModule.php
@@ -11,7 +11,7 @@ class AppModule extends AbstractModule
*/
function doAction(ScriptEvent $e = null)
{
- $GLOBALS['version'] = "dev-v0.0.1.3";
+ $GLOBALS['version'] = "dev-v0.0.1.4";
$ide = fs::name($GLOBALS['argv'][0])=="jphp-core.jar";
$GLOBALS['progdir'] = fs::parent($GLOBALS['argv'][0]) . '/';
if($ide) $GLOBALS['progdir'] = fs::abs('./').'/';