diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2015-03-04 08:54:23 +0100 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-03-05 16:57:31 +0000 |
| commit | 9076bf311924360bc0ab7cb098e47ec1afbd50d1 (patch) | |
| tree | 8791eb8539c6bc4751393466283014872e185312 | |
| parent | cdab4426acdb2bced1fb3f049f168a68e48bc406 (diff) | |
| download | wireshark-9076bf311924360bc0ab7cb098e47ec1afbd50d1.tar.gz | |
Qt: Display only filename on status bar and display full path and size on tooltip
Ping-Bug: 10949
Change-Id: Ic735afdb7994a4c10b527217327831138362ffc9
Reviewed-on: https://code.wireshark.org/review/7538
Reviewed-by: Gerald Combs <gerald@wireshark.org>
| -rw-r--r-- | ui/qt/main_status_bar.cpp | 4 | ||||
| -rw-r--r-- | ui/qt/main_status_bar.h | 2 | ||||
| -rw-r--r-- | ui/qt/main_window_slots.cpp | 10 |
3 files changed, 11 insertions, 5 deletions
diff --git a/ui/qt/main_status_bar.cpp b/ui/qt/main_status_bar.cpp index d3acd6af4d..881903bd2a 100644 --- a/ui/qt/main_status_bar.cpp +++ b/ui/qt/main_status_bar.cpp @@ -239,13 +239,15 @@ void MainStatusBar::popTemporaryStatus() { info_status_.popText(STATUS_CTX_TEMPORARY); } -void MainStatusBar::pushFileStatus(QString &message) { +void MainStatusBar::pushFileStatus(QString &message, QString &messagetip ) { info_status_.pushText(message, STATUS_CTX_FILE); + info_status_.setToolTip(messagetip); expertUpdate(); } void MainStatusBar::popFileStatus() { info_status_.popText(STATUS_CTX_FILE); + info_status_.setToolTip(""); } void MainStatusBar::pushFieldStatus(QString &message) { diff --git a/ui/qt/main_status_bar.h b/ui/qt/main_status_bar.h index 49accc6ae9..d81eaf4737 100644 --- a/ui/qt/main_status_bar.h +++ b/ui/qt/main_status_bar.h @@ -64,7 +64,7 @@ public slots: void setCaptureFile(capture_file *cf); void pushTemporaryStatus(QString &message); void popTemporaryStatus(); - void pushFileStatus(QString &message); + void pushFileStatus(QString &message, QString &messagetip); void popFileStatus(); void pushFieldStatus(QString &message); void popFieldStatus(); diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp index 979f7203f5..f1abbe24ff 100644 --- a/ui/qt/main_window_slots.cpp +++ b/ui/qt/main_window_slots.cpp @@ -45,6 +45,7 @@ #include "wsutil/file_util.h" #include "wsutil/filesystem.h" +#include <wsutil/str_util.h> #include "epan/addr_resolv.h" #include "epan/column.h" @@ -612,7 +613,8 @@ void MainWindow::captureFileReadStarted() { main_ui_->statusBar->popFileStatus(); QString msg = QString(tr("Loading: %1")).arg(get_basename(capture_file_.capFile()->filename)); - main_ui_->statusBar->pushFileStatus(msg); + QString msgtip = QString(); + main_ui_->statusBar->pushFileStatus(msg, msgtip); main_ui_->mainStack->setCurrentWidget(&master_split_); WiresharkApplication::processEvents(); } @@ -637,10 +639,12 @@ void MainWindow::captureFileReadFinished() { setForCapturedPackets(true); main_ui_->statusBar->popFileStatus(); - QString msg = QString("%1 (%2)") + QString msg = QString().sprintf("%s", get_basename(capture_file_.capFile()->filename)); + QString msgtip = QString("%1 (%2)") .arg(capture_file_.capFile()->filename) .arg(file_size_to_qstring(capture_file_.capFile()->f_datalen)); - main_ui_->statusBar->pushFileStatus(msg); + main_ui_->statusBar->pushFileStatus(msg, msgtip); + emit setDissectedCaptureFile(capture_file_.capFile()); } |