diff -r a5692c68d772 -r 593f946f4fec controlpanelui/src/cpplugins/personalizationplugin/src/cpprofilenameeditdialog.cpp
--- a/controlpanelui/src/cpplugins/personalizationplugin/src/cpprofilenameeditdialog.cpp	Fri Jun 25 17:12:20 2010 +0800
+++ b/controlpanelui/src/cpplugins/personalizationplugin/src/cpprofilenameeditdialog.cpp	Wed Sep 29 10:09:58 2010 +0800
@@ -24,8 +24,8 @@
 #include <QGraphicsLinearLayout>
 #include <QScopedPointer>
 
-CpProfileNameEditDialog::CpProfileNameEditDialog( QGraphicsItem *parent )
-    :HbDialog( parent )
+CpProfileNameEditDialog::CpProfileNameEditDialog(QGraphicsItem *parent)
+                                                 : HbDialog(parent)
 {
     init();
 }
@@ -36,60 +36,48 @@
 
 void CpProfileNameEditDialog::init()
 {
-    setDismissPolicy( HbPopup::NoDismiss );
-    setHeadingWidget( new HbLabel( hbTrId( "txt_cp_title_edit_name" ), this ));
+    setDismissPolicy(HbPopup::NoDismiss);
+    setHeadingWidget(new HbLabel(hbTrId("txt_cp_title_edit_name"), this));
     
     QGraphicsLinearLayout *vLayout = new QGraphicsLinearLayout();
-    vLayout->setOrientation( Qt::Vertical );
-    HbWidget *contentWidget = new HbWidget( this );
-    mTextEdit = new HbLineEdit( this );
-    mTextEdit->setFontSpec( HbFontSpec( HbFontSpec::Primary ) );
-    vLayout->addItem( mTextEdit );
-    contentWidget->setLayout( vLayout );
-    setContentWidget( contentWidget );
+    vLayout->setOrientation(Qt::Vertical);
+    HbWidget *contentWidget = new HbWidget(this);
+    HbLabel *label = new HbLabel(hbTrId("txt_cp_heading_profile_name"));
+    vLayout->addItem(label);
+    mLineEdit = new HbLineEdit(this);
+    mLineEdit->setFontSpec(HbFontSpec(HbFontSpec::Primary));    
+    vLayout->addItem(mLineEdit);
+    contentWidget->setLayout(vLayout);
+    setContentWidget(contentWidget);    
+    connect(mLineEdit, SIGNAL(contentsChanged()), this, SLOT(checkPrimaryAction()));
     
-    connect( mTextEdit, SIGNAL( contentsChanged() ), this, SLOT( checkPrimaryAction() ) );
-    
-    addAction( new HbAction( hbTrId( "txt_common_button_ok" ), this ));
-    addAction( new HbAction( hbTrId( "txt_common_button_cancel" ), this ) );
-    
-    setTimeout( NoTimeout );
+    setTimeout(NoTimeout);    
 }
 
-void CpProfileNameEditDialog::setLineEditText( const QString &text )
+void CpProfileNameEditDialog::setLineEditText(const QString &text)
 {
-    mTextEdit->setText( text );
-    mTextEdit->setSelection( 0, text.length() );
-}
-
-QString CpProfileNameEditDialog::getLineEditText()
-{
-    QString text = mTextEdit->text();
-    return text;
+    mLineEdit->setText(text);
 }
 
-bool CpProfileNameEditDialog::launchProfileNameEditDialog( QString &profileName )
+QString CpProfileNameEditDialog::lineEditText()
 {
-    CpProfileNameEditDialog *profileEditNameDialog = new CpProfileNameEditDialog();
-    
-    profileEditNameDialog->setLineEditText( profileName );
-    profileEditNameDialog->checkPrimaryAction();
-    
-    HbAction *secondAction = qobject_cast<HbAction *>
-                                 (profileEditNameDialog->actions().at(1));
-    profileEditNameDialog->show();
-    return false;
+    return mLineEdit->text().trimmed();
+}
+
+void CpProfileNameEditDialog::setLineEditMaxLength(int length)
+{
+    mLineEdit->setMaxLength(length);
 }
 
 void CpProfileNameEditDialog::checkPrimaryAction()
 {
-    HbAction *const primaryAction = qobject_cast<HbAction *>
-                                                (actions().at(0));
-    if (primaryAction) {
-        if ( !mTextEdit->text().isEmpty() ) {
-            primaryAction->setEnabled(true);        
+    //the first button(number 0) is Ok Button. 
+    HbAction *const primaryAction = qobject_cast<HbAction *>(actions().at(0));
+    if (primaryAction) {        
+        if (!mLineEdit->text().trimmed().isEmpty()) {
+            primaryAction->setEnabled(true);            
         } else {        
             primaryAction->setEnabled(false);        
-        }
+        }        
     }
 }