[KMess-commits] SF.net SVN: kmess: [2639] branches/kmess/kde4porting/kmess/settings

[<it_...@us...>]

Revision: 2639
          http://kmess.svn.sourceforge.net/kmess/?rev=2639&view=rev
Author:   it_amroth
Date:     2008-02-10 17:48:03 -0800 (Sun, 10 Feb 2008)

Log Message:
-----------
kde4porting: Added a signal to update the chat style preview when changing account details.

Modified Paths:
--------------
    branches/kmess/kde4porting/kmess/settings/accountswidget.cpp
    branches/kmess/kde4porting/kmess/settings/accountswidget.h
    branches/kmess/kde4porting/kmess/settings/chatstylepage.cpp
    branches/kmess/kde4porting/kmess/settings/settingsdialog.cpp

Modified: branches/kmess/kde4porting/kmess/settings/accountswidget.cpp
===================================================================
--- branches/kmess/kde4porting/kmess/settings/accountswidget.cpp	2008-02-11 01:22:54 UTC (rev 2638)
+++ branches/kmess/kde4porting/kmess/settings/accountswidget.cpp	2008-02-11 01:48:03 UTC (rev 2639)
@@ -62,9 +62,11 @@
   setupUi( this );
 
   // Connect the UI signals
-  connect( noPictureCheckbox_, SIGNAL(       toggled(bool)), this,  SLOT(    showImageToggled(bool) ) );
-  connect( registerButton_,    SIGNAL(leftClickedUrl()    ), this,  SLOT(showRegisterPassport()     ) );
-  connect( rememberCheckbox_,  SIGNAL(       toggled(bool)), this,  SLOT(   rememberMeToggled(bool) ) );
+  connect( friendlyNameEdit_,  SIGNAL(   textChanged(const QString&)), this,  SLOT(forwardSettingsUpdate()     ) );
+  connect( handleEdit_,        SIGNAL(   textChanged(const QString&)), this,  SLOT(forwardSettingsUpdate()     ) );
+  connect( noPictureCheckbox_, SIGNAL(       toggled(bool)          ), this,  SLOT(     showImageToggled(bool) ) );
+  connect( registerButton_,    SIGNAL(leftClickedUrl()              ), this,  SLOT( showRegisterPassport()     ) );
+  connect( rememberCheckbox_,  SIGNAL(       toggled(bool)          ), this,  SLOT(    rememberMeToggled(bool) ) );
 
   // Find the default image
   KStandardDirs *dirs   = KGlobal::dirs();
@@ -119,6 +121,14 @@
 
 
 
+// Send a signal to the Chat Style page with the new account settings
+void AccountsWidget::forwardSettingsUpdate()
+{
+  emit settingsUpdated( handleEdit_->text(), friendlyNameEdit_->text(), tempImageFile_ );
+}
+
+
+
 // Return the filename of the currently selected image.
 QString AccountsWidget::getPictureFileName() const
 {
@@ -249,6 +259,9 @@
   // Run the event manually this time to update the GUI.
   noPictureCheckbox_->setChecked( ! showImage );
   showImageToggled( ! showImage );
+
+  // Force update of the preview in the Chat Style settings page
+  forwardSettingsUpdate();
 }
 
 
@@ -487,6 +500,9 @@
   {
     KIO::NetAccess::removeTempFile(localFilePath);
   }
+
+  // Signal the update to the settings
+  forwardSettingsUpdate();
 }
 
 

Modified: branches/kmess/kde4porting/kmess/settings/accountswidget.h
===================================================================
--- branches/kmess/kde4porting/kmess/settings/accountswidget.h	2008-02-11 01:22:54 UTC (rev 2638)
+++ branches/kmess/kde4porting/kmess/settings/accountswidget.h	2008-02-11 01:48:03 UTC (rev 2639)
@@ -71,6 +71,14 @@
     QPixmap            defaultPixmap_;
     // The pixmap for the custom user icon
     QPixmap            customPixmap_;
+
+  private slots:
+    // Send a signal to the Chat Style page with the new account settings
+    void               forwardSettingsUpdate();
+
+  signals:
+    // Send to the Chat Style page the new account details, to update the preview
+    void               settingsUpdated( const QString &handle, const QString &name, const QString &picture );
 };
 
 #endif // ACCOUNTSWIDGET_H

Modified: branches/kmess/kde4porting/kmess/settings/chatstylepage.cpp
===================================================================
--- branches/kmess/kde4porting/kmess/settings/chatstylepage.cpp	2008-02-11 01:22:54 UTC (rev 2638)
+++ branches/kmess/kde4porting/kmess/settings/chatstylepage.cpp	2008-02-11 01:48:03 UTC (rev 2639)
@@ -382,8 +382,16 @@
 void ChatStylePage::updatePreviewDetails( const QString &handle, const QString &name, const QString picture )
 {
   previewHandle_   = handle;
-  previewPicture_  = name;
-  previewUsername_ = picture;
+  previewPicture_  = picture;
+
+  if( name.isEmpty() )
+  {
+    previewUsername_ = handle;
+  }
+  else
+  {
+    previewUsername_ = name;
+  }
 }
 
 

Modified: branches/kmess/kde4porting/kmess/settings/settingsdialog.cpp
===================================================================
--- branches/kmess/kde4porting/kmess/settings/settingsdialog.cpp	2008-02-11 01:22:54 UTC (rev 2638)
+++ branches/kmess/kde4porting/kmess/settings/settingsdialog.cpp	2008-02-11 01:48:03 UTC (rev 2639)
@@ -93,6 +93,10 @@
   emailPage_       = new EmailPage();
   emoticonPage_    = new EmoticonWidget();
 
+  // Connect the account page signal to update the chatting page preview
+  connect( accountsPage_, SIGNAL( accountSettingsUpdated(const QString&,const QString&,const QString&) ),
+           chattingPage_,   SLOT(   updatePreviewDetails(const QString&,const QString&,const QString&) ) );
+
   // Add the pages to the dialog and set them up
   KPageWidgetItem *page;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.