aboutsummaryrefslogtreecommitdiffstats
path: root/ui/qt/main_window.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'ui/qt/main_window.cpp')
-rw-r--r--ui/qt/main_window.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp
index a8d98568f3..cd4064fdb0 100644
--- a/ui/qt/main_window.cpp
+++ b/ui/qt/main_window.cpp
@@ -270,7 +270,7 @@ MainWindow::MainWindow(QWidget *parent) :
QMainWindow(parent),
main_ui_(new Ui::MainWindow),
cur_layout_(QVector<unsigned>()),
- df_combo_box_(NULL),
+ df_combo_box_(new DisplayFilterCombo),
packet_list_(NULL),
proto_tree_(NULL),
previous_focus_(NULL),
@@ -364,12 +364,6 @@ MainWindow::MainWindow(QWidget *parent) :
Qt::BlockingQueuedConnection);
#endif
- // We set the minimum width of df_combo_box_ in resizeEvent so that it won't shrink
- // down too much if we have a lot of filter buttons. Unfortunately that can break
- // Aero snapping if our window is large or maximized. Set a minimum width here in
- // order to counteract that.
- setMinimumWidth(350); // Arbitrary
- df_combo_box_ = new DisplayFilterCombo();
const DisplayFilterEdit *df_edit = qobject_cast<DisplayFilterEdit *>(df_combo_box_->lineEdit());
connect(df_edit, SIGNAL(pushFilterSyntaxStatus(const QString&)),
main_ui_->statusBar, SLOT(pushFilterStatus(const QString&)));
@@ -688,6 +682,12 @@ MainWindow::MainWindow(QWidget *parent) :
/* Register Interface Toolbar callbacks */
iface_toolbar_register_cb(mainwindow_add_toolbar, mainwindow_remove_toolbar);
+ // We set the minimum width of df_combo_box_ in resizeEvent so that it won't shrink
+ // down too much if we have a lot of filter buttons. Unfortunately that can break
+ // Aero snapping if our window is large or maximized. Set a minimum width here in
+ // order to counteract that.
+ setMinimumWidth(350); // Arbitrary
+
showWelcome();
}