From 437b7c48361d577d08c0ae21f099d1842fb65db4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Quentin?=
 <jquentin@jquentin-laptop-kub2.(none)>
Date: Fri, 3 Jul 2009 10:18:30 -0400
Subject: [PATCH] [#1781] Window title is SFLPhone

---
 sflphone-client-kde/doc/index.docbook               | 2 +-
 sflphone-client-kde/src/AccountWizard.cpp           | 2 +-
 sflphone-client-kde/src/SFLPhone.cpp                | 2 +-
 sflphone-client-kde/src/conf/dlgaccounts.cpp        | 2 +-
 sflphone-client-kde/src/sflphone_const.h            | 2 +-
 sflphone-client-kde/src/sflphone_kdeview.cpp        | 6 +++---
 sflphone-client-kde/src/sflphone_kdeview.h          | 2 +-
 sflphone-client-kde/src/ui/sflphone_kdeview_base.ui | 5 ++++-
 8 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/sflphone-client-kde/doc/index.docbook b/sflphone-client-kde/doc/index.docbook
index 0e82203c8..5bf4cfa21 100644
--- a/sflphone-client-kde/doc/index.docbook
+++ b/sflphone-client-kde/doc/index.docbook
@@ -13,7 +13,7 @@
   <!ENTITY pt-cell "cell phone">
   <!ENTITY pt-work "work phone">
 
-  <!ENTITY sflphone "SFLPhone">
+  <!ENTITY sflphone "SFLphone">
   <!ENTITY % addindex "IGNORE">
   <!ENTITY % English "INCLUDE" >
   
diff --git a/sflphone-client-kde/src/AccountWizard.cpp b/sflphone-client-kde/src/AccountWizard.cpp
index 4235aa522..ba73b0052 100644
--- a/sflphone-client-kde/src/AccountWizard.cpp
+++ b/sflphone-client-kde/src/AccountWizard.cpp
@@ -276,7 +276,7 @@ WizardIntroPage::WizardIntroPage(QWidget *parent)
      : QWizardPage(parent)
 {
 	setTitle(i18n("Account Creation Wizard"));
-	setSubTitle(i18n("Welcome to the Account creation wizard of SFLPhone"));
+	setSubTitle(i18n("Welcome to the Account creation wizard of SFLphone"));
 
 	introLabel = new QLabel(i18n("This wizard will help you setting up an account."));
 	introLabel->setWordWrap(true);
diff --git a/sflphone-client-kde/src/SFLPhone.cpp b/sflphone-client-kde/src/SFLPhone.cpp
index 179023b5c..ff1147a9f 100644
--- a/sflphone-client-kde/src/SFLPhone.cpp
+++ b/sflphone-client-kde/src/SFLPhone.cpp
@@ -59,7 +59,7 @@ SFLPhone::SFLPhone(QWidget *parent)
 
 
 		setWindowIcon(QIcon(ICON_SFLPHONE));
-		setWindowTitle(i18n("SFLPhone"));
+		setWindowTitle(i18n("SFLphone"));
 		
 		setupActions();
 		
diff --git a/sflphone-client-kde/src/conf/dlgaccounts.cpp b/sflphone-client-kde/src/conf/dlgaccounts.cpp
index 01333831f..f0732f85e 100644
--- a/sflphone-client-kde/src/conf/dlgaccounts.cpp
+++ b/sflphone-client-kde/src/conf/dlgaccounts.cpp
@@ -99,7 +99,7 @@ void DlgAccounts::saveAccountList()
 		else{
 			if(! accountIds.contains(current.getAccountId()))
 			{
-				qDebug() << "The account with id " << current.getAccountId() << " doesn't exist. It might have been removed by another SFLPhone client.";
+				qDebug() << "The account with id " << current.getAccountId() << " doesn't exist. It might have been removed by another SFLphone client.";
 				currentId = QString();
 			}
 			else
diff --git a/sflphone-client-kde/src/sflphone_const.h b/sflphone-client-kde/src/sflphone_const.h
index 339613bea..06d67cef2 100644
--- a/sflphone-client-kde/src/sflphone_const.h
+++ b/sflphone-client-kde/src/sflphone_const.h
@@ -27,7 +27,7 @@
  * @brief Contains the global variables for the client code
  */
  
-#define APP_NAME                          "SFLPhone KDE Client"
+#define APP_NAME                          "SFLphone KDE Client"
 
 /** Locale */
 // #define _(STRING)                         gettext( STRING )   
diff --git a/sflphone-client-kde/src/sflphone_kdeview.cpp b/sflphone-client-kde/src/sflphone_kdeview.cpp
index c0366da60..3049235f1 100644
--- a/sflphone-client-kde/src/sflphone_kdeview.cpp
+++ b/sflphone-client-kde/src/sflphone_kdeview.cpp
@@ -1044,17 +1044,17 @@ void sflphone_kdeView::on_stackedWidget_screen_currentChanged(int index)
 	{
 		case 0:
 			qDebug() << "Switched to call list screen.";
-			window->setWindowTitle(i18n("SFLPhone") + " - " + i18n("Main screen"));
+			window->setWindowTitle(i18n("SFLphone") + " - " + i18n("Main screen"));
 			break;
 		case 1:
 			qDebug() << "Switched to call history screen.";
 			updateCallHistory();
-			window->setWindowTitle(i18n("SFLPhone") + " - " + i18n("Call history"));
+			window->setWindowTitle(i18n("SFLphone") + " - " + i18n("Call history"));
 			break;
 		case 2:
 			qDebug() << "Switched to address book screen.";
 			updateAddressBook();
-			window->setWindowTitle(i18n("SFLPhone") + " - " + i18n("Address book"));
+			window->setWindowTitle(i18n("SFLphone") + " - " + i18n("Address book"));
 			break;
 		default:
 			qDebug() << "Error : reached an unknown index \"" << index << "\" with stackedWidget_screen.";
diff --git a/sflphone-client-kde/src/sflphone_kdeview.h b/sflphone-client-kde/src/sflphone_kdeview.h
index 8accc3dc8..41bdde02f 100644
--- a/sflphone-client-kde/src/sflphone_kdeview.h
+++ b/sflphone-client-kde/src/sflphone_kdeview.h
@@ -105,7 +105,7 @@ public:
 	/**
 	* Used to sort contacts according to their types with Kabc.
 	* @return the integer resulting to the flags of the types 
-	* chosen to be displayed in SFLPhone configuration.
+	* chosen to be displayed in SFLphone configuration.
 	*/
 	int phoneNumberTypesDisplayed();
 	
diff --git a/sflphone-client-kde/src/ui/sflphone_kdeview_base.ui b/sflphone-client-kde/src/ui/sflphone_kdeview_base.ui
index 02ef5f252..4cdc5aab6 100644
--- a/sflphone-client-kde/src/ui/sflphone_kdeview_base.ui
+++ b/sflphone-client-kde/src/ui/sflphone_kdeview_base.ui
@@ -395,7 +395,10 @@
   </action>
   <action name="action_configureSflPhone">
    <property name="text">
-    <string>&amp;Configure SFLPhone</string>
+    <string>&amp;Configure SFLphone</string>
+   </property>
+   <property name="toolTip">
+    <string>Configure SFLphone</string>
    </property>
   </action>
   <action name="action_displayVolumeControls">