diff options
| author | Roland Knall <roland.knall@br-automation.com> | 2017-11-24 15:46:30 +0100 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-11-26 15:57:56 +0000 |
| commit | d8658716277bbb2378819d25997ce0646b72c9c2 (patch) | |
| tree | 1f4453fcc2a8a020c848ac98f7eac3e0cbdcdf58 /ui/qt/about_dialog.ui | |
| parent | d35ed012ce62fae4344e80a0df3742619a4eaa0f (diff) | |
Qt: About Dialog move to QTreeView and fix copy
- Fix an issue, where the url was opened twice on Linux
- Make the filter case insensitive if so wished for
- Allow the copy to either copy the selected column (just Copy) or copy the complete row, with tab separation
- Move to QTreeView instead to make it similar to the rest of the tables
Change-Id: Ie6064f2ad2014e24546553c5febe63358e2f69ec
Reviewed-on: https://code.wireshark.org/review/24570
Petri-Dish: Roland Knall <rknall@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Jim Young <jim.young.ws@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui/qt/about_dialog.ui')
| -rw-r--r-- | ui/qt/about_dialog.ui | 208 |
1 files changed, 87 insertions, 121 deletions
diff --git a/ui/qt/about_dialog.ui b/ui/qt/about_dialog.ui index 8d029382f6..ef45c43755 100644 --- a/ui/qt/about_dialog.ui +++ b/ui/qt/about_dialog.ui @@ -7,7 +7,7 @@ <x>0</x> <y>0</y> <width>740</width> - <height>600</height> + <height>610</height> </rect> </property> <property name="windowTitle"> @@ -35,119 +35,42 @@ <attribute name="title"> <string>Wireshark</string> </attribute> - <layout class="QVBoxLayout" name="verticalLayout_7"> + <layout class="QVBoxLayout" name="verticalLayout"> <item> - <layout class="QHBoxLayout" name="horizontalLayout"> - <item> - <spacer name="horizontalSpacer"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>40</width> - <height>38</height> - </size> - </property> - </spacer> - </item> - <item> - <layout class="QVBoxLayout" name="verticalLayout"> - <item> - <widget class="QLabel" name="label_logo"> - <property name="text"> - <string/> - </property> - <property name="pixmap"> - <pixmap resource="../../image/about.qrc">:/about/wssplash.png</pixmap> - </property> - <property name="scaledContents"> - <bool>false</bool> - </property> - <property name="alignment"> - <set>Qt::AlignHCenter|Qt::AlignTop</set> - </property> - </widget> - </item> - <item> - <widget class="QLabel" name="label_title"> - <property name="text"> - <string><span size=\"x-large\" weight=\"bold\">Network Protocol Analyzer</span></string> - </property> - <property name="alignment"> - <set>Qt::AlignCenter</set> - </property> - </widget> - </item> - </layout> - </item> - <item> - <spacer name="horizontalSpacer_2"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>40</width> - <height>48</height> - </size> - </property> - </spacer> - </item> - </layout> + <widget class="QLabel" name="label_logo"> + <property name="text"> + <string/> + </property> + <property name="pixmap"> + <pixmap resource="../../image/about.qrc">:/about/wssplash.png</pixmap> + </property> + <property name="scaledContents"> + <bool>false</bool> + </property> + <property name="alignment"> + <set>Qt::AlignHCenter|Qt::AlignTop</set> + </property> + </widget> </item> <item> - <layout class="QHBoxLayout" name="horizontalLayout_2"> - <item> - <spacer name="horizontalSpacer_3"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>40</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item> - <widget class="QLabel" name="label_wireshark"> - <property name="text"> - <string/> - </property> - <property name="scaledContents"> - <bool>true</bool> - </property> - </widget> - </item> - <item> - <spacer name="horizontalSpacer_4"> - <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> + <widget class="QLabel" name="label_title"> + <property name="text"> + <string><span size=\"x-large\" weight=\"bold\">Network Protocol Analyzer</span></string> + </property> + <property name="alignment"> + <set>Qt::AlignCenter</set> + </property> + </widget> </item> <item> - <spacer name="verticalSpacer"> - <property name="orientation"> - <enum>Qt::Vertical</enum> + <widget class="QLabel" name="label_wireshark"> + <property name="text"> + <string/> </property> - <property name="sizeHint" stdset="0"> - <size> - <width>20</width> - <height>357</height> - </size> + <property name="scaledContents"> + <bool>true</bool> </property> - </spacer> + </widget> </item> </layout> </widget> @@ -164,17 +87,22 @@ </widget> </item> <item> - <widget class="QTableView" name="tblAuthors"> + <widget class="QTreeView" name="tblAuthors"> + <property name="editTriggers"> + <set>QAbstractItemView::NoEditTriggers</set> + </property> + <property name="selectionMode"> + <enum>QAbstractItemView::ContiguousSelection</enum> + </property> <property name="selectionBehavior"> <enum>QAbstractItemView::SelectRows</enum> </property> - </widget> - </item> - <item> - <widget class="QPlainTextEdit" name="pte_Authors"> - <property name="readOnly"> + <attribute name="headerMinimumSectionSize"> + <number>100</number> + </attribute> + <attribute name="headerStretchLastSection"> <bool>true</bool> - </property> + </attribute> </widget> </item> </layout> @@ -192,7 +120,13 @@ </widget> </item> <item> - <widget class="QTableView" name="tblFolders"> + <widget class="QTreeView" name="tblFolders"> + <property name="editTriggers"> + <set>QAbstractItemView::NoEditTriggers</set> + </property> + <property name="selectionMode"> + <enum>QAbstractItemView::ContiguousSelection</enum> + </property> <property name="selectionBehavior"> <enum>QAbstractItemView::SelectRows</enum> </property> @@ -246,7 +180,13 @@ </layout> </item> <item> - <widget class="QTableView" name="tblPlugins"> + <widget class="QTreeView" name="tblPlugins"> + <property name="editTriggers"> + <set>QAbstractItemView::NoEditTriggers</set> + </property> + <property name="selectionMode"> + <enum>QAbstractItemView::ContiguousSelection</enum> + </property> <property name="selectionBehavior"> <enum>QAbstractItemView::SelectRows</enum> </property> @@ -267,10 +207,36 @@ </widget> </item> <item> - <widget class="QTableView" name="tblShortcuts"> + <widget class="QTreeView" name="tblShortcuts"> + <property name="editTriggers"> + <set>QAbstractItemView::NoEditTriggers</set> + </property> + <property name="selectionMode"> + <enum>QAbstractItemView::ContiguousSelection</enum> + </property> <property name="selectionBehavior"> <enum>QAbstractItemView::SelectRows</enum> </property> + <property name="textElideMode"> + <enum>Qt::ElideNone</enum> + </property> + <property name="wordWrap"> + <bool>true</bool> + </property> + </widget> + </item> + </layout> + </widget> + <widget class="QWidget" name="tab_3"> + <attribute name="title"> + <string>Acknowledgments</string> + </attribute> + <layout class="QVBoxLayout" name="verticalLayout_8"> + <item> + <widget class="QPlainTextEdit" name="pte_Authors"> + <property name="readOnly"> + <bool>true</bool> + </property> </widget> </item> </layout> @@ -314,8 +280,8 @@ <slot>accept()</slot> <hints> <hint type="sourcelabel"> - <x>248</x> - <y>254</y> + <x>254</x> + <y>595</y> </hint> <hint type="destinationlabel"> <x>157</x> @@ -330,8 +296,8 @@ <slot>reject()</slot> <hints> <hint type="sourcelabel"> - <x>316</x> - <y>260</y> + <x>322</x> + <y>595</y> </hint> <hint type="destinationlabel"> <x>286</x> |