Skip to content

Commit d218720

Browse files
dim-sdim-s
committed
Beta-5
1 parent 7692a3c commit d218720

File tree

8 files changed

+109
-93
lines changed

8 files changed

+109
-93
lines changed

‎develnext-designer/src/main/java/org/develnext/jphp/gui/designer/editor/syntax/hotkey/AutoBracketsHotkey.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ public boolean apply(AbstractCodeArea area, KeyEvent keyEvent) {
2020
String ch = area.getText(pos - 1, pos);
2121
char nextCh = area.getText().length() >= pos + 1 ? area.getText(pos, pos + 1).charAt(0) : '\0';
2222

23-
switch (ch) {
23+
/*switch (ch) {
2424
case "[":
2525
if (nextCh == ']') break;
2626
case "(":
2727
if (nextCh == ')') break;
2828
case "{":
2929
if (nextCh == '}') break;
3030
31-
if (!(nextCh == '\0' || Character.isWhitespace(nextCh))) {
31+
if (!(nextCh == '\0' || Character.isSpaceChar(nextCh))) {
3232
return false;
3333
}
3434
break;
@@ -48,7 +48,7 @@ public boolean apply(AbstractCodeArea area, KeyEvent keyEvent) {
4848
4949
if (check != 0) return false;
5050
break;
51-
}
51+
}*/
5252

5353

5454
switch (ch) {

‎develnext-doc/src/ide/doc/commands/DocCommand.php‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public function isAlways()
2323

2424
public function getName()
2525
{
26-
return 'Помощь';
26+
return 'Справка';
2727
}
2828

2929
public function getCategory()
@@ -44,7 +44,7 @@ public function getAccelerator()
4444
protected function makeSearchInputUi()
4545
{
4646
$input = new UXTextField();
47-
$input->promptText = 'поиск решений';
47+
$input->promptText = 'поиск в справке';
4848
$input->width = 170;
4949
$input->maxHeight = 999;
5050
$input->font = UXFont::of($input->font->family, 15);
@@ -55,10 +55,12 @@ protected function makeSearchInputUi()
5555
public function makeUiForRightHead()
5656
{
5757
$button = $this->makeGlyphButton();
58-
//$button->text = $this->getName();
58+
$button->text = $this->getName();
5959
$button->maxHeight = 999;
60+
$button->padding = [0, 15];
61+
6062
//$button->style = '-fx-font-weight: bold;';
61-
$button->width = 35;
63+
//$button->width = 35;
6264

6365
$searchButton = new UXButton();
6466
$searchButton->classes->addAll(['icon-flat-search']);
@@ -94,7 +96,7 @@ public function makeUiForRightHead()
9496

9597
$searchButton->on('action', $searchHandle);
9698

97-
$ui = new UXHBox([$input, $searchButton, $button]);
99+
$ui = new UXHBox([$searchButton, $input, $button]);
98100
$ui->spacing = 5;
99101
$ui->fillHeight = true;
100102

‎develnext-store/src/.dn/extensions‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ide\store\StoreExtension
1+
# ide\store\StoreExtension

‎develnext-store/src/.dn/mainCommands‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ide\store\commands\StoreLinkCommand
1+
# ide\store\commands\StoreLinkCommand

‎develnext/src/ide/build/AntOneJarBuildType.php‎

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ function getBuildPath(Project $project)
5555

5656
public static function makeAntBuildFile(Project $project, array $config)
5757
{
58+
$project->copyModuleFiles($project->getRootDir() . "/build/dist/lib");
59+
5860
$content = FileUtils::get('res://ide/build/ant/buildDist.xml');
5961
$content = str::replace($content, '#NAME#', $project->getName());
6062
$content = str::replace($content, '#JRE_DIR#', Ide::get()->getJrePath());
@@ -111,13 +113,21 @@ public static function makeAntBuildFile(Project $project, array $config)
111113
}
112114

113115

114-
115-
$project->copyModuleFiles($project->getRootDir() . "/build/dist/lib");
116-
117116
$extList = '';
117+
$oneJarContent = [];
118118

119119
foreach ($project->getModules() as $module) {
120120
if ($module->getType() == 'jarfile') {
121+
$name = fs::name($module->getId());
122+
123+
if ($php = PhpProjectBehaviour::get()) {
124+
$excl = $php->isByteCodeEnabled() ? '**/*.php' : '';
125+
} else {
126+
$excl = '';
127+
}
128+
129+
$oneJarContent[] = "<zipfileset src='\${dist}/lib/{$name}' excludes='JPHP-INF/sdk/** $excl' />";
130+
121131
try {
122132
$zipFile = new ZipFile($module->getId());
123133
if ($extContent = $zipFile->getEntryContent('META-INF/services/php.runtime.ext.support.Extension')) {
@@ -132,6 +142,8 @@ public static function makeAntBuildFile(Project $project, array $config)
132142
}
133143
}
134144

145+
$content = str::replace($content, '#ONE_JAR_CONTENT#', str::join($oneJarContent, " "));
146+
135147
FileUtils::put($project->getRootDir() . "/build.xml", $content);
136148
FileUtils::put($project->getRootDir() . '/build/dist/gen/META-INF/services/php.runtime.ext.support.Extension', $extList);
137149
}

‎develnext/src/ide/build/ant/buildDist.xml‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,9 @@
2929

3030
<target name="onejar" depends="dist">
3131
<jar destfile="${dist}/#NAME#.jar" duplicate="preserve" level="7" encoding="UTF-8">
32-
<zipgroupfileset dir="${dist}/lib">
33-
<include name="**/*.jar"/>
34-
</zipgroupfileset>
3532
<fileset dir="${dist}/gen" />
36-
37-
<exclude name="JPHP-INF/sdk/**" />
33+
<zipfileset src="${dist}/lib/dn-compiled-module.jar" />
34+
#ONE_JAR_CONTENT#
3835

3936
<manifest>
4037
<attribute name="Main-Class" value="php.runtime.launcher.Launcher" />

‎develnext/src/ide/forms/BundleCheckListForm.php‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,9 @@ public function addBundle()
254254
$resource = Ide::get()->getLibrary()->findResource('bundles', $resource->getPath());
255255
$this->display($resource);
256256

257-
$this->toast('Пакет успешно добавлен в IDE');
257+
UXDialog::showAndWait('Для завершения установки пакета перезапустите DevelNext!');
258+
259+
//$this->toast('Пакет успешно добавлен в IDE');
258260
});
259261
} finally {
260262
$zip->close();

‎jphp-gui-ext/src/main/java/org/develnext/jphp/ext/javafx/support/event/WebEngineEventProvider.java‎

Lines changed: 77 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,77 @@
1-
package org.develnext.jphp.ext.javafx.support.event;
2-
3-
import javafx.event.EventHandler;
4-
import javafx.scene.web.WebEngine;
5-
import org.develnext.jphp.ext.javafx.support.EventProvider;
6-
7-
public class WebEngineEventProvider extends EventProvider<WebEngine> {
8-
public WebEngineEventProvider() {
9-
setHandler("error", new Handler() {
10-
@Override
11-
public void set(WebEngine target, EventHandler eventHandler) {
12-
target.setOnError(eventHandler);
13-
}
14-
15-
@Override
16-
public EventHandler get(WebEngine target) {
17-
return target.getOnError();
18-
}
19-
});
20-
21-
setHandler("alert", new Handler() {
22-
@Override
23-
public void set(WebEngine target, EventHandler eventHandler) {
24-
target.setOnAlert(eventHandler);
25-
}
26-
27-
@Override
28-
public EventHandler get(WebEngine target) {
29-
return target.getOnAlert();
30-
}
31-
});
32-
33-
setHandler("resize", new Handler() {
34-
@Override
35-
public void set(WebEngine target, EventHandler eventHandler) {
36-
target.setOnResized(eventHandler);
37-
}
38-
39-
@Override
40-
public EventHandler get(WebEngine target) {
41-
return target.getOnResized();
42-
}
43-
});
44-
45-
setHandler("statusChanged", new Handler() {
46-
@Override
47-
public void set(WebEngine target, EventHandler eventHandler) {
48-
target.setOnStatusChanged(eventHandler);
49-
}
50-
51-
@Override
52-
public EventHandler get(WebEngine target) {
53-
return target.getOnStatusChanged();
54-
}
55-
});
56-
57-
setHandler("visibilityChanged", new Handler() {
58-
@Override
59-
public void set(WebEngine target, EventHandler eventHandler) {
60-
target.setOnVisibilityChanged(eventHandler);
61-
}
62-
63-
@Override
64-
public EventHandler get(WebEngine target) {
65-
return target.getOnVisibilityChanged();
66-
}
67-
});
68-
}
69-
70-
@Override
71-
public Class<WebEngine> getTargetClass() {
72-
return WebEngine.class;
73-
}
74-
}
1+
package org.develnext.jphp.ext.javafx.support.event;
2+
3+
import javafx.beans.value.ChangeListener;
4+
import javafx.beans.value.ObservableValue;
5+
import javafx.event.ActionEvent;
6+
import javafx.event.EventHandler;
7+
import javafx.scene.web.WebEngine;
8+
import org.develnext.jphp.ext.javafx.support.EventProvider;
9+
10+
public class WebEngineEventProvider extends EventProvider<WebEngine> {
11+
public WebEngineEventProvider() {
12+
setHandler("error", new Handler() {
13+
@Override
14+
public void set(WebEngine target, EventHandler eventHandler) {
15+
target.setOnError(eventHandler);
16+
}
17+
18+
@Override
19+
public EventHandler get(WebEngine target) {
20+
return target.getOnError();
21+
}
22+
});
23+
24+
setHandler("alert", new Handler() {
25+
@Override
26+
public void set(WebEngine target, EventHandler eventHandler) {
27+
target.setOnAlert(eventHandler);
28+
}
29+
30+
@Override
31+
public EventHandler get(WebEngine target) {
32+
return target.getOnAlert();
33+
}
34+
});
35+
36+
setHandler("resize", new Handler() {
37+
@Override
38+
public void set(WebEngine target, EventHandler eventHandler) {
39+
target.setOnResized(eventHandler);
40+
}
41+
42+
@Override
43+
public EventHandler get(WebEngine target) {
44+
return target.getOnResized();
45+
}
46+
});
47+
48+
setHandler("statusChanged", new Handler() {
49+
@Override
50+
public void set(WebEngine target, EventHandler eventHandler) {
51+
target.setOnStatusChanged(eventHandler);
52+
}
53+
54+
@Override
55+
public EventHandler get(WebEngine target) {
56+
return target.getOnStatusChanged();
57+
}
58+
});
59+
60+
setHandler("visibilityChanged", new Handler() {
61+
@Override
62+
public void set(WebEngine target, EventHandler eventHandler) {
63+
target.setOnVisibilityChanged(eventHandler);
64+
}
65+
66+
@Override
67+
public EventHandler get(WebEngine target) {
68+
return target.getOnVisibilityChanged();
69+
}
70+
});
71+
}
72+
73+
@Override
74+
public Class<WebEngine> getTargetClass() {
75+
return WebEngine.class;
76+
}
77+
}

0 commit comments

Comments
 (0)