[Kde-pim] KDE/kdepim/kontact/src

[Rafael Fernández López]

SVN commit 818015 by ereslibre:

Tool tips are shown now. Is a pity KFileItemDelegate tries to draw different tooltips. Will talk with Fredrik to see if we can get normal tooltips using KFileItemDelegate. Anyway, QStyledItemDelegate
doesn't get us in any regressions, and works as expected.

Tool tips are only shown if the mode of view is "Icons Only".

CCMAIL: kde-pim at kde.org


 M  +9 -4      iconsidepane.cpp  


--- trunk/KDE/kdepim/kontact/src/iconsidepane.cpp #818014:818015
@@ -29,9 +29,9 @@
 #include <QtGui/QSortFilterProxyModel>
 #include <QtGui/QDragEnterEvent>
 #include <QtGui/QDragMoveEvent>
+#include <QtGui/QStyledItemDelegate>
 
 #include <KLocalizedString>
-#include <KFileItemDelegate>
 #include <KDialog>
 #include <KIcon>
 
@@ -99,6 +99,11 @@
         return KIcon( static_cast<Kontact::Plugin*>( index.internalPointer() )->icon() );
       } else if ( role == Qt::TextAlignmentRole ) {
         return Qt::AlignCenter;
+      } else if ( role == Qt::ToolTipRole ) {
+        if ( !mNavigator->showText() ) {
+          return static_cast<Kontact::Plugin*>( index.internalPointer() )->title();
+        }
+        return QVariant();
       } else if ( role == PluginName ) {
         return static_cast<Kontact::Plugin*>( index.internalPointer() )->identifier();
       }
@@ -128,11 +133,11 @@
     }
 };
 
-class Delegate : public KFileItemDelegate
+class Delegate : public QStyledItemDelegate
 {
   public:
     Delegate( Navigator *parentNavigator = 0 )
-      : KFileItemDelegate( parentNavigator ), mNavigator( parentNavigator )
+      : QStyledItemDelegate( parentNavigator ), mNavigator( parentNavigator )
     {
     }
 
@@ -142,7 +147,7 @@
       QStyleOptionViewItemV4 optionCopy( *static_cast<const QStyleOptionViewItemV4*>( &option ) );
       optionCopy.decorationPosition = QStyleOptionViewItem::Top;
       optionCopy.decorationSize = QSize( mNavigator->iconSize(), mNavigator->iconSize() );
-      KFileItemDelegate::paint( painter, optionCopy, index );
+      QStyledItemDelegate::paint( painter, optionCopy, index );
     }
 
     QSize sizeHint( const QStyleOptionViewItem &option, const QModelIndex &index ) const
_______________________________________________
KDE PIM mailing list kde-pim at kde.org
https://mail.kde.org/mailman/listinfo/kde-pim
KDE PIM home page at http://pim.kde.org/