@@ -23,7 +23,7 @@ |
||
23 | 23 | |
24 | 24 | $required_packages = array |
25 | 25 | ( |
26 | - array ('github:winforms-php/VoidFramework', '3.5.4'), |
|
27 | - array ('github:KRypt0nn/ConsoleArgs', '1.5'), |
|
28 | - array ('github:winforms-php/VoidBuilder', '1.2') |
|
26 | + array ('github:winforms-php/VoidFramework', '3.5.4'), |
|
27 | + array ('github:KRypt0nn/ConsoleArgs', '1.5'), |
|
28 | + array ('github:winforms-php/VoidBuilder', '1.2') |
|
29 | 29 | ); |
@@ -78,40 +78,40 @@ discard block |
||
78 | 78 | { |
79 | 79 | $this->componentAddedEvent = function ($self, $args) |
80 | 80 | { |
81 | - if (!isset ($GLOBALS['new_component'])) |
|
82 | - { |
|
81 | + if (!isset ($GLOBALS['new_component'])) |
|
82 | + { |
|
83 | 83 | $name = $args->component->getType ()->toString (); |
84 | 84 | |
85 | 85 | // pre (VoidEngine::getProperty ($args->component->selector, 'Name')); |
86 | 86 | |
87 | - $GLOBALS['new_component'] = [$this->getComponentName ($args->component->selector), [$name, substr ($name, 0, strrpos ($name, '.'))]]; |
|
88 | - } |
|
87 | + $GLOBALS['new_component'] = [$this->getComponentName ($args->component->selector), [$name, substr ($name, 0, strrpos ($name, '.'))]]; |
|
88 | + } |
|
89 | 89 | |
90 | - $this->setComponentToHistory ($GLOBALS['new_component'][1], $GLOBALS['new_component'][0]); |
|
91 | - $components = VoidStudioAPI::getObjects ('main')['PropertiesPanel__SelectedComponent']; |
|
90 | + $this->setComponentToHistory ($GLOBALS['new_component'][1], $GLOBALS['new_component'][0]); |
|
91 | + $components = VoidStudioAPI::getObjects ('main')['PropertiesPanel__SelectedComponent']; |
|
92 | 92 | |
93 | - $components->items->clear (); |
|
94 | - $components->items->addRange (array_keys ($this->objects)); |
|
93 | + $components->items->clear (); |
|
94 | + $components->items->addRange (array_keys ($this->objects)); |
|
95 | 95 | |
96 | - $components->selectedItem = $GLOBALS['new_component'][0]; |
|
97 | - $this->setSelectedComponents ($args->component); |
|
96 | + $components->selectedItem = $GLOBALS['new_component'][0]; |
|
97 | + $this->setSelectedComponents ($args->component); |
|
98 | 98 | |
99 | - unset ($GLOBALS['new_component']); |
|
99 | + unset ($GLOBALS['new_component']); |
|
100 | 100 | }; |
101 | 101 | |
102 | - $this->componentRemovedEvent = function ($self, $args) |
|
103 | - { |
|
104 | - $name = $this->getComponentName ($args->component->selector); |
|
105 | - unset ($this->objects[$name]); |
|
102 | + $this->componentRemovedEvent = function ($self, $args) |
|
103 | + { |
|
104 | + $name = $this->getComponentName ($args->component->selector); |
|
105 | + unset ($this->objects[$name]); |
|
106 | 106 | |
107 | - foreach ($this->objects as $objectName => $object) |
|
108 | - if (!is_int ($this->getComponentByName ($objectName))) |
|
109 | - unset ($this->objects[$objectName]); |
|
107 | + foreach ($this->objects as $objectName => $object) |
|
108 | + if (!is_int ($this->getComponentByName ($objectName))) |
|
109 | + unset ($this->objects[$objectName]); |
|
110 | 110 | |
111 | - $this->currentSelectedItem->items->clear (); |
|
112 | - $this->currentSelectedItem->items->addRange (array_keys ($this->objects)); |
|
113 | - $this->currentSelectedItem->selectedItem = $this->getComponentName ($this->getPrimarySelection ()->selector); |
|
114 | - }; |
|
111 | + $this->currentSelectedItem->items->clear (); |
|
112 | + $this->currentSelectedItem->items->addRange (array_keys ($this->objects)); |
|
113 | + $this->currentSelectedItem->selectedItem = $this->getComponentName ($this->getPrimarySelection ()->selector); |
|
114 | + }; |
|
115 | 115 | |
116 | 116 | // ! Отредактировал что-то здесь? |
117 | 117 | // ! Не забудь отредактировать и в main.vlf |
@@ -151,9 +151,9 @@ discard block |
||
151 | 151 | // $desItem->shortcutKeys = 131148; |
152 | 152 | $desItem->clickEvent = function () use ($object, $locker, $locked) |
153 | 153 | { |
154 | - $locker->setValue ($object, !$locked); |
|
154 | + $locker->setValue ($object, !$locked); |
|
155 | 155 | |
156 | - $this->propertyGrid->refresh (); |
|
156 | + $this->propertyGrid->refresh (); |
|
157 | 157 | }; |
158 | 158 | |
159 | 159 | $selectAllItem = new ToolStripMenuItem ('Выделить всё'); |
@@ -161,7 +161,7 @@ discard block |
||
161 | 161 | $selectAllItem->shortcutKeys = 131137; |
162 | 162 | $selectAllItem->clickEvent = function () use ($self) |
163 | 163 | { |
164 | - $self->doAction ('selectAll'); |
|
164 | + $self->doAction ('selectAll'); |
|
165 | 165 | }; |
166 | 166 | |
167 | 167 | $cutItem = new ToolStripMenuItem ('Вырезать'); |
@@ -169,7 +169,7 @@ discard block |
||
169 | 169 | $cutItem->shortcutKeys = 131160; |
170 | 170 | $cutItem->clickEvent = function () use ($self) |
171 | 171 | { |
172 | - $self->doAction ('cut'); |
|
172 | + $self->doAction ('cut'); |
|
173 | 173 | }; |
174 | 174 | |
175 | 175 | $copyItem = new ToolStripMenuItem ('Копировать'); |
@@ -177,7 +177,7 @@ discard block |
||
177 | 177 | $copyItem->shortcutKeys = 131139; |
178 | 178 | $copyItem->clickEvent = function () use ($self) |
179 | 179 | { |
180 | - $self->doAction ('copy'); |
|
180 | + $self->doAction ('copy'); |
|
181 | 181 | }; |
182 | 182 | |
183 | 183 | $pasteItem = new ToolStripMenuItem ('Вставить'); |
@@ -185,7 +185,7 @@ discard block |
||
185 | 185 | $pasteItem->shortcutKeys = 131158; |
186 | 186 | $pasteItem->clickEvent = function () use ($self) |
187 | 187 | { |
188 | - $self->doAction('paste'); |
|
188 | + $self->doAction('paste'); |
|
189 | 189 | }; |
190 | 190 | |
191 | 191 | $undoItem = new ToolStripMenuItem ('Отменить'); |
@@ -193,7 +193,7 @@ discard block |
||
193 | 193 | $undoItem->shortcutKeys = 131162; |
194 | 194 | $undoItem->clickEvent = function () use ($self) |
195 | 195 | { |
196 | - $self->undoEngine->undo (); |
|
196 | + $self->undoEngine->undo (); |
|
197 | 197 | }; |
198 | 198 | |
199 | 199 | $redoItem = new ToolStripMenuItem ('Повторить'); |
@@ -201,7 +201,7 @@ discard block |
||
201 | 201 | $redoItem->shortcutKeys = 131161; |
202 | 202 | $redoItem->clickEvent = function () use ($self) |
203 | 203 | { |
204 | - $self->undoEngine->redo (); |
|
204 | + $self->undoEngine->redo (); |
|
205 | 205 | }; |
206 | 206 | |
207 | 207 | $infoItem = new ToolStripMenuItem ('Отладочная информация'); |
@@ -212,7 +212,7 @@ discard block |
||
212 | 212 | { |
213 | 213 | pre ($value instanceof Component ? $value : $value->toString () ."\nSelector: ". $value->selector); |
214 | 214 | |
215 | - if ((new WFObject(VoidEngine::objectType ('System.Windows.Forms.Form', 'System.Windows.Forms')))->isAssignableFrom ($value->getType ())) |
|
215 | + if ((new WFObject(VoidEngine::objectType ('System.Windows.Forms.Form', 'System.Windows.Forms')))->isAssignableFrom ($value->getType ())) |
|
216 | 216 | pre ($self->getSharpCode ($self->form->name)); |
217 | 217 | }); |
218 | 218 | }; |
@@ -221,7 +221,7 @@ discard block |
||
221 | 221 | $menu->items->addRange ([ |
222 | 222 | $selectAllItem, $copyItem, $pasteItem, $cutItem, $delItem, '-', |
223 | 223 | $toFrontItem, $toBackItem, $desItem, '-', |
224 | - $undoItem, $redoItem, '-', |
|
224 | + $undoItem, $redoItem, '-', |
|
225 | 225 | $infoItem |
226 | 226 | ]); |
227 | 227 |