Repository navigation
Fix master build after the themes merge (#1081) - #1083
Merged
Merged
Conversation
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.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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:
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.