diff options
| author | Gerald Combs <gerald@wireshark.org> | 2016-06-22 14:41:16 -0700 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-06-23 03:03:51 +0000 |
| commit | bcae998048190ce70ae9d0cbc05dc61e9e66c3b4 (patch) | |
| tree | 5346794d02b6f3f7976b7e01ee18a65440e66f1e /ui | |
| parent | 18a900f19126dead1f039c699b5e48b1c5fd2efd (diff) | |
| download | wireshark-bcae998048190ce70ae9d0cbc05dc61e9e66c3b4.tar.gz | |
Qt: Support the -j, -J, and -l command line flags
Add support for -j, -J, and -l. Mark the -m flag deprecated.
Bug: 12546
Change-Id: Ic44b3997840018e5d571aa1813a1646bce11d4a6
Reviewed-on: https://code.wireshark.org/review/16083
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/commandline.c | 2 | ||||
| -rw-r--r-- | ui/preference_utils.h | 2 | ||||
| -rw-r--r-- | ui/qt/main_window.cpp | 4 | ||||
| -rw-r--r-- | ui/qt/main_window_slots.cpp | 1 |
4 files changed, 5 insertions, 4 deletions
diff --git a/ui/commandline.c b/ui/commandline.c index 9381ed1a6b..109952c42c 100644 --- a/ui/commandline.c +++ b/ui/commandline.c @@ -468,7 +468,7 @@ void commandline_other_options(int argc, char *argv[], commandline_param_info_t* arg_error = TRUE; #endif break; - case 'm': /* Fixed-width font for the display */ + case 'm': /* Fixed-width font for the display. GTK+ only. */ g_free(param_info->prefs_p->gui_gtk2_font_name); param_info->prefs_p->gui_gtk2_font_name = g_strdup(optarg); break; diff --git a/ui/preference_utils.h b/ui/preference_utils.h index d85a4ea9e1..e31db19fcc 100644 --- a/ui/preference_utils.h +++ b/ui/preference_utils.h @@ -70,7 +70,7 @@ extern void reset_stashed_pref(pref_t *pref); /** If autoscroll in live captures is active or not */ -extern gboolean auto_scroll_live; /* GTK+ only. */ +extern gboolean auto_scroll_live; /** Fill in capture options with values from the preferences */ diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp index 617e184835..4d81268241 100644 --- a/ui/qt/main_window.cpp +++ b/ui/qt/main_window.cpp @@ -1027,9 +1027,9 @@ void MainWindow::mergeCaptureFile() gchar *err_msg; if (!dfilter_compile(read_filter.toUtf8().constData(), &rfcode, &err_msg)) { - /* Not valid. Tell the user, and go back and run the file + /* Not valid. Tell the user, and go back and run the file selection box again once they dismiss the alert. */ - //bad_dfilter_alert_box(top_level, read_filter->str); + // Similar to commandline_info.jfilter section in main(). QMessageBox::warning(this, tr("Invalid Read Filter"), QString(tr("The filter expression %1 isn't a valid read filter. (%2).").arg(read_filter, err_msg)), QMessageBox::Ok); diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp index 017eaa5d02..ac7bc0d972 100644 --- a/ui/qt/main_window_slots.cpp +++ b/ui/qt/main_window_slots.cpp @@ -1537,6 +1537,7 @@ void MainWindow::setFeaturesEnabled(bool enabled) if(enabled) { main_ui_->statusBar->clearMessage(); + main_ui_->actionGoAutoScroll->setChecked(auto_scroll_live); } else { |