mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-11-28 21:38:51 +03:00
Code Issues Projects Releases Packages Wiki Activity

Don't change combobox index after selection

Browse source 
Also keep the list sorted.

PR #21599.
This commit is contained in:
Chocobo1 2024-10-14 14:39:54 +08:00 committed by Vladimir Golovnev (Glassez)
parent 983b7814aa
commit 4712eba0dc
No known key found for this signature in database
GPG key ID: 52A2C7DEE2DFA6F7
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/gui/optionsdialog.cpp
View file

@ -30,6 +30,7 @@
#include "optionsdialog.h" #include "optionsdialog.h"
#include <algorithm>
#include <chrono> #include <chrono>
#include <cstdlib> #include <cstdlib>
#include <limits> #include <limits>
@ -60,6 +61,7 @@
#include "base/rss/rss_session.h" #include "base/rss/rss_session.h"
#include "base/torrentfileguard.h" #include "base/torrentfileguard.h"
#include "base/torrentfileswatcher.h" #include "base/torrentfileswatcher.h"
#include "base/utils/compare.h"
#include "base/utils/io.h" #include "base/utils/io.h"
#include "base/utils/misc.h" #include "base/utils/misc.h"
#include "base/utils/net.h" #include "base/utils/net.h"
@ -1689,18 +1691,12 @@ bool OptionsDialog::isSplashScreenDisabled() const
void OptionsDialog::initializeStyleCombo() void OptionsDialog::initializeStyleCombo()
{ {
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
QStringList styleNames = QStyleFactory::keys();
std::sort(styleNames.begin(), styleNames.end(), Utils::Compare::NaturalLessThan<Qt::CaseInsensitive>());
m_ui->comboStyle->addItems(styleNames);
const QString prefStyleName = Preferences::instance()->getStyle(); const QString prefStyleName = Preferences::instance()->getStyle();
const QString selectedStyleName = prefStyleName.isEmpty() ? QApplication::style()->name() : prefStyleName; const QString selectedStyleName = prefStyleName.isEmpty() ? QApplication::style()->name() : prefStyleName;
QStringList styleNames = QStyleFactory::keys(); m_ui->comboStyle->setCurrentText(selectedStyleName);
for (qsizetype i = 1, stylesCount = styleNames.size(); i < stylesCount; ++i)
{
if (selectedStyleName.compare(styleNames.at(i), Qt::CaseInsensitive) == 0)
{
styleNames.swapItemsAt(0, i);
break;
}
}
m_ui->comboStyle->addItems(styleNames);
#else #else
m_ui->labelStyle->hide(); m_ui->labelStyle->hide();
m_ui->comboStyle->hide(); m_ui->comboStyle->hide();