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

List:       kde-commits
Subject:    KDE/kdelibs/kdeui
From:       Rafael Fernández López <ereslibre () kde ! org>
Date:       2008-11-19 20:09:11
Message-ID: 1227125351.759740.18240.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 886671 by ereslibre:

Remove builtin effects on KPageView (because the style will provide it if it wants). \
Also, if the user selected some kind of simple animations, animate treeviews \
expanding/collapsing nodes

 M  +5 -1      kernel/kstyle.cpp  
 M  +0 -8      paged/kpageview.cpp  


--- trunk/KDE/kdelibs/kdeui/kernel/kstyle.cpp #886670:886671
@@ -50,7 +50,7 @@
 #include <QtCore/QCache>
 #include <QtCore/QEvent>
 #include <QtCore/QVariant>
-#include <QtGui/QAbstractItemView>
+#include <QtGui/QTreeView>
 #include <QtGui/QApplication>
 #include <QtGui/QDialogButtonBox>
 #include <QtGui/QFormLayout>
@@ -399,6 +399,10 @@
     // Enable hover effects in all itemviews
     if (QAbstractItemView *itemView = qobject_cast<QAbstractItemView*>(w) ) {
         itemView->viewport()->setAttribute(Qt::WA_Hover);
+
+        if (QTreeView *treeView = qobject_cast<QTreeView*>(w)) {
+            treeView->setAnimated(KGlobalSettings::graphicEffectsLevel() & \
KGlobalSettings::SimpleAnimationEffects); +        }
     }
 
     QCommonStyle::polish(w);
--- trunk/KDE/kdelibs/kdeui/paged/kpageview.cpp #886670:886671
@@ -28,7 +28,6 @@
 #include <kdialog.h>
 #include <kiconloader.h>
 #include <ktitlewidget.h>
-#include <kfadewidgeteffect.h>
 
 #include <QAbstractItemView>
 #include <QGridLayout>
@@ -219,8 +218,6 @@
   if (faceType != KPageView::Tabbed) {
   QWidget *widget = qvariant_cast<QWidget*>( model->data( index, \
KPageModel::WidgetRole ) );  
-  KFadeWidgetEffect *effect = new KFadeWidgetEffect(stack);
-
   if ( widget ) {
     if ( stack->indexOf( widget ) == -1 ) { // not included yet
       stack->addWidget( widget );
@@ -232,7 +229,6 @@
   }
 
   updateTitleWidget(index);
-  effect->start();
   }
 
   Q_Q(KPageView);
@@ -243,8 +239,6 @@
 {
     Q_Q(KPageView);
 
-    KFadeWidgetEffect *effect = new KFadeWidgetEffect( titleWidget );
-
     QString header = model->data( index, KPageModel::HeaderRole ).toString();
     if ( header.isNull() ) { //TODO KDE5 remove that ugly logic, see also \
doxy-comments in KPageWidgetItem::setHeader()  header = model->data( index, \
Qt::DisplayRole ).toString(); @@ -255,8 +249,6 @@
     const QIcon icon = model->data( index, Qt::DecorationRole ).value<QIcon>();
     titleWidget->setPixmap( icon.pixmap( 22, 22 ) );
     titleWidget->setVisible(q->showPageHeader());
-
-    effect->start();
 }
 
 void KPageViewPrivate::_k_dataChanged(const QModelIndex &, const QModelIndex &)


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