FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Set better focus in "Write new email message" window when writing new message or replying to one.

Browse Source
This commit is contained in:
Martin Rotter 2020-08-11 11:21:07 +02:00
parent 0351a988a7
commit 203cce77c3
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/librssguard/services/gmail/gui/emailrecipientcontrol.cpp
View File

@ -23,9 +23,12 @@ EmailRecipientControl::EmailRecipientControl(const QString& recipient, QWidget*
m_cmbRecipientType->setFocusPolicy(Qt::FocusPolicy::NoFocus); m_cmbRecipientType->setFocusPolicy(Qt::FocusPolicy::NoFocus);
m_btnCloseMe->setFocusPolicy(Qt::FocusPolicy::NoFocus); m_btnCloseMe->setFocusPolicy(Qt::FocusPolicy::NoFocus);
m_txtRecipient->setFocusPolicy(Qt::FocusPolicy::StrongFocus);
m_txtRecipient->setPlaceholderText(tr("E-mail address")); m_txtRecipient->setPlaceholderText(tr("E-mail address"));
m_txtRecipient->setText(recipient); m_txtRecipient->setText(recipient);
setFocusProxy(m_txtRecipient);
m_btnCloseMe->setToolTip("Remove this recipient."); m_btnCloseMe->setToolTip("Remove this recipient.");
m_btnCloseMe->setIcon(qApp->icons()->fromTheme(QSL("list-remove"))); m_btnCloseMe->setIcon(qApp->icons()->fromTheme(QSL("list-remove")));

7
src/librssguard/services/gmail/gui/formaddeditemail.cpp
View File

@ -49,7 +49,7 @@ FormAddEditEmail::FormAddEditEmail(GmailServiceRoot* root, QWidget* parent)
} }
void FormAddEditEmail::execForAdd() { void FormAddEditEmail::execForAdd() {
addRecipientRow(); addRecipientRow()->setFocus();
exec(); exec();
} }
@ -58,6 +58,7 @@ void FormAddEditEmail::execForReply(Message* original_message) {
addRecipientRow(m_originalMessage->m_author); addRecipientRow(m_originalMessage->m_author);
m_ui.m_txtSubject->setText(QSL("Re: %1").arg(m_originalMessage->m_title)); m_ui.m_txtSubject->setText(QSL("Re: %1").arg(m_originalMessage->m_title));
m_ui.m_txtMessage->setFocus();
exec(); exec();
} }
@ -137,13 +138,15 @@ void FormAddEditEmail::onOkClicked() {
} }
} }
void FormAddEditEmail::addRecipientRow(const QString& recipient) { EmailRecipientControl* FormAddEditEmail::addRecipientRow(const QString& recipient) {
auto* mail_rec = new EmailRecipientControl(recipient, this); auto* mail_rec = new EmailRecipientControl(recipient, this);
connect(mail_rec, &EmailRecipientControl::removalRequested, this, &FormAddEditEmail::removeRecipientRow); connect(mail_rec, &EmailRecipientControl::removalRequested, this, &FormAddEditEmail::removeRecipientRow);
mail_rec->setPossibleRecipients(m_possibleRecipients); mail_rec->setPossibleRecipients(m_possibleRecipients);
m_ui.m_layout->insertRow(m_ui.m_layout->count() - 5, mail_rec); m_ui.m_layout->insertRow(m_ui.m_layout->count() - 5, mail_rec);
return mail_rec;
} }
QList<EmailRecipientControl*> FormAddEditEmail::recipientControls() const { QList<EmailRecipientControl*> FormAddEditEmail::recipientControls() const {

2
src/librssguard/services/gmail/gui/formaddeditemail.h
View File

@ -28,7 +28,7 @@ class FormAddEditEmail : public QDialog {
private slots: private slots:
void removeRecipientRow(); void removeRecipientRow();
void onOkClicked(); void onOkClicked();
void addRecipientRow(const QString& recipient = QString()); EmailRecipientControl* addRecipientRow(const QString& recipient = QString());
private: private:
QList<EmailRecipientControl*> recipientControls() const; QList<EmailRecipientControl*> recipientControls() const;