@@ -4,17 +4,22 @@ |
||
4 | 4 | |
5 | 5 | function dir_copy (string $from, string $to): bool |
6 | 6 | { |
7 | - if (!is_dir ($from)) |
|
8 | - return false; |
|
7 | + if (!is_dir ($from)) { |
|
8 | + return false; |
|
9 | + } |
|
9 | 10 | |
10 | - if (!is_dir ($to)) |
|
11 | - dir_create ($to); |
|
11 | + if (!is_dir ($to)) { |
|
12 | + dir_create ($to); |
|
13 | + } |
|
12 | 14 | |
13 | - foreach (array_slice (scandir ($from), 2) as $file) |
|
14 | - if (is_dir ($f = $from .'/'. $file)) |
|
15 | + foreach (array_slice (scandir ($from), 2) as $file) { |
|
16 | + if (is_dir ($f = $from .'/'. $file)) |
|
15 | 17 | dir_copy ($f, $to .'/'. $file); |
18 | + } |
|
16 | 19 | |
17 | - else copy ($f, $to .'/'. $file); |
|
20 | + else { |
|
21 | + copy ($f, $to .'/'. $file); |
|
22 | + } |
|
18 | 23 | |
19 | 24 | return true; |
20 | 25 | } |
@@ -16,10 +16,11 @@ discard block |
||
16 | 16 | $objects = VLFInterpreter::run (new VLFParser ($vlf, $settings)); |
17 | 17 | $designers = []; |
18 | 18 | |
19 | - foreach ($objects as $name => $object) |
|
20 | - if ($object instanceof Form) |
|
19 | + foreach ($objects as $name => $object) { |
|
20 | + if ($object instanceof Form) |
|
21 | 21 | { |
22 | 22 | $page = new TabPage ($name); |
23 | + } |
|
23 | 24 | $designers[$object->selector] = new VoidDesigner ($page, $name, $propertyGrid, $eventsList, $currentSelectedItem, $formsList, $object); |
24 | 25 | |
25 | 26 | $designers[$object->selector]->form->text = $object->text; |
@@ -28,20 +29,19 @@ discard block |
||
28 | 29 | |
29 | 30 | $formsList->items->add ($page); |
30 | 31 | $formsList->selectedTab = $page->selector; |
31 | - } |
|
32 | - |
|
33 | - elseif ($object instanceof Control) |
|
34 | - try |
|
32 | + } elseif ($object instanceof Control) { |
|
33 | + try |
|
35 | 34 | { |
36 | 35 | $parent = $object->parent; |
37 | - while (!isset ($designers[$parent->selector]) && $parent->parent) |
|
38 | - $parent = $parent->parent; |
|
39 | - |
|
40 | - if (isset ($designers[$parent->selector])) |
|
41 | - $designers[$parent->selector]->addComponent ($object->selector, $name); |
|
42 | - } |
|
43 | - |
|
44 | - catch (\Throwable $e) {} |
|
36 | + } |
|
37 | + while (!isset ($designers[$parent->selector]) && $parent->parent) { |
|
38 | + $parent = $parent->parent; |
|
39 | + } |
|
40 | + |
|
41 | + if (isset ($designers[$parent->selector])) { |
|
42 | + $designers[$parent->selector]->addComponent ($object->selector, $name); |
|
43 | + } |
|
44 | + } catch (\Throwable $e) {} |
|
45 | 45 | |
46 | 46 | return $designers; |
47 | 47 | } |
@@ -78,15 +78,14 @@ |
||
78 | 78 | |
79 | 79 | public function __call ($method, $args) |
80 | 80 | { |
81 | - if (method_exists ($this, $method)) |
|
82 | - return $this->$method (...$args); |
|
83 | - |
|
84 | - else try |
|
81 | + if (method_exists ($this, $method)) { |
|
82 | + return $this->$method (...$args); |
|
83 | + } else { |
|
84 | + try |
|
85 | 85 | { |
86 | 86 | return $this->WinAPI->$method (...$args); |
87 | 87 | } |
88 | - |
|
89 | - catch (\Throwable $e) |
|
88 | + } catch (\Throwable $e) |
|
90 | 89 | { |
91 | 90 | throw new \Exception ('Method "'. $method .'" not found or return an exception. Exception info: '. "\n\n". (string) $e); |
92 | 91 | } |
@@ -15,16 +15,15 @@ |
||
15 | 15 | |
16 | 16 | public function run ($form = null): void |
17 | 17 | { |
18 | - if ($form instanceof WFObject) |
|
19 | - $this->application->run ($form->selector); |
|
20 | - |
|
21 | - elseif (is_int ($form) && VoidEngine::objectExists ($form)) |
|
22 | - $this->application->run ($form); |
|
23 | - |
|
24 | - elseif ($form === null) |
|
25 | - $this->application->run (); |
|
26 | - |
|
27 | - else throw new \Exception ('$form param must be instance of "VoidEngine\WFObject" ("VoidEngine\Form"), be null or object selector'); |
|
18 | + if ($form instanceof WFObject) { |
|
19 | + $this->application->run ($form->selector); |
|
20 | + } elseif (is_int ($form) && VoidEngine::objectExists ($form)) { |
|
21 | + $this->application->run ($form); |
|
22 | + } elseif ($form === null) { |
|
23 | + $this->application->run (); |
|
24 | + } else { |
|
25 | + throw new \Exception ('$form param must be instance of "VoidEngine\WFObject" ("VoidEngine\Form"), be null or object selector'); |
|
26 | + } |
|
28 | 27 | } |
29 | 28 | |
30 | 29 | public function restart (): void |
@@ -338,8 +338,9 @@ |
||
338 | 338 | 'clLight' => $converter->fromHtml ('#EEEEEE') |
339 | 339 | ]; |
340 | 340 | |
341 | -foreach ($constants as $name => $value) |
|
341 | +foreach ($constants as $name => $value) { |
|
342 | 342 | define ($name, $value); |
343 | +} |
|
343 | 344 | |
344 | 345 | $argv = START_PARAMS; |
345 | 346 | $argc = sizeof ($argv); |
@@ -40,8 +40,9 @@ discard block |
||
40 | 40 | |
41 | 41 | public function set_syntax ($syntax) |
42 | 42 | { |
43 | - if (file_exists ($syntax)) |
|
44 | - $syntax = file_get_contents ($syntax); |
|
43 | + if (file_exists ($syntax)) { |
|
44 | + $syntax = file_get_contents ($syntax); |
|
45 | + } |
|
45 | 46 | |
46 | 47 | $syntax = json_decode ($syntax, true); |
47 | 48 | |
@@ -49,30 +50,33 @@ discard block |
||
49 | 50 | !is_array ($syntax['syntax']) || |
50 | 51 | !is_array ($syntax['references']) || |
51 | 52 | !isset ($syntax['lexer']) |
52 | - ) return false; |
|
53 | - |
|
54 | - else |
|
53 | + ) { |
|
54 | + return false; |
|
55 | + } else |
|
55 | 56 | { |
56 | 57 | $this->resetSyntax (); |
57 | 58 | $this->clearSyntax (); |
58 | 59 | |
59 | - foreach ($syntax['references'] as $name => $value) |
|
60 | - if (isset ($syntax['syntax'][$name])) |
|
60 | + foreach ($syntax['references'] as $name => $value) { |
|
61 | + if (isset ($syntax['syntax'][$name])) |
|
61 | 62 | { |
62 | 63 | $element = VoidEngine::getArrayValue ($this->styles, $value); |
64 | + } |
|
63 | 65 | $color = $syntax['syntax'][$name]; |
64 | 66 | |
65 | - if (defined ($color)) |
|
66 | - $color = constant ($color); |
|
67 | + if (defined ($color)) { |
|
68 | + $color = constant ($color); |
|
69 | + } |
|
67 | 70 | |
68 | 71 | VoidEngine::setProperty ($element, 'ForeColor', [$color, 'color']); |
69 | 72 | } |
70 | 73 | |
71 | 74 | $this->lexer = $syntax['lexer']; |
72 | 75 | |
73 | - if (is_array ($syntax['keywords'])) |
|
74 | - foreach ($syntax['keywords'] as $id => $keywords) |
|
76 | + if (is_array ($syntax['keywords'])) { |
|
77 | + foreach ($syntax['keywords'] as $id => $keywords) |
|
75 | 78 | $this->setKeywords ($id, $keywords); |
79 | + } |
|
76 | 80 | |
77 | 81 | $this->propertyInit ('fold', 1); |
78 | 82 | $this->propertyInit ('fold.compact', 1); |
@@ -37,12 +37,12 @@ discard block |
||
37 | 37 | { |
38 | 38 | Components::removeComponent ($this->$name); |
39 | 39 | |
40 | - if (VoidEngine::objectExists ($this->$name)) |
|
41 | - VoidEngine::removeObjects ($this->$name); |
|
40 | + if (VoidEngine::objectExists ($this->$name)) { |
|
41 | + VoidEngine::removeObjects ($this->$name); |
|
42 | + } |
|
43 | + } elseif ($this->$name instanceof Component) { |
|
44 | + $this->$name->dispose (); |
|
42 | 45 | } |
43 | - |
|
44 | - elseif ($this->$name instanceof Component) |
|
45 | - $this->$name->dispose (); |
|
46 | 46 | } |
47 | 47 | |
48 | 48 | unset ($this->$name); |
@@ -56,20 +56,21 @@ discard block |
||
56 | 56 | { |
57 | 57 | Components::removeComponent ($value); |
58 | 58 | |
59 | - if (VoidEngine::objectExists ($value)) |
|
60 | - VoidEngine::removeObjects ($value); |
|
59 | + if (VoidEngine::objectExists ($value)) { |
|
60 | + VoidEngine::removeObjects ($value); |
|
61 | + } |
|
62 | + } elseif ($value instanceof Component) { |
|
63 | + $value->dispose (); |
|
61 | 64 | } |
62 | 65 | |
63 | - elseif ($value instanceof Component) |
|
64 | - $value->dispose (); |
|
65 | - |
|
66 | 66 | unset ($this->$param); |
67 | 67 | } |
68 | 68 | |
69 | 69 | if (isset ($this->selector)) |
70 | 70 | { |
71 | - if (VoidEngine::objectExists ($this->selector)) |
|
72 | - VoidEngine::removeObjects ($this->selector); |
|
71 | + if (VoidEngine::objectExists ($this->selector)) { |
|
72 | + VoidEngine::removeObjects ($this->selector); |
|
73 | + } |
|
73 | 74 | |
74 | 75 | Components::removeComponent ($this->selector); |
75 | 76 | } |
@@ -11,9 +11,7 @@ |
||
11 | 11 | try |
12 | 12 | { |
13 | 13 | $node = $this->selectedNode; |
14 | - } |
|
15 | - |
|
16 | - catch (\Throwable $e) |
|
14 | + } catch (\Throwable $e) |
|
17 | 15 | { |
18 | 16 | return false; |
19 | 17 | } |
@@ -10,8 +10,9 @@ |
||
10 | 10 | { |
11 | 11 | parent::__construct ($className, ...$args); |
12 | 12 | |
13 | - if ($parent) |
|
14 | - $this->parent = $parent; |
|
13 | + if ($parent) { |
|
14 | + $this->parent = $parent; |
|
15 | + } |
|
15 | 16 | } |
16 | 17 | |
17 | 18 | public function get_caption (): string |