diff --git a/CMakeModules/FindCLucene.cmake b/CMakeModules/FindCLucene.cmake index b7c0e862b..d7c318241 100644 --- a/CMakeModules/FindCLucene.cmake +++ b/CMakeModules/FindCLucene.cmake @@ -27,6 +27,7 @@ SET(TRIAL_LIBRARY_PATHS /usr/lib${LIB_SUFFIX} /sw/lib${LIB_SUFFIX} /usr/pkg/lib${LIB_SUFFIX} + /usr/lib64 ) SET(TRIAL_INCLUDE_PATHS $ENV{CLUCENE_HOME}/include diff --git a/src/libtomahawk/playlist/playlistmanager.cpp b/src/libtomahawk/playlist/playlistmanager.cpp index b6615c219..1a52a2f15 100644 --- a/src/libtomahawk/playlist/playlistmanager.cpp +++ b/src/libtomahawk/playlist/playlistmanager.cpp @@ -82,6 +82,7 @@ PlaylistManager::PlaylistManager( QObject* parent ) m_superCollectionView = new CollectionView(); m_superCollectionFlatModel = new CollectionFlatModel( m_superCollectionView ); m_superCollectionView->setModel( m_superCollectionFlatModel ); + m_superCollectionView->setFrameShape( QFrame::NoFrame ); m_superAlbumView = new AlbumView(); m_superAlbumModel = new AlbumModel( m_superAlbumView ); diff --git a/src/libtomahawk/playlist/topbar/topbar.cpp b/src/libtomahawk/playlist/topbar/topbar.cpp index 7a3a6cbd2..df23ed1bc 100644 --- a/src/libtomahawk/playlist/topbar/topbar.cpp +++ b/src/libtomahawk/playlist/topbar/topbar.cpp @@ -106,9 +106,7 @@ TopBar::resizeEvent(QResizeEvent* e ) gradient.setColorAt( 1.0, QColor( 63, 63, 63 ) ); QPalette p = palette(); - p.setBrush( QPalette::Background, QBrush( gradient ) ); p.setBrush( QPalette::Window, QBrush( gradient ) ); - p.setBrush( QPalette::Base, QBrush( gradient ) ); setPalette( p ); } diff --git a/src/libtomahawk/utils/animatedsplitter.cpp b/src/libtomahawk/utils/animatedsplitter.cpp index 764782ade..696f76959 100644 --- a/src/libtomahawk/utils/animatedsplitter.cpp +++ b/src/libtomahawk/utils/animatedsplitter.cpp @@ -8,6 +8,8 @@ AnimatedSplitter::AnimatedSplitter( QWidget* parent ) , m_animateIndex( -1 ) , m_greedyIndex( 0 ) { + setHandleWidth( 1 ); + m_timeLine = new QTimeLine( ANIMATION_TIME, this ); m_timeLine->setUpdateInterval( 5 ); m_timeLine->setEasingCurve( QEasingCurve::OutBack ); diff --git a/src/libtomahawk/utils/proxystyle.cpp b/src/libtomahawk/utils/proxystyle.cpp index edac0a743..2778e47ee 100644 --- a/src/libtomahawk/utils/proxystyle.cpp +++ b/src/libtomahawk/utils/proxystyle.cpp @@ -1,5 +1,6 @@ #include "proxystyle.h" +#include #include #include #include @@ -11,3 +12,16 @@ ProxyStyle::drawPrimitive( PrimitiveElement pe, const QStyleOption* opt, QPainte if ( pe != PE_FrameStatusBar ) QProxyStyle::drawPrimitive( pe, opt, p, w ); } + + +void +ProxyStyle::drawControl( ControlElement ce, const QStyleOption* opt, QPainter* p, const QWidget* w ) const +{ + if ( ce == CE_Splitter ) + { + p->setPen( QColor( 0x8c, 0x8c, 0x8c ) ); + p->drawLine( opt->rect.topLeft(), opt->rect.bottomRight() ); + } + else + QProxyStyle::drawControl( ce, opt, p, w ); +} diff --git a/src/libtomahawk/utils/proxystyle.h b/src/libtomahawk/utils/proxystyle.h index fcf105e12..c104ac0fe 100644 --- a/src/libtomahawk/utils/proxystyle.h +++ b/src/libtomahawk/utils/proxystyle.h @@ -12,6 +12,7 @@ public: ProxyStyle() {} virtual void drawPrimitive( PrimitiveElement pe, const QStyleOption *opt, QPainter *p, const QWidget *w = 0 ) const; + virtual void drawControl( ControlElement ce, const QStyleOption *opt, QPainter *p, const QWidget *w = 0 ) const; }; #endif // PROXYSTYLE_H diff --git a/src/tomahawkwindow.cpp b/src/tomahawkwindow.cpp index 784dd3571..2264a63f3 100644 --- a/src/tomahawkwindow.cpp +++ b/src/tomahawkwindow.cpp @@ -62,12 +62,14 @@ TomahawkWindow::TomahawkWindow( QWidget* parent ) ui->splitter->setStretchFactor( 0, 1 ); ui->splitter->setStretchFactor( 1, 3 ); ui->splitter->setCollapsible( 1, false ); + ui->splitter->setHandleWidth( 1 ); ui->sidebarSplitter->setChildrenCollapsible( false ); ui->sidebarSplitter->setGreedyWidget( 0 ); ui->sidebarSplitter->setStretchFactor( 0, 3 ); ui->sidebarSplitter->setStretchFactor( 1, 1 ); ui->sidebarSplitter->hide( 1, false ); + ui->sidebarSplitter->setHandleWidth( 1 ); /* QToolBar* toolbar = addToolBar( "TomahawkToolbar" ); toolbar->setObjectName( "TomahawkToolbar" );