diff --git a/sflphone-client-kde/src/SFLPhoneView.cpp b/sflphone-client-kde/src/SFLPhoneView.cpp
old mode 100644
new mode 100755
index b46a0947d16ae38193b61f109333471e27ed8447..16b8355e369b2aca7c4ab781c2af252d972827f1
--- a/sflphone-client-kde/src/SFLPhoneView.cpp
+++ b/sflphone-client-kde/src/SFLPhoneView.cpp
@@ -794,22 +794,27 @@ void SFLPhoneView::updateRecordButton()
if(recVol == 0.00)
{
toolButton_recVol->setIcon(QIcon(ICON_REC_VOL_0));
+ toolButton_recVol_2->setIcon(QIcon(ICON_REC_VOL_0));
}
else if(recVol < 0.33)
{
toolButton_recVol->setIcon(QIcon(ICON_REC_VOL_1));
+ toolButton_recVol_2->setIcon(QIcon(ICON_REC_VOL_1));
}
else if(recVol < 0.67)
{
toolButton_recVol->setIcon(QIcon(ICON_REC_VOL_2));
+ toolButton_recVol_2->setIcon(QIcon(ICON_REC_VOL_2));
}
else
{
toolButton_recVol->setIcon(QIcon(ICON_REC_VOL_3));
+ toolButton_recVol_2->setIcon(QIcon(ICON_REC_VOL_3));
}
if(recVol > 0)
{
toolButton_recVol->setChecked(false);
+ toolButton_recVol_2->setChecked(false);
}
}
void SFLPhoneView::updateVolumeButton()
@@ -820,22 +825,27 @@ void SFLPhoneView::updateVolumeButton()
if(sndVol == 0.00)
{
toolButton_sndVol->setIcon(QIcon(ICON_SND_VOL_0));
+ toolButton_sndVol_2->setIcon(QIcon(ICON_SND_VOL_0));
}
else if(sndVol < 0.33)
{
toolButton_sndVol->setIcon(QIcon(ICON_SND_VOL_1));
+ toolButton_sndVol_2->setIcon(QIcon(ICON_SND_VOL_1));
}
else if(sndVol < 0.67)
{
toolButton_sndVol->setIcon(QIcon(ICON_SND_VOL_2));
+ toolButton_sndVol_2->setIcon(QIcon(ICON_SND_VOL_2));
}
else
{
toolButton_sndVol->setIcon(QIcon(ICON_SND_VOL_3));
+ toolButton_sndVol_2->setIcon(QIcon(ICON_SND_VOL_3));
}
if(sndVol > 0)
{
toolButton_sndVol->setChecked(false);
+ toolButton_sndVol_2->setChecked(false);
}
}
@@ -876,8 +886,12 @@ void SFLPhoneView::updateVolumeControls()
qDebug() << "updateVolumeControls " << display;
((SFLPhone*)parent())->action_displayVolumeControls->setChecked(display);
- widget_recVol->setVisible(display);
- widget_sndVol->setVisible(display);
+ //widget_recVol->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()
@@ -969,6 +983,15 @@ void SFLPhoneView::on_slider_sndVol_valueChanged(int value)
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)
{
@@ -991,6 +1014,16 @@ void SFLPhoneView::on_toolButton_recVol_clicked(bool checked)
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)
{
diff --git a/sflphone-client-kde/src/SFLPhoneView.h b/sflphone-client-kde/src/SFLPhoneView.h
old mode 100644
new mode 100755
index 6683a1c4a1dfd9093ac7a0f5f16dc1b371651d24..b6aacc196e962d8ba9bd859844378a63341e3390
--- a/sflphone-client-kde/src/SFLPhoneView.h
+++ b/sflphone-client-kde/src/SFLPhoneView.h
@@ -315,9 +315,13 @@ public slots:
void on_slider_recVol_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_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_itemChanged();
diff --git a/sflphone-client-kde/src/ui/SFLPhoneView_base.ui b/sflphone-client-kde/src/ui/SFLPhoneView_base.ui
old mode 100644
new mode 100755
index 603bf037b77bfd125f7d23993614a6109c807d2c..af4e43852a1ba0e6bd78340f96107d81373dfc3d
--- a/sflphone-client-kde/src/ui/SFLPhoneView_base.ui
+++ b/sflphone-client-kde/src/ui/SFLPhoneView_base.ui
@@ -7,19 +7,13 @@
<x>0</x>
<y>0</y>
<width>337</width>
- <height>420</height>
+ <height>526</height>
</rect>
</property>
<property name="windowTitle">
<string notr="true">Form</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
- <property name="spacing">
- <number>1</number>
- </property>
- <property name="margin">
- <number>2</number>
- </property>
<item>
<widget class="QStackedWidget" name="stackedWidget_screen">
<property name="sizePolicy">
@@ -29,13 +23,13 @@
</sizepolicy>
</property>
<property name="currentIndex">
- <number>0</number>
+ <number>1</number>
</property>
<widget class="QWidget" name="page_callList">
<layout class="QHBoxLayout" name="horizontalLayout_3"/>
</widget>
<widget class="QWidget" name="page_callHistory">
- <layout class="QVBoxLayout" name="verticalLayout_3">
+ <layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QListWidget" name="listWidget_callHistory"/>
</item>
@@ -85,8 +79,48 @@
<property name="enabled">
<bool>true</bool>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_2">
- <item>
+ <layout class="QGridLayout" name="gridLayout">
+ <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">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
@@ -96,58 +130,111 @@
</property>
</widget>
</item>
- <item>
- <widget class="QWidget" name="widget_recVol" native="true">
- <layout class="QHBoxLayout" name="horizontalLayout_4">
- <item>
- <widget class="QToolButton" name="toolButton_recVol">
- <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>
- <widget class="QSlider" name="slider_recVol">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- </widget>
- </item>
- </layout>
+ <item row="0" column="3">
+ <widget class="QSlider" name="slider_sndVol_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>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">
+ <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="2" column="2" colspan="2">
+ <widget class="QSlider" name="slider_recVol">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
</widget>
</item>
- <item>
- <widget class="QWidget" name="widget_sndVol" native="true">
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <widget class="QToolButton" name="toolButton_sndVol">
- <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>
- <widget class="QSlider" name="slider_sndVol">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- </widget>
- </item>
- </layout>
+ <item row="3" column="0" colspan="2">
+ <widget class="QToolButton" name="toolButton_sndVol">
+ <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="3" column="2" colspan="2">
+ <widget class="QSlider" name="slider_sndVol">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
</widget>
</item>
</layout>
@@ -171,5 +258,70 @@
<resources>
<include location="../qrc/resources.qrc"/>
</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>