Add validation to message entry fields.

All message  entry fields on the  mainscreen and in the  macro editing
facilities are now restricted to valid characters in the JT65/JT9 free
text message alphabet.

git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@4362 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Bill Somerville
2014-09-25 11:36:01 +00:00
parent fbc744e066
commit cb27e2c4b0
3 changed files with 42 additions and 5 deletions
+30 -1
View File
@@ -60,6 +60,8 @@ namespace
// disabled
int const combo_box_item_enabled (32 | 1);
int const combo_box_item_disabled (0);
QRegExp message_alphabet {"[- A-Za-z0-9+./?]*"};
}
@@ -165,6 +167,32 @@ public:
};
// Class MessageItemDelegate
//
// Item delegate for message entry such as free text message macros.
//
class MessageItemDelegate final
: public QStyledItemDelegate
{
public:
explicit MessageItemDelegate (QObject * parent = nullptr)
: QStyledItemDelegate {parent}
{
}
QWidget * createEditor (QWidget * parent
, QStyleOptionViewItem const& /* option*/
, QModelIndex const& /* index */
) const override
{
auto editor = new QLineEdit {parent};
editor->setFrame (false);
editor->setValidator (new QRegExpValidator {message_alphabet, editor});
return editor;
}
};
// Fields that are transceiver related.
//
// These are aggregated in a structure to enable a non-equivalence to
@@ -682,7 +710,7 @@ Configuration::impl::impl (Configuration * self, QString const& instance_key, QS
//
ui_->callsign_line_edit->setValidator (new QRegExpValidator {QRegExp {"[A-Za-z0-9/]+"}, this});
ui_->grid_line_edit->setValidator (new QRegExpValidator {QRegExp {"[A-Ra-r]{2,2}[0-9]{2,2}[A-Xa-x]{0,2}"}, this});
ui_->add_macro_line_edit->setValidator (new QRegExpValidator {QRegExp {"[ A-Za-z0-9/?]+"}, this});
ui_->add_macro_line_edit->setValidator (new QRegExpValidator {message_alphabet, this});
//
// assign ids to radio buttons
@@ -736,6 +764,7 @@ Configuration::impl::impl (Configuration * self, QString const& instance_key, QS
// setup macros list view
//
ui_->macros_list_view->setModel (&next_macros_);
ui_->macros_list_view->setItemDelegate (new MessageItemDelegate {this});
macro_delete_action_ = new QAction {tr ("&Delete"), ui_->macros_list_view};
ui_->macros_list_view->insertAction (nullptr, macro_delete_action_);