mirrors/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2024-11-25 10:46:15 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix Enter key behavior in Add new torrent dialog

Browse source 
Prevent inappropriate default completer from being used by path edit.

PR #20670.
Closes #20663.
This commit is contained in:
Vladimir Golovnev 2024-04-08 16:02:26 +03:00 committed by GitHub
parent 92ce507151
commit f085f8c076
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/gui/fspathedit_p.cpp
View file

@ -163,6 +163,7 @@ QValidator::State Private::FileSystemPathValidator::validate(QString &input, [[m
Private::FileLineEdit::FileLineEdit(QWidget *parent)
: QLineEdit(parent)
{
setCompleter(new QCompleter(this));
connect(this, &QLineEdit::textChanged, this, &FileLineEdit::validateText);
}
@ -221,7 +222,7 @@ void Private::FileLineEdit::keyPressEvent(QKeyEvent *e)
if ((e->key() == Qt::Key_Space) && (e->modifiers() == Qt::CTRL))
{
if (!m_completer)
if (!m_completerModel)
{
m_iconProvider = new QFileIconProvider;
m_iconProvider->setOptions(QFileIconProvider::DontUseCustomDirectoryIcons);
@ -234,9 +235,7 @@ void Private::FileLineEdit::keyPressEvent(QKeyEvent *e)
| (m_completeDirectoriesOnly ? QDir::Dirs : QDir::AllEntries);
m_completerModel->setFilter(filters);
m_completer = new QCompleter(this);
m_completer->setModel(m_completerModel);
setCompleter(m_completer);
completer()->setModel(m_completerModel);
}
m_completerModel->setRootPath(Path(text()).data());
@ -260,8 +259,8 @@ void Private::FileLineEdit::contextMenuEvent(QContextMenuEvent *event)
void Private::FileLineEdit::showCompletionPopup()
{
m_completer->setCompletionPrefix(text());
m_completer->complete();
completer()->setCompletionPrefix(text());
completer()->complete();
}
void Private::FileLineEdit::validateText()

2
src/gui/fspathedit_p.h
View file

@ -37,7 +37,6 @@
#include "base/pathfwd.h"
class QAction;
class QCompleter;
class QContextMenuEvent;
class QFileIconProvider;
class QFileSystemModel;
@ -141,7 +140,6 @@ namespace Private
static QString warningText(FileSystemPathValidator::TestResult result);
QFileSystemModel *m_completerModel = nullptr;
QCompleter *m_completer = nullptr;
QAction *m_browseAction = nullptr;
QAction *m_warningAction = nullptr;
QFileIconProvider *m_iconProvider = nullptr;