matyalatte · matyalatte · Oct 30, 2024 · Oct 26, 2024 · Oct 26, 2024 · Oct 26, 2024
diff --git a/docs/changelog.txt b/docs/changelog.txt
@@ -1,5 +1,7 @@
 - Array brackets can now be omitted when there is only one element.
 - GUI elements can now be defined in root object.
+- GUI labels became optional.
+- "window_name" can now be default values of GUI labels.
 
 ver 0.7.2
 - Added "optional" to ignore some options when a text box is empty.

diff --git a/examples/all_keys/gui_definition.json b/examples/all_keys/gui_definition.json
@@ -3,7 +3,7 @@
     "minimum_required": "0.7.1",
     "gui": [
         {
-            "label": "Components Minimal",
+            "window_name": "Components Minimal",
             "command": "echo file: %-% & echo folder: %-% & echo combo: %-% & echo radio: %-% & echo check: %-% & echo check_array: %-% & echo textbox: %-% & echo int: %-% & echo float: %-%",
             "components": [
                 {
@@ -82,7 +82,7 @@
             ]
         },
         {
-            "label": "Components Optional",
+            "window_name": "Components Optional",
             "command": "echo file: %file% & echo folder: %folder% & echo combo: %combo% & echo radio: %radio% & echo check: %check% & echo check_array: %options% & echo textbox: %text% & echo int: %integer% & echo float: %double%",
             "components": [
                 {
@@ -248,8 +248,8 @@
             ]
         },
         {
-            "label": "GUI Optional",
-            "window_name": "Window Title Here",
+            "window_name": "GUI Optional",
+            "label": "GUI Optional (this string is for a menu item)",
             "command_win": "echo home: %__HOME__% & echo cwd: %__CWD__% & echo percent: %% & echo sample message!",
             "command_linux": "echo home: %__HOME__%; echo cwd: %__CWD__%; echo percent: %%; echo sample message!",
             "command_mac": "echo home: %__HOME__%; echo cwd: %__CWD__%; echo percent: %%; echo sample message!",

diff --git a/examples/comp_options/affix/README.md b/examples/comp_options/affix/README.md
@@ -7,7 +7,6 @@
 ```json
 {
     "gui": {
-        "label": "Affix example",
         "command": "echo %-%",
         "components": [
             {

diff --git a/examples/comp_options/affix/gui_definition.json b/examples/comp_options/affix/gui_definition.json
@@ -1,6 +1,5 @@
 {
     "gui": {
-        "label": "Affix example",
         "command": "echo %-%",
         "components": [
             {

diff --git a/examples/comp_options/button/README.md b/examples/comp_options/button/README.md
@@ -8,7 +8,6 @@ It allows you to rename the button associated with the picker component.
 ```json
 {
     "gui": {
-        "label": "Button",
         "window_name": "Button sample",
         "command": "echo %-% %-%",
         "components": [

diff --git a/examples/comp_options/button/gui_definition.json b/examples/comp_options/button/gui_definition.json
@@ -1,6 +1,5 @@
 {
     "gui": {
-        "label": "Button",
         "window_name": "Button sample",
         "command": "echo %-% %-%",
         "components": [

diff --git a/examples/comp_options/default/gui_definition.json b/examples/comp_options/default/gui_definition.json
@@ -1,6 +1,5 @@
 {
     "gui": {
-        "label": "Sample GUI",
         "command": "echo file: %-% & echo options: %-%",
         "components": [
             {

diff --git a/examples/comp_options/id/README.md b/examples/comp_options/id/README.md
@@ -5,7 +5,6 @@ You can use the defined ids as variable names in commands.
 
 ```json
 {
-    "label": "IDs",
     "command": "echo x: %x% & echo y: %y% & echo x: %x%",
     "button": "Echo!",
     "components": [
@@ -29,7 +28,6 @@ When you put an undefined id in `%*%`, it'll use one of the components that have
 
 ```json
 {
-    "label": "Undefined IDs",
     "command": "echo x: %-% & echo y: %y% & echo z: %foo%",
     "button": "Echo!",
     "components": [
@@ -61,7 +59,6 @@ There are some predefined ids.
 
 ```json
 {
-    "label": "Reserved IDs",
     "command": "echo percent: %% & echo cwd: %__CWD__% & echo home: %__HOME__%",
     "button": "Echo!",
     "components": []

diff --git a/examples/comp_options/optional/README.md b/examples/comp_options/optional/README.md
@@ -7,7 +7,6 @@
 ```json
 {
     "gui": {
-        "label": "Optional component",
         "command": "echo %-%",
         "components": [
             {

diff --git a/examples/comp_options/optional/gui_definition.json b/examples/comp_options/optional/gui_definition.json
@@ -1,6 +1,5 @@
 {
     "gui": {
-        "label": "Optional component",
         "command": "echo %-%",
         "components": [
             {

diff --git a/examples/comp_options/placeholder/README.md b/examples/comp_options/placeholder/README.md
@@ -8,7 +8,6 @@ It displays a message when the text box is empty.
 ```json
 {
     "gui": {
-        "label": "Placeholder",
         "window_name": "Placeholder sample",
         "command": "echo %-% %-% %-%",
         "components": [

diff --git a/examples/comp_options/placeholder/gui_definition.json b/examples/comp_options/placeholder/gui_definition.json
@@ -1,6 +1,5 @@
 {
     "gui": {
-        "label": "Placeholder",
         "window_name": "Placeholder sample",
         "command": "echo %-% %-% %-%",
         "components": [

diff --git a/examples/comp_options/tooltip/gui_definition.json b/examples/comp_options/tooltip/gui_definition.json
@@ -1,6 +1,5 @@
 {
     "gui": {
-        "label": "Sample GUI",
         "command": "echo file: %-% & echo folder: %-% & echo options: %-%",
         "components": [
             {

diff --git a/examples/components/check_boxes/gui_definition.json b/examples/components/check_boxes/gui_definition.json
@@ -1,6 +1,5 @@
 {
     "gui": {
-        "label": "Check Boxes",
         "command": "echo checkbox: %-% & echo options:%-%",
         "button": "Echo!",
         "components": [

diff --git a/examples/components/choices/gui_definition.json b/examples/components/choices/gui_definition.json
@@ -1,6 +1,5 @@
 {
     "gui": {
-        "label": "Component Sample",
         "command": "echo combo: %a% & echo radio: %b%",
         "button": "Echo!",
         "components": [

diff --git a/examples/components/num_pickers/gui_definition.json b/examples/components/num_pickers/gui_definition.json
@@ -1,6 +1,5 @@
 {
     "gui": {
-        "label": "Select numbers",
         "window_name": "Picker sample",
         "command": "echo int: %-% & echo float: %-%",
         "components": [

diff --git a/examples/components/other_components/gui_definition.json b/examples/components/other_components/gui_definition.json
@@ -1,6 +1,5 @@
 {
     "gui": {
-        "label": "Component Sample",
         "command": "echo textbox: %c%",
         "button": "Echo!",
         "components": [

diff --git a/examples/components/path_pickers/README.md b/examples/components/path_pickers/README.md
@@ -8,7 +8,6 @@ Of course, you can drop files on the pickers to specify the paths.
 ```json
 {
     "gui": {
-        "label": "Copy file",
         "window_name": "Picker sample",
         "command": "copy %foo% %bar%",
         "button": "copy",

diff --git a/examples/components/path_pickers/gui_definition.json b/examples/components/path_pickers/gui_definition.json
@@ -1,6 +1,5 @@
 {
     "gui": {
-        "label": "Copy file",
         "window_name": "Picker sample",
         "command": "copy %foo% %bar%",
         "button": "copy",

diff --git a/examples/get_start/minimal/README.md b/examples/get_start/minimal/README.md
@@ -10,7 +10,6 @@ It has only a button to echo `Hello!`.
 ```json
 {
     "gui": {
-        "label": "Minimal Sample",
         "command": "echo Hello!",
         "components": []
     }
@@ -19,6 +18,5 @@ It has only a button to echo `Hello!`.
 
 You can write a definition of your GUI in `"gui": {}`.  
 
--   `label` is the label for your definition. You can type anything you like here.
 -   `command` is the command you want to execute when clicking the execution button.
 -   `components` is an array of GUI components (e.g., file pickers). `[]` means no components.
diff --git a/examples/get_start/minimal/gui_definition.json b/examples/get_start/minimal/gui_definition.json
@@ -1,6 +1,5 @@
 {
     "gui": {
-        "label": "Minimal Sample",
         "command": "echo Hello!",
         "components": []
     }

diff --git a/examples/get_start/put_component/README.md b/examples/get_start/put_component/README.md
@@ -7,7 +7,6 @@ You can put a text box in the GUI.
 ```json
 {
     "gui": {
-        "label": "Text Box Sample",
         "window_name": "Title here!",
         "command": "echo %-%",
         "button": "Hello!",

diff --git a/examples/get_start/put_component/gui_definition.json b/examples/get_start/put_component/gui_definition.json
@@ -1,6 +1,5 @@
 {
     "gui": {
-        "label": "Minimal Sample",
         "window_name": "Title here!",
         "command": "echo %-%",
         "button": "Hello!",

diff --git a/examples/get_start/title_button/README.md b/examples/get_start/title_button/README.md
@@ -7,7 +7,6 @@ You can rename the window title and the execution button.
 ```json
 {
     "gui": {
-        "label": "Minimal Sample",
         "window_name": "Title here!",
         "command": "echo Hello!",
         "button": "Hello!",

diff --git a/examples/get_start/title_button/gui_definition.json b/examples/get_start/title_button/gui_definition.json
@@ -1,6 +1,5 @@
 {
     "gui": {
-        "label": "Minimal Sample",
         "window_name": "Title here!",
         "command": "echo Hello!",
         "button": "Hello!",

diff --git a/examples/other_features/alternate_spellings/gui_definition.json b/examples/other_features/alternate_spellings/gui_definition.json
@@ -1,6 +1,5 @@
 {
     "gui": {
-        "label": "Alternate Spellings",
         "command": "echo folder: %-% & echo combo: %-% & echo check_array: %-% & echo textbox: %-% & echo int: %-%",
         "title": "Alternate Spellings Sample",
         "component_array": [

diff --git a/examples/other_features/codepage/README.md b/examples/other_features/codepage/README.md
@@ -5,7 +5,7 @@ Tuw expects user's default locale for stdout on Windows. If you want to use UTF-
 ```json
 {
     "gui": {
-        "label": "Use UTF-8 outputs on Windows",
+        "window_name": "Use UTF-8 outputs on Windows",
         "command": "powershell -ExecutionPolicy Bypass -File \"utf.ps1\"",
         "codepage": "utf8",
         "components": []

diff --git a/examples/other_features/codepage/gui_definition.json b/examples/other_features/codepage/gui_definition.json
@@ -1,6 +1,6 @@
 {
     "gui": {
-        "label": "Use UTF-8 outputs on Windows",
+        "window_name": "Use UTF-8 outputs on Windows",
         "command": "powershell -ExecutionPolicy Bypass -File \"utf.ps1\"",
         "codepage": "utf8",
         "components": []

diff --git a/examples/other_features/cross_platform/README.md b/examples/other_features/cross_platform/README.md
@@ -14,7 +14,6 @@ Tuw will use the platform-specific command instead of the default `command` valu
 
 ```json
 {
-    "label": "Platform Specific Commands",
     "command_win": "echo Windows!",
     "command_mac": "echo macOS!",
     "command_linux": "echo Linux!",
@@ -35,7 +34,6 @@ Tuw will ignore the component if the current OS does not match the specified pla
 
 ```json
 {
-    "label": "Platform Specific Components",
     "command": "echo %os%",
     "show_last_line": true,
     "components": [

diff --git a/examples/other_features/error/README.md b/examples/other_features/error/README.md
@@ -8,13 +8,8 @@ When the executed command outputs something to `stderr`, Tuw will display an err
 
 ```json
 {
-    "gui": [
-        {
-            "label": "Error Sample",
-            "command": "notcommand",
-            "components": []
-        }
-    ]
+    "command": "notcommand",
+    "components": []
 }
 ```
 
@@ -26,7 +21,6 @@ You can also customize the success code using the `exit_success` option.
 
 ```json
 {
-    "label": "check_exit_code Sample",
     "command": "echo exit code is zero.",
     "check_exit_code": true,
     "exit_success": 10,
@@ -44,7 +38,6 @@ When `check_exit_code` is enabled, it can also show the last line in the error d
 
 ```json
 {
-    "label": "show_last_line Sample",
     "command": "echo Fake Error!",
     "show_last_line": true,
     "components": []

diff --git a/examples/other_features/help/gui_definition.json b/examples/other_features/help/gui_definition.json
@@ -1,6 +1,6 @@
 {
     "gui": {
-        "label": "Sample GUI",
+        "window_name": "Sample GUI",
         "command": "echo file: %-% & echo folder: %-% & echo checkbox: %-%",
         "components": [
             {

diff --git a/examples/other_features/multiple/README.md b/examples/other_features/multiple/README.md
@@ -1,6 +1,37 @@
 # Multiple Definitions
 
 `"gui"` can be an array of gui definitions.
-Users can select one of the definitions from the `Menu` in the executable.  
+Users can select one of these definitions from the `Menu` in the executable.
+You can also use `"label"` to modify strings that are displayed in the menu bar.
+When `"label"` is not defined, `"window_name"` will be used as the GUI label.  
 
 ![advanced](https://github.com/matyalatte/tuw/assets/69258547/956be42e-6931-4b71-ae3c-180103a93714)  
+
+```json
+{
+    "gui": [
+        {
+            "label": "Sample GUI",
+            "command": "echo file: %-%",
+            "button": "Echo!",
+            "components": [
+                {
+                    "type": "file",
+                    "label": "Some file path"
+                }
+            ]
+        },
+        {
+            "window_name": "Sample GUI2",
+            "command": "echo text_box: %-%",
+            "button": "Echo!",
+            "components": [
+                {
+                    "type": "text",
+                    "label": "Some text"
+                }
+            ]
+        }
+    ]
+}
+```