aboutsummaryrefslogtreecommitdiffstats
path: root/ui/qt/preferences_dialog.ui
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2013-01-21 05:29:14 +0000
committerGerald Combs <gerald@wireshark.org>2013-01-21 05:29:14 +0000
commit5fcf513161c40cb51b0742e874636b98f00b1398 (patch)
tree4e80aef24962ee00c8b6b0bb97d21499ccc508c2 /ui/qt/preferences_dialog.ui
parent3f3040b345bfb769c7dfd768ac27983c45872bf3 (diff)
Add an initial layout preference pane. Set SVN properties.
svn path=/trunk/; revision=47190
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 ed5ed9caf8..925139c59e 100644
--- a/ui/qt/preferences_dialog.ui
+++ b/ui/qt/preferences_dialog.ui
@@ -45,9 +45,6 @@
<property name="text">
<string>Layout</string>
</property>
- <property name="flags">
- <set>ItemIsDragEnabled|ItemIsUserCheckable</set>
- </property>
</item>
<item>
<property name="text">
@@ -123,7 +120,7 @@
<number>0</number>
</property>
<widget class="MainWindowPreferencesFrame" name="appearanceFrame"/>
- <widget class="QFrame" name="layoutFrame"/>
+ <widget class="LayoutPreferencesFrame" name="layoutFrame"/>
<widget class="QFrame" name="columnFrame"/>
<widget class="QFrame" name="fontandcolorFrame"/>
<widget class="QFrame" name="captureFrame"/>
@@ -211,6 +208,12 @@
<header>main_window_preferences_frame.h</header>
<container>1</container>
</customwidget>
+ <customwidget>
+ <class>LayoutPreferencesFrame</class>
+ <extends>QFrame</extends>
+ <header>layout_preferences_frame.h</header>
+ <container>1</container>
+ </customwidget>
</customwidgets>
<resources/>
<connections>