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.

Sign up for GitHub

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

WIP: Update channel UI enhancements #6873

Draft
wants to merge 12 commits into
base: master
Choose a base branch
from
+191 −172
Draft

WIP: Update channel UI enhancements #6873

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
e07f6f5
Add daily update channel.
camilasan Apr 15, 2024
d5ecfa6
Modernize ConfigFile::updateChannel and Updater::getQueryParams.
camilasan Jun 3, 2024
e396fbe
Adds info about daily builds to message shown if user changes update …
camilasan Jun 3, 2024
1dfa608
Clean up code in GeneralSettings.
camilasan Jun 3, 2024
d905401
List daily update channel in the general settings view.
camilasan Jun 3, 2024
6f60094
Change the default MIRALL_VERSION_SUFFIX from "git" to "daily".
camilasan Jun 26, 2024
1e68dab
Use the value from MIRALL_VERSION_SUFFIX as the default update channel.
camilasan Jun 26, 2024
8d22b61
Add versionSuffix function to Theme.
camilasan Jun 26, 2024
13b0d9e
Enforce the update channel based on the current client installed.
camilasan Jun 26, 2024
a9ed8f9
Improve text displayed when user switches update channel.
camilasan Jun 27, 2024
e788c2f
Use radio buttons instead of a combo box to list the update channels.
camilasan Jun 27, 2024
091b49a
Remove commented out line.
camilasan Jun 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
List daily update channel in the general settings view. 
Signed-off-by: Camila Ayres <hello@camilasan.com>
  • Loading branch information
@camilasan
camilasan committed Jun 26, 2024
commit d905401a35c406e5c02efde5e130a220c78a16d3
16 changes: 8 additions & 8 deletions src/gui/generalsettings.cpp
View file
Original file line number Diff line number Diff line change
@@ -279,6 +279,14 @@ void GeneralSettings::loadMiscSettings()
_ui->stopExistingFolderNowBigSyncCheckBox->setChecked(_ui->existingFolderLimitCheckBox->isChecked() && cfgFile.stopSyncingExistingFoldersOverLimit());
_ui->newExternalStorage->setChecked(cfgFile.confirmExternalStorage());
_ui->monoIconsCheckBox->setChecked(cfgFile.monoIcons());

#if defined(BUILD_UPDATER)
auto validUpdateChannels = cfgFile.validUpdateChannels();
_ui->updateChannel->addItems(validUpdateChannels);
const auto currentUpdateChannelIndex = validUpdateChannels.indexOf(cfgFile.updateChannel());
_ui->updateChannel->setCurrentIndex(currentUpdateChannelIndex != -1? currentUpdateChannelIndex : 0);
connect(_ui->updateChannel, &QComboBox::currentTextChanged, this, &GeneralSettings::slotUpdateChannelChanged);
#endif
}

#if defined(BUILD_UPDATER)
@@ -292,9 +300,6 @@ void GeneralSettings::slotUpdateInfo()
return;
}

const auto validUpdateChannels = config.validUpdateChannels();
_ui->updateChannel->addItems(validUpdateChannels);

if (updater) {
connect(_ui->updateButton,
&QAbstractButton::clicked,
@@ -338,11 +343,6 @@ void GeneralSettings::slotUpdateInfo()
_ui->updateButton->setEnabled(enableUpdateButton);
}
#endif

const auto currentUpdateChannelIndex = validUpdateChannels.indexOf(config.updateChannel());
_ui->updateChannel->setCurrentIndex(currentUpdateChannelIndex != -1? currentUpdateChannelIndex : 0);
connect(_ui->updateChannel, &QComboBox::currentTextChanged,
this, &GeneralSettings::slotUpdateChannelChanged, Qt::UniqueConnection);
}

void GeneralSettings::slotUpdateChannelChanged()