diff options
| author | Dario Lombardo <lomato@gmail.com> | 2016-01-18 12:01:14 +0100 |
|---|---|---|
| committer | Roland Knall <rknall@gmail.com> | 2016-01-18 15:04:33 +0000 |
| commit | ff033c6a2fb7a6286e66b6ed89e24ea4c6cd22c9 (patch) | |
| tree | bab0bf4c3077a1f36ec4dce13f864525096a814d /ui | |
| parent | 36cd1959d313862216c58a0765d75758c8715b1d (diff) | |
| download | wireshark-ff033c6a2fb7a6286e66b6ed89e24ea4c6cd22c9.tar.gz | |
extcap: add masked to options.
This allows an option to be masked (like a password), by using
the argument-type password.
Change-Id: I2eae1be2e6672bff28ba5f749d7a3f687ebd4631
Reviewed-on: https://code.wireshark.org/review/13385
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Roland Knall <rknall@gmail.com>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/gtk/extcap_gtk.c | 5 | ||||
| -rw-r--r-- | ui/qt/extcap_argument.cpp | 5 |
2 files changed, 9 insertions, 1 deletions
diff --git a/ui/gtk/extcap_gtk.c b/ui/gtk/extcap_gtk.c index c2a1e3386e..6d7c068db9 100644 --- a/ui/gtk/extcap_gtk.c +++ b/ui/gtk/extcap_gtk.c @@ -157,6 +157,7 @@ GHashTable *extcap_gtk_get_state(GtkWidget *widget) { case EXTCAP_ARG_LONG: case EXTCAP_ARG_DOUBLE: case EXTCAP_ARG_STRING: + case EXTCAP_ARG_PASSWORD: parsed_complex = extcap_parse_complex(arg->arg_type, gtk_entry_get_text(GTK_ENTRY(list_widget))); if (parsed_complex == NULL) { @@ -812,6 +813,7 @@ GSList *extcap_populate_gtk_vbox(GList *arguments, GtkWidget *vbox, } break; case EXTCAP_ARG_STRING: + case EXTCAP_ARG_PASSWORD: label = gtk_label_new(arg_iter->display); item = gtk_entry_new(); @@ -828,6 +830,9 @@ GSList *extcap_populate_gtk_vbox(GList *arguments, GtkWidget *vbox, g_free(default_str); } + if ( arg_iter->arg_type == EXTCAP_ARG_PASSWORD) + gtk_entry_set_visibility(GTK_ENTRY(item), FALSE); + break; case EXTCAP_ARG_FILESELECT: label = gtk_label_new(arg_iter->display); diff --git a/ui/qt/extcap_argument.cpp b/ui/qt/extcap_argument.cpp index 2ae543660f..38dc865770 100644 --- a/ui/qt/extcap_argument.cpp +++ b/ui/qt/extcap_argument.cpp @@ -287,6 +287,9 @@ QWidget * ExtArgText::createEditor(QWidget * parent) if ( _argument->tooltip != NULL ) textBox->setToolTip(QString().fromUtf8(_argument->tooltip)); + if (_argument->arg_type == EXTCAP_ARG_PASSWORD) + textBox->setEchoMode(QLineEdit::Password); + connect(textBox , SIGNAL(textChanged(QString)), SLOT(onStringChanged(QString))); return textBox; @@ -568,7 +571,7 @@ ExtcapArgument * ExtcapArgument::create(extcap_arg * argument, GHashTable * devi ExtcapArgument * result = 0; - if ( argument->arg_type == EXTCAP_ARG_STRING ) + if ( argument->arg_type == EXTCAP_ARG_STRING || argument->arg_type == EXTCAP_ARG_PASSWORD ) result = new ExtArgText(argument); else if ( argument->arg_type == EXTCAP_ARG_INTEGER || argument->arg_type == EXTCAP_ARG_LONG || argument->arg_type == EXTCAP_ARG_UNSIGNED || argument->arg_type == EXTCAP_ARG_DOUBLE ) |