fixes

eez-open · Jun 30, 2023 · 16afe0d · 16afe0d
1 parent 79bb5ff
commit 16afe0d
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 5 deletions.
diff --git a/packages/eez-studio-ui/_stylesheets/app.less b/packages/eez-studio-ui/_stylesheets/app.less
@@ -3246,6 +3246,10 @@ button.EezStudio_Action {
                     }
                 }
 
+                & > td > div.EezStudio_CodeEditor {
+                    display: list-item;
+                }
+
                 & > td.property-name {
                     white-space: nowrap;
                     height: 26px;

diff --git a/packages/project-editor/features/bitmap/bitmap.tsx b/packages/project-editor/features/bitmap/bitmap.tsx
@@ -96,7 +96,7 @@ const ExportBitmapFilePropertyGridUI = observer(
             return (
                 <div style={{ marginTop: 10 }}>
                     <Button color="primary" size="small" onClick={this.export}>
-                        Export Bitmap File...
+                        Export Bitmap File
                     </Button>
                 </div>
             );
@@ -231,6 +231,7 @@ export class Bitmap extends EezObject {
             },
             {
                 name: "alwaysBuild",
+                displayName: "Always add to the generated code",
                 type: PropertyType.Boolean,
                 hideInPropertyGrid: object =>
                     isLVGLProject(object) || isDashboardProject(object)

diff --git a/packages/project-editor/features/font/font.tsx b/packages/project-editor/features/font/font.tsx
@@ -956,7 +956,7 @@ const ExportFontFilePropertyGridUI = observer(
             return (
                 <div style={{ marginTop: 10 }}>
                     <Button color="primary" size="small" onClick={this.export}>
-                        Export font file...
+                        Export Font File
                     </Button>
                 </div>
             );
@@ -1116,6 +1116,7 @@ export class Font extends EezObject {
             },
             {
                 name: "alwaysBuild",
+                displayName: "Always add to the generated code",
                 type: PropertyType.Boolean,
                 hideInPropertyGrid: isLVGLProject
             },

diff --git a/packages/project-editor/features/style/style.tsx b/packages/project-editor/features/style/style.tsx
@@ -693,6 +693,7 @@ const cssPreviewProperty: PropertyInfo = {
 
 const alwaysBuildProperty: PropertyInfo = {
     name: "alwaysBuild",
+    displayName: "Always add to the generated code",
     type: PropertyType.Boolean,
     defaultValue: false,
     inheritable: false,

diff --git a/packages/project-editor/flow/components/widgets/index.tsx b/packages/project-editor/flow/components/widgets/index.tsx
@@ -2768,6 +2768,15 @@ const BitmapWidgetPropertyGridUI = observer(
                 return null;
             }
 
+            const widget = this.props.objects[0] as Widget;
+
+            if (
+                widget.width == imageElement.width &&
+                widget.height == imageElement.height
+            ) {
+                return null;
+            }
+
             return (
                 <Button
                     color="primary"

diff --git a/resources/project-templates/IEXT.eez-project-ui-state b/resources/project-templates/IEXT.eez-project-ui-state
@@ -332,7 +332,8 @@
                   "component": "editors",
                   "enableClose": false
                 }
-              ]
+              ],
+              "active": true
             },
             {
               "type": "tabset",
@@ -922,10 +923,23 @@
             {
               "type": "tabset",
               "id": "EDITORS",
-              "selected": -1,
               "enableDeleteWhenEmpty": false,
               "enableClose": false,
-              "children": []
+              "children": [
+                {
+                  "type": "tab",
+                  "id": "#1bda63f8-44d3-4151-8691-421a3f4cff61",
+                  "name": "Settings",
+                  "component": "editor",
+                  "config": {
+                    "objectPath": "[C:/work/eez/studio/resources/project-templates/IEXT.eez-project]:/settings",
+                    "subObjectPath": "[C:/work/eez/studio/resources/project-templates/IEXT.eez-project]:/settings",
+                    "permanent": false
+                  },
+                  "icon": "material:settings"
+                }
+              ],
+              "active": true
             }
           ]
         }