✅ v0.9.3_beta

- Глобальное обновление дизайна главной формы, - Добавлено открытие проектов, - В главной форме, в меню "Проект" теперь не доступны кнопки связанные с сохранением когда проект не открыт, - Добавлено меню "Справка" и "Язык".
meigoc · Jun 20, 2024 · 281b4ea · 281b4ea
1 parent d1b7e38
commit 281b4ea
Show file tree

Hide file tree

Showing 11 changed files with 221 additions and 54 deletions.
diff --git a/BundleBuild.dnproject b/BundleBuild.dnproject
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project author="winda" authorOS="Windows 10" createdAt="1718544975550" ideName="DevelNext" ideVersion="16.7.0" ideVersionHash="2017103112" name="BundleBuild" packageName="meigo" template="ide\project\templates\DefaultGuiProjectTemplate" updatedAt="1718820013282">
+<project author="winda" authorOS="Windows 10" createdAt="1718544975550" ideName="DevelNext" ideVersion="16.7.0" ideVersionHash="2017103112" name="BundleBuild" packageName="meigo" template="ide\project\templates\DefaultGuiProjectTemplate" updatedAt="1718831887937">
   <tree>
     <expanded>
     <path src=""/>
@@ -11,9 +11,9 @@
     </expanded>
   </tree>
   <openedFiles>
-  <file selected="1" src="BundleBuild.dnproject"/>
+  <file src="BundleBuild.dnproject"/>
     <file src="src/meigo/forms/MainForm.php"/>
-    <file src="src/meigo/modules/AppModule.php"/>
+    <file selected="1" src="src/meigo/modules/AppModule.php"/>
     <file src="src/meigo/modules/design.php"/>
     <file src="src/meigo/forms/new.php"/>
   </openedFiles>

diff --git a/build/dist/BundleBuild_v0.9.3_beta.jar b/build/dist/BundleBuild_v0.9.3_beta.jar
diff --git a/settings.gradle b/settings.gradle
@@ -1 +1 @@
-rootProject.name = 'BundleBuild'
+rootProject.name = ''
diff --git a/src/meigo/forms/MainForm.conf b/src/meigo/forms/MainForm.conf
@@ -1,7 +1,8 @@
-#Wed Jun 19 19:42:26 MSK 2024
+#Thu Jun 20 17:53:57 MSK 2024
 form.style=DECORATED
 form.resizable=1
 modules=
+form.backgroundColor=
 form.title=BundleBuild v0.9.1_beta | By Meigo™ Corporation
 title=MainForm
 form.icon=.data/img/dn17/bundleMake32.png
diff --git a/src/meigo/forms/MainForm.fxml b/src/meigo/forms/MainForm.fxml
@@ -1,35 +1,25 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?import javafx.scene.*?><?import javafx.collections.*?><?import javafx.scene.layout.*?><?import javafx.scene.control.*?><?import javafx.scene.text.*?><?import javafx.scene.image.*?><?import javafx.scene.shape.*?><?import javafx.scene.paint.*?><?import javafx.scene.web.*?><?import javafx.geometry.*?><?import java.lang.*?><?import org.develnext.jphp.ext.javafx.classes.data.*?><?import org.develnext.jphp.ext.javafx.support.*?><?import org.develnext.jphp.ext.javafx.support.control.*?><?import org.develnext.jphp.ext.game.support.*?><AnchorPane xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1" AnchorPane.bottomAnchor="0" AnchorPane.leftAnchor="0" AnchorPane.rightAnchor="0" AnchorPane.topAnchor="0" focusTraversable="false" id="" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="408" prefWidth="704" styleClass="">
   <children>
-    <LabelEx alignment="CENTER_LEFT" autoSize="false" contentDisplay="LEFT" ellipsisString="..." focusTraversable="false" graphicTextGap="4" id="label" layoutX="8" layoutY="48" prefHeight="36" prefWidth="416" styleClass="label " text="Добро пожаловать в BundleBuild" textAlignment="LEFT" underline="false" wrapText="false">
-      <font>
-        <Font name="System Bold" size="25"/>
-      </font>
-    </LabelEx>
-    <Data cursor="DEFAULT" enabled="1" id="data-label" visible="1"/>
-    <LabelEx alignment="TOP_LEFT" autoSize="false" contentDisplay="LEFT" ellipsisString="..." focusTraversable="false" graphicTextGap="4" id="labelAlt" layoutX="16" layoutY="88" prefHeight="200" prefWidth="416" styleClass="label " text="версия сборки: v0.9.1_beta&#10;Разработка только начата, так что функционала здесь может не быть." textAlignment="LEFT" underline="false" wrapText="true">
-      <font>
-        <Font name="Calibri" size="15"/>
-      </font>
-    </LabelEx>
-    <Data cursor="DEFAULT" enabled="1" id="data-labelAlt" visible="1"/>
-    <Button alignment="CENTER" contentDisplay="LEFT" ellipsisString="..." focusTraversable="true" graphicTextGap="4" id="button" layoutX="472" layoutY="328" prefHeight="32" prefWidth="144" styleClass="button " text="Кнопка" textAlignment="CENTER" underline="false" wrapText="false">
+    <Button alignment="CENTER" contentDisplay="LEFT" ellipsisString="..." focusTraversable="true" graphicTextGap="4" id="button" layoutX="304" layoutY="288" prefHeight="32" prefWidth="144" styleClass="button " text="Кнопка" textAlignment="CENTER" underline="false" wrapText="false">
       <font>
         <Font name="System Regular" size="12"/>
       </font>
     </Button>
     <Data cursor="DEFAULT" enabled="1" id="data-button" visible="1"/>
-    <Button alignment="CENTER" contentDisplay="LEFT" ellipsisString="..." focusTraversable="true" graphicTextGap="4" id="buttonAlt" layoutX="288" layoutY="320" prefHeight="32" prefWidth="144" styleClass="button " text="Кнопка" textAlignment="CENTER" underline="false" wrapText="false">
+    <Button alignment="CENTER" contentDisplay="LEFT" ellipsisString="..." focusTraversable="true" graphicTextGap="4" id="buttonAlt" layoutX="3" layoutY="27" prefHeight="34" prefWidth="144" styleClass="button " text="тут скоро что-то будет" textAlignment="CENTER" underline="false" wrapText="false">
       <font>
         <Font name="System Regular" size="12"/>
       </font>
     </Button>
-    <Data cursor="DEFAULT" enabled="1" id="data-buttonAlt" visible="1"/>
-    <Button alignment="CENTER" contentDisplay="LEFT" ellipsisString="..." focusTraversable="true" graphicTextGap="4" id="button3" layoutX="576" layoutY="64" prefHeight="32" prefWidth="144" styleClass="button " text="Кнопка" textAlignment="CENTER" underline="false" wrapText="false">
+    <Data cursor="DEFAULT" enabled="1" graphic="" id="data-buttonAlt" visible=""/>
+    <Separator focusTraversable="false" id="separator" layoutX="144" layoutY="27" orientation="VERTICAL" prefHeight="34" prefWidth="16" styleClass="separator "/>
+    <Data cursor="DEFAULT" enabled="1" id="data-separator" visible=""/>
+    <LabelEx alignment="CENTER_LEFT" autoSize="false" contentDisplay="LEFT" ellipsisString="..." focusTraversable="false" graphicTextGap="4" id="label" layoutX="168" layoutY="72" prefHeight="16" prefWidth="96" styleClass="label " text="Текст" textAlignment="LEFT" underline="false" wrapText="false">
       <font>
         <Font name="System Regular" size="12"/>
       </font>
-    </Button>
-    <Data cursor="DEFAULT" enabled="1" id="data-button3" visible="1"/>
+    </LabelEx>
+    <Data cursor="DEFAULT" enabled="1" id="data-label" visible="1"/>
   </children>
 </AnchorPane>
diff --git a/src/meigo/forms/MainForm.php b/src/meigo/forms/MainForm.php
@@ -115,23 +115,73 @@ function doShow(UXWindowEvent $e = null)
      */
     function doButtonAction(UXEvent $e = null)
     {    
-        alert($this->labelAlt->alignment);
+        $tree = new UXTreeView;
+        $tree->position = [0, 64];
+        $tree->size = [160, 344];
+        $tree->anchors = ['top' => 64, 'bottom' => 0];
+        $this->add($tree);
+
+        $panel = new UXPanel;
+        $panel->backgroundColor = "#f2f2f2";
+        $panel->position = [0, 24];
+        $panel->size = [704, 40];
+        $panel->anchors = ['left' => 0, 'right' => 0];
+
+        $meigoid_button = new UXButton;
+        $meigoid_button->size = [144, 34];
+        $meigoid_button->position = [3, 3];
+        $meigoid_button->text = "тут скоро что-то будет";
+
+        $separator1 = new UXSeparator;
+        $separator1->orientation = "VERTICAL";
+        $separator1->size = [16, 34];
+        $separator1->position = [144, 3];
+
+        $newproject_button = new UXButton;
+        //$newproject_button->position = [3, 27];
+        $newproject_button->size = [35, 34];
+        $newproject_button->position = [153, 3]; // + 147
+        $newproject_button->graphic = new UXImageView(new UXImage('res://.data/img/dn17/new16.png'));
+        $newproject_button->text = null;
+
+        $openproject_button = new UXButton;
+        $openproject_button->size = [35, 34];
+        $openproject_button->position = [191, 3]; // +38
+        $openproject_button->graphic = new UXImageView(new UXImage('res://.data/img/dn17/open16.png'));
+        $openproject_button->text = null;
+
+        $saveproject_button = new UXButton;
+        $saveproject_button->size = [35, 34];
+        $saveproject_button->position = [229, 3]; // +38
+        $saveproject_button->graphic = new UXImageView(new UXImage('res://.data/img/dn17/save16.png'));
+        $saveproject_button->text = null;
+
+        $savezipproject_button = new UXButton;
+        $savezipproject_button->size = [35, 34];
+        $savezipproject_button->position = [267, 3]; // +38
+        $savezipproject_button->graphic = new UXImageView(new UXImage('res://.data/img/dn17/saveAs16.png'));
+        $savezipproject_button->text = null;
+
+        $s_button = new UXButton;
+        $s_button->size = [340, 34];
+        $s_button->position = [305, 3]; // +38
+        $s_button->graphic = new UXImageView(new UXImage('res://.data/img/dn17/warning16.png'));
+        $s_button->text = "это бета-версия, какие-то функции могут не работать.";
+
+        $panel->add($meigoid_button);
+        $panel->add($separator1);
+        $panel->add($newproject_button);
+        $panel->add($openproject_button);
+        $panel->add($saveproject_button);
+        $panel->add($savezipproject_button);
+        $panel->add($s_button);
+        $this->add($panel);
+        //$this->panel->add($separator2);
     }
 
-    /**
-     * @event buttonAlt.action 
-     */
-    function doButtonAltAction(UXEvent $e = null)
-    {    
-        alert(app()->form("MainForm")->modules);
-    }
 
-    /**
-     * @event button3.action 
-     */
-    function doButton3Action(UXEvent $e = null)
-    {    
-        $this->button->observer();
-    }
+
+
+
 
 }
diff --git a/src/meigo/forms/MainForm.php.axml b/src/meigo/forms/MainForm.php.axml
@@ -1,2 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<root/>
+<root>
+  <class name="MainForm"/>
+</root>
diff --git a/src/meigo/forms/new.conf b/src/meigo/forms/new.conf
@@ -1,4 +1,4 @@
-#Wed Jun 19 21:00:10 MSK 2024
+#Thu Jun 20 18:00:43 MSK 2024
 form.style=DECORATED
 form.resizable=
 form.title=Новый проект

diff --git a/src/meigo/modules/AppModule.php b/src/meigo/modules/AppModule.php
@@ -14,13 +14,17 @@ class AppModule extends AbstractModule
     function doAction(ScriptEvent $e = null)
     {    
         // все выводы в лог (консоль) на английском языке, т.к. на данный момент я не знаю как сделать поддержку русского текста в командной строке windows
+        // форма
+        global $Form;
         // глобальные переменные
         global $ver;
         global $JAVA_HOME;
         global $TEMP;
         global $USERPROFILE;
+        // папки проектов
+        global $folder_projects;
 
-        $ver = "v0.9.2_beta"; // версия программы
+        $ver = "v0.9.3_beta"; // версия программы
         $JAVA_HOME = $_ENV['JAVA_HOME']; // Путь к джаве
         $TEMP = $_ENV['TEMP']; // TEMP-папка
         $USERPROFILE = $_ENV['USERPROFILE']; // Путь к пользовательской папке типа: C:/Users/User/ (запись всегда разрешена)
@@ -43,6 +47,7 @@ function doAction(ScriptEvent $e = null)
         // Стало: C:/Users/User/papka
         $folder_projects = str::replace($nfolder_projects, "\\", "/");
         $folder_library = str::replace($nfolder_library, "\\", "/");
+        app()->module("design")->fileChooser3->initialDirectory = $folder_projects;
         echo "[INFO] Projects: ".$folder_projects." | Library: ".$folder_library." \n";
         // Создание папки проектов BundleBuild
         if (fs::isDir($folder_projects)) {
@@ -91,20 +96,27 @@ function doAction(ScriptEvent $e = null)
 
         // Создание меню
         app()->module("design")->AddMenuBar($Form);
+        // Создание панели
+        app()->module("design")->AddPanel($Form);
+        // Создание дерева
+        app()->module("design")->AddTree($Form);
 
         // Создание двух текстов
         $text1 = new UXLabel;
         $text1->size = [416, 36];
-        $text1->position = [8, 48];
+        $text1->position = [168, 72];
         $text1->text = "Добро пожаловать в BundleBuild";
         $text1->font = $text1->font->withBold()->withSize(25);
         $Form->add($text1);
 
         $text2 = new UXLabel;
         $text2->size = [416, 200];
-        $text2->position = [16, 88];
-        $text2->text = "версия сборки: v0.9.2_beta
-Добавлено создание проектов";
+        $text2->position = [168, 105];
+        $text2->text = 'версия сборки: v0.9.3_beta;
+- Глобальное обновление дизайна главной формы,        
+- Добавлено открытие проектов,
+- В главной форме, в меню "Проект" теперь не доступны кнопки связанные с сохранением когда проект не открыт,
+- Добавлено меню "Справка" и "Язык".';
         $text2->alignment = "TOP_LEFT";
         $text2->wrapText = true;
         $text2->font = $text2->font->withSize(15)->withRegular()->withName('Calibri');

diff --git a/src/meigo/modules/design.module b/src/meigo/modules/design.module
@@ -1,10 +1,22 @@
 {
   "props": [],
   "components": {
+    "fileChooser3": {
+      "type": "script\\FileChooserScript",
+      "x": 800.0,
+      "y": 304.0,
+      "props": {
+        "filterName": "Пакет .resource (BundleBuild)",
+        "filterExtensions": ".resource",
+        "filterAny": "0",
+        "inputNode": "",
+        "actionNode": ""
+      }
+    },
     "ini": {
       "type": "script\\storage\\IniStorage",
-      "x": 368.0,
-      "y": 240.0,
+      "x": 368,
+      "y": 240,
       "props": {
         "path": ".resource",
         "autoSave": "1",
@@ -14,8 +26,8 @@
     },
     "fileChooserAlt": {
       "type": "script\\FileChooserScript",
-      "x": 272.0,
-      "y": 144.0,
+      "x": 272,
+      "y": 144,
       "props": {
         "filterName": "Изображение",
         "filterExtensions": "*.png",
@@ -26,8 +38,8 @@
     },
     "fileChooser": {
       "type": "script\\FileChooserScript",
-      "x": 96.0,
-      "y": 128.0,
+      "x": 96,
+      "y": 128,
       "props": {
         "initialDirectory": "",
         "initialFileName": "аа",