summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp4
-rw-r--r--kdeui/kjanuswidget.cpp16
2 files changed, 12 insertions, 8 deletions
diff --git a/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp b/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp
index 79ef97e42..11fa58f27 100644
--- a/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp
+++ b/interfaces/kmediaplayer/kfileaudiopreview/kfileaudiopreview.cpp
@@ -13,7 +13,7 @@
#include <kmimetype.h>
#include <kparts/componentfactory.h>
-#include <kdemm/factory.h>
+#include <kplayobjectfactory.h>
#include <config-kfile.h>
@@ -58,7 +58,7 @@ KFileAudioPreview::KFileAudioPreview( TQWidget *parent, const char *name )
{
KGlobal::locale()->insertCatalogue("kfileaudiopreview");
- TQStringList formats = KDE::Multimedia::Factory::self()->playableMimeTypes();
+ TQStringList formats = KDE::PlayObjectFactory::mimeTypes();
// ###
TQStringList::ConstIterator it = formats.begin();
for ( ; it != formats.end(); ++it )
diff --git a/kdeui/kjanuswidget.cpp b/kdeui/kjanuswidget.cpp
index 7f34dc5c1..4fb398395 100644
--- a/kdeui/kjanuswidget.cpp
+++ b/kdeui/kjanuswidget.cpp
@@ -1069,13 +1069,17 @@ int KJanusWidget::IconListItem::expandMinimumWidth( int width )
void KJanusWidget::IconListItem::highlight( bool erase )
-{
+{
+ // FIXME: Add configuration option to disable highlighting
+ // For now, always disable highlighting
+ erase = true;
+
TQRect r = listBox()->itemRect( this );
- r.addCoords( 1, 1, -1, -1 );
-
+ r.addCoords( 1, 1, -1, -1 );
+
TQPainter p( listBox()->viewport() );
p.setClipRegion( r );
-
+
const TQColorGroup &cg = listBox()->colorGroup();
if ( erase )
{
@@ -1089,9 +1093,9 @@ void KJanusWidget::IconListItem::highlight( bool erase )
p.drawRect( r );
p.setPen( cg.highlight().dark( 140 ) );
- p.drawRect( r );
+ p.drawRect( r );
}
-
+
p.setPen( cg.foreground() );
p.translate( r.x() - 1, r.y() - 1 );
paintContents( &p );