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

List:       kde-commits
Subject:    KDE/kdenetwork/kopete/kopete
From:       Andre Duffeck <andre () duffeck ! de>
Date:       2005-05-22 15:36:29
Message-ID: 1116776189.055297.26045.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 416936 by duffeck:

Fix change of font size with baseFormatting


 M  +9 -2      trunk/KDE/kdenetwork/kopete/kopete/chatwindow/krichtexteditpart.cpp  
 M  +2 -0      trunk/KDE/kdenetwork/kopete/kopete/chatwindow/krichtexteditpart.h  
 M  +0 -1      trunk/KDE/kdenetwork/kopete/kopete/kopetewindow.cpp  


--- trunk/KDE/kdenetwork/kopete/kopete/chatwindow/krichtexteditpart.cpp #416935:416936
@@ -146,7 +146,7 @@
 	action_font_size = new KFontSizeAction( i18n("Font &Size"), 0,
 			ac, "format_font_size" );
 	connect( action_font_size, SIGNAL( fontSizeChanged(int) ),
-		editor, SLOT( setPointSize(int) ) );
+		this, SLOT( setFontSize(int) ) );
 
 	//Formatting
 	action_bold = new KToggleAction( i18n("&Bold"), "text_bold", CTRL+Key_B,
@@ -374,8 +374,15 @@
 		editor->setPalette(pal);
 }
 
+void KopeteRichTextEditPart::setFontSize( int size )
+{
+	mFont.setPointSize( size );
+	if( m_capabilities & Kopete::Protocol::RichFont )
+		editor->setPointSize( size );
+	else if( m_capabilities & Kopete::Protocol::BaseFont)
+		editor->setFont( mFont );
+}
 
-
 void KopeteRichTextEditPart::setFont()
 {
 	KFontDialog::getFont(mFont, false, editor);
--- trunk/KDE/kdenetwork/kopete/kopete/chatwindow/krichtexteditpart.h #416935:416936
@@ -66,6 +66,8 @@
 		void setFont( const QFont & );
 		void setFont( const QString & );
 
+		void setFontSize( int );
+
 		void setUnderline( bool );
 		void setBold( bool );
 		void setItalic( bool );
--- trunk/KDE/kdenetwork/kopete/kopete/kopetewindow.cpp #416935:416936
@@ -65,7 +65,6 @@
 #include "kopetestdaction.h"
 #include "kopeteawayaction.h"
 #include "kopeteuiglobal.h"
-#include "systemtray.h"
 #include "kopeteonlinestatusmanager.h"
 
 /* KMainWindow is very broken from our point of view - it deref()'s the app
[prev in list] [next in list] [prev in thread] [next in thread]