[KMess-commits] SF.net SVN: kmess:[5568] trunk/kmess

[<fon...@us...>]

Revision: 5568
          http://kmess.svn.sourceforge.net/kmess/?rev=5568&view=rev
Author:   fontknocker
Date:     2009-10-22 02:10:28 +0000 (Thu, 22 Oct 2009)

Log Message:
-----------
Forward port r5566 and r5567 from 2.0.x.

Modified Paths:
--------------
    trunk/kmess/ChangeLog
    trunk/kmess/src/chat/chatmessageview.cpp
    trunk/kmess/src/chat/chatmessageview.h
    trunk/kmess/src/chat/chatview.cpp
    trunk/kmess/src/contact/contactextension.cpp
    trunk/kmess/src/settings/chatstylepage.cpp
    trunk/kmess/src/settings/chatstylepage.ui

Modified: trunk/kmess/ChangeLog
===================================================================
--- trunk/kmess/ChangeLog	2009-10-22 01:53:17 UTC (rev 5567)
+++ trunk/kmess/ChangeLog	2009-10-22 02:10:28 UTC (rev 5568)
@@ -1,5 +1,6 @@
+2009-10-22 (Adam)
+ * Forward port r5566 and r5567 from 2.0.x
 
-
 2009-05-20 (Pano)
  * Merged an updated Traditional Chinese translation by Yen-chou Chen.
 

Modified: trunk/kmess/src/chat/chatmessageview.cpp
===================================================================
--- trunk/kmess/src/chat/chatmessageview.cpp	2009-10-22 01:53:17 UTC (rev 5567)
+++ trunk/kmess/src/chat/chatmessageview.cpp	2009-10-22 02:10:28 UTC (rev 5568)
@@ -43,8 +43,8 @@
 #include <KMenu>
 
 // The constructor
-ChatMessageView::ChatMessageView( QWidget *parent )
- : KHTMLPart( parent, 0, DefaultGUI )
+ChatMessageView::ChatMessageView( QWidget *parentWidget, QObject *parent )
+ : KHTMLPart( parentWidget, parent, DefaultGUI )
  , chatClearingMark_(0)
  , isEmpty_(true)
  , lastMessageId_(0)

Modified: trunk/kmess/src/chat/chatmessageview.h
===================================================================
--- trunk/kmess/src/chat/chatmessageview.h	2009-10-22 01:53:17 UTC (rev 5567)
+++ trunk/kmess/src/chat/chatmessageview.h	2009-10-22 02:10:28 UTC (rev 5568)
@@ -47,7 +47,7 @@
   public:  // public methods
 
     // The constructor
-                         ChatMessageView( QWidget *parent );
+                         ChatMessageView( QWidget *parentWidget = 0, QObject *parent = 0 );
     // The destructor
     virtual             ~ChatMessageView();
     // Return the chat history in a specified format

Modified: trunk/kmess/src/chat/chatview.cpp
===================================================================
--- trunk/kmess/src/chat/chatview.cpp	2009-10-22 01:53:17 UTC (rev 5567)
+++ trunk/kmess/src/chat/chatview.cpp	2009-10-22 02:10:28 UTC (rev 5568)
@@ -73,7 +73,7 @@
   // Create a layout to maximize the KHTMLPart
   QVBoxLayout *layout = new QVBoxLayout( this );
   layout->setContentsMargins( 0, 6, 0, 0 );
-  layout->addWidget( chatMessageView_->widget() );
+  layout->addWidget( chatMessageView_->view() );
 
   // And to the messages view
   chatMessageView_->view()->setAcceptDrops( true );

Modified: trunk/kmess/src/contact/contactextension.cpp
===================================================================
--- trunk/kmess/src/contact/contactextension.cpp	2009-10-22 01:53:17 UTC (rev 5567)
+++ trunk/kmess/src/contact/contactextension.cpp	2009-10-22 02:10:28 UTC (rev 5568)
@@ -234,9 +234,17 @@
   {
     setLastSeen();
   }
-
-  extensionGroup.writeEntry( "lastSeen",           lastSeen_.toTime_t()        );
-  extensionGroup.writeEntry( "lastMessageDate",    lastMessageDate_.toTime_t() );
+  
+  if( ! lastSeenDate_.isNull() && lastSeenDate_.isValid() )
+  {
+    extensionGroup.writeEntry( "lastSeen",           lastSeen_.toTime_t()        );
+  }
+ 
+  if( ! lastMessageDate_.isNull() && lastMessageDate_.isValid() )
+  {
+    extensionGroup.writeEntry( "lastMessageDate",    lastMessageDate_.toTime_t() );
+  }
+  
   extensionGroup.writeEntry( "pictureFile",        pictureFile_                );
   extensionGroup.writeEntry( "pictureFileList",    pictureFileList_            );
   extensionGroup.writeEntry( "soundFile",          soundFile_                  );

Modified: trunk/kmess/src/settings/chatstylepage.cpp
===================================================================
--- trunk/kmess/src/settings/chatstylepage.cpp	2009-10-22 01:53:17 UTC (rev 5567)
+++ trunk/kmess/src/settings/chatstylepage.cpp	2009-10-22 02:10:28 UTC (rev 5568)
@@ -82,7 +82,7 @@
   // Configure the preview form of the "chatting" widget
 
   // Insert a KHTMLPart in the placeholder
-  chatMessageView_ = new ChatMessageView( this );
+  chatMessageView_ = new ChatMessageView( styleTab_, this );
 
   // Create a layout to maximize the KHTMLPart
   QBoxLayout *layout = new QHBoxLayout( khtmlPlaceholder_ );

Modified: trunk/kmess/src/settings/chatstylepage.ui
===================================================================
--- trunk/kmess/src/settings/chatstylepage.ui	2009-10-22 01:53:17 UTC (rev 5567)
+++ trunk/kmess/src/settings/chatstylepage.ui	2009-10-22 02:10:28 UTC (rev 5568)
@@ -22,7 +22,7 @@
      <property name="currentIndex">
       <number>0</number>
      </property>
-     <widget class="QWidget" name="tab_4">
+     <widget class="QWidget" name="styleTab_">
       <attribute name="title">
        <string>St&amp;yle</string>
       </attribute>
@@ -698,14 +698,14 @@
  </widget>
  <customwidgets>
   <customwidget>
-   <class>KColorButton</class>
+   <class>KPushButton</class>
    <extends>QPushButton</extends>
-   <header>kcolorbutton.h</header>
+   <header>kpushbutton.h</header>
   </customwidget>
   <customwidget>
-   <class>KPushButton</class>
+   <class>KColorButton</class>
    <extends>QPushButton</extends>
-   <header>kpushbutton.h</header>
+   <header>kcolorbutton.h</header>
   </customwidget>
  </customwidgets>
  <tabstops>


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