aboutsummaryrefslogtreecommitdiffstats
path: root/ui/qt/preferences_dialog.ui
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2013-01-23 19:04:36 +0000
committerGerald Combs <gerald@wireshark.org>2013-01-23 19:04:36 +0000
commit21e66f0c6f38d20dc4ac3968324fff0959113b14 (patch)
treee801135c51e407d67516e1969c1ef788af48292e /ui/qt/preferences_dialog.ui
parentd59e9cf574976b1e9849f5c35be1fd2abdf8ed6d (diff)
Add column preferences.
svn path=/trunk/; revision=47231
Diffstat (limited to 'ui/qt/preferences_dialog.ui')
-rw-r--r--ui/qt/preferences_dialog.ui11
1 files changed, 7 insertions, 4 deletions
diff --git a/ui/qt/preferences_dialog.ui b/ui/qt/preferences_dialog.ui
index 13da76beb8..2a00617285 100644
--- a/ui/qt/preferences_dialog.ui
+++ b/ui/qt/preferences_dialog.ui
@@ -50,9 +50,6 @@
<property name="text">
<string>Columns</string>
</property>
- <property name="flags">
- <set>ItemIsDragEnabled|ItemIsUserCheckable</set>
- </property>
</item>
<item>
<property name="text">
@@ -121,7 +118,7 @@
</property>
<widget class="MainWindowPreferencesFrame" name="appearanceFrame"/>
<widget class="LayoutPreferencesFrame" name="layoutFrame"/>
- <widget class="QFrame" name="columnFrame"/>
+ <widget class="ColumnPreferencesFrame" name="columnFrame"/>
<widget class="QFrame" name="fontandcolorFrame"/>
<widget class="QFrame" name="captureFrame"/>
<widget class="QFrame" name="filterFrame"/>
@@ -214,6 +211,12 @@
<header>layout_preferences_frame.h</header>
<container>1</container>
</customwidget>
+ <customwidget>
+ <class>ColumnPreferencesFrame</class>
+ <extends>QFrame</extends>
+ <header>column_preferences_frame.h</header>
+ <container>1</container>
+ </customwidget>
</customwidgets>
<resources/>
<connections>