[#1421] Make volume bars horizontal when dialpad is hidden.

+ others

sflphone-client-kde/AccountWizard.cpp

@@ -347,8 +347,8 @@ WizardAccountTypePage::WizardAccountTypePage(QWidget *parent)
 	setTitle(tr2i18n("VoIP Protocols"));
 	setSubTitle(tr2i18n("Choose the account type :"));
 
-	radioButton_SIP = new QRadioButton(tr2i18n("Create a SIP (Session Initiation Protocol) account"));
-	radioButton_IAX = new QRadioButton(tr2i18n("Create a IAX2 (InterAsterisk eXchange) account"));
+	radioButton_SIP = new QRadioButton(tr2i18n("Register a SIP (Session Initiation Protocol) account"));
+	radioButton_IAX = new QRadioButton(tr2i18n("Register a IAX2 (InterAsterisk eXchange) account"));
 	radioButton_SIP->setChecked(true);
 	
 	registerField(FIELD_SIP_ACCOUNT, radioButton_SIP);

sflphone-client-kde/debian/postinst

@@ -4,4 +4,6 @@ update-alternatives --install /usr/bin/sflphone sflphone /usr/bin/sflphone-clien
                     --slave /usr/share/man/man1/sflphone.1.gz sflphone.1.gz \
                             /usr/share/man/man1/sflphone-client-kde.1.gz
                             
+update-alternatives --set sflphone /usr/bin/sflphone-client-kde
+
 exit 0

sflphone-client-kde/main.cpp

@@ -77,4 +77,8 @@ int main(int argc, char **argv)
 	{
 		printf("%s\n",msg);
 	}
+	catch(QString msg)
+	{
+		qDebug() << msg;
+	}
 } 

sflphone-client-kde/sflphone-client-kde.desktop

@@ -6,7 +6,7 @@
 # Exec=kapp4 %i -caption "%c"
 # Icon=kapp4
 Type=Application
-X-DocPath=sflphone-client-kde/index.html
+X-DocPath=sflphone-client-kde/index.docbook
 # GenericName=A KDE4 Application
 # GenericName[ca]=Una aplicació del KDE4
 # GenericName[da]=Et KDE4-program
@@ -32,7 +32,7 @@ Terminal=false
 Name=SFLphone VoIP KDE4 client
 GenericName=Telephone
 Comment=Call and receive calls with SIP or IAX protocols
-Exec=sflphone_kde
+Exec=sflphone-client-kde
 Icon=sflphone.png
 StartupNotify=true
 Categories=Network;Telephony;

sflphone-client-kde/sflphone_kdeview.cpp

@@ -94,6 +94,7 @@ sflphone_kdeView::~sflphone_kdeView()
 
 void sflphone_kdeView::loadWindow()
 {
+	qDebug() << "loadWindow";
 	ConfigurationManagerInterface & configurationManager = ConfigurationManagerInterfaceSingleton::getInstance();
 	action_displayVolumeControls->setChecked(configurationManager.getVolumeControls());
 	action_displayDialpad->setChecked(configurationManager.getDialpad());
@@ -714,21 +715,28 @@ void sflphone_kdeView::updateRecordButton()
 	if(recVol == 0.00)
 	{
 		toolButton_recVol->setIcon(QIcon(ICON_REC_VOL_0));
+		toolButton_recVolAlone->setIcon(QIcon(ICON_REC_VOL_0));
 	}
 	else if(recVol < 0.33)
 	{
 		toolButton_recVol->setIcon(QIcon(ICON_REC_VOL_1));
+		toolButton_recVolAlone->setIcon(QIcon(ICON_REC_VOL_1));
 	}
 	else if(recVol < 0.67)
 	{
 		toolButton_recVol->setIcon(QIcon(ICON_REC_VOL_2));
+		toolButton_recVolAlone->setIcon(QIcon(ICON_REC_VOL_2));
 	}
 	else
 	{
 		toolButton_recVol->setIcon(QIcon(ICON_REC_VOL_3));
+		toolButton_recVolAlone->setIcon(QIcon(ICON_REC_VOL_3));
 	}
 	if(recVol > 0)
+	{	
 		toolButton_recVol->setChecked(false);
+		toolButton_recVolAlone->setChecked(false);
+	}
 }
 void sflphone_kdeView::updateVolumeButton()
 {
@@ -738,21 +746,28 @@ void sflphone_kdeView::updateVolumeButton()
 	if(sndVol == 0.00)
 	{
 		toolButton_sndVol->setIcon(QIcon(ICON_SND_VOL_0));
+		toolButton_sndVolAlone->setIcon(QIcon(ICON_SND_VOL_0));
 	}
 	else if(sndVol < 0.33)
 	{
 		toolButton_sndVol->setIcon(QIcon(ICON_SND_VOL_1));
+		toolButton_sndVolAlone->setIcon(QIcon(ICON_SND_VOL_1));
 	}
 	else if(sndVol < 0.67)
 	{
 		toolButton_sndVol->setIcon(QIcon(ICON_SND_VOL_2));
+		toolButton_sndVolAlone->setIcon(QIcon(ICON_SND_VOL_2));
 	}
 	else
 	{
 		toolButton_sndVol->setIcon(QIcon(ICON_SND_VOL_3));
+		toolButton_sndVolAlone->setIcon(QIcon(ICON_SND_VOL_3));
 	}
 	if(sndVol > 0)
+	{
 		toolButton_sndVol->setChecked(false);
+		toolButton_sndVolAlone->setChecked(false);
+	}
 }
 
 
@@ -761,14 +776,18 @@ void sflphone_kdeView::updateRecordBar()
 	qDebug() << "updateRecordBar";
 	CallManagerInterface & callManager = CallManagerInterfaceSingleton::getInstance();
 	double recVol = callManager.getVolume(RECORD_DEVICE);
-	slider_recVol->setValue((int)(recVol * 100));
+	int value = (int)(recVol * 100);
+	slider_recVol->setValue(value);
+	slider_recVolAlone->setValue(value);
 }
 void sflphone_kdeView::updateVolumeBar()
 {
 	qDebug() << "updateVolumeBar";
 	CallManagerInterface & callManager = CallManagerInterfaceSingleton::getInstance();
 	double sndVol = callManager.getVolume(SOUND_DEVICE);
-	slider_sndVol->setValue((int)(sndVol * 100));
+	int value = (int)(sndVol * 100);
+	slider_sndVol->setValue(value);
+	slider_sndVolAlone->setValue(value);
 }
 
 void sflphone_kdeView::updateVolumeControls()
@@ -776,8 +795,11 @@ void sflphone_kdeView::updateVolumeControls()
 	qDebug() << "updateVolumeControls";
 	ConfigurationManagerInterface & configurationManager = ConfigurationManagerInterfaceSingleton::getInstance();
 	int display = configurationManager.getVolumeControls();
-	widget_recVol->setVisible(display);
-	widget_sndVol->setVisible(display);
+	int displayDialpad = configurationManager.getDialpad();
+	widget_recVol->setVisible(display && displayDialpad);
+	widget_sndVol->setVisible(display && displayDialpad);
+	widget_recVolAlone->setVisible(display && ! displayDialpad);
+	widget_sndVolAlone->setVisible(display && ! displayDialpad);
 }
 
 void sflphone_kdeView::updateDialpad()
@@ -794,18 +816,19 @@ void sflphone_kdeView::updateDialpad()
 ************            Autoconnect             *************
 ************************************************************/
 
-void sflphone_kdeView::on_action_displayVolumeControls_toggled()
+void sflphone_kdeView::on_action_displayVolumeControls_triggered()
 {
 	ConfigurationManagerInterface & configurationManager = ConfigurationManagerInterfaceSingleton::getInstance();
 	configurationManager.setVolumeControls();
 	updateVolumeControls();
 }
 
-void sflphone_kdeView::on_action_displayDialpad_toggled()
+void sflphone_kdeView::on_action_displayDialpad_triggered()
 {
 	ConfigurationManagerInterface & configurationManager = ConfigurationManagerInterfaceSingleton::getInstance();
 	configurationManager.setDialpad();
 	updateDialpad();
+	updateVolumeControls();
 }
 
 void sflphone_kdeView::on_pushButton_1_clicked()      { typeString("1"); }
@@ -853,6 +876,7 @@ void sflphone_kdeView::on_slider_sndVol_valueChanged(int value)
 	updateVolumeButton();
 }
 
+
 void sflphone_kdeView::on_toolButton_recVol_clicked(bool checked)
 {
 	CallManagerInterface & callManager = CallManagerInterfaceSingleton::getInstance();
@@ -861,19 +885,25 @@ void sflphone_kdeView::on_toolButton_recVol_clicked(bool checked)
 	{
 		qDebug() << "checked";
 		toolButton_recVol->setChecked(false);
+		toolButton_recVolAlone->setChecked(false);
 		slider_recVol->setEnabled(true);
+		slider_recVolAlone->setEnabled(true);
 		callManager.setVolume(RECORD_DEVICE, (double)slider_recVol->value() / 100.0);
 	}
 	else
 	{
 		qDebug() << "unchecked";
 		toolButton_recVol->setChecked(true);
+		qDebug() << "toolButton_recVolAlone->setChecked(true);";
+		toolButton_recVolAlone->setChecked(true);
 		slider_recVol->setEnabled(false);
+		slider_recVolAlone->setEnabled(false);
 		callManager.setVolume(RECORD_DEVICE, 0.0);
 	}
 	updateRecordButton();
 }
 
+
 void sflphone_kdeView::on_toolButton_sndVol_clicked(bool checked)
 {
 	CallManagerInterface & callManager = CallManagerInterfaceSingleton::getInstance();
@@ -882,14 +912,18 @@ void sflphone_kdeView::on_toolButton_sndVol_clicked(bool checked)
 	{
 		qDebug() << "checked";
 		toolButton_sndVol->setChecked(false);
+		toolButton_sndVolAlone->setChecked(false);
 		slider_sndVol->setEnabled(true);
+		slider_sndVolAlone->setEnabled(true);
 		callManager.setVolume(SOUND_DEVICE, (double)slider_sndVol->value() / 100.0);
 	}
 	else
 	{
 		qDebug() << "unchecked";
 		toolButton_sndVol->setChecked(true);
+		toolButton_sndVolAlone->setChecked(true);
 		slider_sndVol->setEnabled(false);
+		slider_sndVolAlone->setEnabled(false);
 		callManager.setVolume(SOUND_DEVICE, 0.0);
 	}
 	updateVolumeButton();
@@ -931,7 +965,7 @@ void sflphone_kdeView::on_listWidget_callHistory_itemDoubleClicked(QListWidgetIt
 	qDebug() << "on_listWidget_callHistory_itemDoubleClicked";
 	action_history->setChecked(false);
 	stackedWidget_screen->setCurrentWidget(page_callList);
-	Call * pastCall = callList->findCallByHistoryItem(listWidget_callHistory->currentItem());
+	Call * pastCall = callList->findCallByHistoryItem(item);
 	Call * call = callList->addDialingCall(pastCall->getPeerName());
 	call->appendItemText(pastCall->getPeerPhoneNumber());
 	addCallToCallList(call);
@@ -945,7 +979,7 @@ void sflphone_kdeView::on_listWidget_addressBook_itemDoubleClicked(QListWidgetIt
 	qDebug() << "on_listWidget_addressBook_itemDoubleClicked";
 	action_addressBook->setChecked(false);
 	stackedWidget_screen->setCurrentWidget(page_callList);
-	ContactItemWidget * w = (ContactItemWidget *) (listWidget_addressBook->itemWidget(listWidget_addressBook->currentItem()));
+	ContactItemWidget * w = (ContactItemWidget *) (listWidget_addressBook->itemWidget(item));
 	Call * call = callList->addDialingCall(w->getContactName());
 	call->appendItemText(w->getContactNumber());
 	addCallToCallList(call);

sflphone-client-kde/sflphone_kdeview.h

@@ -131,8 +131,8 @@ private slots:
 		}
 	}
 
-	void on_action_displayVolumeControls_toggled();
-	void on_action_displayDialpad_toggled();
+	void on_action_displayVolumeControls_triggered();
+	void on_action_displayDialpad_triggered();
 	void on_action_configureAccounts_triggered();
 	void on_action_configureAudio_triggered();
 	void on_action_configureSflPhone_triggered();

sflphone-client-kde/sflphone_kdeview_base.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>327</width>
-    <height>475</height>
+    <width>655</width>
+    <height>487</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -391,6 +391,75 @@
      </layout>
     </widget>
    </item>
+   <item>
+    <widget class="QWidget" name="widget_controlsAlone" native="true">
+     <property name="enabled">
+      <bool>true</bool>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_6">
+      <property name="spacing">
+       <number>0</number>
+      </property>
+      <property name="margin">
+       <number>0</number>
+      </property>
+      <item>
+       <widget class="QWidget" name="widget_recVolAlone" native="true">
+        <layout class="QHBoxLayout" name="horizontalLayout_4">
+         <item>
+          <widget class="QToolButton" name="toolButton_recVolAlone">
+           <property name="text">
+            <string>...</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_recVolAlone">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </item>
+      <item>
+       <widget class="QWidget" name="widget_sndVolAlone" native="true">
+        <layout class="QHBoxLayout" name="horizontalLayout">
+         <item>
+          <widget class="QToolButton" name="toolButton_sndVolAlone">
+           <property name="text">
+            <string>...</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_sndVolAlone">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
   </layout>
   <action name="action_accept">
    <property name="icon">
@@ -547,5 +616,70 @@
  <resources>
   <include location="resources.qrc"/>
  </resources>
- <connections/>
+ <connections>
+  <connection>
+   <sender>slider_recVolAlone</sender>
+   <signal>valueChanged(int)</signal>
+   <receiver>slider_recVol</receiver>
+   <slot>setValue(int)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>158</x>
+     <y>434</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>19</x>
+     <y>342</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>slider_sndVolAlone</sender>
+   <signal>valueChanged(int)</signal>
+   <receiver>slider_sndVol</receiver>
+   <slot>setValue(int)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>264</x>
+     <y>463</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>637</x>
+     <y>368</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>toolButton_recVolAlone</sender>
+   <signal>clicked()</signal>
+   <receiver>toolButton_recVol</receiver>
+   <slot>click()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>32</x>
+     <y>429</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>12</x>
+     <y>402</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>toolButton_sndVolAlone</sender>
+   <signal>clicked()</signal>
+   <receiver>toolButton_sndVol</receiver>
+   <slot>click()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>18</x>
+     <y>462</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>637</x>
+     <y>411</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
 </ui>