@@ -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 | } |
@@ -40,4 +40,4 @@ |
||
| 40 | 40 | unlink (__FILE__); |
| 41 | 41 | |
| 42 | 42 | echo ' Configuration completed'. PHP_EOL . |
| 43 | - ' Thank for installing winforms-php/VoidFramework!'. PHP_EOL . PHP_EOL; |
|
| 43 | + ' Thank for installing winforms-php/VoidFramework!'. PHP_EOL . PHP_EOL; |
|
@@ -1,43 +1,43 @@ |
||
| 1 | 1 | <?php |
| 2 | 2 | |
| 3 | -echo ' Configuring VoidFramework...'. PHP_EOL; |
|
| 3 | +echo ' Configuring VoidFramework...'.PHP_EOL; |
|
| 4 | 4 | |
| 5 | -function dir_copy (string $from, string $to): bool |
|
| 5 | +function dir_copy(string $from, string $to): bool |
|
| 6 | 6 | { |
| 7 | - if (!is_dir ($from)) |
|
| 7 | + if (!is_dir($from)) |
|
| 8 | 8 | return false; |
| 9 | 9 | |
| 10 | - if (!is_dir ($to)) |
|
| 11 | - dir_create ($to); |
|
| 10 | + if (!is_dir($to)) |
|
| 11 | + dir_create($to); |
|
| 12 | 12 | |
| 13 | - foreach (array_slice (scandir ($from), 2) as $file) |
|
| 14 | - if (is_dir ($f = $from .'/'. $file)) |
|
| 15 | - dir_copy ($f, $to .'/'. $file); |
|
| 13 | + foreach (array_slice(scandir($from), 2) as $file) |
|
| 14 | + if (is_dir($f = $from.'/'.$file)) |
|
| 15 | + dir_copy($f, $to.'/'.$file); |
|
| 16 | 16 | |
| 17 | - else copy ($f, $to .'/'. $file); |
|
| 17 | + else copy($f, $to.'/'.$file); |
|
| 18 | 18 | |
| 19 | 19 | return true; |
| 20 | 20 | } |
| 21 | 21 | |
| 22 | -$info = file_exists (QERO_DIR .'/qero-info.json') ? |
|
| 23 | - json_decode (file_get_contents (QERO_DIR .'/qero-info.json'), true) : array (); |
|
| 22 | +$info = file_exists(QERO_DIR.'/qero-info.json') ? |
|
| 23 | + json_decode (file_get_contents(QERO_DIR.'/qero-info.json'), true) : array(); |
|
| 24 | 24 | |
| 25 | 25 | $info['scripts']['start'] = '"qero-packages/winforms-php/VoidFramework/core/VoidCore.exe" "app/start.php"'; |
| 26 | 26 | |
| 27 | -file_put_contents (QERO_DIR .'/qero-info.json', json_encode ($info, defined ('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : 0)); |
|
| 28 | -file_put_contents (QERO_DIR .'/start.bat', '@echo off |
|
| 27 | +file_put_contents(QERO_DIR.'/qero-info.json', json_encode($info, defined('JSON_PRETTY_PRINT') ? JSON_PRETTY_PRINT : 0)); |
|
| 28 | +file_put_contents(QERO_DIR.'/start.bat', '@echo off |
|
| 29 | 29 | '. $info['scripts']['start']); |
| 30 | 30 | |
| 31 | -if (!is_dir (QERO_DIR .'/app')) |
|
| 31 | +if (!is_dir(QERO_DIR.'/app')) |
|
| 32 | 32 | { |
| 33 | - echo ' Configuring application...'. PHP_EOL; |
|
| 33 | + echo ' Configuring application...'.PHP_EOL; |
|
| 34 | 34 | |
| 35 | - mkdir (QERO_DIR .'/app'); |
|
| 36 | - dir_copy (__DIR__ .'/app_bundle', QERO_DIR .'/app'); |
|
| 35 | + mkdir(QERO_DIR.'/app'); |
|
| 36 | + dir_copy(__DIR__.'/app_bundle', QERO_DIR.'/app'); |
|
| 37 | 37 | } |
| 38 | 38 | |
| 39 | -Qero\dir_delete (__DIR__ .'/app_bundle'); |
|
| 40 | -unlink (__FILE__); |
|
| 39 | +Qero\dir_delete(__DIR__.'/app_bundle'); |
|
| 40 | +unlink(__FILE__); |
|
| 41 | 41 | |
| 42 | -echo ' Configuration completed'. PHP_EOL . |
|
| 43 | - ' Thank for installing winforms-php/VoidFramework!'. PHP_EOL . PHP_EOL; |
|
| 42 | +echo ' Configuration completed'.PHP_EOL. |
|
| 43 | + ' Thank for installing winforms-php/VoidFramework!'.PHP_EOL.PHP_EOL; |
|
@@ -4,7 +4,7 @@ discard block |
||
| 4 | 4 | |
| 5 | 5 | class VLFImporter |
| 6 | 6 | { |
| 7 | - static function import (string $vlf, PropertyGrid $propertyGrid, ListBox $eventsList, ComboBox $currentSelectedItem, TabControl $formsList, array $settings = array ( |
|
| 7 | + static function import(string $vlf, PropertyGrid $propertyGrid, ListBox $eventsList, ComboBox $currentSelectedItem, TabControl $formsList, array $settings = array( |
|
| 8 | 8 | 'strong_line_parser' => false, |
| 9 | 9 | 'ignore_postobject_info' => true, |
| 10 | 10 | 'ignore_unexpected_method_args' => true, |
@@ -13,20 +13,20 @@ discard block |
||
| 13 | 13 | 'debug_mode' => false |
| 14 | 14 | )): array |
| 15 | 15 | { |
| 16 | - $objects = VLFInterpreter::run (new VLFParser ($vlf, $settings)); |
|
| 16 | + $objects = VLFInterpreter::run(new VLFParser($vlf, $settings)); |
|
| 17 | 17 | $designers = []; |
| 18 | 18 | |
| 19 | 19 | foreach ($objects as $name => $object) |
| 20 | 20 | if ($object instanceof Form) |
| 21 | 21 | { |
| 22 | - $page = new TabPage ($name); |
|
| 23 | - $designers[$object->selector] = new VoidDesigner ($page, $name, $propertyGrid, $eventsList, $currentSelectedItem, $formsList, $object); |
|
| 22 | + $page = new TabPage($name); |
|
| 23 | + $designers[$object->selector] = new VoidDesigner($page, $name, $propertyGrid, $eventsList, $currentSelectedItem, $formsList, $object); |
|
| 24 | 24 | |
| 25 | 25 | $designers[$object->selector]->form->text = $object->text; |
| 26 | 26 | |
| 27 | - VoidStudioAPI::addObjects ('main', ['Designer__'. $name .'Designer' => $designers[$object->selector]]); |
|
| 27 | + VoidStudioAPI::addObjects('main', ['Designer__'.$name.'Designer' => $designers[$object->selector]]); |
|
| 28 | 28 | |
| 29 | - $formsList->items->add ($page); |
|
| 29 | + $formsList->items->add($page); |
|
| 30 | 30 | $formsList->selectedTab = $page->selector; |
| 31 | 31 | } |
| 32 | 32 | |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | $parent = $parent->parent; |
| 39 | 39 | |
| 40 | 40 | if (isset ($designers[$parent->selector])) |
| 41 | - $designers[$parent->selector]->addComponent ($object->selector, $name); |
|
| 41 | + $designers[$parent->selector]->addComponent($object->selector, $name); |
|
| 42 | 42 | } |
| 43 | 43 | |
| 44 | 44 | catch (\Throwable $e) {} |
@@ -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 | } |
@@ -29,7 +29,7 @@ discard block |
||
| 29 | 29 | { |
| 30 | 30 | protected $WinAPI; |
| 31 | 31 | |
| 32 | - public function __construct () |
|
| 32 | + public function __construct() |
|
| 33 | 33 | { |
| 34 | 34 | /** |
| 35 | 35 | * Большинство функций было взято из класса "WinAPI" проекта "DevelStudio XL" |
@@ -40,7 +40,7 @@ discard block |
||
| 40 | 40 | * |
| 41 | 41 | */ |
| 42 | 42 | |
| 43 | - $this->WinAPI = \FFI::cdef (' |
|
| 43 | + $this->WinAPI = \FFI::cdef(' |
|
| 44 | 44 | struct LPCTSTR |
| 45 | 45 | { |
| 46 | 46 | char string; |
@@ -76,25 +76,25 @@ discard block |
||
| 76 | 76 | ', 'User32.dll'); |
| 77 | 77 | } |
| 78 | 78 | |
| 79 | - public function __call ($method, $args) |
|
| 79 | + public function __call($method, $args) |
|
| 80 | 80 | { |
| 81 | - if (method_exists ($this, $method)) |
|
| 82 | - return $this->$method (...$args); |
|
| 81 | + if (method_exists($this, $method)) |
|
| 82 | + return $this->$method(...$args); |
|
| 83 | 83 | |
| 84 | 84 | else try |
| 85 | 85 | { |
| 86 | - return $this->WinAPI->$method (...$args); |
|
| 86 | + return $this->WinAPI->$method(...$args); |
|
| 87 | 87 | } |
| 88 | 88 | |
| 89 | 89 | catch (\Throwable $e) |
| 90 | 90 | { |
| 91 | - throw new \Exception ('Method "'. $method .'" not found or return an exception. Exception info: '. "\n\n". (string) $e); |
|
| 91 | + throw new \Exception('Method "'.$method.'" not found or return an exception. Exception info: '."\n\n".(string) $e); |
|
| 92 | 92 | } |
| 93 | 93 | } |
| 94 | 94 | |
| 95 | - public function findWindow (string $caption, string $class = null): ?int |
|
| 95 | + public function findWindow(string $caption, string $class = null): ?int |
|
| 96 | 96 | { |
| 97 | - return $this->FindWindowA ($class, $caption); |
|
| 97 | + return $this->FindWindowA($class, $caption); |
|
| 98 | 98 | } |
| 99 | 99 | |
| 100 | 100 | /*public function getWindowCaption (int $handle) |
@@ -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 | } |
@@ -8,338 +8,338 @@ |
||
| 8 | 8 | $converter = new WFClass ('System.Drawing.ColorTranslator'); |
| 9 | 9 | |
| 10 | 10 | $constants = [ |
| 11 | - # Информация об окружении |
|
| 11 | + # Информация об окружении |
|
| 12 | 12 | |
| 13 | - 'EXE_NAME' => $APPLICATION->executablePath, |
|
| 14 | - 'DOC_ROOT' => dirname ($APPLICATION->executablePath), |
|
| 15 | - 'IS_ADMIN' => is_writable (getenv ('SystemRoot')), |
|
| 16 | - 'START_PARAMS' => $params, |
|
| 17 | - 'USERNAME' => $env->username, |
|
| 13 | + 'EXE_NAME' => $APPLICATION->executablePath, |
|
| 14 | + 'DOC_ROOT' => dirname ($APPLICATION->executablePath), |
|
| 15 | + 'IS_ADMIN' => is_writable (getenv ('SystemRoot')), |
|
| 16 | + 'START_PARAMS' => $params, |
|
| 17 | + 'USERNAME' => $env->username, |
|
| 18 | 18 | |
| 19 | - # Константы MessageBox'а |
|
| 19 | + # Константы MessageBox'а |
|
| 20 | 20 | |
| 21 | - 'MB_YESNO' => 4, |
|
| 22 | - 'MB_YESNOCANCEL' => 3, |
|
| 23 | - 'MB_OK' => 0, |
|
| 24 | - 'MB_OKCANCEL' => 1, |
|
| 25 | - 'MB_RETRYCANCEL' => 5, |
|
| 26 | - 'MB_ABORTRETRYIGNORE' => 2, |
|
| 27 | - 'MBI_ASTERISK' => 64, |
|
| 28 | - 'MBI_ERROR' => 16, |
|
| 29 | - 'MBI_EXCLAMATION' => 48, |
|
| 30 | - 'MBI_HAND' => 16, |
|
| 31 | - 'MBI_INFORMATION' => 64, |
|
| 32 | - 'MBI_NONE' => 0, |
|
| 33 | - 'MBI_QUESTION' => 32, |
|
| 34 | - 'MBI_STOP' => 16, |
|
| 35 | - 'MBI_WARNING' => 48, |
|
| 36 | - 'MBDB_1' => 0, |
|
| 37 | - 'MBDB_2' => 256, |
|
| 38 | - 'MBDB_3' => 512, |
|
| 21 | + 'MB_YESNO' => 4, |
|
| 22 | + 'MB_YESNOCANCEL' => 3, |
|
| 23 | + 'MB_OK' => 0, |
|
| 24 | + 'MB_OKCANCEL' => 1, |
|
| 25 | + 'MB_RETRYCANCEL' => 5, |
|
| 26 | + 'MB_ABORTRETRYIGNORE' => 2, |
|
| 27 | + 'MBI_ASTERISK' => 64, |
|
| 28 | + 'MBI_ERROR' => 16, |
|
| 29 | + 'MBI_EXCLAMATION' => 48, |
|
| 30 | + 'MBI_HAND' => 16, |
|
| 31 | + 'MBI_INFORMATION' => 64, |
|
| 32 | + 'MBI_NONE' => 0, |
|
| 33 | + 'MBI_QUESTION' => 32, |
|
| 34 | + 'MBI_STOP' => 16, |
|
| 35 | + 'MBI_WARNING' => 48, |
|
| 36 | + 'MBDB_1' => 0, |
|
| 37 | + 'MBDB_2' => 256, |
|
| 38 | + 'MBDB_3' => 512, |
|
| 39 | 39 | |
| 40 | - # Константы DialogResult |
|
| 40 | + # Константы DialogResult |
|
| 41 | 41 | |
| 42 | - 'drOk' => 1, |
|
| 43 | - 'drYes' => 6, |
|
| 44 | - 'drNo' => 7, |
|
| 45 | - 'drCancel' => 2, |
|
| 46 | - 'drRetry' => 4, |
|
| 47 | - 'drAbort' => 3, |
|
| 48 | - 'drIgnore' => 5, |
|
| 49 | - 'drNone' => 0, |
|
| 42 | + 'drOk' => 1, |
|
| 43 | + 'drYes' => 6, |
|
| 44 | + 'drNo' => 7, |
|
| 45 | + 'drCancel' => 2, |
|
| 46 | + 'drRetry' => 4, |
|
| 47 | + 'drAbort' => 3, |
|
| 48 | + 'drIgnore' => 5, |
|
| 49 | + 'drNone' => 0, |
|
| 50 | 50 | |
| 51 | - # Константы форм |
|
| 51 | + # Константы форм |
|
| 52 | 52 | |
| 53 | - 'fbsNone' => 0, |
|
| 54 | - 'fbsSingle' => 1, |
|
| 55 | - 'fbs3D' => 2, |
|
| 56 | - 'fbsDialog' => 3, |
|
| 57 | - 'fbsSizable' => 4, |
|
| 58 | - 'fbsToolWindow' => 5, |
|
| 59 | - 'fbsSizableToolWindow' => 6, |
|
| 60 | - |
|
| 61 | - 'fwsNormal' => 0, |
|
| 62 | - 'fwsMinimized' => 1, |
|
| 63 | - 'fwsMaximized' => 2, |
|
| 64 | - |
|
| 65 | - 'fspManual' => 0, |
|
| 66 | - 'fspCenterScreen' => 1, |
|
| 67 | - 'fspWindowsDefaultLocation' => 2, |
|
| 68 | - 'fspWindowsDefaultBounds' => 3, |
|
| 69 | - 'fspCenterParent' => 4, |
|
| 70 | - |
|
| 71 | - # Константы стиля оконтовки |
|
| 72 | - |
|
| 73 | - 'bsNone' => 0, |
|
| 74 | - 'bsFixedSingle' => 1, |
|
| 75 | - 'bsFixed3D' => 2, |
|
| 76 | - |
|
| 77 | - # Константы выравнивания |
|
| 78 | - |
|
| 79 | - 'alTopLeft' => 1, |
|
| 80 | - 'alTopCenter' => 2, |
|
| 81 | - 'alTopRight' => 4, |
|
| 82 | - 'alMiddleLeft' => 16, |
|
| 83 | - 'alMiddleCenter' => 32, |
|
| 84 | - 'alMiddleRight' => 64, |
|
| 85 | - 'alBottomLeft' => 256, |
|
| 86 | - 'alBottomCenter' => 512, |
|
| 87 | - 'alBottomRight' => 1024, |
|
| 88 | - |
|
| 89 | - # Константы притягивания (Anchor) |
|
| 90 | - |
|
| 91 | - 'acNone' => 0, |
|
| 92 | - 'acTop' => 1, |
|
| 93 | - 'acBottom' => 2, |
|
| 94 | - 'acLeft' => 4, |
|
| 95 | - 'acRight' => 8, |
|
| 96 | - |
|
| 97 | - # Константы SizeMode-параметра PictureBox'а |
|
| 98 | - |
|
| 99 | - 'smNormal' => 0, |
|
| 100 | - 'smStretchImage' => 1, |
|
| 101 | - 'smAutoSize' => 2, |
|
| 102 | - 'smCenterImage' => 3, |
|
| 103 | - 'smZoom' => 4, |
|
| 104 | - |
|
| 105 | - # Константы View-параметра ListView'а |
|
| 53 | + 'fbsNone' => 0, |
|
| 54 | + 'fbsSingle' => 1, |
|
| 55 | + 'fbs3D' => 2, |
|
| 56 | + 'fbsDialog' => 3, |
|
| 57 | + 'fbsSizable' => 4, |
|
| 58 | + 'fbsToolWindow' => 5, |
|
| 59 | + 'fbsSizableToolWindow' => 6, |
|
| 60 | + |
|
| 61 | + 'fwsNormal' => 0, |
|
| 62 | + 'fwsMinimized' => 1, |
|
| 63 | + 'fwsMaximized' => 2, |
|
| 64 | + |
|
| 65 | + 'fspManual' => 0, |
|
| 66 | + 'fspCenterScreen' => 1, |
|
| 67 | + 'fspWindowsDefaultLocation' => 2, |
|
| 68 | + 'fspWindowsDefaultBounds' => 3, |
|
| 69 | + 'fspCenterParent' => 4, |
|
| 70 | + |
|
| 71 | + # Константы стиля оконтовки |
|
| 72 | + |
|
| 73 | + 'bsNone' => 0, |
|
| 74 | + 'bsFixedSingle' => 1, |
|
| 75 | + 'bsFixed3D' => 2, |
|
| 76 | + |
|
| 77 | + # Константы выравнивания |
|
| 78 | + |
|
| 79 | + 'alTopLeft' => 1, |
|
| 80 | + 'alTopCenter' => 2, |
|
| 81 | + 'alTopRight' => 4, |
|
| 82 | + 'alMiddleLeft' => 16, |
|
| 83 | + 'alMiddleCenter' => 32, |
|
| 84 | + 'alMiddleRight' => 64, |
|
| 85 | + 'alBottomLeft' => 256, |
|
| 86 | + 'alBottomCenter' => 512, |
|
| 87 | + 'alBottomRight' => 1024, |
|
| 88 | + |
|
| 89 | + # Константы притягивания (Anchor) |
|
| 90 | + |
|
| 91 | + 'acNone' => 0, |
|
| 92 | + 'acTop' => 1, |
|
| 93 | + 'acBottom' => 2, |
|
| 94 | + 'acLeft' => 4, |
|
| 95 | + 'acRight' => 8, |
|
| 96 | + |
|
| 97 | + # Константы SizeMode-параметра PictureBox'а |
|
| 98 | + |
|
| 99 | + 'smNormal' => 0, |
|
| 100 | + 'smStretchImage' => 1, |
|
| 101 | + 'smAutoSize' => 2, |
|
| 102 | + 'smCenterImage' => 3, |
|
| 103 | + 'smZoom' => 4, |
|
| 104 | + |
|
| 105 | + # Константы View-параметра ListView'а |
|
| 106 | 106 | |
| 107 | - 'vwLargeIcon' => 0, |
|
| 108 | - 'vwDetails' => 1, |
|
| 109 | - 'vwSmallIcon' => 2, |
|
| 110 | - 'vwList' => 3, |
|
| 111 | - 'vwTile' => 4, |
|
| 107 | + 'vwLargeIcon' => 0, |
|
| 108 | + 'vwDetails' => 1, |
|
| 109 | + 'vwSmallIcon' => 2, |
|
| 110 | + 'vwList' => 3, |
|
| 111 | + 'vwTile' => 4, |
|
| 112 | 112 | |
| 113 | - # Константы dropDownStyle компонента ComboBox |
|
| 113 | + # Константы dropDownStyle компонента ComboBox |
|
| 114 | 114 | |
| 115 | - 'ddSimple' => 0, |
|
| 116 | - 'ddDropDown' => 1, |
|
| 117 | - 'ddDropDownList' => 2, |
|
| 115 | + 'ddSimple' => 0, |
|
| 116 | + 'ddDropDown' => 1, |
|
| 117 | + 'ddDropDownList' => 2, |
|
| 118 | 118 | |
| 119 | - # Константы причины закрытия формы |
|
| 119 | + # Константы причины закрытия формы |
|
| 120 | 120 | |
| 121 | - 'fcrNone' => 0, |
|
| 122 | - 'fcrWindowsShutDown' => 1, |
|
| 123 | - 'fcrMdiFormClosing' => 2, |
|
| 124 | - 'fcrUserClosing' => 3, |
|
| 125 | - 'fcrTaskManagerClosing' => 4, |
|
| 126 | - 'fcrFormOwnerClosing' => 5, |
|
| 127 | - 'fcrApplicationExitCall' => 6, |
|
| 121 | + 'fcrNone' => 0, |
|
| 122 | + 'fcrWindowsShutDown' => 1, |
|
| 123 | + 'fcrMdiFormClosing' => 2, |
|
| 124 | + 'fcrUserClosing' => 3, |
|
| 125 | + 'fcrTaskManagerClosing' => 4, |
|
| 126 | + 'fcrFormOwnerClosing' => 5, |
|
| 127 | + 'fcrApplicationExitCall' => 6, |
|
| 128 | 128 | |
| 129 | - # Константы дока |
|
| 129 | + # Константы дока |
|
| 130 | 130 | |
| 131 | - 'dsBottom' => 2, |
|
| 132 | - 'dsFill' => 5, |
|
| 133 | - 'dsLeft' => 3, |
|
| 134 | - 'dsNone' => 0, |
|
| 135 | - 'dsRight' => 4, |
|
| 136 | - 'dsTop' => 1, |
|
| 131 | + 'dsBottom' => 2, |
|
| 132 | + 'dsFill' => 5, |
|
| 133 | + 'dsLeft' => 3, |
|
| 134 | + 'dsNone' => 0, |
|
| 135 | + 'dsRight' => 4, |
|
| 136 | + 'dsTop' => 1, |
|
| 137 | 137 | |
| 138 | - # Константы FCTB.Language |
|
| 138 | + # Константы FCTB.Language |
|
| 139 | 139 | |
| 140 | - 'langCSharp' => 1, |
|
| 141 | - 'langCustom' => 2, |
|
| 142 | - 'langHTML' => 3, |
|
| 143 | - 'langJS' => 4, |
|
| 144 | - 'langLua' => 5, |
|
| 145 | - 'langPHP' => 6, |
|
| 146 | - 'langSQL' => 7, |
|
| 147 | - 'langVB' => 8, |
|
| 148 | - 'langXML' => 9, |
|
| 140 | + 'langCSharp' => 1, |
|
| 141 | + 'langCustom' => 2, |
|
| 142 | + 'langHTML' => 3, |
|
| 143 | + 'langJS' => 4, |
|
| 144 | + 'langLua' => 5, |
|
| 145 | + 'langPHP' => 6, |
|
| 146 | + 'langSQL' => 7, |
|
| 147 | + 'langVB' => 8, |
|
| 148 | + 'langXML' => 9, |
|
| 149 | 149 | |
| 150 | - # Константы видимости окна процесса |
|
| 150 | + # Константы видимости окна процесса |
|
| 151 | 151 | |
| 152 | - 'pwsHidden' => 0, |
|
| 153 | - 'pwsMaximized' => 3, |
|
| 154 | - 'pwsMinimized' => 2, |
|
| 155 | - 'pwsNormal' => 1, |
|
| 152 | + 'pwsHidden' => 0, |
|
| 153 | + 'pwsMaximized' => 3, |
|
| 154 | + 'pwsMinimized' => 2, |
|
| 155 | + 'pwsNormal' => 1, |
|
| 156 | 156 | |
| 157 | - # Константы запуска |
|
| 157 | + # Константы запуска |
|
| 158 | 158 | |
| 159 | - 'runNo' => 0, |
|
| 160 | - 'runYes' => 1, |
|
| 161 | - 'runThread' => 2, |
|
| 159 | + 'runNo' => 0, |
|
| 160 | + 'runYes' => 1, |
|
| 161 | + 'runThread' => 2, |
|
| 162 | 162 | |
| 163 | - # Константы стиля ProgressBar'а |
|
| 163 | + # Константы стиля ProgressBar'а |
|
| 164 | 164 | |
| 165 | - 'pbBlocks' => 0, |
|
| 166 | - 'pbContinuous' => 1, |
|
| 167 | - 'pbMarquee' => 2, |
|
| 165 | + 'pbBlocks' => 0, |
|
| 166 | + 'pbContinuous' => 1, |
|
| 167 | + 'pbMarquee' => 2, |
|
| 168 | 168 | |
| 169 | - # Константы свойства FlatStyle |
|
| 169 | + # Константы свойства FlatStyle |
|
| 170 | 170 | |
| 171 | - 'flFlat' => 0, |
|
| 172 | - 'flPopup' => 1, |
|
| 173 | - 'flStandard' => 2, |
|
| 174 | - 'flSystem' => 3, |
|
| 171 | + 'flFlat' => 0, |
|
| 172 | + 'flPopup' => 1, |
|
| 173 | + 'flStandard' => 2, |
|
| 174 | + 'flSystem' => 3, |
|
| 175 | 175 | |
| 176 | - # Константы свойства DrawMode |
|
| 176 | + # Константы свойства DrawMode |
|
| 177 | 177 | |
| 178 | - 'dwNormal' => 0, |
|
| 179 | - 'dwOwnerDrawFixed' => 1, |
|
| 180 | - 'dwOwnerDrawVariable' => 2, |
|
| 178 | + 'dwNormal' => 0, |
|
| 179 | + 'dwOwnerDrawFixed' => 1, |
|
| 180 | + 'dwOwnerDrawVariable' => 2, |
|
| 181 | 181 | |
| 182 | - # Константы свойства SizeMode PictureBox'а |
|
| 182 | + # Константы свойства SizeMode PictureBox'а |
|
| 183 | 183 | |
| 184 | - 'smNormal' => 0, |
|
| 185 | - 'smStretchImage' => 1, |
|
| 186 | - 'smAutoSize' => 2, |
|
| 187 | - 'smCenterImage' => 3, |
|
| 188 | - 'smZoom' => 4, |
|
| 184 | + 'smNormal' => 0, |
|
| 185 | + 'smStretchImage' => 1, |
|
| 186 | + 'smAutoSize' => 2, |
|
| 187 | + 'smCenterImage' => 3, |
|
| 188 | + 'smZoom' => 4, |
|
| 189 | 189 | |
| 190 | - # Цветовые константы |
|
| 190 | + # Цветовые константы |
|
| 191 | 191 | |
| 192 | - 'clAliceBlue' => 0xFFF0F8FF, |
|
| 193 | - 'clAntiqueWhite' => 0xFFFAEBD7, |
|
| 194 | - 'clAqua' => 0xFF00FFFF, |
|
| 195 | - 'clAquamarine' => 0xFF7FFFD4, |
|
| 196 | - 'clAzure' => 0xFFF0FFFF, |
|
| 197 | - 'clBeige' => 0xFFF5F5DC, |
|
| 198 | - 'clBisque' => 0xFFFFE4C4, |
|
| 199 | - 'clBlack' => 0xFF000000, |
|
| 200 | - 'clBlanchedAlmond' => 0xFFFFEBCD, |
|
| 201 | - 'clBlue' => 0xFF0000FF, |
|
| 202 | - 'clBlueViolet' => 0xFF8A2BE2, |
|
| 203 | - 'clBrown' => 0xFFA52A2A, |
|
| 204 | - 'clBurlyWood' => 0xFFDEB887, |
|
| 205 | - 'clCadetBlue' => 0xFF5F9EA0, |
|
| 206 | - 'clChartreuse' => 0xFF7FFF00, |
|
| 207 | - 'clChocolate' => 0xFFD2691E, |
|
| 208 | - 'clCoral' => 0xFFFF7F50, |
|
| 209 | - 'clCornflowerBlue' => 0xFF6495ED, |
|
| 210 | - 'clCornsilk' => 0xFFFFF8DC, |
|
| 211 | - 'clCrimson' => 0xFFDC143C, |
|
| 212 | - 'clCyan' => 0xFF00FFFF, |
|
| 213 | - 'clDarkBlue' => 0xFF00008B, |
|
| 214 | - 'clDarkCyan' => 0xFF008B8B, |
|
| 215 | - 'clDarkGoldenrod' => 0xFFB8860B, |
|
| 216 | - 'clDarkGray' => 0xFFA9A9A9, |
|
| 217 | - 'clDarkGreen' => 0xFF006400, |
|
| 218 | - 'clDarkKhaki' => 0xFFBDB76B, |
|
| 219 | - 'clDarkMagenta' => 0xFF8B008B, |
|
| 220 | - 'clDarkOliveGreen' => 0xFF556B2F, |
|
| 221 | - 'clDarkOrange' => 0xFFFF8C00, |
|
| 222 | - 'clDarkOrchid' => 0xFF9932CC, |
|
| 223 | - 'clDarkRed' => 0xFF8B0000, |
|
| 224 | - 'clDarkSalmon' => 0xFFE9967A, |
|
| 225 | - 'clDarkSeaGreen' => 0xFF8FBC8F, |
|
| 226 | - 'clDarkSlateBlue' => 0xFF483D8B, |
|
| 227 | - 'clDarkSlateGray' => 0xFF2F4F4F, |
|
| 228 | - 'clDarkTurquoise' => 0xFF00CED1, |
|
| 229 | - 'clDarkViolet' => 0xFF9400D3, |
|
| 230 | - 'clDeepPink' => 0xFFFF1493, |
|
| 231 | - 'clDeepSkyBlue' => 0xFF00BFFF, |
|
| 232 | - 'clDimGray' => 0xFF696969, |
|
| 233 | - 'clDodgerBlue' => 0xFF1E90FF, |
|
| 234 | - 'clFirebrick' => 0xFFB22222, |
|
| 235 | - 'clFloralWhite' => 0xFFFFFAF0, |
|
| 236 | - 'clForestGreen' => 0xFF228B22, |
|
| 237 | - 'clFuchsia' => 0xFFFF00FF, |
|
| 238 | - 'clGainsboro' => 0xFFDCDCDC, |
|
| 239 | - 'clGhostWhite' => 0xFFF8F8FF, |
|
| 240 | - 'clGold' => 0xFFFFD700, |
|
| 241 | - 'clGoldenrod' => 0xFFDAA520, |
|
| 242 | - 'clGray' => 0xFF808080, |
|
| 243 | - 'clGreen' => 0xFF008000, |
|
| 244 | - 'clGreenYellow' => 0xFFADFF2F, |
|
| 245 | - 'clHoneydew' => 0xFFF0FFF0, |
|
| 246 | - 'clHotPink' => 0xFFFF69B4, |
|
| 247 | - 'clIndianRed' => 0xFFCD5C5C, |
|
| 248 | - 'clIndigo' => 0xFF4B0082, |
|
| 249 | - 'clIvory' => 0xFFFFFFF0, |
|
| 250 | - 'clKhaki' => 0xFFF0E68C, |
|
| 251 | - 'clLavender' => 0xFFE6E6FA, |
|
| 252 | - 'clLavenderBlush' => 0xFFFFF0F5, |
|
| 253 | - 'clLawnGreen' => 0xFF7CFC00, |
|
| 254 | - 'clLemonChiffon' => 0xFFFFFACD, |
|
| 255 | - 'clLightBlue' => 0xFFADD8E6, |
|
| 256 | - 'clLightCoral' => 0xFFF08080, |
|
| 257 | - 'clLightCyan' => 0xFFE0FFFF, |
|
| 258 | - 'clLightGoldenrodYellow' => 0xFFFAFAD2, |
|
| 259 | - 'clLightGray' => 0xFFD3D3D3, |
|
| 260 | - 'clLightGreen' => 0xFF90EE90, |
|
| 261 | - 'clLightPink' => 0xFFFFB6C1, |
|
| 262 | - 'clLightSalmon' => 0xFFFFA07A, |
|
| 263 | - 'clLightSeaGreen' => 0xFF20B2AA, |
|
| 264 | - 'clLightSkyBlue' => 0xFF87CEFA, |
|
| 265 | - 'clLightSlateGray' => 0xFF778899, |
|
| 266 | - 'clLightSteelBlue' => 0xFFB0C4DE, |
|
| 267 | - 'clLightYellow' => 0xFFFFFFE0, |
|
| 268 | - 'clLime' => 0xFF00FF00, |
|
| 269 | - 'clLimeGreen' => 0xFF32CD32, |
|
| 270 | - 'clLinen' => 0xFFFAF0E6, |
|
| 271 | - 'clMagenta' => 0xFFFF00FF, |
|
| 272 | - 'clMaroon' => 0xFF800000, |
|
| 273 | - 'clMediumAquamarine' => 0xFF66CDAA, |
|
| 274 | - 'clMediumBlue' => 0xFF0000CD, |
|
| 275 | - 'clMediumOrchid' => 0xFFBA55D3, |
|
| 276 | - 'clMediumPurple' => 0xFF9370DB, |
|
| 277 | - 'clMediumSeaGreen' => 0xFF3CB371, |
|
| 278 | - 'clMediumSlateBlue' => 0xFF7B68EE, |
|
| 279 | - 'clMediumSpringGreen' => 0xFF00FA9A, |
|
| 280 | - 'clMediumTurquoise' => 0xFF48D1CC, |
|
| 281 | - 'clMediumVioletRed' => 0xFFC71585, |
|
| 282 | - 'clMidnightBlue' => 0xFF191970, |
|
| 283 | - 'clMintCream' => 0xFFF5FFFA, |
|
| 284 | - 'clMistyRose' => 0xFFFFE4E1, |
|
| 285 | - 'clMoccasin' => 0xFFFFE4B5, |
|
| 286 | - 'clNavajoWhite' => 0xFFFFDEAD, |
|
| 287 | - 'clNavy' => 0xFF000080, |
|
| 288 | - 'clOldLace' => 0xFFFDF5E6, |
|
| 289 | - 'clOlive' => 0xFF808000, |
|
| 290 | - 'clOliveDrab' => 0xFF6B8E23, |
|
| 291 | - 'clOrange' => 0xFFFFA500, |
|
| 292 | - 'clOrangeRed' => 0xFFFF4500, |
|
| 293 | - 'clOrchid' => 0xFFDA70D6, |
|
| 294 | - 'clPaleGoldenrod' => 0xFFEEE8AA, |
|
| 295 | - 'clPaleGreen' => 0xFF98FB98, |
|
| 296 | - 'clPaleTurquoise' => 0xFFAFEEEE, |
|
| 297 | - 'clPaleVioletRed' => 0xFFDB7093, |
|
| 298 | - 'clPapayaWhip' => 0xFFFFEFD5, |
|
| 299 | - 'clPeachPuff' => 0xFFFFDAB9, |
|
| 300 | - 'clPeru' => 0xFFCD853F, |
|
| 301 | - 'clPink' => 0xFFFFC0CB, |
|
| 302 | - 'clPlum' => 0xFFDDA0DD, |
|
| 303 | - 'clPowderBlue' => 0xFFB0E0E6, |
|
| 304 | - 'clPurple' => 0xFF800080, |
|
| 305 | - 'clRed' => 0xFFFF0000, |
|
| 306 | - 'clRosyBrown' => 0xFFBC8F8F, |
|
| 307 | - 'clRoyalBlue' => 0xFF4169E1, |
|
| 308 | - 'clSaddleBrown' => 0xFF8B4513, |
|
| 309 | - 'clSalmon' => 0xFFFA8072, |
|
| 310 | - 'clSandyBrown' => 0xFFF4A460, |
|
| 311 | - 'clSeaGreen' => 0xFF2E8B57, |
|
| 312 | - 'clSeaShell' => 0xFFFFF5EE, |
|
| 313 | - 'clSienna' => 0xFFA0522D, |
|
| 314 | - 'clSilver' => 0xFFC0C0C0, |
|
| 315 | - 'clSkyBlue' => 0xFF87CEEB, |
|
| 316 | - 'clSlateBlue' => 0xFF6A5ACD, |
|
| 317 | - 'clSlateGray' => 0xFF708090, |
|
| 318 | - 'clSnow' => 0xFFFFFAFA, |
|
| 319 | - 'clSpringGreen' => 0xFF00FF7F, |
|
| 320 | - 'clSteelBlue' => 0xFF4682B4, |
|
| 321 | - 'clTan' => 0xFFD2B48C, |
|
| 322 | - 'clTeal' => 0xFF008080, |
|
| 323 | - 'clThistle' => 0xFFD8BFD8, |
|
| 324 | - 'clTomato' => 0xFFFF6347, |
|
| 325 | - 'clTurquoise' => 0xFF40E0D0, |
|
| 326 | - 'clViolet' => 0xFFEE82EE, |
|
| 327 | - 'clWheat' => 0xFFF5DEB3, |
|
| 328 | - 'clWhite' => 0xFFFFFFFF, |
|
| 329 | - 'clWhiteSmoke' => 0xFFF5F5F5, |
|
| 330 | - 'clYellow' => 0xFFFFFF00, |
|
| 331 | - 'clYellowGreen' => 0xFF9ACD32, |
|
| 332 | - |
|
| 333 | - # Моя подборка цветов |
|
| 334 | - |
|
| 335 | - 'clDark' => $converter->fromHtml ('#0D0F12'), |
|
| 336 | - 'clDark2' => $converter->fromHtml ('#121416'), |
|
| 337 | - 'clTurquoise' => $converter->fromHtml ('#00ADB5'), |
|
| 338 | - 'clLight' => $converter->fromHtml ('#EEEEEE') |
|
| 192 | + 'clAliceBlue' => 0xFFF0F8FF, |
|
| 193 | + 'clAntiqueWhite' => 0xFFFAEBD7, |
|
| 194 | + 'clAqua' => 0xFF00FFFF, |
|
| 195 | + 'clAquamarine' => 0xFF7FFFD4, |
|
| 196 | + 'clAzure' => 0xFFF0FFFF, |
|
| 197 | + 'clBeige' => 0xFFF5F5DC, |
|
| 198 | + 'clBisque' => 0xFFFFE4C4, |
|
| 199 | + 'clBlack' => 0xFF000000, |
|
| 200 | + 'clBlanchedAlmond' => 0xFFFFEBCD, |
|
| 201 | + 'clBlue' => 0xFF0000FF, |
|
| 202 | + 'clBlueViolet' => 0xFF8A2BE2, |
|
| 203 | + 'clBrown' => 0xFFA52A2A, |
|
| 204 | + 'clBurlyWood' => 0xFFDEB887, |
|
| 205 | + 'clCadetBlue' => 0xFF5F9EA0, |
|
| 206 | + 'clChartreuse' => 0xFF7FFF00, |
|
| 207 | + 'clChocolate' => 0xFFD2691E, |
|
| 208 | + 'clCoral' => 0xFFFF7F50, |
|
| 209 | + 'clCornflowerBlue' => 0xFF6495ED, |
|
| 210 | + 'clCornsilk' => 0xFFFFF8DC, |
|
| 211 | + 'clCrimson' => 0xFFDC143C, |
|
| 212 | + 'clCyan' => 0xFF00FFFF, |
|
| 213 | + 'clDarkBlue' => 0xFF00008B, |
|
| 214 | + 'clDarkCyan' => 0xFF008B8B, |
|
| 215 | + 'clDarkGoldenrod' => 0xFFB8860B, |
|
| 216 | + 'clDarkGray' => 0xFFA9A9A9, |
|
| 217 | + 'clDarkGreen' => 0xFF006400, |
|
| 218 | + 'clDarkKhaki' => 0xFFBDB76B, |
|
| 219 | + 'clDarkMagenta' => 0xFF8B008B, |
|
| 220 | + 'clDarkOliveGreen' => 0xFF556B2F, |
|
| 221 | + 'clDarkOrange' => 0xFFFF8C00, |
|
| 222 | + 'clDarkOrchid' => 0xFF9932CC, |
|
| 223 | + 'clDarkRed' => 0xFF8B0000, |
|
| 224 | + 'clDarkSalmon' => 0xFFE9967A, |
|
| 225 | + 'clDarkSeaGreen' => 0xFF8FBC8F, |
|
| 226 | + 'clDarkSlateBlue' => 0xFF483D8B, |
|
| 227 | + 'clDarkSlateGray' => 0xFF2F4F4F, |
|
| 228 | + 'clDarkTurquoise' => 0xFF00CED1, |
|
| 229 | + 'clDarkViolet' => 0xFF9400D3, |
|
| 230 | + 'clDeepPink' => 0xFFFF1493, |
|
| 231 | + 'clDeepSkyBlue' => 0xFF00BFFF, |
|
| 232 | + 'clDimGray' => 0xFF696969, |
|
| 233 | + 'clDodgerBlue' => 0xFF1E90FF, |
|
| 234 | + 'clFirebrick' => 0xFFB22222, |
|
| 235 | + 'clFloralWhite' => 0xFFFFFAF0, |
|
| 236 | + 'clForestGreen' => 0xFF228B22, |
|
| 237 | + 'clFuchsia' => 0xFFFF00FF, |
|
| 238 | + 'clGainsboro' => 0xFFDCDCDC, |
|
| 239 | + 'clGhostWhite' => 0xFFF8F8FF, |
|
| 240 | + 'clGold' => 0xFFFFD700, |
|
| 241 | + 'clGoldenrod' => 0xFFDAA520, |
|
| 242 | + 'clGray' => 0xFF808080, |
|
| 243 | + 'clGreen' => 0xFF008000, |
|
| 244 | + 'clGreenYellow' => 0xFFADFF2F, |
|
| 245 | + 'clHoneydew' => 0xFFF0FFF0, |
|
| 246 | + 'clHotPink' => 0xFFFF69B4, |
|
| 247 | + 'clIndianRed' => 0xFFCD5C5C, |
|
| 248 | + 'clIndigo' => 0xFF4B0082, |
|
| 249 | + 'clIvory' => 0xFFFFFFF0, |
|
| 250 | + 'clKhaki' => 0xFFF0E68C, |
|
| 251 | + 'clLavender' => 0xFFE6E6FA, |
|
| 252 | + 'clLavenderBlush' => 0xFFFFF0F5, |
|
| 253 | + 'clLawnGreen' => 0xFF7CFC00, |
|
| 254 | + 'clLemonChiffon' => 0xFFFFFACD, |
|
| 255 | + 'clLightBlue' => 0xFFADD8E6, |
|
| 256 | + 'clLightCoral' => 0xFFF08080, |
|
| 257 | + 'clLightCyan' => 0xFFE0FFFF, |
|
| 258 | + 'clLightGoldenrodYellow' => 0xFFFAFAD2, |
|
| 259 | + 'clLightGray' => 0xFFD3D3D3, |
|
| 260 | + 'clLightGreen' => 0xFF90EE90, |
|
| 261 | + 'clLightPink' => 0xFFFFB6C1, |
|
| 262 | + 'clLightSalmon' => 0xFFFFA07A, |
|
| 263 | + 'clLightSeaGreen' => 0xFF20B2AA, |
|
| 264 | + 'clLightSkyBlue' => 0xFF87CEFA, |
|
| 265 | + 'clLightSlateGray' => 0xFF778899, |
|
| 266 | + 'clLightSteelBlue' => 0xFFB0C4DE, |
|
| 267 | + 'clLightYellow' => 0xFFFFFFE0, |
|
| 268 | + 'clLime' => 0xFF00FF00, |
|
| 269 | + 'clLimeGreen' => 0xFF32CD32, |
|
| 270 | + 'clLinen' => 0xFFFAF0E6, |
|
| 271 | + 'clMagenta' => 0xFFFF00FF, |
|
| 272 | + 'clMaroon' => 0xFF800000, |
|
| 273 | + 'clMediumAquamarine' => 0xFF66CDAA, |
|
| 274 | + 'clMediumBlue' => 0xFF0000CD, |
|
| 275 | + 'clMediumOrchid' => 0xFFBA55D3, |
|
| 276 | + 'clMediumPurple' => 0xFF9370DB, |
|
| 277 | + 'clMediumSeaGreen' => 0xFF3CB371, |
|
| 278 | + 'clMediumSlateBlue' => 0xFF7B68EE, |
|
| 279 | + 'clMediumSpringGreen' => 0xFF00FA9A, |
|
| 280 | + 'clMediumTurquoise' => 0xFF48D1CC, |
|
| 281 | + 'clMediumVioletRed' => 0xFFC71585, |
|
| 282 | + 'clMidnightBlue' => 0xFF191970, |
|
| 283 | + 'clMintCream' => 0xFFF5FFFA, |
|
| 284 | + 'clMistyRose' => 0xFFFFE4E1, |
|
| 285 | + 'clMoccasin' => 0xFFFFE4B5, |
|
| 286 | + 'clNavajoWhite' => 0xFFFFDEAD, |
|
| 287 | + 'clNavy' => 0xFF000080, |
|
| 288 | + 'clOldLace' => 0xFFFDF5E6, |
|
| 289 | + 'clOlive' => 0xFF808000, |
|
| 290 | + 'clOliveDrab' => 0xFF6B8E23, |
|
| 291 | + 'clOrange' => 0xFFFFA500, |
|
| 292 | + 'clOrangeRed' => 0xFFFF4500, |
|
| 293 | + 'clOrchid' => 0xFFDA70D6, |
|
| 294 | + 'clPaleGoldenrod' => 0xFFEEE8AA, |
|
| 295 | + 'clPaleGreen' => 0xFF98FB98, |
|
| 296 | + 'clPaleTurquoise' => 0xFFAFEEEE, |
|
| 297 | + 'clPaleVioletRed' => 0xFFDB7093, |
|
| 298 | + 'clPapayaWhip' => 0xFFFFEFD5, |
|
| 299 | + 'clPeachPuff' => 0xFFFFDAB9, |
|
| 300 | + 'clPeru' => 0xFFCD853F, |
|
| 301 | + 'clPink' => 0xFFFFC0CB, |
|
| 302 | + 'clPlum' => 0xFFDDA0DD, |
|
| 303 | + 'clPowderBlue' => 0xFFB0E0E6, |
|
| 304 | + 'clPurple' => 0xFF800080, |
|
| 305 | + 'clRed' => 0xFFFF0000, |
|
| 306 | + 'clRosyBrown' => 0xFFBC8F8F, |
|
| 307 | + 'clRoyalBlue' => 0xFF4169E1, |
|
| 308 | + 'clSaddleBrown' => 0xFF8B4513, |
|
| 309 | + 'clSalmon' => 0xFFFA8072, |
|
| 310 | + 'clSandyBrown' => 0xFFF4A460, |
|
| 311 | + 'clSeaGreen' => 0xFF2E8B57, |
|
| 312 | + 'clSeaShell' => 0xFFFFF5EE, |
|
| 313 | + 'clSienna' => 0xFFA0522D, |
|
| 314 | + 'clSilver' => 0xFFC0C0C0, |
|
| 315 | + 'clSkyBlue' => 0xFF87CEEB, |
|
| 316 | + 'clSlateBlue' => 0xFF6A5ACD, |
|
| 317 | + 'clSlateGray' => 0xFF708090, |
|
| 318 | + 'clSnow' => 0xFFFFFAFA, |
|
| 319 | + 'clSpringGreen' => 0xFF00FF7F, |
|
| 320 | + 'clSteelBlue' => 0xFF4682B4, |
|
| 321 | + 'clTan' => 0xFFD2B48C, |
|
| 322 | + 'clTeal' => 0xFF008080, |
|
| 323 | + 'clThistle' => 0xFFD8BFD8, |
|
| 324 | + 'clTomato' => 0xFFFF6347, |
|
| 325 | + 'clTurquoise' => 0xFF40E0D0, |
|
| 326 | + 'clViolet' => 0xFFEE82EE, |
|
| 327 | + 'clWheat' => 0xFFF5DEB3, |
|
| 328 | + 'clWhite' => 0xFFFFFFFF, |
|
| 329 | + 'clWhiteSmoke' => 0xFFF5F5F5, |
|
| 330 | + 'clYellow' => 0xFFFFFF00, |
|
| 331 | + 'clYellowGreen' => 0xFF9ACD32, |
|
| 332 | + |
|
| 333 | + # Моя подборка цветов |
|
| 334 | + |
|
| 335 | + 'clDark' => $converter->fromHtml ('#0D0F12'), |
|
| 336 | + 'clDark2' => $converter->fromHtml ('#121416'), |
|
| 337 | + 'clTurquoise' => $converter->fromHtml ('#00ADB5'), |
|
| 338 | + 'clLight' => $converter->fromHtml ('#EEEEEE') |
|
| 339 | 339 | ]; |
| 340 | 340 | |
| 341 | 341 | foreach ($constants as $name => $value) |
| 342 | - define ($name, $value); |
|
| 342 | + define ($name, $value); |
|
| 343 | 343 | |
| 344 | 344 | $argv = START_PARAMS; |
| 345 | 345 | $argc = sizeof ($argv); |
@@ -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); |
@@ -2,17 +2,17 @@ discard block |
||
| 2 | 2 | |
| 3 | 3 | namespace VoidEngine; |
| 4 | 4 | |
| 5 | -$env = new WFClass ('System.Environment', 'mscorlib'); |
|
| 6 | -$params = $env->getCommandLineArgs ()->list; |
|
| 5 | +$env = new WFClass('System.Environment', 'mscorlib'); |
|
| 6 | +$params = $env->getCommandLineArgs()->list; |
|
| 7 | 7 | |
| 8 | -$converter = new WFClass ('System.Drawing.ColorTranslator'); |
|
| 8 | +$converter = new WFClass('System.Drawing.ColorTranslator'); |
|
| 9 | 9 | |
| 10 | 10 | $constants = [ |
| 11 | 11 | # Информация об окружении |
| 12 | 12 | |
| 13 | 13 | 'EXE_NAME' => $APPLICATION->executablePath, |
| 14 | - 'DOC_ROOT' => dirname ($APPLICATION->executablePath), |
|
| 15 | - 'IS_ADMIN' => is_writable (getenv ('SystemRoot')), |
|
| 14 | + 'DOC_ROOT' => dirname($APPLICATION->executablePath), |
|
| 15 | + 'IS_ADMIN' => is_writable(getenv('SystemRoot')), |
|
| 16 | 16 | 'START_PARAMS' => $params, |
| 17 | 17 | 'USERNAME' => $env->username, |
| 18 | 18 | |
@@ -332,17 +332,17 @@ discard block |
||
| 332 | 332 | |
| 333 | 333 | # Моя подборка цветов |
| 334 | 334 | |
| 335 | - 'clDark' => $converter->fromHtml ('#0D0F12'), |
|
| 336 | - 'clDark2' => $converter->fromHtml ('#121416'), |
|
| 337 | - 'clTurquoise' => $converter->fromHtml ('#00ADB5'), |
|
| 338 | - 'clLight' => $converter->fromHtml ('#EEEEEE') |
|
| 335 | + 'clDark' => $converter->fromHtml('#0D0F12'), |
|
| 336 | + 'clDark2' => $converter->fromHtml('#121416'), |
|
| 337 | + 'clTurquoise' => $converter->fromHtml('#00ADB5'), |
|
| 338 | + 'clLight' => $converter->fromHtml('#EEEEEE') |
|
| 339 | 339 | ]; |
| 340 | 340 | |
| 341 | 341 | foreach ($constants as $name => $value) |
| 342 | - define ($name, $value); |
|
| 342 | + define($name, $value); |
|
| 343 | 343 | |
| 344 | 344 | $argv = START_PARAMS; |
| 345 | -$argc = sizeof ($argv); |
|
| 345 | +$argc = sizeof($argv); |
|
| 346 | 346 | |
| 347 | -\VoidCore::removeObjects ($converter->selector); |
|
| 347 | +\VoidCore::removeObjects($converter->selector); |
|
| 348 | 348 | unset ($constants, $env, $params, $converter); |
@@ -12,11 +12,11 @@ |
||
| 12 | 12 | protected $styles; |
| 13 | 13 | |
| 14 | 14 | public function __construct (Component $parent = null) |
| 15 | - { |
|
| 15 | + { |
|
| 16 | 16 | parent::__construct ($parent, $this->class); |
| 17 | 17 | |
| 18 | 18 | $this->styles = $this->getProperty ('Styles'); |
| 19 | - } |
|
| 19 | + } |
|
| 20 | 20 | |
| 21 | 21 | public function resetSyntax () |
| 22 | 22 | { |
@@ -2,7 +2,7 @@ discard block |
||
| 2 | 2 | |
| 3 | 3 | namespace VoidEngine; |
| 4 | 4 | |
| 5 | -EngineAdditions::loadModule ('ScintillaNET.dll'); |
|
| 5 | +EngineAdditions::loadModule('ScintillaNET.dll'); |
|
| 6 | 6 | |
| 7 | 7 | class Scintilla extends NoVisual |
| 8 | 8 | { |
@@ -11,71 +11,71 @@ discard block |
||
| 11 | 11 | |
| 12 | 12 | protected $styles; |
| 13 | 13 | |
| 14 | - public function __construct (Component $parent = null) |
|
| 14 | + public function __construct(Component $parent = null) |
|
| 15 | 15 | { |
| 16 | - parent::__construct ($parent, $this->class); |
|
| 16 | + parent::__construct($parent, $this->class); |
|
| 17 | 17 | |
| 18 | - $this->styles = $this->getProperty ('Styles'); |
|
| 18 | + $this->styles = $this->getProperty('Styles'); |
|
| 19 | 19 | } |
| 20 | 20 | |
| 21 | - public function resetSyntax () |
|
| 21 | + public function resetSyntax() |
|
| 22 | 22 | { |
| 23 | - $this->callMethod ('StyleResetDefault'); |
|
| 23 | + $this->callMethod('StyleResetDefault'); |
|
| 24 | 24 | } |
| 25 | 25 | |
| 26 | - public function clearSyntax () |
|
| 26 | + public function clearSyntax() |
|
| 27 | 27 | { |
| 28 | - $this->callMethod ('StyleClearAll'); |
|
| 28 | + $this->callMethod('StyleClearAll'); |
|
| 29 | 29 | } |
| 30 | 30 | |
| 31 | - public function setKeywords (int $index, string $keywords) |
|
| 31 | + public function setKeywords(int $index, string $keywords) |
|
| 32 | 32 | { |
| 33 | - $this->callMethod ('SetKeywords', [$index, 'int'], [$keywords, 'string']); |
|
| 33 | + $this->callMethod('SetKeywords', [$index, 'int'], [$keywords, 'string']); |
|
| 34 | 34 | } |
| 35 | 35 | |
| 36 | - public function propertyInit (string $propertyName, $propertyValue) |
|
| 36 | + public function propertyInit(string $propertyName, $propertyValue) |
|
| 37 | 37 | { |
| 38 | - $this->callMethod ('SetProperty', [$propertyName, 'string'], [$propertyValue, 'string']); |
|
| 38 | + $this->callMethod('SetProperty', [$propertyName, 'string'], [$propertyValue, 'string']); |
|
| 39 | 39 | } |
| 40 | 40 | |
| 41 | - public function set_syntax ($syntax) |
|
| 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 | - $syntax = json_decode ($syntax, true); |
|
| 46 | + $syntax = json_decode($syntax, true); |
|
| 47 | 47 | |
| 48 | 48 | if ( |
| 49 | - !is_array ($syntax['syntax']) || |
|
| 50 | - !is_array ($syntax['references']) || |
|
| 49 | + !is_array($syntax['syntax']) || |
|
| 50 | + !is_array($syntax['references']) || |
|
| 51 | 51 | !isset ($syntax['lexer']) |
| 52 | 52 | ) return false; |
| 53 | 53 | |
| 54 | 54 | else |
| 55 | 55 | { |
| 56 | - $this->resetSyntax (); |
|
| 57 | - $this->clearSyntax (); |
|
| 56 | + $this->resetSyntax(); |
|
| 57 | + $this->clearSyntax(); |
|
| 58 | 58 | |
| 59 | 59 | foreach ($syntax['references'] as $name => $value) |
| 60 | 60 | if (isset ($syntax['syntax'][$name])) |
| 61 | 61 | { |
| 62 | - $element = \VoidCore::getArrayValue ($this->styles, $value); |
|
| 62 | + $element = \VoidCore::getArrayValue($this->styles, $value); |
|
| 63 | 63 | $color = $syntax['syntax'][$name]; |
| 64 | 64 | |
| 65 | - if (defined ($color)) |
|
| 66 | - $color = constant ($color); |
|
| 65 | + if (defined($color)) |
|
| 66 | + $color = constant($color); |
|
| 67 | 67 | |
| 68 | - \VoidCore::setProperty ($element, 'ForeColor', [$color, 'color']); |
|
| 68 | + \VoidCore::setProperty($element, 'ForeColor', [$color, 'color']); |
|
| 69 | 69 | } |
| 70 | 70 | |
| 71 | 71 | $this->lexer = $syntax['lexer']; |
| 72 | 72 | |
| 73 | - if (is_array ($syntax['keywords'])) |
|
| 73 | + if (is_array($syntax['keywords'])) |
|
| 74 | 74 | foreach ($syntax['keywords'] as $id => $keywords) |
| 75 | - $this->setKeywords ($id, $keywords); |
|
| 75 | + $this->setKeywords($id, $keywords); |
|
| 76 | 76 | |
| 77 | - $this->propertyInit ('fold', 1); |
|
| 78 | - $this->propertyInit ('fold.compact', 1); |
|
| 77 | + $this->propertyInit('fold', 1); |
|
| 78 | + $this->propertyInit('fold.compact', 1); |
|
| 79 | 79 | |
| 80 | 80 | return true; |
| 81 | 81 | } |
@@ -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 = \VoidCore::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 | \VoidCore::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); |
@@ -6,33 +6,33 @@ |
||
| 6 | 6 | { |
| 7 | 7 | public $class = 'System.Windows.Forms.ProgressBar'; |
| 8 | 8 | |
| 9 | - public function get_max () |
|
| 9 | + public function get_max() |
|
| 10 | 10 | { |
| 11 | - return $this->getProperty ('Maximum'); |
|
| 11 | + return $this->getProperty('Maximum'); |
|
| 12 | 12 | } |
| 13 | 13 | |
| 14 | - public function set_max (int $max) |
|
| 14 | + public function set_max(int $max) |
|
| 15 | 15 | { |
| 16 | - $this->setProperty ('Maximum', $max); |
|
| 16 | + $this->setProperty('Maximum', $max); |
|
| 17 | 17 | } |
| 18 | 18 | |
| 19 | - public function get_min () |
|
| 19 | + public function get_min() |
|
| 20 | 20 | { |
| 21 | - return $this->getProperty ('Minimum'); |
|
| 21 | + return $this->getProperty('Minimum'); |
|
| 22 | 22 | } |
| 23 | 23 | |
| 24 | - public function set_min (int $min) |
|
| 24 | + public function set_min(int $min) |
|
| 25 | 25 | { |
| 26 | - $this->setProperty ('Minimum', $min); |
|
| 26 | + $this->setProperty('Minimum', $min); |
|
| 27 | 27 | } |
| 28 | 28 | |
| 29 | - public function get_position () |
|
| 29 | + public function get_position() |
|
| 30 | 30 | { |
| 31 | - return $this->getProperty ('Value'); |
|
| 31 | + return $this->getProperty('Value'); |
|
| 32 | 32 | } |
| 33 | 33 | |
| 34 | - public function set_position (int $position) |
|
| 34 | + public function set_position(int $position) |
|
| 35 | 35 | { |
| 36 | - $this->setProperty ('Value', $position); |
|
| 36 | + $this->setProperty('Value', $position); |
|
| 37 | 37 | } |
| 38 | 38 | } |
@@ -6,8 +6,8 @@ |
||
| 6 | 6 | { |
| 7 | 7 | public $class = 'System.Windows.Forms.CommonDialog'; |
| 8 | 8 | |
| 9 | - public function execute (): int |
|
| 9 | + public function execute(): int |
|
| 10 | 10 | { |
| 11 | - return $this->callMethod ('ShowDialog'); |
|
| 11 | + return $this->callMethod('ShowDialog'); |
|
| 12 | 12 | } |
| 13 | 13 | } |
@@ -49,7 +49,7 @@ |
||
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | public function dispose (): void |
| 52 | - { |
|
| 52 | + { |
|
| 53 | 53 | foreach (array_diff (get_object_vars ($this), ['selector']) as $param => $value) |
| 54 | 54 | { |
| 55 | 55 | if (is_int ($value)) |
@@ -9,81 +9,81 @@ |
||
| 9 | 9 | public $class = 'System.Windows.Forms.Component'; |
| 10 | 10 | public $namespace = 'System.Windows.Forms'; |
| 11 | 11 | |
| 12 | - public function __construct ($className = null, ...$args) |
|
| 12 | + public function __construct($className = null, ...$args) |
|
| 13 | 13 | { |
| 14 | - parent::__construct ( |
|
| 14 | + parent::__construct( |
|
| 15 | 15 | $className === null ? $this->class : $className, |
| 16 | 16 | $this->namespace ?? false, |
| 17 | 17 | ...$args |
| 18 | 18 | ); |
| 19 | 19 | |
| 20 | - Components::addComponent ($this->selector, $this); |
|
| 20 | + Components::addComponent($this->selector, $this); |
|
| 21 | 21 | } |
| 22 | 22 | |
| 23 | - public function __debugInfo (): array |
|
| 23 | + public function __debugInfo(): array |
|
| 24 | 24 | { |
| 25 | 25 | return [ |
| 26 | - 'description' => @$this->__toString (), |
|
| 26 | + 'description' => @$this->__toString(), |
|
| 27 | 27 | 'selector' => @$this->selector, |
| 28 | 28 | 'name' => @$this->name, |
| 29 | - 'objectInfo' => @json_encode ($this, JSON_PRETTY_PRINT) |
|
| 29 | + 'objectInfo' => @json_encode($this, JSON_PRETTY_PRINT) |
|
| 30 | 30 | ]; |
| 31 | 31 | } |
| 32 | 32 | |
| 33 | - public function __unset ($name) |
|
| 33 | + public function __unset($name) |
|
| 34 | 34 | { |
| 35 | 35 | if (isset ($this->$name)) |
| 36 | 36 | { |
| 37 | - if (is_int ($this->$name)) |
|
| 37 | + if (is_int($this->$name)) |
|
| 38 | 38 | { |
| 39 | - Components::removeComponent ($this->$name); |
|
| 39 | + Components::removeComponent($this->$name); |
|
| 40 | 40 | |
| 41 | - if (\VoidCore::objectExists ($this->$name)) |
|
| 42 | - \VoidCore::removeObjects ($this->$name); |
|
| 41 | + if (\VoidCore::objectExists($this->$name)) |
|
| 42 | + \VoidCore::removeObjects($this->$name); |
|
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | elseif ($this->$name instanceof Component) |
| 46 | - $this->$name->dispose (); |
|
| 46 | + $this->$name->dispose(); |
|
| 47 | 47 | } |
| 48 | 48 | |
| 49 | 49 | unset ($this->$name); |
| 50 | 50 | } |
| 51 | 51 | |
| 52 | - public function dispose (): void |
|
| 52 | + public function dispose(): void |
|
| 53 | 53 | { |
| 54 | - foreach (array_diff (get_object_vars ($this), ['selector']) as $param => $value) |
|
| 54 | + foreach (array_diff(get_object_vars($this), ['selector']) as $param => $value) |
|
| 55 | 55 | { |
| 56 | - if (is_int ($value)) |
|
| 56 | + if (is_int($value)) |
|
| 57 | 57 | { |
| 58 | - Components::removeComponent ($value); |
|
| 58 | + Components::removeComponent($value); |
|
| 59 | 59 | |
| 60 | - if (\VoidCore::objectExists ($value)) |
|
| 61 | - \VoidCore::removeObjects ($value); |
|
| 60 | + if (\VoidCore::objectExists($value)) |
|
| 61 | + \VoidCore::removeObjects($value); |
|
| 62 | 62 | } |
| 63 | 63 | |
| 64 | 64 | elseif ($value instanceof Component) |
| 65 | - $value->dispose (); |
|
| 65 | + $value->dispose(); |
|
| 66 | 66 | |
| 67 | 67 | unset ($this->$param); |
| 68 | 68 | } |
| 69 | 69 | |
| 70 | 70 | if (isset ($this->selector)) |
| 71 | 71 | { |
| 72 | - if (\VoidCore::objectExists ($this->selector)) |
|
| 73 | - \VoidCore::removeObjects ($this->selector); |
|
| 72 | + if (\VoidCore::objectExists($this->selector)) |
|
| 73 | + \VoidCore::removeObjects($this->selector); |
|
| 74 | 74 | |
| 75 | - Components::removeComponent ($this->selector); |
|
| 75 | + Components::removeComponent($this->selector); |
|
| 76 | 76 | } |
| 77 | 77 | |
| 78 | - Components::cleanJunk (); |
|
| 78 | + Components::cleanJunk(); |
|
| 79 | 79 | } |
| 80 | 80 | |
| 81 | - public function __destruct () |
|
| 81 | + public function __destruct() |
|
| 82 | 82 | { |
| 83 | - if (isset ($this->selector) && \VoidCore::destructObject ($this->selector)) |
|
| 83 | + if (isset ($this->selector) && \VoidCore::destructObject($this->selector)) |
|
| 84 | 84 | { |
| 85 | - \VoidCore::removeObjects ($this->selector); |
|
| 86 | - Components::removeComponent ($this->selector); |
|
| 85 | + \VoidCore::removeObjects($this->selector); |
|
| 86 | + Components::removeComponent($this->selector); |
|
| 87 | 87 | } |
| 88 | 88 | } |
| 89 | 89 | } |
@@ -38,12 +38,12 @@ discard block |
||
| 38 | 38 | { |
| 39 | 39 | Components::removeComponent ($this->$name); |
| 40 | 40 | |
| 41 | - if (\VoidCore::objectExists ($this->$name)) |
|
| 42 | - \VoidCore::removeObjects ($this->$name); |
|
| 41 | + if (\VoidCore::objectExists ($this->$name)) { |
|
| 42 | + \VoidCore::removeObjects ($this->$name); |
|
| 43 | + } |
|
| 44 | + } elseif ($this->$name instanceof Component) { |
|
| 45 | + $this->$name->dispose (); |
|
| 43 | 46 | } |
| 44 | - |
|
| 45 | - elseif ($this->$name instanceof Component) |
|
| 46 | - $this->$name->dispose (); |
|
| 47 | 47 | } |
| 48 | 48 | |
| 49 | 49 | unset ($this->$name); |
@@ -57,20 +57,21 @@ discard block |
||
| 57 | 57 | { |
| 58 | 58 | Components::removeComponent ($value); |
| 59 | 59 | |
| 60 | - if (\VoidCore::objectExists ($value)) |
|
| 61 | - \VoidCore::removeObjects ($value); |
|
| 60 | + if (\VoidCore::objectExists ($value)) { |
|
| 61 | + \VoidCore::removeObjects ($value); |
|
| 62 | + } |
|
| 63 | + } elseif ($value instanceof Component) { |
|
| 64 | + $value->dispose (); |
|
| 62 | 65 | } |
| 63 | 66 | |
| 64 | - elseif ($value instanceof Component) |
|
| 65 | - $value->dispose (); |
|
| 66 | - |
|
| 67 | 67 | unset ($this->$param); |
| 68 | 68 | } |
| 69 | 69 | |
| 70 | 70 | if (isset ($this->selector)) |
| 71 | 71 | { |
| 72 | - if (\VoidCore::objectExists ($this->selector)) |
|
| 73 | - \VoidCore::removeObjects ($this->selector); |
|
| 72 | + if (\VoidCore::objectExists ($this->selector)) { |
|
| 73 | + \VoidCore::removeObjects ($this->selector); |
|
| 74 | + } |
|
| 74 | 75 | |
| 75 | 76 | Components::removeComponent ($this->selector); |
| 76 | 77 | } |
@@ -6,18 +6,18 @@ |
||
| 6 | 6 | { |
| 7 | 7 | public $class = 'System.Windows.Forms.WebBrowser'; |
| 8 | 8 | |
| 9 | - public function back (): void |
|
| 9 | + public function back(): void |
|
| 10 | 10 | { |
| 11 | - $this->callMethod ('GoBack'); |
|
| 11 | + $this->callMethod('GoBack'); |
|
| 12 | 12 | } |
| 13 | 13 | |
| 14 | - public function forward (): void |
|
| 14 | + public function forward(): void |
|
| 15 | 15 | { |
| 16 | - $this->callMethod ('GoForward'); |
|
| 16 | + $this->callMethod('GoForward'); |
|
| 17 | 17 | } |
| 18 | 18 | |
| 19 | - public function browse (string $url) |
|
| 19 | + public function browse(string $url) |
|
| 20 | 20 | { |
| 21 | - return $this->callMethod ('Navigate', $url); |
|
| 21 | + return $this->callMethod('Navigate', $url); |
|
| 22 | 22 | } |
| 23 | 23 | } |