diff options
| author | Gerald Combs <gerald@wireshark.org> | 2016-02-25 12:29:38 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2016-02-26 00:31:22 +0000 |
| commit | 5039a27c55d385e21a0ae4c041076c46592e257d (patch) | |
| tree | bb81f8df40f3cc364793801fb9df46318148a9bb | |
| parent | c216c702433eaa60ebde16669a0413120d9cf917 (diff) | |
| download | wireshark-5039a27c55d385e21a0ae4c041076c46592e257d.tar.gz wireshark-5039a27c55d385e21a0ae4c041076c46592e257d.tar.bz2 wireshark-5039a27c55d385e21a0ae4c041076c46592e257d.zip | |
Qt: Capture Interfaces dialog geometry updates.
Widen CaptureInterfacesDialog. Manually set some column widths.
Change-Id: I84fd060d83b5f7bc186d79e22d5cc608dfdbd6c5
Reviewed-on: https://code.wireshark.org/review/14148
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
(cherry picked from commit 7a9bd51e9501bfe6488d3e913195fafdb3f01bf4)
Reviewed-on: https://code.wireshark.org/review/14157
| -rw-r--r-- | ui/qt/capture_interfaces_dialog.cpp | 33 | ||||
| -rw-r--r-- | ui/qt/capture_interfaces_dialog.ui | 4 |
2 files changed, 31 insertions, 6 deletions
diff --git a/ui/qt/capture_interfaces_dialog.cpp b/ui/qt/capture_interfaces_dialog.cpp index d5e1c7185c..def2722b7c 100644 --- a/ui/qt/capture_interfaces_dialog.cpp +++ b/ui/qt/capture_interfaces_dialog.cpp @@ -64,7 +64,6 @@ // - Fix InterfaceTreeDelegate method names. // - You can edit filters via the main CaptureFilterCombo and via each // individual interface row. We should probably do one or the other. -// - resizeColumnToContents isn't shrinking some columns properly. const int stat_update_interval_ = 1000; // ms @@ -148,7 +147,6 @@ CaptureInterfacesDialog::CaptureInterfacesDialog(QWidget *parent) : ui->interfaceTree->setItemDelegateForColumn(col_filter_, &interface_item_delegate_); interface_item_delegate_.setTree(ui->interfaceTree); - ui->interfaceTree->setColumnWidth(col_link_, 100); connect(ui->interfaceTree,SIGNAL(itemClicked(QTreeWidgetItem*,int)),this,SLOT(interfaceClicked(QTreeWidgetItem*,int))); connect(ui->interfaceTree, SIGNAL(itemSelectionChanged()), this, SLOT(interfaceSelected())); @@ -579,8 +577,35 @@ void CaptureInterfacesDialog::updateInterfaces() } } - for (int i = 0; i < ui->interfaceTree->topLevelItemCount(); i++) { - ui->interfaceTree->resizeColumnToContents(i); + // col_interface_ = 0, + // col_traffic_, + // col_link_, + // col_pmode_, + // col_snaplen_, + // col_buffer_, + // col_monitor_, + // col_filter_, + // col_num_columns_ + // Manually or automatically size some columns as needed. + int one_em = fontMetrics().height(); + for (int col = 0; col < ui->interfaceTree->topLevelItemCount(); col++) { + switch (col) { + case col_pmode_: + ui->interfaceTree->setColumnWidth(col, one_em * 6); + break; + case col_snaplen_: + ui->interfaceTree->setColumnWidth(col, one_em * 4.25); + break; + case col_buffer_: + ui->interfaceTree->setColumnWidth(col, one_em * 4.25); + break; + case col_monitor_: + ui->interfaceTree->setColumnWidth(col, one_em * 5.25); + break; + default: + ui->interfaceTree->resizeColumnToContents(col); + } + } start_bt_->setEnabled((global_capture_opts.num_selected > 0)? true: false); diff --git a/ui/qt/capture_interfaces_dialog.ui b/ui/qt/capture_interfaces_dialog.ui index beb98d73cd..051800bf19 100644 --- a/ui/qt/capture_interfaces_dialog.ui +++ b/ui/qt/capture_interfaces_dialog.ui @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>750</width> - <height>435</height> + <width>950</width> + <height>440</height> </rect> </property> <layout class="QVBoxLayout" name="verticalLayout_12"> |