osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

extcap: Correct save for file arguments 

Also add check to has_configuration

Change-Id: Ia0ffbd3bf68ad51c26bc75b5ee179db179e22bd4
Reviewed-on: https://code.wireshark.org/review/13635
Reviewed-by: Roland Knall <rknall@gmail.com>
This commit is contained in:
Roland Knall 2016-02-01 09:53:31 +01:00 committed by Roland Knall
parent 927ffaa794
commit 71a21d79cf
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
extcap.c
View File

@ -584,6 +584,11 @@ extcap_has_configuration(const char * ifname, gboolean is_required) {
else if ( ! defval && (!stored || strlen(g_strchomp(stored)) <= (size_t)0) )
found = TRUE;
}
if ( arg->arg_type == EXTCAP_ARG_FILESELECT ) {
if ( arg->fileexists && ! ( file_exists(defval) || file_exists(stored) ) )
found = TRUE;
}
}
}

20
ui/qt/extcap_argument_file.cpp
View File

@ -53,6 +53,9 @@ ExtcapArgumentFileSelection::~ExtcapArgumentFileSelection()
QWidget * ExtcapArgumentFileSelection::createEditor(QWidget * parent)
{
QString storeval;
QString text = defaultValue();
QWidget * fileWidget = new QWidget(parent);
QHBoxLayout * editLayout = new QHBoxLayout();
QMargins margins = editLayout->contentsMargins();
@ -63,8 +66,14 @@ QWidget * ExtcapArgumentFileSelection::createEditor(QWidget * parent)
textBox = new QLineEdit(defaultValue(), parent);
textBox->setReadOnly(true);
if ( _argument->default_complex != NULL && _argument->arg_type == EXTCAP_ARG_STRING )
textBox->setText(QString().fromUtf8(extcap_complex_get_string(_argument->default_complex)));
if ( _argument->storeval )
{
QString storeValue = _argument->storeval;
if ( storeValue.length() > 0 && storeValue.compare(text) != 0 )
text = storeValue.trimmed();
}
textBox->setText(text);
if ( _argument->tooltip != NULL )
{
@ -121,7 +130,12 @@ bool ExtcapArgumentFileSelection::isValid()
{
bool valid = false;
if ( textBox->text().length() > 0 || ! isRequired() )
if ( textBox->text().length() > 0 )
{
if ( QFileInfo(textBox->text()).exists() && _argument->fileexists )
valid = true;
}
else if ( ! isRequired() )
valid = true;
QString lblInvalidColor = ColorUtils::fromColorT(prefs.gui_text_invalid).name();