hashirama/goldendict-ng
hashirama/goldendict-ng
0
0
Fork 0
mirror of https://github.com/xiaoyifang/goldendict-ng.git synced 2024-12-05 00:24:06 +00:00
Code Issues Actions 1 Projects Releases Wiki Activity

Merge branch 'staged' into dev

Browse source
This commit is contained in:
YiFang Xiao 2023-09-21 07:45:30 +08:00
parent 76a2cd55a9 19e848ec50
commit 1b4b824501
4 changed files with 9 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ui/mainwindow.cc
View file

@ -2442,6 +2442,8 @@ void MainWindow::setInputLineText( QString text, WildcardPolicy wildcardPolicy,
else {
translateBox->setText( text, popupAction == EnablePopup );
}
updateSuggestionList();
GlobalBroadcaster::instance()->translateLineText = text;
}

4
src/ui/scanpopup.cc
View file

@ -124,7 +124,7 @@ ScanPopup::ScanPopup( QWidget * parent,
definition->installEventFilter( this );
this->installEventFilter( this );
connect( ui.translateBox->translateLine(), &QLineEdit::textChanged, this, &ScanPopup::translateInputChanged );
connect( ui.translateBox->translateLine(), &QLineEdit::textEdited, this, &ScanPopup::translateInputChanged );
connect( ui.translateBox, &TranslateBox::returnPressed, this, &ScanPopup::translateInputFinished );
@ -694,6 +694,8 @@ void ScanPopup::typingEvent( QString const & t )
ui.translateBox->setText( t, true );
ui.translateBox->translateLine()->setCursorPosition( t.size() );
}
updateSuggestionList();
}
bool ScanPopup::eventFilter( QObject * watched, QEvent * event )

35
src/ui/translatebox.cc
View file

@ -50,29 +50,9 @@ TranslateBox::TranslateBox( QWidget * parent ):
completer->setCompletionMode( QCompleter::UnfilteredPopupCompletion );
completer->setMaxVisibleItems( 16 );
connect( completer,
QOverload< const QString & >::of( &QCompleter::activated ),
translate_line,
[ & ]( const QString & text ) {
translate_line->setText( text );
emit returnPressed();
} );
connect( completer,
QOverload< const QString & >::of( &QCompleter::highlighted ),
translate_line,
[ & ]( const QString & text ) {
selectedItem = true;
} );
connect( translate_line,
&QLineEdit::returnPressed,
[ this ]() {
if ( selectedItem )
return;
emit returnPressed();
} );
connect( translate_line, &QLineEdit::returnPressed, [ this ]() {
emit returnPressed();
} );
}
void TranslateBox::setText( const QString & text, bool showPopup )
@ -96,7 +76,7 @@ void TranslateBox::setSizePolicy( QSizePolicy policy )
void TranslateBox::setModel( QStringList & _words )
{
disconnect( completer, 0, translate_line, 0 );
disconnect( completer, QOverload< const QString & >::of( &QCompleter::activated ), translate_line, nullptr );
const auto model = static_cast< QStringListModel * >( completer->model() );
model->setStringList( _words );
@ -109,13 +89,6 @@ void TranslateBox::setModel( QStringList & _words )
[ & ]( const QString & text ) {
translate_line->setText( text );
emit returnPressed();
selectedItem = false;
} );
connect( completer,
QOverload< const QString & >::of( &QCompleter::highlighted ),
translate_line,
[ & ]( const QString & text ) {
selectedItem = true;
} );
}

1
src/ui/translatebox.hh
View file

@ -36,7 +36,6 @@ private slots:
private:
QLineEdit * translate_line;
bool selectedItem = false;
bool m_popupEnabled;
QCompleter * completer;
QStringList words;