chris/js8call
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added ability to add newline into the text edit panel with Shift+Enter

Browse Source
This commit is contained in:
Jordan Sherer 2018-08-04 14:41:55 -04:00
parent 883cb99c0f
commit 16a744d55e
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mainwindow.cpp
View File

@ -1059,10 +1059,16 @@ MainWindow::MainWindow(QDir const& temp_directory, bool multiple,
ui->spotButton->setChecked(m_config.spot_to_psk_reporter()); ui->spotButton->setChecked(m_config.spot_to_psk_reporter());
auto enterFilter = new EnterKeyPressEater(); auto enterFilter = new EnterKeyPressEater();
connect(enterFilter, &EnterKeyPressEater::enterKeyPressed, this, [this](QKeyEvent *, QObject *){ connect(enterFilter, &EnterKeyPressEater::enterKeyPressed, this, [this](QObject *, QKeyEvent *, bool *pProcessed){
if(ui->extFreeTextMsgEdit->isReadOnly()){ if(QApplication::keyboardModifiers() & Qt::ShiftModifier){
if(pProcessed) *pProcessed = false;
return; return;
} }
if(ui->extFreeTextMsgEdit->isReadOnly()){
if(pProcessed) *pProcessed = false;
return;
}
if(pProcessed) *pProcessed = true;
toggleTx(true); toggleTx(true);
}); });
ui->extFreeTextMsgEdit->installEventFilter(enterFilter); ui->extFreeTextMsgEdit->installEventFilter(enterFilter);

7
mainwindow.h
View File

@ -920,17 +920,20 @@ protected:
if (event->type() == QEvent::KeyPress) { if (event->type() == QEvent::KeyPress) {
QKeyEvent *keyEvent = static_cast<QKeyEvent *>(event); QKeyEvent *keyEvent = static_cast<QKeyEvent *>(event);
if(keyEvent->key() == Qt::Key_Enter || keyEvent->key() == Qt::Key_Return){ if(keyEvent->key() == Qt::Key_Enter || keyEvent->key() == Qt::Key_Return){
emit this->enterKeyPressed(keyEvent, obj); bool processed = false;
emit this->enterKeyPressed(obj, keyEvent, &processed);
if(processed){
return true; return true;
} }
} }
}
// standard event processing // standard event processing
return QObject::eventFilter(obj, event); return QObject::eventFilter(obj, event);
} }
public: public:
Q_SIGNAL void enterKeyPressed(QKeyEvent *evt, QObject *obj); Q_SIGNAL void enterKeyPressed(QObject *obj, QKeyEvent *evt, bool *pProcessed);
}; };
extern int killbyname(const char* progName); extern int killbyname(const char* progName);