osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Qt: Selected item preference updates. 

The styling of the color selection buttons in the color preferences is
such that it's impossible to tell if they're disabled or enabled. Hide
and show them instead as needed.

Rename combo box items based on feedback here at SharkFest.

Bug: 15775
Change-Id: I22b384aca56fee73957f5842349efae218b2dd09
Reviewed-on: https://code.wireshark.org/review/33566
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Roland Knall <rknall@gmail.com>
This commit is contained in:
Gerald Combs 2019-06-11 15:58:43 -07:00 committed by Roland Knall
parent e5b9fc309c
commit cbdfc13ecc
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ui/qt/font_color_preferences_frame.cpp
View File

@ -149,9 +149,9 @@ void FontColorPreferencesFrame::updateWidgets()
ui->activeSampleLineEdit->setFont(cur_font_);
ui->activeStyleComboBox->setCurrentIndex(prefs_get_enum_value(pref_active_style_, pref_stashed));
// Enable or disable the widgets
ui->activeFGPushButton->setEnabled(colorstyle != COLOR_STYLE_DEFAULT);
ui->activeBGPushButton->setEnabled(colorstyle != COLOR_STYLE_DEFAULT);
// Show or hide the widgets
ui->activeFGPushButton->setVisible(colorstyle != COLOR_STYLE_DEFAULT);
ui->activeBGPushButton->setVisible(colorstyle != COLOR_STYLE_DEFAULT);
//
// Sample inactive selected item
@ -192,9 +192,9 @@ void FontColorPreferencesFrame::updateWidgets()
ui->inactiveSampleLineEdit->setFont(cur_font_);
ui->inactiveStyleComboBox->setCurrentIndex(prefs_get_enum_value(pref_inactive_style_, pref_stashed));
// Enable or disable the widgets
ui->inactiveFGPushButton->setEnabled(colorstyle != COLOR_STYLE_DEFAULT);
ui->inactiveBGPushButton->setEnabled(colorstyle != COLOR_STYLE_DEFAULT);
// Show or hide the widgets
ui->inactiveFGPushButton->setVisible(colorstyle != COLOR_STYLE_DEFAULT);
ui->inactiveBGPushButton->setVisible(colorstyle != COLOR_STYLE_DEFAULT);
//
// Sample marked packet text

8
ui/qt/font_color_preferences_frame.ui
View File

@ -122,12 +122,12 @@
<widget class="QComboBox" name="activeStyleComboBox">
<item>
<property name="text">
<string>Default</string>
<string>System Default</string>
</property>
</item>
<item>
<property name="text">
<string>Flat</string>
<string>Solid</string>
</property>
</item>
<item>
@ -182,12 +182,12 @@
<widget class="QComboBox" name="inactiveStyleComboBox">
<item>
<property name="text">
<string>Default</string>
<string>System Default</string>
</property>
</item>
<item>
<property name="text">
<string>Flat</string>
<string>Solid</string>
</property>
</item>
<item>