Merged
Conversation
TheOneRing
force-pushed
the
work/redesign2
branch
3 times, most recently
from
8eb478f to
5791bbe
Compare
TheOneRing
force-pushed
the
work/redesign2
branch
2 times, most recently
from
69e5d46 to
8e7293c
Compare
TheOneRing
force-pushed
the
work/redesign2
branch
3 times, most recently
from
8ae183e to
124df60
Compare
dragotin
reviewed
Jan 15, 2025
| // that way, when we intend to reset to the original selection when the dialog, we can look up the config file's stored value in the data model | ||
| ui->updateChannel->addItem(QStringLiteral("ownCloud 10 LTS"), QStringLiteral("stable")); | ||
| ui->updateChannel->addItem(QStringLiteral("ownCloud Infinite Scale stable"), QStringLiteral("ocis")); | ||
| ui->updateChannel->addItem(QStringLiteral("stable"), QStringLiteral("stable")); |
Contributor
There was a problem hiding this comment.
The previous name is more specific, and maybe the new one should also be "OpenCloud" and "OpenCloud" ... or so ;-)
Contributor
Author
There was a problem hiding this comment.
We can decide on this once we again have auto updates 🙈
| tr("<html>The update channel determines which client updates will be offered for installation.<ul>" | ||
| "<li>\"ownCloud 10 LTS\" contains only upgrades that are considered reliable</li>" | ||
| "<li>\"ownCloud Infinite Scale stable\" contains only upgrades that are considered reliable but <b>removes support for \"ownCloud 10\"</b></li>" | ||
| "<li>\"stable\" contains only upgrades that are considered reliable</li>" |
Contributor
There was a problem hiding this comment.
... as we might get another product anytime the next decade?
| rootContext()->setContextProperty(QStringLiteral("ocContext"), ocContext); | ||
| engine()->setObjectOwnership(ocContext, ownership); | ||
| engine()->addImageProvider(QStringLiteral("ownCloud"), new OCC::Resources::CoreImageProvider()); | ||
| engine()->addImageProvider(QStringLiteral("OpenCloud"), new OCC::Resources::CoreImageProvider()); |
Contributor
There was a problem hiding this comment.
I am not sure to spread QStringLiteral("OpenCloud") all over. Maybe rather a more central definition? Winter äh Whitelabeling is coming...
TheOneRing
force-pushed
the
work/redesign2
branch
from
124df60 to
b3ee084
Compare
dragotin
approved these changes
Jan 16, 2025
| { | ||
| if (element.tagName() != QLatin1String("owncloudclient")) { | ||
| qCCritical(lcUpdater) << "Expected 'owncloudclient', got '" << element.tagName() << "'."; | ||
| if (element.tagName() != QLatin1String("OpenCloud")) { |
Contributor
There was a problem hiding this comment.
QLatin1String("OpenCloud") again
TheOneRing
force-pushed
the
work/redesign2
branch
from
b3ee084 to
c877c3b
Compare
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
2 participants
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.
No description provided.