aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ui/qt/main_status_bar.cpp72
-rw-r--r--ui/qt/main_status_bar.h10
-rw-r--r--ui/qt/main_welcome.cpp24
-rw-r--r--ui/qt/main_welcome.h8
-rw-r--r--ui/qt/main_window.cpp10
-rw-r--r--ui/qt/main_window.h18
-rw-r--r--ui/qt/main_window_slots.cpp4
-rw-r--r--ui/qt/search_frame.h2
-rw-r--r--ui/qt/wireshark_application.cpp45
-rw-r--r--ui/qt/wireshark_application.h15
-rw-r--r--wireshark-qt.cpp2
11 files changed, 126 insertions, 84 deletions
diff --git a/ui/qt/main_status_bar.cpp b/ui/qt/main_status_bar.cpp
index 3ebba65a49..c2976ec0cb 100644
--- a/ui/qt/main_status_bar.cpp
+++ b/ui/qt/main_status_bar.cpp
@@ -94,18 +94,21 @@ packets_bar_update(void)
}
static const int icon_size = 14; // px
+
MainStatusBar::MainStatusBar(QWidget *parent) :
QStatusBar(parent),
cap_file_(NULL),
edit_action_(NULL),
- delete_action_(NULL)
-{
- QSplitter *splitter = new QSplitter(this);
+ delete_action_(NULL),
#ifdef HAVE_LIBPCAP
- QString ready_msg(tr("Ready to load or capture"));
+ ready_msg_(tr("Ready to load or capture")),
#else
- QString ready_msg(tr("Ready to load file"));
+ ready_msg_(tr("Ready to load file")),
#endif
+ cs_fixed_(false),
+ cs_count_(0)
+{
+ QSplitter *splitter = new QSplitter(this);
QWidget *info_progress = new QWidget(this);
QHBoxLayout *info_progress_hb = new QHBoxLayout(info_progress);
QAction *action;
@@ -171,7 +174,7 @@ MainStatusBar::MainStatusBar(QWidget *parent) :
cur_main_status_bar_ = this;
splitter->hide();
- info_status_.pushText(ready_msg, STATUS_CTX_MAIN);
+ info_status_.pushText(ready_msg_, STATUS_CTX_MAIN);
packets_bar_update();
action = ctx_menu_.addAction(tr("Manage Profiles" UTF8_HORIZONTAL_ELLIPSIS));
@@ -268,6 +271,17 @@ void MainStatusBar::setFileName(CaptureFile &cf)
}
}
+void MainStatusBar::changeEvent(QEvent *event)
+{
+ if (event->type() == QEvent::LanguageChange) {
+ info_status_.popText(STATUS_CTX_MAIN);
+ info_status_.pushText(ready_msg_, STATUS_CTX_MAIN);
+ showCaptureStatistics();
+ pushProfileName();
+ }
+ QStatusBar::changeEvent(event);
+}
+
void MainStatusBar::setCaptureFile(capture_file *cf)
{
cap_file_ = cf;
@@ -400,7 +414,7 @@ void MainStatusBar::popProgressStatus()
progress_frame_.hide();
}
-void MainStatusBar::updateCaptureStatistics(capture_session *cap_session)
+void MainStatusBar::showCaptureStatistics()
{
QString packets_str;
@@ -408,8 +422,11 @@ void MainStatusBar::updateCaptureStatistics(capture_session *cap_session)
Q_UNUSED(cap_session)
#else
/* Do we have any packets? */
- if ((!cap_session || cap_session->cf == cap_file_) && cap_file_ && cap_file_->count) {
- packets_str.append(QString(tr("Packets: %1 %4 Displayed: %2 (%3%)"))
+ if (cs_fixed_ && cs_count_ > 0) {
+ packets_str.append(QString(tr("Packets: %1"))
+ .arg(cs_count_));
+ } else if (cap_file_ && cs_count_ > 0) {
+ packets_str.append(QString(tr("Packets: %1 %4 Displayed: %2 %4 Marked: %3"))
.arg(cap_file_->count)
.arg(cap_file_->displayed_count)
.arg((100.0*cap_file_->displayed_count)/cap_file_->count, 0, 'f', 1)
@@ -441,37 +458,44 @@ void MainStatusBar::updateCaptureStatistics(capture_session *cap_session)
.arg(computed_elapsed%60000/1000)
.arg(computed_elapsed%1000));
}
- } else {
+ } else
#endif // HAVE_LIBPCAP
+ {
packets_str = tr("No Packets");
-#ifdef HAVE_LIBPCAP
}
-#endif // HAVE_LIBPCAP
popPacketStatus();
pushPacketStatus(packets_str);
}
-void MainStatusBar::updateCaptureFixedStatistics(capture_session *cap_session)
+void MainStatusBar::updateCaptureStatistics(capture_session *cap_session)
{
- QString packets_str;
+ cs_fixed_ = false;
-#ifndef HAVE_LIBPCAP
- Q_UNUSED(cap_session)
-#else
- /* Do we have any packets? */
- if (cap_session->count) {
- packets_str.append(QString(tr("Packets: %1"))
- .arg(cap_session->count));
+#ifdef HAVE_LIBPCAP
+ if ((!cap_session || cap_session->cf == cap_file_) && cap_file_ && cap_file_->count) {
+ cs_count_ = cap_file_->count;
} else {
+ cs_count_ = 0;
+ }
#endif // HAVE_LIBPCAP
- packets_str = tr("No Packets");
+
+ showCaptureStatistics();
+}
+
+void MainStatusBar::updateCaptureFixedStatistics(capture_session *cap_session)
+{
+ cs_fixed_ = true;
+
#ifdef HAVE_LIBPCAP
+ if (cap_session && cap_session->count) {
+ cs_count_ = cap_session->count;
+ } else {
+ cs_count_ = 0;
}
#endif // HAVE_LIBPCAP
- popPacketStatus();
- pushPacketStatus(packets_str);
+ showCaptureStatistics();
}
void MainStatusBar::showProfileMenu(const QPoint &global_pos, Qt::MouseButton button)
diff --git a/ui/qt/main_status_bar.h b/ui/qt/main_status_bar.h
index b1e5ef80fc..7b3ad6b8c0 100644
--- a/ui/qt/main_status_bar.h
+++ b/ui/qt/main_status_bar.h
@@ -49,6 +49,9 @@ public:
void expertUpdate();
void setFileName(CaptureFile &cf);
+protected:
+ virtual void changeEvent(QEvent* event);
+
private:
QToolButton *expert_button_;
QToolButton *comment_button_;
@@ -61,6 +64,13 @@ private:
QMenu ctx_menu_;
QAction *edit_action_;
QAction *delete_action_;
+ QString ready_msg_;
+
+ // Capture statistics
+ bool cs_fixed_;
+ guint32 cs_count_;
+
+ void showCaptureStatistics();
signals:
void showExpertInfo();
diff --git a/ui/qt/main_welcome.cpp b/ui/qt/main_welcome.cpp
index a8961b9c89..98e8cba702 100644
--- a/ui/qt/main_welcome.cpp
+++ b/ui/qt/main_welcome.cpp
@@ -62,6 +62,12 @@
MainWelcome::MainWelcome(QWidget *parent) :
QFrame(parent),
welcome_ui_(new Ui::MainWelcome),
+ flavor_(tr(VERSION_FLAVOR)),
+ #ifdef Q_OS_MAC
+ show_in_str_(tr("Show in Finder")),
+ #else
+ show_in_str_(tr("Show in Folder")),
+ #endif
splash_overlay_(NULL)
{
@@ -115,8 +121,7 @@ MainWelcome::MainWelcome(QWidget *parent) :
// Release_source?
// Typical use cases are automated builds from wireshark.org and private,
// not-for-redistribution packages.
- QString flavor = VERSION_FLAVOR;
- if (flavor.isEmpty()) {
+ if (flavor_.isEmpty()) {
welcome_ui_->flavorBanner->hide();
} else {
// If needed there are a couple of ways we can make this customizable.
@@ -135,7 +140,7 @@ MainWelcome::MainWelcome(QWidget *parent) :
.arg("#2c4bc4"); // Background color. Matches capture start button.
// .arg(tango_butter_5, 6, 16, QChar('0')); // "Warning" background
- welcome_ui_->flavorBanner->setText(flavor);
+ welcome_ui_->flavorBanner->setText(flavor_);
welcome_ui_->flavorBanner->setStyleSheet(flavor_ss);
}
welcome_ui_->captureLabel->setStyleSheet(title_button_ss);
@@ -166,7 +171,7 @@ MainWelcome::MainWelcome(QWidget *parent) :
connect(recent_files_, SIGNAL(customContextMenuRequested(QPoint)),
this, SLOT(showRecentContextMenu(QPoint)));
- connect(wsApp, SIGNAL(updateRecentItemStatus(const QString &, qint64, bool)), this, SLOT(updateRecentFiles()));
+ connect(wsApp, SIGNAL(updateRecentCaptureStatus(const QString &, qint64, bool)), this, SLOT(updateRecentCaptures()));
connect(wsApp, SIGNAL(appInitialized()), this, SLOT(appInitialized()));
connect(wsApp, SIGNAL(localInterfaceListChanged()), this, SLOT(interfaceListChanged()));
connect(welcome_ui_->interfaceFrame, SIGNAL(itemSelectionChanged()),
@@ -185,7 +190,7 @@ MainWelcome::MainWelcome(QWidget *parent) :
connect(welcome_ui_->captureFilterComboBox, SIGNAL(startCapture()),
this, SIGNAL(startCapture()));
connect(recent_files_, SIGNAL(itemActivated(QListWidgetItem *)), this, SLOT(openRecentItem(QListWidgetItem *)));
- updateRecentFiles();
+ updateRecentCaptures();
#if !defined(Q_OS_MAC) || QT_VERSION > QT_VERSION_CHECK(5, 0, 0)
// This crashes with Qt 4.8.3 on OS X.
@@ -336,7 +341,7 @@ void MainWelcome::on_interfaceFrame_startCapture()
emit startCapture();
}
-void MainWelcome::updateRecentFiles() {
+void MainWelcome::updateRecentCaptures() {
QString itemLabel;
QListWidgetItem *rfItem;
QFont rfFont;
@@ -430,6 +435,8 @@ void MainWelcome::changeEvent(QEvent* event)
{
case QEvent::LanguageChange:
welcome_ui_->retranslateUi(this);
+ welcome_ui_->flavorBanner->setText(flavor_);
+ interfaceListChanged();
break;
default:
break;
@@ -438,11 +445,6 @@ void MainWelcome::changeEvent(QEvent* event)
QFrame::changeEvent(event);
}
-#ifdef Q_OS_MAC
-static const QString show_in_str_ = QObject::tr("Show in Finder");
-#else
-static const QString show_in_str_ = QObject::tr("Show in Folder");
-#endif
void MainWelcome::showRecentContextMenu(QPoint pos)
{
QListWidgetItem *li = recent_files_->itemAt(pos);
diff --git a/ui/qt/main_welcome.h b/ui/qt/main_welcome.h
index a001f5b5c1..085983901e 100644
--- a/ui/qt/main_welcome.h
+++ b/ui/qt/main_welcome.h
@@ -50,7 +50,8 @@ public slots:
void interfaceSelected();
protected:
- void resizeEvent(QResizeEvent *event);
+ virtual void resizeEvent(QResizeEvent *event);
+ virtual void changeEvent(QEvent* event);
protected slots:
void on_recentLabel_clicked();
@@ -59,6 +60,8 @@ protected slots:
private:
Ui::MainWelcome *welcome_ui_;
+ QString flavor_;
+ QString show_in_str_;
SplashOverlay *splash_overlay_;
// QListWidget doesn't activate items when the return or enter keys are pressed on OS X.
@@ -85,9 +88,8 @@ private slots:
void appInitialized();
void interfaceListChanged();
void captureFilterTextEdited(const QString capture_filter);
- void updateRecentFiles();
+ void updateRecentCaptures();
void openRecentItem(QListWidgetItem *item);
- void changeEvent(QEvent* event);
void showRecentContextMenu(QPoint pos);
void showRecentFolder();
void copyRecentPath();
diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp
index 17fed1914e..169fb943f4 100644
--- a/ui/qt/main_window.cpp
+++ b/ui/qt/main_window.cpp
@@ -355,8 +355,8 @@ MainWindow::MainWindow(QWidget *parent) :
connect(wsApp, SIGNAL(preferencesChanged()), this, SLOT(zoomText()));
connect(wsApp, SIGNAL(preferencesChanged()), this, SLOT(setTitlebarForCaptureFile()));
- connect(wsApp, SIGNAL(updateRecentItemStatus(const QString &, qint64, bool)), this, SLOT(updateRecentFiles()));
- updateRecentFiles();
+ connect(wsApp, SIGNAL(updateRecentCaptureStatus(const QString &, qint64, bool)), this, SLOT(updateRecentCaptures()));
+ updateRecentCaptures();
df_combo_box_ = new DisplayFilterCombo();
const DisplayFilterEdit *df_edit = dynamic_cast<DisplayFilterEdit *>(df_combo_box_->lineEdit());
@@ -555,9 +555,9 @@ MainWindow::MainWindow(QWidget *parent) :
packet_list_, SLOT(columnsChanged()));
connect(wsApp, SIGNAL(preferencesChanged()),
packet_list_, SLOT(preferencesChanged()));
- connect(wsApp, SIGNAL(recentFilesRead()),
+ connect(wsApp, SIGNAL(recentPreferencesRead()),
this, SLOT(applyRecentPaneGeometry()));
- connect(wsApp, SIGNAL(recentFilesRead()),
+ connect(wsApp, SIGNAL(recentPreferencesRead()),
this, SLOT(updateRecentActions()));
connect(wsApp, SIGNAL(packetDissectionChanged()),
this, SLOT(redissectPackets()), Qt::QueuedConnection);
@@ -2183,7 +2183,7 @@ void MainWindow::changeEvent(QEvent* event)
case QEvent::LanguageChange:
main_ui_->retranslateUi(this);
// make sure that the "Clear Menu" item is retranslated
- updateRecentFiles();
+ wsApp->emitAppSignal(WiresharkApplication::RecentCapturesChanged);
break;
case QEvent::LocaleChange:{
QString locale = QLocale::system().name();
diff --git a/ui/qt/main_window.h b/ui/qt/main_window.h
index e6ce20331b..b0965fe02f 100644
--- a/ui/qt/main_window.h
+++ b/ui/qt/main_window.h
@@ -96,11 +96,14 @@ public:
CaptureFile *captureFile() { return &capture_file_; }
protected:
- bool eventFilter(QObject *obj, QEvent *event);
- void keyPressEvent(QKeyEvent *event);
- void closeEvent(QCloseEvent *event);
- void dragEnterEvent(QDragEnterEvent *event);
- void dropEvent(QDropEvent *event);
+ virtual bool eventFilter(QObject *obj, QEvent *event);
+ virtual void keyPressEvent(QKeyEvent *event);
+ virtual void closeEvent(QCloseEvent *event);
+ virtual void dragEnterEvent(QDragEnterEvent *event);
+ virtual void dropEvent(QDropEvent *event);
+ virtual void changeEvent(QEvent* event);
+ virtual void resizeEvent(QResizeEvent *event);
+
private:
// XXX Move to FilterUtils
@@ -305,7 +308,7 @@ private slots:
void loadWindowGeometry();
void saveWindowGeometry();
void mainStackChanged(int);
- void updateRecentFiles();
+ void updateRecentCaptures();
void recentActionTriggered();
void setMenusForSelectedPacket();
void setMenusForSelectedTreeRow(field_info *fi = NULL);
@@ -625,9 +628,6 @@ private slots:
void on_actionContextWikiProtocolPage_triggered();
void on_actionContextFilterFieldReference_triggered();
- virtual void changeEvent(QEvent* event);
- virtual void resizeEvent(QResizeEvent *event);
-
#ifdef HAVE_EXTCAP
void extcap_options_finished(int result);
void showExtcapOptionsDialog(QString & device_name);
diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp
index 7597ab9503..b6ce13de5b 100644
--- a/ui/qt/main_window_slots.cpp
+++ b/ui/qt/main_window_slots.cpp
@@ -1020,7 +1020,7 @@ void MainWindow::mainStackChanged(int)
* Add the capture filename (with an absolute path) to the "Recent Files" menu.
*/
// XXX - We should probably create a RecentFile class.
-void MainWindow::updateRecentFiles() {
+void MainWindow::updateRecentCaptures() {
QAction *ra;
QMenu *recentMenu = main_ui_->menuOpenRecentCaptureFile;
QString action_cf_name;
@@ -1098,7 +1098,7 @@ void MainWindow::updateRecentFiles() {
ra = new QAction(recentMenu);
ra->setText(tr("Clear Menu"));
recentMenu->insertAction(NULL, ra);
- connect(ra, SIGNAL(triggered()), wsApp, SLOT(clearRecentItems()));
+ connect(ra, SIGNAL(triggered()), wsApp, SLOT(clearRecentCaptures()));
} else {
if (main_ui_->actionDummyNoFilesFound) {
recentMenu->addAction(main_ui_->actionDummyNoFilesFound);
diff --git a/ui/qt/search_frame.h b/ui/qt/search_frame.h
index ee895e0366..12d49844bb 100644
--- a/ui/qt/search_frame.h
+++ b/ui/qt/search_frame.h
@@ -53,6 +53,7 @@ signals:
protected:
virtual void keyPressEvent(QKeyEvent *event);
+ void changeEvent(QEvent* event);
private:
bool regexCompile();
@@ -69,7 +70,6 @@ private slots:
void on_searchLineEdit_textChanged(const QString &);
void on_findButton_clicked();
void on_cancelButton_clicked();
- void changeEvent(QEvent* event);
};
#endif // SEARCH_FRAME_H
diff --git a/ui/qt/wireshark_application.cpp b/ui/qt/wireshark_application.cpp
index 892cc7154d..0cc9d8867f 100644
--- a/ui/qt/wireshark_application.cpp
+++ b/ui/qt/wireshark_application.cpp
@@ -99,7 +99,7 @@ WiresharkApplication *wsApp = NULL;
// MUST be UTF-8
static char *last_open_dir = NULL;
-static QList<recent_item_status *> recent_items_;
+static QList<recent_item_status *> recent_captures_;
static QHash<int, QList<QAction *> > dynamic_menu_groups_;
static QHash<int, QList<QAction *> > added_menu_groups_;
static QHash<int, QList<QAction *> > removed_menu_groups_;
@@ -146,7 +146,7 @@ add_menu_recent_capture_file(const gchar *cf_name) {
* item above count_max
*/
unsigned int cnt = 1;
- QMutableListIterator<recent_item_status *> rii(recent_items_);
+ QMutableListIterator<recent_item_status *> rii(recent_captures_);
while (rii.hasNext()) {
recent_item_status *ri = rii.next();
/* if this element string is one of our special items (separator, ...) or
@@ -184,7 +184,7 @@ extern "C" void menu_recent_file_write_all(FILE *rf) {
/* we have to iterate backwards through the children's list,
* so we get the latest item last in the file.
*/
- QListIterator<recent_item_status *> rii(recent_items_);
+ QListIterator<recent_item_status *> rii(recent_captures_);
rii.toBack();
while (rii.hasPrevious()) {
QString cf_name;
@@ -199,14 +199,14 @@ extern "C" void menu_recent_file_write_all(FILE *rf) {
// Check each recent item in a separate thread so that we don't hang while
// calling stat(). This is called periodically because files and entire
// volumes can disappear and reappear at any time.
-void WiresharkApplication::refreshRecentFiles(void) {
+void WiresharkApplication::refreshRecentCaptures(void) {
recent_item_status *ri;
RecentFileStatus *rf_status;
// We're in the middle of a capture. Don't create traffic.
if (active_captures_ > 0) return;
- foreach (ri, recent_items_) {
+ foreach (ri, recent_captures_) {
if (ri->in_thread) {
continue;
}
@@ -386,7 +386,7 @@ void WiresharkApplication::setConfigurationProfile(const gchar *profile_name)
emit columnsChanged();
emit preferencesChanged();
- emit recentFilesRead();
+ emit recentPreferencesRead();
emit filterExpressionsChanged();
emit checkDisplayFilter();
emit captureFilterListChanged();
@@ -497,10 +497,10 @@ bool WiresharkApplication::event(QEvent *event)
return QApplication::event(event);
}
-void WiresharkApplication::clearRecentItems() {
- qDeleteAll(recent_items_);
- recent_items_.clear();
- emit updateRecentItemStatus(NULL, 0, false);
+void WiresharkApplication::clearRecentCaptures() {
+ qDeleteAll(recent_captures_);
+ recent_captures_.clear();
+ emit updateRecentCaptureStatus(NULL, 0, false);
}
void WiresharkApplication::captureFileReadStarted()
@@ -518,20 +518,20 @@ void WiresharkApplication::cleanup()
write_profile_recent();
write_recent();
- qDeleteAll(recent_items_);
- recent_items_.clear();
+ qDeleteAll(recent_captures_);
+ recent_captures_.clear();
}
void WiresharkApplication::itemStatusFinished(const QString filename, qint64 size, bool accessible) {
recent_item_status *ri;
- foreach (ri, recent_items_) {
+ foreach (ri, recent_captures_) {
if (filename == ri->filename && (size != ri->size || accessible != ri->accessible)) {
ri->size = size;
ri->accessible = accessible;
ri->in_thread = false;
- emit updateRecentItemStatus(filename, size, accessible);
+ emit updateRecentCaptureStatus(filename, size, accessible);
}
}
}
@@ -657,7 +657,7 @@ WiresharkApplication::WiresharkApplication(int &argc, char **argv) :
// I'm not sure what can be done on Linux.
//
recent_timer_.setParent(this);
- connect(&recent_timer_, SIGNAL(timeout()), this, SLOT(refreshRecentFiles()));
+ connect(&recent_timer_, SIGNAL(timeout()), this, SLOT(refreshRecentCaptures()));
recent_timer_.start(2000);
addr_resolv_timer_.setParent(this);
@@ -717,8 +717,11 @@ void WiresharkApplication::emitAppSignal(AppSignal signal)
case PacketDissectionChanged:
emit packetDissectionChanged();
break;
- case RecentFilesRead:
- emit recentFilesRead();
+ case RecentCapturesChanged:
+ emit updateRecentCaptureStatus(NULL, 0, false);
+ break;
+ case RecentPreferencesRead:
+ emit recentPreferencesRead();
break;
case FieldsChanged:
emit fieldsChanged();
@@ -1043,7 +1046,7 @@ _e_prefs *WiresharkApplication::readConfigurationFiles(char **gdp_path, char **d
}
QList<recent_item_status *> WiresharkApplication::recentItems() const {
- return recent_items_;
+ return recent_captures_;
}
void WiresharkApplication::addRecentItem(const QString filename, qint64 size, bool accessible) {
@@ -1053,14 +1056,14 @@ void WiresharkApplication::addRecentItem(const QString filename, qint64 size, bo
ri->size = size;
ri->accessible = accessible;
ri->in_thread = false;
- recent_items_.prepend(ri);
+ recent_captures_.prepend(ri);
itemStatusFinished(filename, size, accessible);
}
void WiresharkApplication::removeRecentItem(const QString &filename)
{
- QMutableListIterator<recent_item_status *> rii(recent_items_);
+ QMutableListIterator<recent_item_status *> rii(recent_captures_);
while (rii.hasNext()) {
recent_item_status *ri = rii.next();
@@ -1082,7 +1085,7 @@ void WiresharkApplication::removeRecentItem(const QString &filename)
}
}
- emit updateRecentItemStatus(NULL, 0, false);
+ emit updateRecentCaptureStatus(NULL, 0, false);
}
static void switchTranslator(QTranslator& myTranslator, const QString& filename,
diff --git a/ui/qt/wireshark_application.h b/ui/qt/wireshark_application.h
index 9a54a37480..58b489badf 100644
--- a/ui/qt/wireshark_application.h
+++ b/ui/qt/wireshark_application.h
@@ -62,16 +62,17 @@ public:
explicit WiresharkApplication(int &argc, char **argv);
enum AppSignal {
- ColumnsChanged,
CaptureFilterListChanged,
+ ColumnsChanged,
DisplayFilterListChanged,
+ FieldsChanged,
FilterExpressionsChanged,
LocalInterfacesChanged,
NameResolutionChanged,
PacketDissectionChanged,
PreferencesChanged,
- RecentFilesRead,
- FieldsChanged
+ RecentCapturesChanged,
+ RecentPreferencesRead
};
enum MainMenuItem {
@@ -154,8 +155,8 @@ signals:
void localInterfaceListChanged();
void openCaptureFile(QString cf_path, QString display_filter, unsigned int type);
void openCaptureOptions();
- void recentFilesRead();
- void updateRecentItemStatus(const QString &filename, qint64 size, bool accessible);
+ void recentPreferencesRead();
+ void updateRecentCaptureStatus(const QString &filename, qint64 size, bool accessible);
void splashUpdate(register_action_e action, const char *message);
void profileChanging();
void profileNameChanged(const gchar *profile_name);
@@ -175,7 +176,7 @@ signals:
void openTapParameterDialog(const QString cfg_str, const QString arg, void *userdata);
public slots:
- void clearRecentItems();
+ void clearRecentCaptures();
void captureFileReadStarted();
void captureStarted() { active_captures_++; }
void captureFinished() { active_captures_--; }
@@ -185,7 +186,7 @@ private slots:
void cleanup();
void ifChangeEventsAvailable();
void itemStatusFinished(const QString filename = "", qint64 size = 0, bool accessible = false);
- void refreshRecentFiles(void);
+ void refreshRecentCaptures(void);
void refreshAddressResolution(void);
};
diff --git a/wireshark-qt.cpp b/wireshark-qt.cpp
index d2c045acde..fabd09f469 100644
--- a/wireshark-qt.cpp
+++ b/wireshark-qt.cpp
@@ -742,7 +742,7 @@ int main(int argc, char *qt_argv[])
build_column_format_array(&CaptureFile::globalCapFile()->cinfo, global_commandline_info.prefs_p->num_cols, TRUE);
wsApp->emitAppSignal(WiresharkApplication::ColumnsChanged); // We read "recent" widths above.
- wsApp->emitAppSignal(WiresharkApplication::RecentFilesRead); // Must be emitted after PreferencesChanged.
+ wsApp->emitAppSignal(WiresharkApplication::RecentPreferencesRead); // Must be emitted after PreferencesChanged.
wsApp->setMonospaceFont(prefs.gui_qt_font_name);
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-26 09:37:24 +0000