Skip to content
Snippets Groups Projects
Commit 6bb2b27b authored by Emmanuel Lepage Vallee's avatar Emmanuel Lepage Vallee
Browse files

Backport alternate volume control from a branch. We now have two volume...

Backport alternate volume control from a branch. We now have two volume control applet. The old one may be dissimissed if nobody have something against that move. Always on volume control have better accecibility.
parent 04bd2dae
Branches
Tags
No related merge requests found
...@@ -794,22 +794,27 @@ void SFLPhoneView::updateRecordButton() ...@@ -794,22 +794,27 @@ void SFLPhoneView::updateRecordButton()
if(recVol == 0.00) if(recVol == 0.00)
{ {
toolButton_recVol->setIcon(QIcon(ICON_REC_VOL_0)); toolButton_recVol->setIcon(QIcon(ICON_REC_VOL_0));
toolButton_recVol_2->setIcon(QIcon(ICON_REC_VOL_0));
} }
else if(recVol < 0.33) else if(recVol < 0.33)
{ {
toolButton_recVol->setIcon(QIcon(ICON_REC_VOL_1)); toolButton_recVol->setIcon(QIcon(ICON_REC_VOL_1));
toolButton_recVol_2->setIcon(QIcon(ICON_REC_VOL_1));
} }
else if(recVol < 0.67) else if(recVol < 0.67)
{ {
toolButton_recVol->setIcon(QIcon(ICON_REC_VOL_2)); toolButton_recVol->setIcon(QIcon(ICON_REC_VOL_2));
toolButton_recVol_2->setIcon(QIcon(ICON_REC_VOL_2));
} }
else else
{ {
toolButton_recVol->setIcon(QIcon(ICON_REC_VOL_3)); toolButton_recVol->setIcon(QIcon(ICON_REC_VOL_3));
toolButton_recVol_2->setIcon(QIcon(ICON_REC_VOL_3));
} }
if(recVol > 0) if(recVol > 0)
{ {
toolButton_recVol->setChecked(false); toolButton_recVol->setChecked(false);
toolButton_recVol_2->setChecked(false);
} }
} }
void SFLPhoneView::updateVolumeButton() void SFLPhoneView::updateVolumeButton()
...@@ -820,22 +825,27 @@ void SFLPhoneView::updateVolumeButton() ...@@ -820,22 +825,27 @@ void SFLPhoneView::updateVolumeButton()
if(sndVol == 0.00) if(sndVol == 0.00)
{ {
toolButton_sndVol->setIcon(QIcon(ICON_SND_VOL_0)); toolButton_sndVol->setIcon(QIcon(ICON_SND_VOL_0));
toolButton_sndVol_2->setIcon(QIcon(ICON_SND_VOL_0));
} }
else if(sndVol < 0.33) else if(sndVol < 0.33)
{ {
toolButton_sndVol->setIcon(QIcon(ICON_SND_VOL_1)); toolButton_sndVol->setIcon(QIcon(ICON_SND_VOL_1));
toolButton_sndVol_2->setIcon(QIcon(ICON_SND_VOL_1));
} }
else if(sndVol < 0.67) else if(sndVol < 0.67)
{ {
toolButton_sndVol->setIcon(QIcon(ICON_SND_VOL_2)); toolButton_sndVol->setIcon(QIcon(ICON_SND_VOL_2));
toolButton_sndVol_2->setIcon(QIcon(ICON_SND_VOL_2));
} }
else else
{ {
toolButton_sndVol->setIcon(QIcon(ICON_SND_VOL_3)); toolButton_sndVol->setIcon(QIcon(ICON_SND_VOL_3));
toolButton_sndVol_2->setIcon(QIcon(ICON_SND_VOL_3));
} }
if(sndVol > 0) if(sndVol > 0)
{ {
toolButton_sndVol->setChecked(false); toolButton_sndVol->setChecked(false);
toolButton_sndVol_2->setChecked(false);
} }
} }
...@@ -876,8 +886,12 @@ void SFLPhoneView::updateVolumeControls() ...@@ -876,8 +886,12 @@ void SFLPhoneView::updateVolumeControls()
qDebug() << "updateVolumeControls " << display; qDebug() << "updateVolumeControls " << display;
((SFLPhone*)parent())->action_displayVolumeControls->setChecked(display); ((SFLPhone*)parent())->action_displayVolumeControls->setChecked(display);
widget_recVol->setVisible(display); //widget_recVol->setVisible(display);
widget_sndVol->setVisible(display); //widget_sndVol->setVisible(display);
toolButton_recVol->setVisible(display);
toolButton_sndVol->setVisible(display);
slider_recVol->setVisible(display);
slider_sndVol->setVisible(display);
} }
void SFLPhoneView::updateDialpad() void SFLPhoneView::updateDialpad()
...@@ -969,6 +983,15 @@ void SFLPhoneView::on_slider_sndVol_valueChanged(int value) ...@@ -969,6 +983,15 @@ void SFLPhoneView::on_slider_sndVol_valueChanged(int value)
updateVolumeButton(); updateVolumeButton();
} }
void SFLPhoneView::on_slider_recVol_2_valueChanged(int value)
{
on_slider_recVol_valueChanged(value);
}
void SFLPhoneView::on_slider_sndVol_2_valueChanged(int value)
{
on_slider_sndVol_valueChanged(value);
}
void SFLPhoneView::on_toolButton_recVol_clicked(bool checked) void SFLPhoneView::on_toolButton_recVol_clicked(bool checked)
{ {
...@@ -991,6 +1014,16 @@ void SFLPhoneView::on_toolButton_recVol_clicked(bool checked) ...@@ -991,6 +1014,16 @@ void SFLPhoneView::on_toolButton_recVol_clicked(bool checked)
updateRecordButton(); updateRecordButton();
} }
void SFLPhoneView::on_toolButton_recVol_2_clicked(bool checked)
{
on_toolButton_recVol_clicked(checked);
}
void SFLPhoneView::on_toolButton_sndVol_2_clicked(bool checked)
{
on_toolButton_sndVol_clicked(checked);
}
void SFLPhoneView::on_toolButton_sndVol_clicked(bool checked) void SFLPhoneView::on_toolButton_sndVol_clicked(bool checked)
{ {
......
...@@ -315,9 +315,13 @@ public slots: ...@@ -315,9 +315,13 @@ public slots:
void on_slider_recVol_valueChanged(int value); void on_slider_recVol_valueChanged(int value);
void on_slider_sndVol_valueChanged(int value); void on_slider_sndVol_valueChanged(int value);
void on_slider_recVol_2_valueChanged(int value);
void on_slider_sndVol_2_valueChanged(int value);
void on_toolButton_recVol_clicked(bool checked); void on_toolButton_recVol_clicked(bool checked);
void on_toolButton_sndVol_clicked(bool checked); void on_toolButton_sndVol_clicked(bool checked);
void on_toolButton_recVol_2_clicked(bool checked);
void on_toolButton_sndVol_2_clicked(bool checked);
void on_callTree_currentItemChanged(); void on_callTree_currentItemChanged();
void on_callTree_itemChanged(); void on_callTree_itemChanged();
......
...@@ -7,19 +7,13 @@ ...@@ -7,19 +7,13 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>337</width> <width>337</width>
<height>420</height> <height>526</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string notr="true">Form</string> <string notr="true">Form</string>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<property name="spacing">
<number>1</number>
</property>
<property name="margin">
<number>2</number>
</property>
<item> <item>
<widget class="QStackedWidget" name="stackedWidget_screen"> <widget class="QStackedWidget" name="stackedWidget_screen">
<property name="sizePolicy"> <property name="sizePolicy">
...@@ -29,13 +23,13 @@ ...@@ -29,13 +23,13 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="currentIndex"> <property name="currentIndex">
<number>0</number> <number>1</number>
</property> </property>
<widget class="QWidget" name="page_callList"> <widget class="QWidget" name="page_callList">
<layout class="QHBoxLayout" name="horizontalLayout_3"/> <layout class="QHBoxLayout" name="horizontalLayout_3"/>
</widget> </widget>
<widget class="QWidget" name="page_callHistory"> <widget class="QWidget" name="page_callHistory">
<layout class="QVBoxLayout" name="verticalLayout_3"> <layout class="QVBoxLayout" name="verticalLayout_2">
<item> <item>
<widget class="QListWidget" name="listWidget_callHistory"/> <widget class="QListWidget" name="listWidget_callHistory"/>
</item> </item>
...@@ -85,8 +79,48 @@ ...@@ -85,8 +79,48 @@
<property name="enabled"> <property name="enabled">
<bool>true</bool> <bool>true</bool>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_2"> <layout class="QGridLayout" name="gridLayout">
<item> <item row="0" column="0">
<widget class="QSlider" name="slider_recVol_2">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>50</height>
</size>
</property>
<property name="toolTip">
<string>Mic volume</string>
</property>
<property name="layoutDirection">
<enum>Qt::RightToLeft</enum>
</property>
<property name="autoFillBackground">
<bool>false</bool>
</property>
<property name="maximum">
<number>100</number>
</property>
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="invertedAppearance">
<bool>false</bool>
</property>
<property name="invertedControls">
<bool>false</bool>
</property>
<property name="tickPosition">
<enum>QSlider::NoTicks</enum>
</property>
</widget>
</item>
<item row="0" column="1" rowspan="2" colspan="2">
<widget class="Dialpad" name="widget_dialpad" native="true"> <widget class="Dialpad" name="widget_dialpad" native="true">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred"> <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
...@@ -96,10 +130,72 @@ ...@@ -96,10 +130,72 @@
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="0" column="3">
<widget class="QWidget" name="widget_recVol" native="true"> <widget class="QSlider" name="slider_sndVol_2">
<layout class="QHBoxLayout" name="horizontalLayout_4"> <property name="sizePolicy">
<item> <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>50</height>
</size>
</property>
<property name="toolTip">
<string>Speakers volume</string>
</property>
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
</property>
<property name="autoFillBackground">
<bool>false</bool>
</property>
<property name="maximum">
<number>100</number>
</property>
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="tickPosition">
<enum>QSlider::NoTicks</enum>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QToolButton" name="toolButton_recVol_2">
<property name="text">
<string/>
</property>
<property name="icon">
<iconset>
<normaloff>:/Images/mic_75.svg</normaloff>:/Images/mic_75.svg</iconset>
</property>
<property name="checkable">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="3">
<widget class="QToolButton" name="toolButton_sndVol_2">
<property name="text">
<string/>
</property>
<property name="icon">
<iconset>
<normaloff>:/Images/speaker_75.svg</normaloff>:/Images/speaker_75.svg</iconset>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="checked">
<bool>false</bool>
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QToolButton" name="toolButton_recVol"> <widget class="QToolButton" name="toolButton_recVol">
<property name="text"> <property name="text">
<string/> <string/>
...@@ -113,20 +209,14 @@ ...@@ -113,20 +209,14 @@
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="2" column="2" colspan="2">
<widget class="QSlider" name="slider_recVol"> <widget class="QSlider" name="slider_recVol">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
</widget> </widget>
</item> </item>
</layout> <item row="3" column="0" colspan="2">
</widget>
</item>
<item>
<widget class="QWidget" name="widget_sndVol" native="true">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QToolButton" name="toolButton_sndVol"> <widget class="QToolButton" name="toolButton_sndVol">
<property name="text"> <property name="text">
<string/> <string/>
...@@ -140,7 +230,7 @@ ...@@ -140,7 +230,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item> <item row="3" column="2" colspan="2">
<widget class="QSlider" name="slider_sndVol"> <widget class="QSlider" name="slider_sndVol">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
...@@ -152,9 +242,6 @@ ...@@ -152,9 +242,6 @@
</item> </item>
</layout> </layout>
</widget> </widget>
</item>
</layout>
</widget>
<customwidgets> <customwidgets>
<customwidget> <customwidget>
<class>KLineEdit</class> <class>KLineEdit</class>
...@@ -171,5 +258,70 @@ ...@@ -171,5 +258,70 @@
<resources> <resources>
<include location="../qrc/resources.qrc"/> <include location="../qrc/resources.qrc"/>
</resources> </resources>
<connections/> <connections>
<connection>
<sender>toolButton_sndVol</sender>
<signal>toggled(bool)</signal>
<receiver>toolButton_sndVol_2</receiver>
<slot>setChecked(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>26</x>
<y>509</y>
</hint>
<hint type="destinationlabel">
<x>317</x>
<y>449</y>
</hint>
</hints>
</connection>
<connection>
<sender>toolButton_recVol</sender>
<signal>toggled(bool)</signal>
<receiver>toolButton_recVol_2</receiver>
<slot>setChecked(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>25</x>
<y>478</y>
</hint>
<hint type="destinationlabel">
<x>23</x>
<y>450</y>
</hint>
</hints>
</connection>
<connection>
<sender>slider_recVol</sender>
<signal>valueChanged(int)</signal>
<receiver>slider_recVol_2</receiver>
<slot>setValue(int)</slot>
<hints>
<hint type="sourcelabel">
<x>208</x>
<y>477</y>
</hint>
<hint type="destinationlabel">
<x>19</x>
<y>318</y>
</hint>
</hints>
</connection>
<connection>
<sender>slider_sndVol</sender>
<signal>valueChanged(int)</signal>
<receiver>slider_sndVol_2</receiver>
<slot>setValue(int)</slot>
<hints>
<hint type="sourcelabel">
<x>253</x>
<y>500</y>
</hint>
<hint type="destinationlabel">
<x>317</x>
<y>318</y>
</hint>
</hints>
</connection>
</connections>
</ui> </ui>
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment