pygamestudio 1.0.0.dev2__tar.gz → 1.0.0.dev4__tar.gz

{pygamestudio-1.0.0.dev2 → pygamestudio-1.0.0.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pygamestudio
-Version: 1.0.0.dev2
+Version: 1.0.0.dev4
 Summary: Let's create pygame visually!
 Project-URL: Documentation, https://pygamestudio.com/tutorial/installation
 Project-URL: Homepage, https://pygamestudio.com
@@ -39,7 +39,7 @@ Description-Content-Type: text/markdown
     <br>
     <br>
 
-[README (简体中文)](https://github.com/pygamestudio/pygamestudio/blob/main/README_zh-CN.md)
+English&nbsp; | &nbsp;[简体中文](https://github.com/pygamestudio/pygamestudio/blob/main/README_zh-CN.md)
 </div>
 
 **Pygame Studio** is a visual editor built specifically for **pygame-ce**, designed to help users create pygame-ce projects visually, making it easier for beginners, students, and hobby developers to get started with pygame development.

{pygamestudio-1.0.0.dev2 → pygamestudio-1.0.0.dev4}/README.md

@@ -10,7 +10,7 @@
     <br>
     <br>
 
-[README (简体中文)](https://github.com/pygamestudio/pygamestudio/blob/main/README_zh-CN.md)
+English&nbsp; | &nbsp;[简体中文](https://github.com/pygamestudio/pygamestudio/blob/main/README_zh-CN.md)
 </div>
 
 **Pygame Studio** is a visual editor built specifically for **pygame-ce**, designed to help users create pygame-ce projects visually, making it easier for beginners, students, and hobby developers to get started with pygame development.

{pygamestudio-1.0.0.dev2 → pygamestudio-1.0.0.dev4}/README_zh-CN.md

@@ -10,7 +10,7 @@
     <br>
     <br>
 
-[README (English)](https://github.com/pygamestudio/pygamestudio)
+[English](https://github.com/pygamestudio/pygamestudio) &nbsp;|&nbsp; 简体中文
 </div>
 
 **Pygame Studio** 是专为 **pygame-ce** 打造的可视化编辑器，支持以可视化方式制作 pygame-ce 项目，让编程新手、在校学生以及业余开发者都能更轻松地入门 Pygame 游戏开发。

{pygamestudio-1.0.0.dev2 → pygamestudio-1.0.0.dev4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "pygamestudio"
-version = "1.0.0.dev2"
+version = "1.0.0.dev4"
 authors = [{ name="Louis Ren", email="louis@pygamestudio.com" }]
 description = "Let's create pygame visually!"
 readme = "README.md"

{pygamestudio-1.0.0.dev2 → pygamestudio-1.0.0.dev4}/src/pygamestudio/api/runtime/config.py

@@ -1,6 +1,7 @@
 import os
 import json
 from pathlib import Path
+from pygamestudio.common.i18n.translator import Translator as T
 
 
 def get_project_config():
@@ -8,11 +9,11 @@ def get_project_config():
     project_config_file_path = project_path / 'project.pygs'
 
     if not project_config_file_path.exists():
-        raise RuntimeError('没有在项目根目录下找到project.pygs配置文件')
+        raise RuntimeError(T.tr('api.no_project_pygs', 'Failed to find config file project.pygs in the project root directory.'))
 
     try:
         with open(project_config_file_path, 'r', encoding='utf-8') as f:
             project_config = json.load(f)
             return project_config
     except Exception as e:
-        raise RuntimeError(f'project.pygs配置加载失败：{e}')
+        raise RuntimeError(T.tr('api.fail_to_load_project_pygs', 'Failed to load config file project.pygs: {}').format(str(e)))

{pygamestudio-1.0.0.dev2 → pygamestudio-1.0.0.dev4}/src/pygamestudio/api/runtime/scene.py

@@ -3,13 +3,15 @@ import re
 import json
 import pygame
 from pathlib import Path
-from pygamestudio.api.runtime.config import get_project_config
-
 from pygamestudio.game.object.type import *
 from pygamestudio.game.object.rect import *
 from pygamestudio.game.object.canvas import *
 from pygamestudio.game.object.text import *
 from pygamestudio.game.object.ellipse import *
+from pygamestudio.game.object.line import *
+from pygamestudio.game.object.image import *
+from pygamestudio.api.runtime.config import get_project_config
+from pygamestudio.common.i18n.translator import Translator as T
 
 
 class SceneLoader:
@@ -30,7 +32,7 @@ class SceneLoader:
             scene_path = Path(os.environ.get('PROJECT_PATH')) / project_config['asset']['current_scene']
 
         if not Path(scene_path).exists():
-            raise RuntimeError(f'没有在scene文件夹下找到名为{scene_path}的场景文件')
+            raise RuntimeError(T.tr('api.no_scene_path', 'The scene path {} does not exist.').format(scene_path))
 
         self._all_object_tree_struct = {}
         self._current_scene_path = scene_path
@@ -75,7 +77,10 @@ class SceneLoader:
             obj = ObjectText(self, object_data, is_for_api=True)
         elif object_type == OBJECT_ELLIPSE:
             obj = ObjectEllipse(self, object_data, is_for_api=True)
-
+        elif object_type == OBJECT_LINE:
+            obj = ObjectLine(self, object_data, is_for_api=True)
+        elif object_type == OBJECT_IMAGE:
+            obj = ObjectImage(self, object_data, is_for_api=True)
         return obj
     
     def _add_object_tree_struct(self, parent_uuid, object_tree_struct_to_add): 
@@ -124,7 +129,9 @@ class SceneLoader:
             if part_number < recursion_time:
                 return None
             elif part_number == recursion_time:
-                if name == value['object'].name and target_item_index == current_item_index:
+                if target_item_index == current_item_index and name == value['object'].name:
+                    return {key: value}
+                elif target_item_index is None and name == value['object'].name: 
                     return {key: value}
                 else:
                     return None
@@ -148,7 +155,7 @@ class SceneLoader:
             
             recursion_time = 0
             name = match.group(1)
-            target_item_index = int(match.group(2)) if match.group(2) is not None else 0
+            target_item_index = int(match.group(2)) if match.group(2) is not None else None
             object_tree_struct = _get(name, target_item_index, 0, recursion_time, i, self._all_object_tree_struct)
 
             if i < len(path_parts)-1:

{pygamestudio-1.0.0.dev2 → pygamestudio-1.0.0.dev4}/src/pygamestudio/common/i18n/languages/en.json

@@ -87,7 +87,8 @@
         "line": "Line",
         "rect": "Rect",
         "ellipse": "Ellipse",
-        "text": "Text"
+        "text": "Text",
+        "image": "Image"
     },
 
     "gm": {
@@ -112,6 +113,7 @@
 
     "scene": {
         "scene": "Scene",
+        "scene_saved": "Scene saved",
         "run_project": "Run Project {}",
         "failed_to_run_project": "Failed to Run Project {}: {}"
     },
@@ -149,7 +151,11 @@
         "italic": "Italic",
         "underline": "Underline",
         "strikethrough": "Strikethrough",
-        "select_color": "Select Color"
+        "select_color": "Select Color",
+        "image_path": "Image Path",
+        "select_image": "Select Image",
+        "font_path": "Font Path",
+        "format": "Format"
     },
 
     "dashboard": {
@@ -181,7 +187,8 @@
         "screen_width": "Screen Width",
         "screen_height": "Screen Height",
         "general": "General",
-        "language": "Language"
+        "language": "Language",
+        "theme": "Theme"
     },
 
     "about": {
@@ -202,5 +209,21 @@
         "stop": "Stop",
         "select_app_icon": "Select App Icon",
         "select_output_dir": "Select Output Dir"
+    },
+
+    "theme": {
+        "dark": "Dark",
+        "light": "Light"
+    },
+
+    "api": {
+        "no_scene_path": "The scene path {} does not exist.",
+        "no_project_pygs": "Failed to find config file project.pygs in the project root directory.",
+        "fail_to_load_project_pygs": "Failed to load config file project.pygs: {}"
+    },
+
+    "translator": {
+        "no_lang_code_json": "Couldn't find {}.json",
+        "fail_to_load_lang_code_json": "Failed to load {}.json: {}"
     }
 }

{pygamestudio-1.0.0.dev2 → pygamestudio-1.0.0.dev4}/src/pygamestudio/common/i18n/languages/zh_CN.json

@@ -87,7 +87,8 @@
         "line": "线条",
         "rect": "矩形",
         "ellipse": "椭圆",
-        "text": "文本"
+        "text": "文本",
+        "image": "图片"
     },
 
     "gm": {
@@ -112,6 +113,7 @@
 
     "scene": {
         "scene": "场景编辑器",
+        "scene_saved": "场景已保存",
         "run_project": "运行项目{}",
         "failed_to_run_project": "项目{}运行失败：{}"
     },
@@ -149,7 +151,11 @@
         "italic": "斜体",
         "underline": "下划线",
         "strikethrough": "删除线",
-        "select_color": "选择颜色"
+        "select_color": "选择颜色",
+        "image_path": "图片路径",
+        "font_path": "字体路径",
+        "select_image": "选择图片",
+        "format": "格式"
     },
 
     "dashboard": {
@@ -181,7 +187,8 @@
         "screen_width": "窗口宽度",
         "screen_height": "窗口高度",
         "general": "通用",
-        "language": "语言"
+        "language": "语言",
+        "theme": "主题"
     },
 
     "about": {
@@ -202,5 +209,21 @@
         "stop": "停止",
         "select_app_icon": "选择应用图标",
         "select_output_dir": "选择输出目录"
+    },
+
+    "theme": {
+        "dark": "深色",
+        "light": "浅色"
+    },
+
+    "api": {
+        "no_scene_path": "场景路径{}不存在。",
+        "no_project_pygs": "没有在项目根目录下找到project.pygs配置文件",
+        "fail_to_load_project_pygs": "配置文件project.pygs加载失败：{}"
+    },
+
+    "translator": {
+        "no_lang_code_json": "无法找到文件{}.json",
+        "fail_to_load_lang_code_json": "无法加载{}.json：{}"
     }
 }

{pygamestudio-1.0.0.dev2 → pygamestudio-1.0.0.dev4}/src/pygamestudio/common/i18n/translator.py

@@ -23,20 +23,19 @@ class Translator:
 
     @staticmethod
     def load_language(lang_code):
+        instance = Translator.get_instance()
         lang_file = LANG_PATH / f'{lang_code}.json'
         
         if not lang_file.exists():
-            Logger.error(f"Couldn't find {lang_code}.json")
+            Logger.error(instance.tr('translator.no_lang_code_json', "Couldn't find {}.json").format(lang_code))
             return
-        
-        instance = Translator.get_instance()
 
         try:
             with open(lang_file, 'r', encoding='utf-8') as f:
                 instance.lang_dict = json.load(f)
                 instance.current_language = lang_code
         except Exception as e:
-            Logger.error(f'Failed to load {lang_code}.json: {e}')
+            Logger.error(instance.tr('translator.fail_to_load_lang_code_json', 'Failed to load {}.json: {}').format(lang_code, e))
 
     @staticmethod
     def toggle_language(lang_code):

{pygamestudio-1.0.0.dev2 → pygamestudio-1.0.0.dev4}/src/pygamestudio/common/res/qss/dark.qss

@@ -24,6 +24,7 @@ QPushButton {
     background-color: #2e2f30;
     border-radius: 5px;
     padding: 5px;
+    outline: none;
 }
 
 QPushButton:disabled {
@@ -100,15 +101,27 @@ QSpinBox QLabel, QDoubleSpinBox QLabel {
 
 QComboBox {
     border-radius: 5px;
-    padding: 3px 6px;
+    padding: 0px 6px;
     padding-right: 2px;
     border: 1px solid #3c3c3c;
+    min-height: 26px;
 }
 
 QComboBox:hover {
     border: 1px solid #007acc;
 }
 
+QComboBox::item {
+    width: 20px;
+    height: 26px;
+    padding-left: -20px;
+}
+
+QComboBox::item:hover, QComboBox::item:selected {
+    background-color: #007acc;
+    padding-left: -20px;
+}
+
 QComboBox::drop-down {
     width: 15px;
     border: 0px;
@@ -533,6 +546,10 @@ QWidget#inspectorContainer QCheckBox::indicator:hover {
     border: 1px solid #007acc;
 }
 
+QWidget#inspectorContainer QSpinBox:disabled, QWidget#inspectorContainer QDoubleSpinBox:disabled {
+    color: gray;
+}
+
 /* ----- About ----- */
 QLabel#aboutCopyrightLabel {
     font-size: 10px;