diff options
Diffstat (limited to 'ui/qt')
-rw-r--r-- | ui/qt/CMakeLists.txt | 3 | ||||
-rw-r--r-- | ui/qt/Makefile.am | 37 | ||||
-rw-r--r-- | ui/qt/Makefile.common | 3 | ||||
-rw-r--r-- | ui/qt/QtShark.pro | 9 | ||||
-rw-r--r-- | ui/qt/byte_view_tab.cpp | 1 | ||||
-rw-r--r-- | ui/qt/byte_view_text.h | 1 | ||||
-rw-r--r-- | ui/qt/capture_file_dialog.cpp | 2 | ||||
-rw-r--r-- | ui/qt/export_dissection_dialog.cpp | 1 | ||||
-rw-r--r-- | ui/qt/export_object_dialog.ui | 3 | ||||
-rw-r--r-- | ui/qt/file_set_dialog.ui | 3 | ||||
-rw-r--r-- | ui/qt/main_welcome.ui | 5 | ||||
-rw-r--r-- | ui/qt/main_window.h | 1 | ||||
-rw-r--r-- | ui/qt/main_window_slots.cpp | 12 | ||||
-rw-r--r-- | ui/qt/preferences_dialog.cpp | 185 | ||||
-rw-r--r-- | ui/qt/preferences_dialog.h | 48 | ||||
-rw-r--r-- | ui/qt/preferences_dialog.ui | 236 | ||||
-rw-r--r-- | ui/qt/profile_dialog.cpp | 1 |
17 files changed, 505 insertions, 46 deletions
diff --git a/ui/qt/CMakeLists.txt b/ui/qt/CMakeLists.txt index 708881470d..743602cfb2 100644 --- a/ui/qt/CMakeLists.txt +++ b/ui/qt/CMakeLists.txt @@ -49,6 +49,7 @@ set(QTSHARK_H_SRC packet_list.h packet_list_model.h packet_range_group_box.h + preferences_dialog.h print_dialog.h profile_dialog.h progress_bar.h @@ -96,6 +97,7 @@ set(QTSHARK_CPP_SRC packet_list_model.cpp packet_list_record.cpp packet_range_group_box.cpp + preferences_dialog.cpp print_dialog.cpp profile_dialog.cpp progress_bar.cpp @@ -124,6 +126,7 @@ set(QTSHARK_UI packet_comment_dialog.ui packet_format_group_box.ui packet_range_group_box.ui + preferences_dialog.ui print_dialog.ui profile_dialog.ui search_frame.ui diff --git a/ui/qt/Makefile.am b/ui/qt/Makefile.am index 761d3dc365..4a30d6ed39 100644 --- a/ui/qt/Makefile.am +++ b/ui/qt/Makefile.am @@ -87,64 +87,30 @@ export_object_dialog.cpp export_object_dialog.h: ui_export_object_dialog.h file_set_dialog.cpp file_set_dialog.h: ui_file_set_dialog.h -#ui_file_set_dialog.h: file_set_dialog.ui -# uic $< -o $@ - import_text_dialog.cpp import_text_dialog.h: ui_import_text_dialog.h -#ui_import_text_dialog.h: import_text_dialog.ui -# uic $< -o $@ - main_welcome.cpp main_welcome.h: ui_main_welcome.h -#ui_main_welcome.h: main_welcome.ui -# uic $< -o $@ - main_window.cpp main_window.h: ui_main_window.h -#ui_main_window.h: main_window.ui -# uic $< -o $@ - packet_comment_dialog.cpp packet_comment_dialog.h: ui_packet_comment_dialog.h -#ui_packet_comment_dialog.h: packet_comment_dialog.ui -# uic $< -o $@ - packet_format_group_box.cpp packet_format_group_box.h: ui_packet_format_group_box.h -#ui_packet_format_group_box.h: packet_format_group_box.ui -# uic $< -o $@ - packet_range_group_box.cpp packet_range_group_box.h: ui_packet_range_group_box.h -#ui_packet_range_group_box.h: packet_range_group_box.ui -# uic $< -o $@ +preferences_dialog.cpp preferences_dialog.h: ui_preferences_dialog.h print_dialog.cpp print_dialog.h: ui_print_dialog.h -#ui_print_dialog.h: print_dialog.ui -# uic $< -o $@ - profile_dialog.cpp profile_dialog.h: ui_profile_dialog.h -#ui_profile_dialog.h: profile_dialog.ui -# uic $< -o $@ - search_frame.cpp search_frame.h: ui_search_frame.h -#ui_search_frame.h: search_frame.ui -# uic $< -o $@ - splash_overlay.cpp splash_overlay.h: ui_splash_overlay.h -#ui_splash_overlay.h: splash_overlay.ui -# uic $< -o $@ - time_shift_dialog.cpp time_shift_dialog.h: ui_time_shift_dialog.h -#ui_time_shift_dialog.h: time_shift_dialog.ui -# uic $< -o $@ - doxygen: if HAVE_DOXYGEN $(DOXYGEN) doxygen.cfg @@ -206,6 +172,7 @@ EXTRA_DIST = \ packet_format_group_box.ui \ packet_range_group_box.ui \ packet_comment_dialog.ui \ + preferences_dialog.ui \ print_dialog.ui \ profile_dialog.ui \ QtShark.pro \ diff --git a/ui/qt/Makefile.common b/ui/qt/Makefile.common index 4cf270f668..140974775b 100644 --- a/ui/qt/Makefile.common +++ b/ui/qt/Makefile.common @@ -39,6 +39,7 @@ GENERATED_NODIST_HEADER_FILES = \ ui_packet_comment_dialog.h \ ui_packet_format_group_box.h \ ui_packet_range_group_box.h \ + ui_preferences_dialog.h \ ui_print_dialog.h \ ui_profile_dialog.h \ ui_search_frame.h \ @@ -103,6 +104,7 @@ MOC_HDRS = \ packet_list.h \ packet_list_model.h \ packet_range_group_box.h \ + preferences_dialog.h \ print_dialog.h \ profile_dialog.h \ progress_bar.h \ @@ -187,6 +189,7 @@ WIRESHARK_QT_SRC = \ packet_list_model.cpp \ packet_list_record.cpp \ packet_range_group_box.cpp \ + preferences_dialog.cpp \ print_dialog.cpp \ profile_dialog.cpp \ progress_bar.cpp \ diff --git a/ui/qt/QtShark.pro b/ui/qt/QtShark.pro index 5184e667d0..fa3bf6f5d3 100644 --- a/ui/qt/QtShark.pro +++ b/ui/qt/QtShark.pro @@ -193,7 +193,8 @@ FORMS += main_window.ui \ search_frame.ui \ splash_overlay.ui \ time_shift_dialog.ui \ - profile_dialog.ui + profile_dialog.ui \ + preferences_dialog.ui win32 { ## These should be in config.pri ?? !isEmpty(PORTAUDIO_DIR) { @@ -226,7 +227,8 @@ HEADERS += $$HEADERS_WS_C \ search_frame.h \ splash_overlay.h \ tango_colors.h \ - profile_dialog.h + profile_dialog.h \ + preferences_dialog.h win32 { OBJECTS_WS_C = $$SOURCES_WS_C @@ -444,4 +446,5 @@ SOURCES += \ syntax_line_edit.cpp \ time_shift_dialog.cpp \ wireshark_application.cpp \ - profile_dialog.cpp + profile_dialog.cpp \ + preferences_dialog.cpp diff --git a/ui/qt/byte_view_tab.cpp b/ui/qt/byte_view_tab.cpp index b152ebea6a..a47402a65b 100644 --- a/ui/qt/byte_view_tab.cpp +++ b/ui/qt/byte_view_tab.cpp @@ -33,7 +33,6 @@ ByteViewTab::ByteViewTab(QWidget *parent) : addTab(); } -#include <QDebug> void ByteViewTab::addTab(const char *name, tvbuff_t *tvb, proto_tree *tree, QTreeWidget *protoTree, packet_char_enc encoding) { ByteViewText *byte_view_text = new ByteViewText(this, tvb, tree, protoTree, encoding); diff --git a/ui/qt/byte_view_text.h b/ui/qt/byte_view_text.h index dbd13baefe..c29d6e7971 100644 --- a/ui/qt/byte_view_text.h +++ b/ui/qt/byte_view_text.h @@ -31,6 +31,7 @@ #include <epan/tvbuff.h> #include "proto_tree.h" +#include <QPrinter> #include <QTextEdit> // XXX - Is there any reason we shouldn't add ByteViewImage, etc? diff --git a/ui/qt/capture_file_dialog.cpp b/ui/qt/capture_file_dialog.cpp index 8301e6cec8..ac15a79bc0 100644 --- a/ui/qt/capture_file_dialog.cpp +++ b/ui/qt/capture_file_dialog.cpp @@ -54,8 +54,6 @@ #include <QPushButton> -#include <QDebug> - #ifdef Q_WS_WIN // All of these routines are required by file_dlg_win32.c. // We don't yet have a good place for them so we'll add them as stubs here. diff --git a/ui/qt/export_dissection_dialog.cpp b/ui/qt/export_dissection_dialog.cpp index 33e6c946c9..7e38909571 100644 --- a/ui/qt/export_dissection_dialog.cpp +++ b/ui/qt/export_dissection_dialog.cpp @@ -43,7 +43,6 @@ #include <QGridLayout> #include <QPushButton> -#include <QDebug> #endif // Q_WS_WIN ExportDissectionDialog::ExportDissectionDialog(QWidget *parent, capture_file *cap_file, export_type_e export_type): diff --git a/ui/qt/export_object_dialog.ui b/ui/qt/export_object_dialog.ui index d362aeef9f..5cd532a393 100644 --- a/ui/qt/export_object_dialog.ui +++ b/ui/qt/export_object_dialog.ui @@ -22,6 +22,9 @@ <property name="rootIsDecorated"> <bool>false</bool> </property> + <property name="uniformRowHeights"> + <bool>true</bool> + </property> <property name="itemsExpandable"> <bool>false</bool> </property> diff --git a/ui/qt/file_set_dialog.ui b/ui/qt/file_set_dialog.ui index 718f17786c..6722b98418 100644 --- a/ui/qt/file_set_dialog.ui +++ b/ui/qt/file_set_dialog.ui @@ -76,6 +76,9 @@ <property name="rootIsDecorated"> <bool>false</bool> </property> + <property name="uniformRowHeights"> + <bool>true</bool> + </property> <property name="itemsExpandable"> <bool>false</bool> </property> diff --git a/ui/qt/main_welcome.ui b/ui/qt/main_welcome.ui index d484f8051b..284d4bcb5c 100644 --- a/ui/qt/main_welcome.ui +++ b/ui/qt/main_welcome.ui @@ -34,7 +34,7 @@ </sizepolicy> </property> <property name="currentIndex"> - <number>1</number> + <number>0</number> </property> <widget class="InterfaceTree" name="interfaceTree"> <property name="sizePolicy"> @@ -46,6 +46,9 @@ <property name="horizontalScrollBarPolicy"> <enum>Qt::ScrollBarAlwaysOff</enum> </property> + <property name="uniformRowHeights"> + <bool>true</bool> + </property> <property name="columnCount"> <number>2</number> </property> diff --git a/ui/qt/main_window.h b/ui/qt/main_window.h index 73e6093a85..81a4552a97 100644 --- a/ui/qt/main_window.h +++ b/ui/qt/main_window.h @@ -224,6 +224,7 @@ private slots: void on_actionEditTimeShift_triggered(); void on_actionEditPacketComment_triggered(); void on_actionEditConfigurationProfiles_triggered(); + void on_actionEditPreferences_triggered(); void on_actionGoGoToPacket_triggered(); void resetPreviousFocus(); diff --git a/ui/qt/main_window_slots.cpp b/ui/qt/main_window_slots.cpp index 00389d4c6d..1094f37a30 100644 --- a/ui/qt/main_window_slots.cpp +++ b/ui/qt/main_window_slots.cpp @@ -58,13 +58,14 @@ #include "ui/main_statusbar.h" #include "ui/ssl_key_export.h" -#include "wireshark_application.h" #include "capture_file_dialog.h" #include "export_object_dialog.h" -#include "print_dialog.h" #include "time_shift_dialog.h" #include "packet_comment_dialog.h" +#include "preferences_dialog.h" +#include "print_dialog.h" #include "profile_dialog.h" +#include "wireshark_application.h" #include <QMessageBox> #include <QClipboard> @@ -1303,6 +1304,13 @@ void MainWindow::on_actionEditConfigurationProfiles_triggered() cp_dialog.exec(); } +void MainWindow::on_actionEditPreferences_triggered() +{ + PreferencesDialog pref_dialog; + + pref_dialog.exec(); +} + // View Menu // Expand / collapse slots in proto_tree diff --git a/ui/qt/preferences_dialog.cpp b/ui/qt/preferences_dialog.cpp new file mode 100644 index 0000000000..1e12a5a560 --- /dev/null +++ b/ui/qt/preferences_dialog.cpp @@ -0,0 +1,185 @@ +/* preferences_dialog.cpp + * + * $Id$ + * + * Wireshark - Network traffic analyzer + * By Gerald Combs <gerald@wireshark.org> + * Copyright 1998 Gerald Combs + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include "config.h" + +#include <glib.h> + +#include "color.h" +#include "packet-range.h" + +#include <epan/prefs.h> +#include <epan/prefs-int.h> + +#include "preferences_dialog.h" +#include "ui_preferences_dialog.h" + +#include <QMessageBox> +#include <QDebug> + +extern "C" { +// Callbacks prefs routines + +static guint +fill_advanced_prefs(module_t *module, gpointer root_ptr) +{ + QTreeWidgetItem *root_item = static_cast<QTreeWidgetItem *>(root_ptr); + + if (!module || !root_item) return 1; + + if (module->numprefs < 1 && !prefs_module_has_submodules(module)) return 0; + + QString module_title; +// if (module->parent == NULL) + module_title = module->title; +// else +// module_title = QString(module->parent->title) +": "+ module->title; + + QTreeWidgetItem *tl_item = new QTreeWidgetItem(root_item); + tl_item->setText(0, module_title); + tl_item->setToolTip(0, module->description); + tl_item->setFirstColumnSpanned(true); + + QList<QTreeWidgetItem *>tl_children; + for (GList *pref_l = module->prefs; pref_l && pref_l->data; pref_l = g_list_next(pref_l)) { + pref_t *pref = (pref_t *) pref_l->data; + + if (pref->type == PREF_OBSOLETE || pref->type == PREF_STATIC_TEXT) continue; + const char *type_name = prefs_pref_type_name(pref); + if (!type_name) continue; + + QTreeWidgetItem *item = new QTreeWidgetItem(); + QString full_name = QString(module->name ? module->name : module->parent->name) + "." + pref->name; + QFont font = item->font(0); + char *type_desc = prefs_pref_type_description(pref); + char *cur_value = prefs_pref_to_str(pref, false); + char *default_value = prefs_pref_to_str(pref, true); + bool is_default = false; + bool is_editable = true; + + if (pref->type == PREF_UAT) { + is_editable = false; + } else { + if (prefs_pref_is_default(pref)) is_default = true; + } + + item->setText(0, full_name); + item->setToolTip(0, pref->description); + item->setText(1, is_default ? "Default" : "Changed"); + item->setToolTip(1, "Has this value been changed?"); + item->setText(2, type_name); + item->setToolTip(2, type_desc); + item->setText(3, QString(cur_value).replace(QRegExp("\n\t"), " ")); + item->setToolTip(3, QString("Default: ") + default_value); + g_free(type_desc); + g_free(cur_value); + g_free(default_value); + + font.setBold(!is_default); + + if (!is_editable) { + item->setFlags(item->flags() ^ Qt::ItemIsEnabled); + } + font.setItalic(!is_editable); + item->setFont(0, font); + + item->setFont(0, font); + item->setFont(1, font); + item->setFont(2, font); + item->setFont(3, font); + tl_children << item; + } + tl_item->addChildren(tl_children); + + if(prefs_module_has_submodules(module)) + return prefs_modules_foreach_submodules(module, fill_advanced_prefs, tl_item); + + return 0; +} + + +} // extern "C" + +const int appearance_item_ = 0; +const int protocols_item_ = 4; +const int statistics_item_ = 5; +const int advanced_item_ = 6; + +PreferencesDialog::PreferencesDialog(QWidget *parent) : + QDialog(parent), + pd_ui_(new Ui::PreferencesDialog) +{ + pd_ui_->setupUi(this); + QTreeWidgetItem tmp_item; + + pd_ui_->advancedTree->setUpdatesEnabled(false); + prefs_modules_foreach_submodules(NULL, fill_advanced_prefs, (gpointer) &tmp_item); + pd_ui_->advancedTree->invisibleRootItem()->addChildren(tmp_item.takeChildren()); + pd_ui_->advancedTree->expandAll(); + pd_ui_->advancedTree->setSortingEnabled(true); + pd_ui_->advancedTree->sortByColumn(0, Qt::AscendingOrder); + pd_ui_->advancedTree->setColumnWidth(0, pd_ui_->advancedTree->width() * 2 / 5); + pd_ui_->advancedTree->resizeColumnToContents(1); + pd_ui_->advancedTree->resizeColumnToContents(2); + pd_ui_->advancedTree->setColumnWidth(3, pd_ui_->advancedTree->width() * 3 / 5); + pd_ui_->advancedTree->setUpdatesEnabled(true); + + pd_ui_->splitter->setStretchFactor(0, 1); + pd_ui_->splitter->setStretchFactor(1, 5); + + pd_ui_->prefsTree->invisibleRootItem()->child(appearance_item_)->setExpanded(true); + pd_ui_->prefsTree->invisibleRootItem()->child(advanced_item_)->setSelected(true); +} + +PreferencesDialog::~PreferencesDialog() +{ + delete pd_ui_; +} + +void PreferencesDialog::showEvent(QShowEvent *evt) +{ + Q_UNUSED(evt); + QStyleOption style_opt; + int new_prefs_tree_width = pd_ui_->prefsTree->style()->subElementRect(QStyle::SE_TreeViewDisclosureItem, &style_opt).left(); + QList<int> sizes = pd_ui_->splitter->sizes(); + + pd_ui_->prefsTree->resizeColumnToContents(0); + new_prefs_tree_width += pd_ui_->prefsTree->columnWidth(0); + sizes[1] += sizes[0] - new_prefs_tree_width; + sizes[0] = new_prefs_tree_width; + pd_ui_->splitter->setSizes(sizes); + pd_ui_->splitter->setStretchFactor(0, 0); +} + +/* + * Editor modelines + * + * Local Variables: + * c-basic-offset: 4 + * tab-width: 8 + * indent-tabs-mode: nil + * End: + * + * ex: set shiftwidth=4 tabstop=8 expandtab: + * :indentSize=4:tabSize=8:noTabs=true: + */ diff --git a/ui/qt/preferences_dialog.h b/ui/qt/preferences_dialog.h new file mode 100644 index 0000000000..67f9a48aa3 --- /dev/null +++ b/ui/qt/preferences_dialog.h @@ -0,0 +1,48 @@ +/* preferences_dialog.h + * + * $Id$ + * + * Wireshark - Network traffic analyzer + * By Gerald Combs <gerald@wireshark.org> + * Copyright 1998 Gerald Combs + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#ifndef PREFERENCES_DIALOG_H +#define PREFERENCES_DIALOG_H + +#include <QDialog> + +namespace Ui { +class PreferencesDialog; +} + +class PreferencesDialog : public QDialog +{ + Q_OBJECT + +public: + explicit PreferencesDialog(QWidget *parent = 0); + ~PreferencesDialog(); + +protected: + void showEvent(QShowEvent *evt); + +private: + Ui::PreferencesDialog *pd_ui_; +}; + +#endif // PREFERENCES_DIALOG_H diff --git a/ui/qt/preferences_dialog.ui b/ui/qt/preferences_dialog.ui new file mode 100644 index 0000000000..ffc65f87cc --- /dev/null +++ b/ui/qt/preferences_dialog.ui @@ -0,0 +1,236 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>PreferencesDialog</class> + <widget class="QDialog" name="PreferencesDialog"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>680</width> + <height>475</height> + </rect> + </property> + <property name="windowTitle"> + <string>Dialog</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QSplitter" name="splitter"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <widget class="QTreeWidget" name="prefsTree"> + <property name="uniformRowHeights"> + <bool>true</bool> + </property> + <property name="headerHidden"> + <bool>true</bool> + </property> + <column> + <property name="text"> + <string notr="true">1</string> + </property> + </column> + <item> + <property name="text"> + <string>Appearance</string> + </property> + <property name="flags"> + <set>ItemIsDragEnabled|ItemIsUserCheckable</set> + </property> + <item> + <property name="text"> + <string>Layout</string> + </property> + <property name="flags"> + <set>ItemIsDragEnabled|ItemIsUserCheckable</set> + </property> + </item> + <item> + <property name="text"> + <string>Columns</string> + </property> + <property name="flags"> + <set>ItemIsDragEnabled|ItemIsUserCheckable</set> + </property> + </item> + <item> + <property name="text"> + <string>Font and Colors</string> + </property> + <property name="flags"> + <set>ItemIsDragEnabled|ItemIsUserCheckable</set> + </property> + </item> + </item> + <item> + <property name="text"> + <string>Capture</string> + </property> + <property name="flags"> + <set>ItemIsDragEnabled|ItemIsUserCheckable</set> + </property> + </item> + <item> + <property name="text"> + <string>Filter Expressions</string> + </property> + <property name="flags"> + <set>ItemIsDragEnabled|ItemIsUserCheckable</set> + </property> + </item> + <item> + <property name="text"> + <string>Name Resolution</string> + </property> + <property name="flags"> + <set>ItemIsDragEnabled|ItemIsUserCheckable</set> + </property> + </item> + <item> + <property name="text"> + <string>Protocols</string> + </property> + <property name="flags"> + <set>ItemIsDragEnabled|ItemIsUserCheckable</set> + </property> + </item> + <item> + <property name="text"> + <string>Statistics</string> + </property> + <property name="flags"> + <set>ItemIsDragEnabled|ItemIsUserCheckable</set> + </property> + </item> + <item> + <property name="text"> + <string>Advanced</string> + </property> + </item> + </widget> + <widget class="QStackedWidget" name="stackedWidget"> + <property name="currentIndex"> + <number>9</number> + </property> + <widget class="QFrame" name="appearanceFrame"/> + <widget class="QFrame" name="layoutFrame"/> + <widget class="QFrame" name="columnFrame"/> + <widget class="QFrame" name="fontColorFrame"/> + <widget class="QFrame" name="captureFrame"/> + <widget class="QFrame" name="filterFrame"/> + <widget class="QFrame" name="nameResolutionFrame"/> + <widget class="QFrame" name="protocolsFrame"/> + <widget class="QFrame" name="statisticsFrame"/> + <widget class="QFrame" name="advancedFrame"> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <layout class="QHBoxLayout" name="horizontalLayout_2"> + <item> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Search:</string> + </property> + </widget> + </item> + <item> + <widget class="QLineEdit" name="advancedSearchLineEdit"/> + </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> + <item> + <widget class="QTreeWidget" name="advancedTree"> + <property name="alternatingRowColors"> + <bool>true</bool> + </property> + <property name="uniformRowHeights"> + <bool>true</bool> + </property> + <column> + <property name="text"> + <string>Name</string> + </property> + </column> + <column> + <property name="text"> + <string>Status</string> + </property> + </column> + <column> + <property name="text"> + <string>Type</string> + </property> + </column> + <column> + <property name="text"> + <string>Value</string> + </property> + </column> + </widget> + </item> + </layout> + </widget> + </widget> + </widget> + </item> + <item> + <widget class="QDialogButtonBox" name="buttonBox"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="standardButtons"> + <set>QDialogButtonBox::Cancel|QDialogButtonBox::Help|QDialogButtonBox::Ok</set> + </property> + </widget> + </item> + </layout> + </widget> + <resources/> + <connections> + <connection> + <sender>buttonBox</sender> + <signal>accepted()</signal> + <receiver>PreferencesDialog</receiver> + <slot>accept()</slot> + <hints> + <hint type="sourcelabel"> + <x>248</x> + <y>254</y> + </hint> + <hint type="destinationlabel"> + <x>157</x> + <y>274</y> + </hint> + </hints> + </connection> + <connection> + <sender>buttonBox</sender> + <signal>rejected()</signal> + <receiver>PreferencesDialog</receiver> + <slot>reject()</slot> + <hints> + <hint type="sourcelabel"> + <x>316</x> + <y>260</y> + </hint> + <hint type="destinationlabel"> + <x>286</x> + <y>274</y> + </hint> + </hints> + </connection> + </connections> +</ui> diff --git a/ui/qt/profile_dialog.cpp b/ui/qt/profile_dialog.cpp index a704a08fd3..403490b747 100644 --- a/ui/qt/profile_dialog.cpp +++ b/ui/qt/profile_dialog.cpp @@ -316,4 +316,3 @@ void ProfileDialog::editingFinished() * ex: set shiftwidth=4 tabstop=8 expandtab: * :indentSize=4:tabSize=8:noTabs=true: */ - |