Skip to content

Commit 7b9c56f

Browse files
authored
Merge pull request #4 from matyalatte/dev
Dev
2 parents 57ec499 + fe33a2b commit 7b9c56f

13 files changed

+565
-526
lines changed

CMakeLists.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,10 @@ add_executable(${PROJECT_NAME}
3333
"src/MainFrame.cpp"
3434
"src/Exec.h"
3535
"src/Exec.cpp"
36-
"src/Component.cpp"
3736
"src/Component.h"
37+
"src/Component.cpp"
38+
"src/JsonUtils.h"
39+
"src/JsonUtils.cpp"
3840
)
3941

4042
#link libraries

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
![build](https://github.com/matyalatte/Simple-Command-Runner/actions/workflows/build_windows.yml/badge.svg)
22
![build](https://github.com/matyalatte/Simple-Command-Runner/actions/workflows/build_ubuntu.yml/badge.svg)
33
![build](https://github.com/matyalatte/Simple-Command-Runner/actions/workflows/build_mac.yml/badge.svg)
4-
# Simple-Command-Runner ver 0.1.0
4+
# Simple-Command-Runner ver 0.1.1
55
Simple GUI builder to execute commands.<br>
66

77
## About

build.bat

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ cmake -G "%VS_VERSION%"^
1515
../
1616

1717
REM build with VS
18+
1819
"%MSBUILD%" SimpleCommandRunner.vcxproj /t:build /p:configuration=Release /p:platform=x64 -maxcpucount
1920

2021
pause

changelog.txt

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
ver0.1.1
2+
- Added textbox to GUI components
3+
- Changed json format
4+
- Fixed an error when reading utf-16 strings from stdout
5+
- Fixed a bug can't read configs for checkboxes
6+
17
ver0.1.0
28
- Added support for mac and linux (ubuntu)
39
- Added console window for linux

samples/advanced/gui_definition.json

+5-6
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"button": "Echo!",
99
"components": [
1010
{
11-
"type": "text",
11+
"type": "static_text",
1212
"label": "This is a sample GUI. Edit 'gui_definition.json' for your scripts."
1313
},
1414
{
@@ -37,12 +37,12 @@
3737
{
3838
"label": "Sample GUI2",
3939
"window_name": "Simple Command Runner",
40-
"command": "echo \"num: %hoo%\" & echo \"file: %bar%\" & echo \"Sample message!\"",
40+
"command": "echo \"num: %hoo%\" & echo \"text: %bar%\" & echo \"Sample message!\"",
4141
"button": "Echo!",
4242
"show_last_line": true,
4343
"components": [
4444
{
45-
"type": "text",
45+
"type": "static_text",
4646
"label": "This is a sample GUI. Edit 'gui_definition.json' for your scripts."
4747
},
4848
{
@@ -53,9 +53,8 @@
5353
"default": 1
5454
},
5555
{
56-
"type": "file",
57-
"label": "Some file path",
58-
"extension": "any files | *"
56+
"type": "text_box",
57+
"label": "Some text"
5958
}
6059
]
6160
}

0 commit comments

Comments
 (0)