[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdenetwork/kopete
From:       Lamarque Souza <lamarque () gmail ! com>
Date:       2011-03-05 18:55:11
Message-ID: 20110305185511.73A053E1F1 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1223898 by lvsouza:

Appying patch http://reviewboard.kde.org/r/2462.
Thanks Fabian Rami for the patch.

BUG: 217277
REVIEW: 2462


 M  +13 -2     kopete/chatwindow/chatmessagepart.cpp  
 M  +8 -0      kopete/chatwindow/chatmessagepart.h  
 M  +7 -0      libkopete/kopetechatsession.h  
 M  +2 -1      plugins/latex/latexplugin.cpp  
 M  +3 -0      plugins/latex/latexplugin.h  


--- trunk/KDE/kdenetwork/kopete/kopete/chatwindow/chatmessagepart.cpp \
#1223897:1223898 @@ -125,6 +125,7 @@
 	bool bgOverride;
 	bool fgOverride;
 	bool rtfOverride;
+	bool graphicOverride;
 
 //	ToolTip *tt;
 	bool scrollPressed;
@@ -214,7 +215,7 @@
 	: KHTMLPart( parent ), d( new Private )
 {
 	d->manager = mgr;
-
+	d->graphicOverride = true;
 	d->currentChatStyle = ChatWindowStyleManager::self()->getValidStyleFromPool( \
KopeteChatWindowSettings::self()->styleName() );  if (d->currentChatStyle)
 		connect( d->currentChatStyle, SIGNAL(destroyed(QObject*)), this, \
SLOT(clearStyle()) ); @@ -254,6 +255,7 @@
 
 	connect( d->manager, SIGNAL(messageStateChanged(uint, \
                Kopete::Message::MessageState)),
 	         this, SLOT(messageStateChanged(uint, Kopete::Message::MessageState)) );
+	connect (d->manager, SIGNAL( toggleGraphicOverride(bool) ), this, SLOT( \
slotToggleGraphicOverride(bool) ) );  
 	connect ( browserExtension(), SIGNAL( openUrlRequestDelayed( const KUrl &, const \
                KParts::OpenUrlArguments &, const KParts::BrowserArguments & ) ),
 	          this, SLOT( slotOpenURLRequest( const KUrl &, const \
KParts::OpenUrlArguments &, const KParts::BrowserArguments & ) ) ); @@ -406,9 +408,18 \
@@  {
 	d->bgOverride = Kopete::AppearanceSettings::self()->chatBgOverride();
 	d->fgOverride = Kopete::AppearanceSettings::self()->chatFgOverride();
-	d->rtfOverride = Kopete::AppearanceSettings::self()->chatRtfOverride();
+	d->rtfOverride = ( d->graphicOverride ? false : \
Kopete::AppearanceSettings::self()->chatRtfOverride());  }
 
+void ChatMessagePart::slotToggleGraphicOverride(bool enable)
+{
+	if (d->graphicOverride != enable)
+	{
+		d->graphicOverride = enable;
+		emit slotAppearanceChanged();
+	}
+}
+
 void ChatMessagePart::setStyle( const QString &styleName )
 {
 	// Create a new ChatWindowStyle
--- trunk/KDE/kdenetwork/kopete/kopete/chatwindow/chatmessagepart.h #1223897:1223898
@@ -3,6 +3,7 @@
 
     Copyright (c) 2004      by Richard Smith         <kde@metafoo.co.uk>
     Copyright (c) 2005      by Michaël Larouche      <larouche@kde.org>
+    Copyright (c) 2009      by Fabian Rami      <fabian.rami@wowcompany.com>
 
     Kopete    (c) 2002-2008 by the Kopete developers <kopete-devel@kde.org>
 
@@ -147,6 +148,13 @@
 
 	void messageStateChanged( uint messageId, Kopete::Message::MessageState state );
 
+    /**
+    * Change the current style
+    * This method override is used when a plugin need graphic management.
+    * @param enable toggle the override.
+    */
+    void slotToggleGraphicOverride(bool enable);
+
 signals:
 	/**
 	 * Emits before the context menu is about to show
--- trunk/KDE/kdenetwork/kopete/libkopete/kopetechatsession.h #1223897:1223898
@@ -7,6 +7,7 @@
     Copyright (c) 2002-2004 by Olivier Goffart        <ogoffart@kde.org>
     Copyright (c) 2003      by Jason Keirstead        <jason@keirstead.org>
     Copyright (c) 2005      by Michaël Larouche      <larouche@kde.org>
+    Copyright (c) 2009      by Fabian Rami          <fabian.rami@wowcompany.com>
 
     Kopete    (c) 2002-2003 by the Kopete developers  <kopete-devel@kde.org>
 
@@ -327,6 +328,12 @@
 	 */
 	void photoChanged();
 
+    /**
+    * Toggle Graphic Override mode for plugin
+    * @param enable Toggle the overide
+    */
+    void toggleGraphicOverride(bool enable);
+
 public slots:
 	/**
 	 * @brief Got a typing notification from a user
--- trunk/KDE/kdenetwork/kopete/plugins/latex/latexplugin.cpp #1223897:1223898
@@ -80,9 +80,9 @@
 void LatexPlugin::slotNewChatSession( Kopete::ChatSession *KMM )
 {
 	new LatexGUIClient( KMM );
+	connect( this , SIGNAL( toggleLatex(bool) ), KMM, SIGNAL( \
toggleGraphicOverride(bool) ) );  }
 
-
 void LatexPlugin::slotMessageAboutToShow( Kopete::Message& msg )
 {
 	QString mMagick = KStandardDirs::findExe("convert");
@@ -177,6 +177,7 @@
 	}
 
 	msg.setHtmlBody( messageText );
+	emit toggleLatex(true);
 }
 
 
--- trunk/KDE/kdenetwork/kopete/plugins/latex/latexplugin.h #1223897:1223898
@@ -5,6 +5,7 @@
 
     Copyright (c) 2004 by Duncan Mac-Vicar Prett   <duncan@kde.org>
     Copyright (c) 2004-2005 by Olivier Goffart  <ogoffart@kde. org>
+    Copyright (c) 2009      by Fabian Rami      <fabian.rami@wowcompany.com>
 
     Kopete    (c) 2001-2004 by the Kopete developers  <kopete-devel@kde.org>
 
@@ -64,6 +65,8 @@
 	 */
 	bool securityCheck(const QString & formula);
 
+signals:
+    void toggleLatex(bool);
 
 private:
 	static LatexPlugin* s_pluginStatic;


[prev in list] [next in list] [prev in thread] [next in thread]