Conversation
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Was sitting on the same row at columns 3-4; now on its own row directly below the toggle for clearer visual grouping. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
…erge Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
dxqb
added a commit
to dxqb/OneTrainer
that referenced
this pull request
Jul 1, 2026
…bstraction Nerogar/merge received PR Nerogar#1564 as a squash-merge with tree identical to ctk_copy's tip. ctk_abstraction already contains all of ctk_copy's real commits, so -X ours is safe here: there is no content on Nerogar/merge beyond what's already in ctk_abstraction. # Conflicts: # modules/ui/BaseAdditionalEmbeddingsTabView.py # modules/ui/BaseCaptionUIView.py # modules/ui/BaseCloudTabView.py # modules/ui/BaseConceptTabView.py # modules/ui/BaseConceptWindowView.py # modules/ui/BaseConvertModelUIView.py # modules/ui/BaseGenerateCaptionsWindowView.py # modules/ui/BaseGenerateMasksWindowView.py # modules/ui/BaseLoraTabView.py # modules/ui/BaseModelTabView.py # modules/ui/BaseOffloadingWindowView.py # modules/ui/BaseProfilingWindowView.py # modules/ui/BaseSampleFrameView.py # modules/ui/BaseSampleParamsWindowView.py # modules/ui/BaseSampleWindowView.py # modules/ui/BaseSamplingTabView.py # modules/ui/BaseSchedulerParamsWindowView.py # modules/ui/BaseTimestepDistributionWindowView.py # modules/ui/BaseTopBarView.py # modules/ui/BaseTrainUIView.py # modules/ui/BaseTrainingTabView.py # modules/ui/BaseVideoToolUIView.py # modules/ui/CaptionUI.py # modules/ui/CaptionUIController.py # modules/ui/CtkGenerateCaptionsWindowView.py # modules/ui/CtkGenerateMasksWindowView.py # modules/ui/CtkSchedulerParamsWindowView.py # modules/ui/GenerateCaptionsWindow.py # modules/ui/GenerateMasksWindow.py # modules/ui/SampleWindow.py # modules/ui/SampleWindowController.py # modules/ui/SchedulerParamsWindow.py # modules/ui/VideoToolUI.py # modules/ui/VideoToolUIController.py
dxqb
added a commit
to dxqb/OneTrainer
that referenced
this pull request
Jul 1, 2026
…erogar#1445) into pyside Nerogar/merge's tip is a squash-merge of ctk_abstraction, tree-identical to our ctk_abstraction/pyside_copy ancestors already in pyside's history. -X ours plus manual conflict resolution below keeps pyside's tree unchanged.
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
1 participant
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.
Summary
This PR copies all ctk UI files to 3 files:
It doesn't do anything else, just copies. It is the basis for #1445 and I'll keep it a separate commit in git history for good "blame" tracability.