Skip to content

frontend: Make OBSAbout self contained#12202

Open
cg2121 wants to merge 1 commit intoobsproject:masterfrom
cg2121:obsbasic-defriend-obsabout
Open

frontend: Make OBSAbout self contained#12202
cg2121 wants to merge 1 commit intoobsproject:masterfrom
cg2121:obsbasic-defriend-obsabout

Conversation

@cg2121
Copy link
Copy Markdown
Contributor

@cg2121 cg2121 commented May 24, 2025

Description

This makes it so OBSAbout isn't tangled with OBSBasic.

Motivation and Context

Make frontend less messy

How Has This Been Tested?

Opened about dialog to make sure it still worked

Types of changes

  • Code cleanup (non-breaking change which makes code smaller or more readable)

Checklist:

  • My code has been run through clang-format.
  • I have read the contributing document.
  • My code is not on the master branch.
  • The code has been tested.
  • All commit messages are properly formatted and commits squashed where appropriate.
  • I have included updates to all appropriate documentation.

@cg2121 cg2121 added area/ui-ux Anything to do with changes or additions to UI/UX elements. kind/cleanup Non-breaking change which makes code smaller or more readable labels May 24, 2025
@cg2121 cg2121 force-pushed the obsbasic-defriend-obsabout branch 2 times, most recently from a9086a3 to 112b814 Compare May 24, 2025 13:47
@cg2121 cg2121 changed the title UI: Make OBSAbout self contained frontend: Make OBSAbout self contained May 24, 2025
@cg2121 cg2121 force-pushed the obsbasic-defriend-obsabout branch from 112b814 to 5a19707 Compare May 24, 2025 13:55
Copy link
Copy Markdown
Member

@PatTheMav PatTheMav left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So this encapsulates the management (and updating) of the patronJSON entirely into the OBSAbout class? Nice.

Why does it need to include OBSApp though?

@cg2121
Copy link
Copy Markdown
Contributor Author

cg2121 commented May 24, 2025

It is needed for the GetDataFilePath function. OBSApp.hpp was included with OBSBasic.hpp before.

Comment thread frontend/dialogs/OBSAbout.hpp
Comment thread frontend/dialogs/OBSAbout.cpp
@RytoEX
Copy link
Copy Markdown
Member

RytoEX commented Dec 18, 2025

This has a merge conflict. cc @Warchamp7

@RytoEX RytoEX moved this from In Review to Requires Changes in OBS Studio 32.1 PR Considerations Dec 18, 2025
@Warchamp7 Warchamp7 force-pushed the obsbasic-defriend-obsabout branch from 5a19707 to 142353d Compare December 25, 2025 17:14
@Warchamp7
Copy link
Copy Markdown
Member

This has a merge conflict. cc @Warchamp7

Rebased

@Warchamp7
Copy link
Copy Markdown
Member

Now featuring 100% less accidental submodule commits.

Comment thread frontend/dialogs/OBSAbout.cpp Outdated
Comment thread frontend/dialogs/OBSAbout.cpp Outdated
Comment thread frontend/dialogs/OBSAbout.cpp Outdated
@RytoEX
Copy link
Copy Markdown
Member

RytoEX commented May 5, 2026

Might have a conflict with #12934 since that changes some stuff regarding RemoteTextThread.

@Warchamp7 Warchamp7 added this to the OBS Studio 32.2 milestone May 6, 2026
@RytoEX
Copy link
Copy Markdown
Member

RytoEX commented May 6, 2026

Now that #12934 is merged, please resolve merge conflicts and ensure that this still functions as intended after changes to RemoteTextThread.

This makes it so OBSAbout isn't tangled with OBSBasic.
@cg2121 cg2121 force-pushed the obsbasic-defriend-obsabout branch from 8761377 to e55b2ec Compare May 6, 2026 22:46
@cg2121
Copy link
Copy Markdown
Contributor Author

cg2121 commented May 6, 2026

I fixed the merge conflicts and made sure it still works with the changes to the RemoteTextThread.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/ui-ux Anything to do with changes or additions to UI/UX elements. kind/cleanup Non-breaking change which makes code smaller or more readable

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants