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

List:       kopete-devel
Subject:    [kopete-devel] kdenetwork/kopete
From:       Will Stephenson <lists () stevello ! free-online ! co ! uk>
Date:       2005-02-18 8:45:25
Message-ID: 20050218084525.CD81B1D30F () office ! kde ! org
[Download RAW message or body]

CVS commit by wstephens: 

Remove deprecated method and update its users to use the new one.A
Update API docs to reflect change.
Jason, the fingerprint code in KOSM _has_ to take into account the whole string list, \
or else the generated icon cache will not contain all the icons you need for IRC.  \
I've made this change. CCMAIL:kopete-devel@kde.org


  M +3 -3      kopete/kopetewindow.cpp   1.227
  M +0 -5      libkopete/kopeteonlinestatus.cpp   1.45
  M +6 -10     libkopete/kopeteonlinestatus.h   1.38
  M +2 -2      libkopete/kopeteonlinestatusmanager.cpp   1.13


--- kdenetwork/kopete/kopete/kopetewindow.cpp  #1.226:1.227
@@ -572,6 +572,6 @@ void KopeteWindow::slotAccountStatusIcon
 {
         Kopete::OnlineStatus status = contact->onlineStatus();
-//      kdDebug(14000) << k_funcinfo << "Icon: '" <<
-//              status.overlayIcon() << "'" << endl;
+//      kdDebug(14000) << k_funcinfo << "Icons: '" <<
+//              status.overlayIcons() << "'" << endl;
 
         KopeteAccountStatusBarIcon *i = static_cast<KopeteAccountStatusBarIcon *>( \
m_accountStatusBarIcons[ contact->account() ] ); @@ -589,5 +589,5 @@ void \
KopeteWindow::slotAccountStatusIcon  KIconLoader *loader = \
KGlobal::instance()->iconLoader();  
-        QMovie mv = loader->loadMovie( status.overlayIcon(), KIcon::Small );
+        QMovie mv = loader->loadMovie( status.overlayIcons().first(), KIcon::Small \
);  
         if ( mv.isNull() )

--- kdenetwork/kopete/libkopete/kopeteonlinestatus.cpp  #1.44:1.45
@@ -197,9 +197,4 @@ unsigned OnlineStatus::weight() const
 }
 
-QString OnlineStatus::overlayIcon() const
-{
-        return d->overlayIcons.first();
-}
-
 QStringList OnlineStatus::overlayIcons() const
 {

--- kdenetwork/kopete/libkopete/kopeteonlinestatus.h  #1.37:1.38
@@ -168,11 +168,13 @@ public:
          * This status is usually a lot more fine-grained than the status as used
          * by libkopete and should be unique per protocol.
-         * @param overlayIcon is a string returning the name of the status icon to \
                be
-         * used by the KDE icon loader. (Status whiwh doesn't have icon to overlay \
                like
-         * Online and Offline should use QString::null as icon string)
+         * @param overlayIcons is a list of QStrings which are the name of status
+         * icons to be used by the KDE icon loader. (Statuses which don't have icons
+         * to overlay like Online and Offline should use QString::null as icon 
+         * name ).  NOTE if the string is a movie ( *.mng ) it must be the first \
string in the list. +         * TODO: KDE4 sort out movies and overlay icons.
          * @param description is a description in e.g. tooltips.
          */
         OnlineStatus( StatusType status, unsigned weight, Protocol *protocol,
-                unsigned internalStatus, const QStringList &overlayIcon, const \
QString &description ); +                unsigned internalStatus, const QStringList \
&overlayIcons, const QString &description );  
         /**
@@ -251,10 +253,4 @@ public:
 
         /**
-         * \brief Return the first icon
-         * @deprecated Use overlayIcons
-         */
-        QString overlayIcon() const;
-
-        /**
          * \brief Return the list of overlay icons
          */

--- kdenetwork/kopete/libkopete/kopeteonlinestatusmanager.cpp  #1.12:1.13
@@ -101,5 +101,5 @@ QString OnlineStatusManager::fingerprint
                                    .arg( icon )
                                    .arg( color.name() )
-                                   .arg( statusFor.overlayIcon())
+                                   .arg( statusFor.overlayIcons().join( \
                QString::fromLatin1( "," ) ) )
                                    .arg( size )
                                    .arg( idle ? 'i' : 'a' );
@@ -181,5 +181,5 @@ QPixmap* OnlineStatusManager::renderIcon
         // use reasonable defaults if not provided or protocol not set
 
-        if ( baseIcon == statusFor.overlayIcon() )
+        if ( baseIcon == statusFor.overlayIcons().first() )
                 kdWarning( 14010 ) << "Base and overlay icons are the same - icon \
effects will not be visible." << endl;  


_______________________________________________
kopete-devel mailing list
kopete-devel@kde.org
https://mail.kde.org/mailman/listinfo/kopete-devel


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