diff options
| author | Gerald Combs <gerald@wireshark.org> | 2013-01-24 01:10:12 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2013-01-24 01:10:12 +0000 |
| commit | 2dff8d760594661114615366c7cb51133fec0c10 (patch) | |
| tree | d71608abb24be34d21cac0900d64a6ed01142af1 /ui/qt/preferences_dialog.ui | |
| parent | 70755ffa17fc454b4e32c5c586ebbddda0e482e4 (diff) | |
| download | wireshark-2dff8d760594661114615366c7cb51133fec0c10.tar.gz | |
Add font and color preferences. Unfortunately Qt doesn't have a color
picker widget so we're back to popping up dialogs. Move the contents of
monospace_font.{cpp,h} to wireshark_application.{cpp,h}.
Pango and Qt use completely different string representations for fonts.
Add a separate gui.qt.font_name preference so that they don't clobber
each other.
svn path=/trunk/; revision=47240
Diffstat (limited to 'ui/qt/preferences_dialog.ui')
| -rw-r--r-- | ui/qt/preferences_dialog.ui | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/ui/qt/preferences_dialog.ui b/ui/qt/preferences_dialog.ui index 2a00617285..cc710080c7 100644 --- a/ui/qt/preferences_dialog.ui +++ b/ui/qt/preferences_dialog.ui @@ -55,9 +55,6 @@ <property name="text"> <string>Font and Colors</string> </property> - <property name="flags"> - <set>ItemIsDragEnabled|ItemIsUserCheckable</set> - </property> </item> </item> <item> @@ -119,7 +116,7 @@ <widget class="MainWindowPreferencesFrame" name="appearanceFrame"/> <widget class="LayoutPreferencesFrame" name="layoutFrame"/> <widget class="ColumnPreferencesFrame" name="columnFrame"/> - <widget class="QFrame" name="fontandcolorFrame"/> + <widget class="FontColorPreferencesFrame" name="fontandcolorFrame"/> <widget class="QFrame" name="captureFrame"/> <widget class="QFrame" name="filterFrame"/> <widget class="QFrame" name="nameresolutionFrame"/> @@ -217,6 +214,12 @@ <header>column_preferences_frame.h</header> <container>1</container> </customwidget> + <customwidget> + <class>FontColorPreferencesFrame</class> + <extends>QFrame</extends> + <header>font_color_preferences_frame.h</header> + <container>1</container> + </customwidget> </customwidgets> <resources/> <connections> |