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

Restore the previous focus when we're done going to a packet. 

svn path=/trunk/; revision=44601
This commit is contained in:
Gerald Combs 2012-08-20 21:22:01 +00:00
parent 1a95c47b1b
commit 16518aff46
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ui/qt/main_window.cpp
View File

@ -63,6 +63,7 @@ MainWindow::MainWindow(QWidget *parent) :
cap_file_ = NULL;
gbl_cur_main_window = this;
main_ui_->setupUi(this);
previous_focus_ = NULL;
connect(wsApp, SIGNAL(updateRecentItemStatus(const QString &, qint64, bool)), this, SLOT(updateRecentFiles()));
updateRecentFiles();
@ -451,25 +452,34 @@ void MainWindow::on_actionGoGoToPacket_triggered() {
if (packet_list_->model()->rowCount() < 1) {
return;
}
previous_focus_ = wsApp->focusWidget();
connect(previous_focus_, SIGNAL(destroyed()), this, SLOT(resetPreviousFocus()));
main_ui_->goToFrame->show();
main_ui_->goToLineEdit->setFocus();
}
void MainWindow::resetPreviousFocus() {
previous_focus_ = NULL;
}
void MainWindow::on_goToCancel_clicked()
{
main_ui_->goToFrame->hide();
if (previous_focus_) {
disconnect(previous_focus_, SIGNAL(destroyed()), this, SLOT(resetPreviousFocus()));
previous_focus_->setFocus();
resetPreviousFocus();
}
}
void MainWindow::on_goToGo_clicked()
{
int packet_num = main_ui_->goToLineEdit->text().toInt();
main_ui_->goToFrame->hide();
if (packet_num > 0) {
packet_list_->goToPacket(packet_num);
}
on_goToCancel_clicked();
}
void MainWindow::on_goToLineEdit_returnPressed()

4
ui/qt/main_window.h
View File

@ -65,6 +65,8 @@ private:
capture_file *cap_file_;
PacketList *packet_list_;
QWidget *previous_focus_;
signals:
void showProgress(progdlg_t **dlg_p, bool animate, const QString message, bool terminate_is_stop, bool *stop_flag, float pct);
@ -80,6 +82,8 @@ private slots:
void on_actionFileClose_triggered();
void recentActionTriggered();
void on_actionGoGoToPacket_triggered();
void resetPreviousFocus();
void on_actionHelpWebsite_triggered();
void on_actionHelpFAQ_triggered();
void on_actionHelpAsk_triggered();