Skip to content

Fix master build after the themes merge (#1081) - #1083

Merged
SirSparkles merged 2 commits into
TV-Rename:masterfrom
kadeschs:fix-master-build
Nov 15, 2026
Merged

SirSparkles merged 2 commits into
TV-Rename:masterfrom
kadeschs:fix-master-build

Conversation

@kadeschs

Copy link
Copy Markdown
Collaborator

Hi Mark,

Master doesn't build right now. The CodeQL run on a32fd4f (#1081) failed with 72 CS0103 errors, all in UI.cs and UI.Designer.cs (tabMainUITabs, tbSchedule, tabPage1). I got the same 72 building it here.

When master was merged into themes-addin, UI.Designer.cs conflicted with my TabControl to TabControlThemed change, and the resolution kept my older lines. So the designer still declares tabControl1, tabPage1 and tbWTW while the rest of the code uses your new names.

This PR:

  1. Puts your names back in those three spots in UI.Designer.cs (4 lines, TabControlThemed stays).
  2. Removes the old add-in copy I mentioned in Optional colour themes (Dark, Creme, editable theme files) #1077 (TVRename\AddIns\Themes plus the two hook lines in Program.cs and TVRenameSplash.cs), so only the reworked version runs. After this the theme code matches what I tested in 2b9c39e.

Debug and Release both build clean, and it starts and runs fine in Light, Dark and Creme with your new layout. The Preferences pages come out the same as what I tested for #1077.

From here on I'll add new commits on top of your latest master instead of force-pushing, so your local copy stays in step with mine.

The merge of master into themes-addin kept the old tabControl1 / tabPage1 / tbWTW declarations in UI.Designer.cs, while the rest of the code uses the renamed tabMainUITabs / tbSchedule / tabInformationTab. Master did not compile (72 x CS0103).
PR TV-Rename#1077 was redone with themes built into the main code (Settings\Theme.cs, Settings\ThemeManager.cs, ThemeHelper). The first, self-contained add-in version (TVRename\AddIns\Themes and its hooks in Program and the splash screen) was carried in by a merge and ran alongside it.
@SirSparkles
SirSparkles merged commit e78fea8 into TV-Rename:master Nov 15, 2026
4 checks passed
@kadeschs
kadeschs deleted the fix-master-build branch November 15, 2026 17:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants