a71f6807b8
Convert QTableWidget to QTreeWidget. It looks like the GTK+ version has a separate set of apply/save buttons for each tab which *only* operates on that tab. This can result unexpected behavior which throws away changes if the user updates more than one tab. Use a single "OK" button that applies all of our changes instead. Reorder the tabs. Put Local Interfaces first and select it by default. Always show Remote Interfaces. Disable it on platforms that don't have PCAP_REMOTE. Automatically start editing when we add a new pipe. Don't immediately update pipe interface settings. Wait until we hit "OK" instead. Rename NewFileDelegate to PathChooserDelegate. Note that we might want to move it use it elsewhere in the application. Try switching the user-facing terminology from "Hide" to the more positive "Show". Tell the user that we don't save pipe or remote interface settings. Add a help URL for the "Manage Interfaces" dialog box. Use the GLib and Qt string functions and classes to split and join comma-separated preferences. This makes sure capture_dev_user_descr_find doesn't skip over the first interface. It also keeps the Qt code from adding a leading comma to our capture preferences. Add a note about strings to README.qt. Summary: Use QStrings. For another day: - If we *do* save remote settings we need to store credentials securely, e.g. with CryptProtectData. - Get rid of the remote settings dialogs. Their controls should fit in the remote settings tab. - Add an extcap tab. - We need getter/setter functions for global_capture_opts.all_ifaces. We iterate over it *way* too much. Change-Id: Ib7b61972f3ece4325e0230f725e7f2678acbb24b Reviewed-on: https://code.wireshark.org/review/3873 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
300 lines
9.1 KiB
XML
300 lines
9.1 KiB
XML
<?xml version="1.0" encoding="UTF-8"?>
|
|
<ui version="4.0">
|
|
<class>ManageInterfacesDialog</class>
|
|
<widget class="QDialog" name="ManageInterfacesDialog">
|
|
<property name="windowModality">
|
|
<enum>Qt::ApplicationModal</enum>
|
|
</property>
|
|
<property name="geometry">
|
|
<rect>
|
|
<x>0</x>
|
|
<y>0</y>
|
|
<width>750</width>
|
|
<height>425</height>
|
|
</rect>
|
|
</property>
|
|
<property name="windowTitle">
|
|
<string>Manage Interfaces</string>
|
|
</property>
|
|
<property name="modal">
|
|
<bool>false</bool>
|
|
</property>
|
|
<layout class="QVBoxLayout" name="verticalLayout_4">
|
|
<item>
|
|
<widget class="QTabWidget" name="tabWidget">
|
|
<property name="currentIndex">
|
|
<number>2</number>
|
|
</property>
|
|
<widget class="QWidget" name="localTab">
|
|
<property name="toolTip">
|
|
<string><html><head/><body><p>Click the checkbox to hide or show a hidden interface.</p></body></html></string>
|
|
</property>
|
|
<attribute name="title">
|
|
<string>Local Interfaces</string>
|
|
</attribute>
|
|
<layout class="QVBoxLayout" name="verticalLayout">
|
|
<item>
|
|
<widget class="QTreeWidget" name="localList">
|
|
<property name="focusPolicy">
|
|
<enum>Qt::NoFocus</enum>
|
|
</property>
|
|
<property name="indentation">
|
|
<number>0</number>
|
|
</property>
|
|
<property name="rootIsDecorated">
|
|
<bool>false</bool>
|
|
</property>
|
|
<property name="uniformRowHeights">
|
|
<bool>true</bool>
|
|
</property>
|
|
<property name="itemsExpandable">
|
|
<bool>false</bool>
|
|
</property>
|
|
<column>
|
|
<property name="text">
|
|
<string>Show</string>
|
|
</property>
|
|
</column>
|
|
<column>
|
|
<property name="text">
|
|
<string>Friendly Name</string>
|
|
</property>
|
|
</column>
|
|
<column>
|
|
<property name="text">
|
|
<string>Interface Name</string>
|
|
</property>
|
|
</column>
|
|
<column>
|
|
<property name="text">
|
|
<string>Comment</string>
|
|
</property>
|
|
</column>
|
|
</widget>
|
|
</item>
|
|
</layout>
|
|
</widget>
|
|
<widget class="QWidget" name="pipeTab">
|
|
<property name="toolTip">
|
|
<string><html><head/><body><p>Add a pipe to capture from or remove an existing pipe from the list.</p></body></html></string>
|
|
</property>
|
|
<attribute name="title">
|
|
<string>Pipes</string>
|
|
</attribute>
|
|
<layout class="QVBoxLayout" name="verticalLayout_2">
|
|
<item>
|
|
<widget class="QTreeWidget" name="pipeList">
|
|
<property name="sizePolicy">
|
|
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
|
|
<horstretch>0</horstretch>
|
|
<verstretch>0</verstretch>
|
|
</sizepolicy>
|
|
</property>
|
|
<property name="baseSize">
|
|
<size>
|
|
<width>0</width>
|
|
<height>0</height>
|
|
</size>
|
|
</property>
|
|
<property name="verticalScrollBarPolicy">
|
|
<enum>Qt::ScrollBarAsNeeded</enum>
|
|
</property>
|
|
<property name="horizontalScrollBarPolicy">
|
|
<enum>Qt::ScrollBarAlwaysOff</enum>
|
|
</property>
|
|
<property name="textElideMode">
|
|
<enum>Qt::ElideMiddle</enum>
|
|
</property>
|
|
<property name="rootIsDecorated">
|
|
<bool>false</bool>
|
|
</property>
|
|
<property name="itemsExpandable">
|
|
<bool>false</bool>
|
|
</property>
|
|
<column>
|
|
<property name="text">
|
|
<string notr="true">Named Pipe Path</string>
|
|
</property>
|
|
</column>
|
|
</widget>
|
|
</item>
|
|
<item>
|
|
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
|
<item>
|
|
<widget class="QToolButton" name="addPipe">
|
|
<property name="toolTip">
|
|
<string><html><head/><body><p>Add a new pipe using default settings.</p></body></html></string>
|
|
</property>
|
|
<property name="text">
|
|
<string/>
|
|
</property>
|
|
<property name="icon">
|
|
<iconset resource="../../image/toolbar.qrc">
|
|
<normaloff>:/stock/plus-8.png</normaloff>:/stock/plus-8.png</iconset>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item>
|
|
<widget class="QToolButton" name="delPipe">
|
|
<property name="toolTip">
|
|
<string><html><head/><body><p>Remove the selected pipe from the list.</p></body></html></string>
|
|
</property>
|
|
<property name="text">
|
|
<string/>
|
|
</property>
|
|
<property name="icon">
|
|
<iconset resource="../../image/toolbar.qrc">
|
|
<normaloff>:/stock/minus-8.png</normaloff>:/stock/minus-8.png</iconset>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item>
|
|
<spacer name="horizontalSpacer">
|
|
<property name="orientation">
|
|
<enum>Qt::Horizontal</enum>
|
|
</property>
|
|
<property name="sizeHint" stdset="0">
|
|
<size>
|
|
<width>40</width>
|
|
<height>20</height>
|
|
</size>
|
|
</property>
|
|
</spacer>
|
|
</item>
|
|
</layout>
|
|
</item>
|
|
</layout>
|
|
</widget>
|
|
<widget class="QWidget" name="remoteTab">
|
|
<attribute name="title">
|
|
<string>Remote Interfaces</string>
|
|
</attribute>
|
|
<layout class="QVBoxLayout" name="verticalLayout_3">
|
|
<item>
|
|
<widget class="QTreeWidget" name="remoteList">
|
|
<property name="uniformRowHeights">
|
|
<bool>true</bool>
|
|
</property>
|
|
<column>
|
|
<property name="text">
|
|
<string notr="true">Show</string>
|
|
</property>
|
|
</column>
|
|
<column>
|
|
<property name="text">
|
|
<string>Host / Device URL</string>
|
|
</property>
|
|
</column>
|
|
</widget>
|
|
</item>
|
|
<item>
|
|
<layout class="QHBoxLayout" name="horizontalLayout_3">
|
|
<item>
|
|
<widget class="QToolButton" name="addRemote">
|
|
<property name="toolTip">
|
|
<string><html><head/><body><p>Add a remote host and its interfaces</p></body></html></string>
|
|
</property>
|
|
<property name="text">
|
|
<string/>
|
|
</property>
|
|
<property name="icon">
|
|
<iconset resource="../../image/toolbar.qrc">
|
|
<normaloff>:/stock/plus-8.png</normaloff>:/stock/plus-8.png</iconset>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item>
|
|
<widget class="QToolButton" name="delRemote">
|
|
<property name="toolTip">
|
|
<string><html><head/><body><p>Remove the selected host from the list.</p></body></html></string>
|
|
</property>
|
|
<property name="text">
|
|
<string/>
|
|
</property>
|
|
<property name="icon">
|
|
<iconset resource="../../image/toolbar.qrc">
|
|
<normaloff>:/stock/minus-8.png</normaloff>:/stock/minus-8.png</iconset>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item>
|
|
<spacer name="horizontalSpacer_2">
|
|
<property name="orientation">
|
|
<enum>Qt::Horizontal</enum>
|
|
</property>
|
|
<property name="sizeHint" stdset="0">
|
|
<size>
|
|
<width>328</width>
|
|
<height>20</height>
|
|
</size>
|
|
</property>
|
|
</spacer>
|
|
</item>
|
|
<item>
|
|
<widget class="QPushButton" name="remoteSettings">
|
|
<property name="text">
|
|
<string>Remote Settings</string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
</layout>
|
|
</item>
|
|
</layout>
|
|
</widget>
|
|
</widget>
|
|
</item>
|
|
<item>
|
|
<widget class="QLabel" name="hintLabel">
|
|
<property name="text">
|
|
<string><small><i></i></small></string>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
<item>
|
|
<widget class="QDialogButtonBox" name="buttonBox">
|
|
<property name="standardButtons">
|
|
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok</set>
|
|
</property>
|
|
</widget>
|
|
</item>
|
|
</layout>
|
|
</widget>
|
|
<resources>
|
|
<include location="../../image/toolbar.qrc"/>
|
|
</resources>
|
|
<connections>
|
|
<connection>
|
|
<sender>buttonBox</sender>
|
|
<signal>accepted()</signal>
|
|
<receiver>ManageInterfacesDialog</receiver>
|
|
<slot>accept()</slot>
|
|
<hints>
|
|
<hint type="sourcelabel">
|
|
<x>374</x>
|
|
<y>404</y>
|
|
</hint>
|
|
<hint type="destinationlabel">
|
|
<x>374</x>
|
|
<y>212</y>
|
|
</hint>
|
|
</hints>
|
|
</connection>
|
|
<connection>
|
|
<sender>buttonBox</sender>
|
|
<signal>rejected()</signal>
|
|
<receiver>ManageInterfacesDialog</receiver>
|
|
<slot>reject()</slot>
|
|
<hints>
|
|
<hint type="sourcelabel">
|
|
<x>374</x>
|
|
<y>404</y>
|
|
</hint>
|
|
<hint type="destinationlabel">
|
|
<x>374</x>
|
|
<y>212</y>
|
|
</hint>
|
|
</hints>
|
|
</connection>
|
|
</connections>
|
|
</ui>
|