refs #129 , updated GUI to play notification sounds:

* prepared for login/off sounds
* prepared for text message sounds
* helper method to play sounds
* enabled mute / mixer also in cockpit, including context menus
* settings for notification sounds
* some minor tweaks, e.g. changed signal/slot to C++ style where missing
This commit is contained in:
Klaus Basan
2014-02-10 23:37:56 +01:00
parent dbfd4a69e9
commit 18b31b49ac
8 changed files with 118 additions and 39 deletions

View File

@@ -454,7 +454,7 @@ QStatusBar QLabel {
<enum>QFrame::NoFrame</enum>
</property>
<property name="currentIndex">
<number>0</number>
<number>7</number>
</property>
<widget class="QWidget" name="pg_StatusPage">
<property name="sizePolicy">
@@ -540,7 +540,7 @@ QStatusBar QLabel {
</widget>
</item>
<item row="0" column="2">
<widget class="QLabel" name="lbl_VoiceStatus">
<widget class="QLabel" name="lbl_StatusVoiceStatus">
<property name="text">
<string/>
</property>
@@ -564,8 +564,8 @@ QStatusBar QLabel {
<rect>
<x>0</x>
<y>0</y>
<width>326</width>
<height>267</height>
<width>86</width>
<height>59</height>
</rect>
</property>
<attribute name="label">
@@ -607,8 +607,8 @@ QStatusBar QLabel {
<rect>
<x>0</x>
<y>0</y>
<width>326</width>
<height>267</height>
<width>90</width>
<height>55</height>
</rect>
</property>
<attribute name="label">
@@ -1387,22 +1387,6 @@ QStatusBar QLabel {
</property>
</widget>
</item>
<item row="3" column="4">
<spacer name="vs_CockpitTransponder">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>28</height>
</size>
</property>
</spacer>
</item>
<item row="3" column="3">
<widget class="QComboBox" name="cb_CockpitTransponderMode">
<property name="sizePolicy">
@@ -1459,8 +1443,24 @@ QStatusBar QLabel {
</property>
</widget>
</item>
<item row="2" column="4">
<spacer name="vs_CockpitSelcal">
<item row="2" column="4" alignment="Qt::AlignRight">
<widget class="QLabel" name="lbl_CockpitVoiceStatus">
<property name="minimumSize">
<size>
<width>0</width>
<height>28</height>
</size>
</property>
<property name="text">
<string/>
</property>
<property name="pixmap">
<pixmap resource="../../src/blackgui/blackgui.qrc">:/blackgui/icons/audiovolumelow.png</pixmap>
</property>
</widget>
</item>
<item row="3" column="4">
<spacer name="vs_CockpitTransponder">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
@@ -2224,21 +2224,14 @@ QStatusBar QLabel {
</layout>
</widget>
</item>
<item row="5" column="0">
<item row="4" column="0">
<widget class="QLabel" name="lbl_SettingsAudioTestActionAndResult">
<property name="text">
<string>Result</string>
</property>
</widget>
</item>
<item row="6" column="1">
<widget class="QProgressBar" name="prb_SettingsAudioTestProgress">
<property name="value">
<number>0</number>
</property>
</widget>
</item>
<item row="5" column="1">
<item row="4" column="1">
<widget class="QPlainTextEdit" name="pte_SettingsAudioTestActionAndResult">
<property name="maximumSize">
<size>
@@ -2251,6 +2244,47 @@ QStatusBar QLabel {
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QProgressBar" name="prb_SettingsAudioTestProgress">
<property name="value">
<number>0</number>
</property>
</widget>
</item>
<item row="6" column="1">
<spacer name="vs_SettingsAudioMisc">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="8" column="1">
<widget class="QCheckBox" name="cb_SettingsAudioPlayNotificationSounds">
<property name="text">
<string>play notification sounds</string>
</property>
</widget>
</item>
<item row="9" column="1">
<widget class="QCheckBox" name="cb_SettingsAudioNotificationTextMessage">
<property name="text">
<string>notification for text messages</string>
</property>
</widget>
</item>
<item row="7" column="0" colspan="2">
<widget class="QLabel" name="lbl_SettingsAudioNotificationSounds">
<property name="text">
<string>Notification sounds</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>