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

List:       kde-commits
Subject:    extragear/multimedia/amarok
From:       Mark Kretschmann <markey () web ! de>
Date:       2005-09-27 15:54:10
Message-ID: 1127836450.704097.1519.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 464499 by markey:

New mouse-over effect, hilighting the handle with a special pixmap. Not quite there \
yet, imho.

 M  +1 -1      amarok.kdevelop  
 M  +1 -0      src/images/Makefile.am  
 AM            src/images/volumeslider-handle_glow.png  
 M  +5 -8      src/sliderwidget.cpp  
 M  +1 -1      src/sliderwidget.h  


--- trunk/extragear/multimedia/amarok/amarok.kdevelop #464498:464499
@@ -87,7 +87,7 @@
     </groups>
     <tree>
       <hidenonprojectfiles>false</hidenonprojectfiles>
-      <hidepatterns>*.o,*.lo,CVS,amarokapp,*.moc,*~</hidepatterns>
+      <hidepatterns>*.o,*.lo,CVS</hidepatterns>
       <showvcsfields>true</showvcsfields>
     </tree>
   </kdevfileview>
--- trunk/extragear/multimedia/amarok/src/images/Makefile.am #464498:464499
@@ -38,6 +38,7 @@
     vol_speaker.png \
     volumeslider-gradient.png \
     volumeslider-handle.png \
+    volumeslider-handle_glow.png \
     volumeslider-inset.png \
     wizard_compact.png \
     wizard_xmms.png \
** trunk/extragear/multimedia/amarok/src/images/volumeslider-handle_glow.png \
#property svn:mime-type  + application/octet-stream
--- trunk/extragear/multimedia/amarok/src/sliderwidget.cpp #464498:464499
@@ -225,8 +225,9 @@
     setWFlags( getWFlags() | WNoAutoErase );
     setFocusPolicy( QWidget::NoFocus );
 
-    m_pixmapInset  = QPixmap( locate( "data","amarok/images/volumeslider-inset.png" \
                ) );
-    m_pixmapHandle = QPixmap( locate( "data","amarok/images/volumeslider-handle.png" \
) ); +    m_pixmapInset      = QPixmap( locate( \
"data","amarok/images/volumeslider-inset.png" ) ); +    m_pixmapHandle     = QPixmap( \
locate( "data","amarok/images/volumeslider-handle.png" ) ); +    m_pixmapHandleGlow = \
QPixmap( locate( "data","amarok/images/volumeslider-handle_glow.png" ) );  \
generateGradient();  
     setMinimumWidth( m_pixmapInset.width() );
@@ -246,10 +247,6 @@
     KPixmapEffect::gradient( m_pixmapGradient, colorGroup().background(), \
colorGroup().highlight(),  KPixmapEffect::HorizontalGradient );
     m_pixmapGradient.setMask( mask );
-
-    // Generate pixmap for mouse-over effect
-    m_pixmapInsetHilight = m_pixmapInset;
-    KPixmapEffect::fade( m_pixmapInsetHilight, 0.3, colorGroup().highlight() );
 }
 
 void
@@ -313,8 +310,8 @@
     const int offset = int( double( ( width() - 2 * padding ) * value() ) / \
maxValue() );  
     bitBlt( &buf, 0, 0, &m_pixmapGradient, 0, 0, offset + padding );
-    bitBlt( &buf, 0, 0, hasMouse() ? &m_pixmapInsetHilight : &m_pixmapInset );
-    bitBlt( &buf, offset - m_pixmapHandle.width() / 2 + padding, 0, &m_pixmapHandle \
); +    bitBlt( &buf, 0, 0, &m_pixmapInset );
+    bitBlt( &buf, offset - m_pixmapHandle.width() / 2 + padding, 0, hasMouse() ? \
&m_pixmapHandleGlow : &m_pixmapHandle );  
     // Draw percentage number
     QPainter p( &buf );
--- trunk/extragear/multimedia/amarok/src/sliderwidget.h #464498:464499
@@ -107,8 +107,8 @@
             void generateGradient();
 
             KPixmap m_pixmapHandle;
+            KPixmap m_pixmapHandleGlow;
             KPixmap m_pixmapInset;
-            KPixmap m_pixmapInsetHilight;
             KPixmap m_pixmapGradient;
 
             VolumeSlider( const VolumeSlider& ); //undefined


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