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

Make sure we uncheck the "Find Packet" action. 

Make sure we uncheck the "Find Packet" action when we're done finding
packets. Make the "Go To Packet" action checkable and ensure that it's
properly checked an unchecked as well.

Change-Id: I979cabfd950ec4807ebcd40664b44b600557cf48
Reviewed-on: https://code.wireshark.org/review/9577
Reviewed-by: Gerald Combs <gerald@wireshark.org>
This commit is contained in:
Gerald Combs 2015-07-09 10:29:21 -07:00
parent d36930e2d4
commit fdd07c4d3a
4 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ui/qt/accordion_frame.h
View File

@ -35,6 +35,11 @@ public:
void animatedHide();
signals:
void visibilityChanged(bool visible);
protected:
virtual void hideEvent(QHideEvent *) { emit visibilityChanged(false); }
virtual void showEvent(QShowEvent *) { emit visibilityChanged(true); }
private:
int frame_height_;

5
ui/qt/main_window.cpp
View File

@ -288,12 +288,17 @@ MainWindow::MainWindow(QWidget *parent) :
this, SLOT(showPreferencesDialog(QString)));
main_ui_->goToFrame->hide();
connect(main_ui_->goToFrame, SIGNAL(visibilityChanged(bool)),
main_ui_->actionGoGoToPacket, SLOT(setChecked(bool)));
// XXX For some reason the cursor is drawn funny with an input mask set
// https://bugreports.qt-project.org/browse/QTBUG-7174
main_ui_->searchFrame->hide();
connect(main_ui_->searchFrame, SIGNAL(pushFilterSyntaxStatus(const QString&)),
main_ui_->statusBar, SLOT(pushTemporaryStatus(const QString&)));
connect(main_ui_->searchFrame, SIGNAL(visibilityChanged(bool)),
main_ui_->actionEditFindPacket, SLOT(setChecked(bool)));
main_ui_->columnEditorFrame->hide();
main_ui_->preferenceEditorFrame->hide();

3
ui/qt/main_window.ui
View File

@ -910,6 +910,9 @@
</property>
</action>
<action name="actionGoGoToPacket">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>Go to Packet...</string>
</property>

2
ui/qt/search_frame.h
View File

@ -51,7 +51,7 @@ signals:
void pushFilterSyntaxStatus(const QString&);
protected:
void keyPressEvent(QKeyEvent *event);
virtual void keyPressEvent(QKeyEvent *event);
private:
void updateWidgets();