[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-20 20:52:39
Message-ID: 20110320205239.926BDAC8C9 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1225419 by lvsouza:

Increase notifications' pixmap size to match 
other KDE programs notifications' pixmap size.

FIXED-IN: 4.7.0


 M  +2 -2      libkopete/kopeteonlinestatus.cpp  
 M  +2 -1      libkopete/kopeteonlinestatus.h  
 M  +3 -3      protocols/oscar/oscaraccount.cpp  
 M  +2 -0      protocols/wlm/wlmaccount.cpp  
 M  +2 -2      protocols/yahoo/yahooaccount.cpp  


--- trunk/KDE/kdenetwork/kopete/libkopete/kopeteonlinestatus.cpp #1225418:1225419
@@ -339,9 +339,9 @@
 	return OnlineStatusManager::self()->cacheLookupByMimeSource( mimeSource );
 }
 
-QPixmap OnlineStatus::protocolIcon() const
+QPixmap OnlineStatus::protocolIcon(const KIconLoader::StdSizes size) const
 {
-	return OnlineStatusManager::self()->cacheLookupByObject( *this, d->protocolIcon() , \
16, QColor() ); +	return OnlineStatusManager::self()->cacheLookupByObject( *this, \
d->protocolIcon() , size, QColor() );  }
 
 QString OnlineStatus::mimeSource( const QString& icon, int size, QColor color, bool \
                idle) const
--- trunk/KDE/kdenetwork/kopete/libkopete/kopeteonlinestatus.h #1225418:1225419
@@ -25,6 +25,7 @@
 
 #include <kdemacros.h>
 #include <ksharedptr.h>
+#include <kiconloader.h>
 
 #include <QtCore/QObject>
 #include <QtCore/QFlags>
@@ -399,7 +400,7 @@
 	 *
 	 * A cache is employed to reduce CPU and memory usage.
 	 */
-	QPixmap protocolIcon() const;
+	QPixmap protocolIcon(const KIconLoader::StdSizes size = KIconLoader::SizeSmall) \
const;  
 	/**
 	 * Assignment operator
--- trunk/KDE/kdenetwork/kopete/protocols/oscar/oscaraccount.cpp #1225418:1225419
@@ -1020,7 +1020,7 @@
 	Q_UNUSED( errCode );
 	KNotification::event( QLatin1String("connection_error"), i18nc( "account has been \
disconnected", "Kopete: %1 disconnected", accountId() ),  errString,
-	                      myself()->onlineStatus().protocolIcon(),
+	                      \
myself()->onlineStatus().protocolIcon(KIconLoader::SizeMedium),  \
Kopete::UI::Global::mainWidget() );  logOff( Kopete::Account::ConnectionReset );
 }
@@ -1036,7 +1036,7 @@
 	{
 		message = getFLAPErrorMessage( code );
 		KNotification::event( QLatin1String("connection_error"), i18nc( "account has been \
                disconnected", "Kopete: %1 disconnected", accountId() ),
-		                      message, myself()->onlineStatus().protocolIcon(),
+		                      message, \
myself()->onlineStatus().protocolIcon(KIconLoader::SizeMedium),  \
Kopete::UI::Global::mainWidget() );  switch ( code )
 		{
@@ -1076,7 +1076,7 @@
 	else
 		message = i18n("There was an error in the protocol handling; automatic \
reconnection occurring.");  
-	KNotification::event( QLatin1String("server_error"), i18n("Kopete: OSCAR Protocol \
error"), message, myself()->onlineStatus().protocolIcon(), +	KNotification::event( \
QLatin1String("server_error"), i18n("Kopete: OSCAR Protocol error"), message, \
myself()->onlineStatus().protocolIcon(KIconLoader::SizeMedium),  \
Kopete::UI::Global::mainWidget() );  if ( fatal )
 		logOff( Kopete::Account::ConnectionReset );
--- trunk/KDE/kdenetwork/kopete/protocols/wlm/wlmaccount.cpp #1225418:1225419
@@ -1158,6 +1158,7 @@
                                  "You have %1 unread messages in your Hotmail \
                inbox.", unread_inbox));
     notification->setActions(( QStringList() << i18nc("@action", "Open Inbox" ) << \
i18nc("@action", "Close" )) );  notification->setFlags(KNotification::Persistent);
+    notification->setPixmap(accountIcon(KIconLoader::SizeMedium));
     QObject::connect(notification,SIGNAL(activated()), this , SLOT(slotOpenInbox()) \
                );
     QObject::connect(notification,SIGNAL(action1Activated()), this, \
                SLOT(slotOpenInbox()) );
     QObject::connect(notification,SIGNAL(action2Activated()), notification, \
SLOT(close()) ); @@ -1173,6 +1174,7 @@
     notification->setText(i18n( "New message from %1 in your Hotmail \
                inbox.<p>Subject: %2", from, subject));
     notification->setActions(( QStringList() << i18nc("@action", "Open Inbox" ) << \
i18nc("@action", "Close" )) );  notification->setFlags(KNotification::Persistent);
+    notification->setPixmap(accountIcon(KIconLoader::SizeMedium));
     QObject::connect(notification,SIGNAL(activated()), this , SLOT(slotOpenInbox()) \
                );
     QObject::connect(notification,SIGNAL(action1Activated()), this, \
                SLOT(slotOpenInbox()) );
     QObject::connect(notification,SIGNAL(action2Activated()), notification, \
                SLOT(close()) );
--- trunk/KDE/kdenetwork/kopete/protocols/yahoo/yahooaccount.cpp #1225418:1225419
@@ -788,7 +788,7 @@
 	QString message;
 	message = i18n( "%1 has been disconnected.\nError message:\n%2 - %3" ,
 		  accountId(), m_session->error(), m_session->errorString() );
-	KNotification::event( "connection_lost", message, \
myself()->onlineStatus().protocolIcon() ); +	KNotification::event( "connection_lost", \
message, myself()->onlineStatus().protocolIcon(KIconLoader::SizeMedium) );  }
 
 void YahooAccount::slotLoginFailed()
@@ -801,7 +801,7 @@
 	QString message;
 	message = i18n( "There was an error while connecting %1 to the Yahoo server.\nError \
message:\n%2 - %3" ,  accountId(), m_session->error(), m_session->errorString() );
-	KNotification::event( "cannot_connect", message, \
myself()->onlineStatus().protocolIcon() ); +	KNotification::event( "cannot_connect", \
message, myself()->onlineStatus().protocolIcon(KIconLoader::SizeMedium) );  }
 
 void YahooAccount::slotError( int level )


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