Skip to content

Commit

Permalink
Merge pull request #4 from matyalatte/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
matyalatte authored May 15, 2022
2 parents 57ec499 + fe33a2b commit 7b9c56f
Show file tree
Hide file tree
Showing 13 changed files with 565 additions and 526 deletions.
4 changes: 3 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,10 @@ add_executable(${PROJECT_NAME}
"src/MainFrame.cpp"
"src/Exec.h"
"src/Exec.cpp"
"src/Component.cpp"
"src/Component.h"
"src/Component.cpp"
"src/JsonUtils.h"
"src/JsonUtils.cpp"
)

#link libraries
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
![build](https://github.com/matyalatte/Simple-Command-Runner/actions/workflows/build_windows.yml/badge.svg)
![build](https://github.com/matyalatte/Simple-Command-Runner/actions/workflows/build_ubuntu.yml/badge.svg)
![build](https://github.com/matyalatte/Simple-Command-Runner/actions/workflows/build_mac.yml/badge.svg)
# Simple-Command-Runner ver 0.1.0
# Simple-Command-Runner ver 0.1.1
Simple GUI builder to execute commands.<br>

## About
Expand Down
1 change: 1 addition & 0 deletions build.bat
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ cmake -G "%VS_VERSION%"^
../

REM build with VS

"%MSBUILD%" SimpleCommandRunner.vcxproj /t:build /p:configuration=Release /p:platform=x64 -maxcpucount

pause
6 changes: 6 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
ver0.1.1
- Added textbox to GUI components
- Changed json format
- Fixed an error when reading utf-16 strings from stdout
- Fixed a bug can't read configs for checkboxes

ver0.1.0
- Added support for mac and linux (ubuntu)
- Added console window for linux
Expand Down
11 changes: 5 additions & 6 deletions samples/advanced/gui_definition.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"button": "Echo!",
"components": [
{
"type": "text",
"type": "static_text",
"label": "This is a sample GUI. Edit 'gui_definition.json' for your scripts."
},
{
Expand Down Expand Up @@ -37,12 +37,12 @@
{
"label": "Sample GUI2",
"window_name": "Simple Command Runner",
"command": "echo \"num: %hoo%\" & echo \"file: %bar%\" & echo \"Sample message!\"",
"command": "echo \"num: %hoo%\" & echo \"text: %bar%\" & echo \"Sample message!\"",
"button": "Echo!",
"show_last_line": true,
"components": [
{
"type": "text",
"type": "static_text",
"label": "This is a sample GUI. Edit 'gui_definition.json' for your scripts."
},
{
Expand All @@ -53,9 +53,8 @@
"default": 1
},
{
"type": "file",
"label": "Some file path",
"extension": "any files | *"
"type": "text_box",
"label": "Some text"
}
]
}
Expand Down
Loading

0 comments on commit 7b9c56f

Please sign in to comment.