Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix broken general settings UI file #7547

Merged
merged 2 commits into from
Nov 22, 2024
Merged

Conversation

claucambra
Copy link
Collaborator

Looks like it was caused by a bad rebase conflict resolution in the talk notification PR

Fixes this:

AutoUic: /Users/claucambra/Downloads/GitRepos/desktop/src/gui/generalsettings.ui: Warning: The name 'horizontalLayout' (QHBoxLayout) is already in use, defaulting to 'horizontalLayout1'.
/Users/claucambra/Downloads/GitRepos/desktop/src/gui/generalsettings.ui: Warning: The name 'verticalLayout_3' (QVBoxLayout) is already in use, defaulting to 'verticalLayout_31'.
/Users/claucambra/Downloads/GitRepos/desktop/src/gui/generalsettings.ui: Warning: The name 'updateChannelLabel' (QLabel) is already in use, defaulting to 'updateChannelLabel1'.
/Users/claucambra/Downloads/GitRepos/desktop/src/gui/generalsettings.ui: Warning: The name 'updateChannel' (QComboBox) is already in use, defaulting to 'updateChannel1'.
/Users/claucambra/Downloads/GitRepos/desktop/src/gui/generalsettings.ui: Warning: The name 'updateStateLabel' (QLabel) is already in use, defaulting to 'updateStateLabel1'.
/Users/claucambra/Downloads/GitRepos/desktop/src/gui/generalsettings.ui: Warning: The name 'restartButton' (QPushButton) is already in use, defaulting to 'restartButton1'.
/Users/claucambra/Downloads/GitRepos/desktop/src/gui/generalsettings.ui: Warning: The name 'autoCheckForUpdatesCheckBox' (QCheckBox) is already in use, defaulting to 'autoCheckForUpdatesCheckBox1'.
/Users/claucambra/Downloads/GitRepos/desktop/src/gui/generalsettings.ui: Warning: The name 'updateButton' (QPushButton) is already in use, defaulting to 'updateButton1'.
/Users/claucambra/Downloads/GitRepos/desktop/src/gui/generalsettings.ui: Warning: The name 'legalNoticeButton' (QPushButton) is already in use, defaulting to 'legalNoticeButton1'.
/Users/claucambra/Downloads/GitRepos/desktop/src/gui/generalsettings.ui: Warning: The name 'horizontalSpacer_2' (QSpacerItem) is already in use, defaulting to 'horizontalSpacer_21'.
/Users/claucambra/Downloads/GitRepos/desktop/src/gui/generalsettings.ui: Warning: The name 'verticalSpacer' (QSpacerItem) is already in use, defaulting to 'verticalSpacer1'.

@claucambra claucambra added this to the 3.15.0 milestone Nov 21, 2024
@claucambra claucambra self-assigned this Nov 21, 2024
Looks like it was originally caused at some point by a bad rebase
conflict resolution

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
@mgallien mgallien force-pushed the bugfix/general-settings-ui-fix branch from 06f9d27 to caf06d4 Compare November 22, 2024 08:14
@mgallien mgallien merged commit f5be720 into master Nov 22, 2024
9 of 14 checks passed
@mgallien mgallien deleted the bugfix/general-settings-ui-fix branch November 22, 2024 08:14
@nextcloud-desktop-bot
Copy link

AppImage file: nextcloud-PR-7547-caf06d4dfdcc117b6c35c2e5a7494daee5f7213a-x86_64.AppImage

To test this change/fix you can simply download above AppImage file and test it.

Please make sure to quit your existing Nextcloud app and backup your data.

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.

3 participants