Skip to content

Commit

Permalink
Merge pull request #11622 from PatTheMav/frontend-refactor
Browse files Browse the repository at this point in the history
UI: Reorganize and refactor entire frontend codebase
  • Loading branch information
RytoEX authored Jan 16, 2025
2 parents 48dad45 + 1c4b600 commit a8de12c
Show file tree
Hide file tree
Showing 980 changed files with 28,455 additions and 26,200 deletions.
4 changes: 2 additions & 2 deletions .github/actions/qt-xml-validator/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ runs:
uses: ./.github/actions/check-changes
id: checks
with:
checkGlob: 'UI/forms/**/*.ui'
checkGlob: 'frontend/forms/**/*.ui'

- name: Validate XML 💯
if: fromJSON(steps.checks.outputs.hasChangedFiles)
Expand All @@ -56,6 +56,6 @@ runs:
if (( ${#CHANGED_FILES[@]} )); then
if [[ '${{ inputs.failCondition }}' == never ]]; then set +e; fi
xmllint \
--schema ${{ github.workspace }}/UI/forms/XML-Schema-Qt5.15.xsd \
--schema ${{ github.workspace }}/frontend/forms/XML-Schema-Qt5.15.xsd \
--noout "${CHANGED_FILES[@]}"
fi
2 changes: 1 addition & 1 deletion .github/scripts/.build.zsh
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ build() {

rm -rf OBS.app
mkdir OBS.app
ditto UI/${config}/OBS.app OBS.app
ditto frontend/${config}/OBS.app OBS.app
}
}
popd
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
!/cmake
!/deps
!/docs
!/frontend
!/libobs*
!/plugins
!/shared
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,6 @@ add_subdirectory(plugins)

add_subdirectory(test/test-input)

add_subdirectory(UI)
add_subdirectory(frontend)

message_configuration()
Loading

0 comments on commit a8de12c

Please sign in to comment.