Commit aac1f4c6 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files

Qt4 - Better behaviour for the left panel of the playlist.

parent 80f513e4
...@@ -42,8 +42,10 @@ ...@@ -42,8 +42,10 @@
* Playlist Widget. The embedded playlist * Playlist Widget. The embedded playlist
**********************************************************************/ **********************************************************************/
PlaylistWidget::PlaylistWidget( intf_thread_t *_p_i, QSettings *settings, QWidget *_parent ) : PlaylistWidget::PlaylistWidget( intf_thread_t *_p_i,
p_intf ( _p_i ), parent( _parent ) QSettings *settings,
QWidget *_parent )
: p_intf ( _p_i ), parent( _parent )
{ {
/* Left Part and design */ /* Left Part and design */
QSplitter *leftW = new QSplitter( Qt::Vertical, this ); QSplitter *leftW = new QSplitter( Qt::Vertical, this );
...@@ -52,8 +54,13 @@ PlaylistWidget::PlaylistWidget( intf_thread_t *_p_i, QSettings *settings, QWidge ...@@ -52,8 +54,13 @@ PlaylistWidget::PlaylistWidget( intf_thread_t *_p_i, QSettings *settings, QWidge
selector = new PLSelector( this, p_intf, THEPL ); selector = new PLSelector( this, p_intf, THEPL );
leftW->addWidget( selector ); leftW->addWidget( selector );
/* Create a Container for the Art Label
in order to have a beautiful resizing for the selector above it */
QWidget *artContainer = new QWidget; QWidget *artContainer = new QWidget;
QHBoxLayout *artContLay = new QHBoxLayout( artContainer ); QHBoxLayout *artContLay = new QHBoxLayout( artContainer );
artContLay->setMargin( 0 );
artContLay->setSpacing( 0 );
artContainer->setMaximumHeight( 128 );
/* Art label */ /* Art label */
art = new ArtLabel; art = new ArtLabel;
...@@ -64,6 +71,7 @@ PlaylistWidget::PlaylistWidget( intf_thread_t *_p_i, QSettings *settings, QWidge ...@@ -64,6 +71,7 @@ PlaylistWidget::PlaylistWidget( intf_thread_t *_p_i, QSettings *settings, QWidge
art->setScaledContents( true ); art->setScaledContents( true );
art->setPixmap( QPixmap( ":/noart.png" ) ); art->setPixmap( QPixmap( ":/noart.png" ) );
art->setToolTip( qtr( "Double click to get the media informations" ) ); art->setToolTip( qtr( "Double click to get the media informations" ) );
artContLay->addWidget( art, 1 ); artContLay->addWidget( art, 1 );
leftW->addWidget( artContainer ); leftW->addWidget( artContainer );
...@@ -83,7 +91,6 @@ PlaylistWidget::PlaylistWidget( intf_thread_t *_p_i, QSettings *settings, QWidge ...@@ -83,7 +91,6 @@ PlaylistWidget::PlaylistWidget( intf_thread_t *_p_i, QSettings *settings, QWidge
connect( selector, SIGNAL( activated( int ) ), connect( selector, SIGNAL( activated( int ) ),
this, SIGNAL( rootChanged( int ) ) ); this, SIGNAL( rootChanged( int ) ) );
CONNECT( THEMIM->getIM(), artChanged( QString ) , this, setArt( QString ) );
/* Forward removal requests from the selector to the main panel */ /* Forward removal requests from the selector to the main panel */
CONNECT( qobject_cast<PLSelector *>( selector )->model, CONNECT( qobject_cast<PLSelector *>( selector )->model,
shouldRemove( int ), shouldRemove( int ),
...@@ -91,6 +98,9 @@ PlaylistWidget::PlaylistWidget( intf_thread_t *_p_i, QSettings *settings, QWidge ...@@ -91,6 +98,9 @@ PlaylistWidget::PlaylistWidget( intf_thread_t *_p_i, QSettings *settings, QWidge
emit rootChanged( p_root->i_id ); emit rootChanged( p_root->i_id );
/* art */
CONNECT( THEMIM->getIM(), artChanged( QString ) , this, setArt( QString ) );
/* Add the two sides of the QSplitter */ /* Add the two sides of the QSplitter */
addWidget( leftW ); addWidget( leftW );
addWidget( rightPanel ); addWidget( rightPanel );
...@@ -98,7 +108,7 @@ PlaylistWidget::PlaylistWidget( intf_thread_t *_p_i, QSettings *settings, QWidge ...@@ -98,7 +108,7 @@ PlaylistWidget::PlaylistWidget( intf_thread_t *_p_i, QSettings *settings, QWidge
QList<int> sizeList; QList<int> sizeList;
sizeList << 180 << 420 ; sizeList << 180 << 420 ;
setSizes( sizeList ); setSizes( sizeList );
setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Expanding ); //setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Expanding );
setStretchFactor( 0, 0 ); setStretchFactor( 0, 0 );
setStretchFactor( 1, 3 ); setStretchFactor( 1, 3 );
leftW->setMaximumWidth( 250 ); leftW->setMaximumWidth( 250 );
...@@ -114,7 +124,7 @@ PlaylistWidget::PlaylistWidget( intf_thread_t *_p_i, QSettings *settings, QWidge ...@@ -114,7 +124,7 @@ PlaylistWidget::PlaylistWidget( intf_thread_t *_p_i, QSettings *settings, QWidge
void PlaylistWidget::setArt( QString url ) void PlaylistWidget::setArt( QString url )
{ {
if( url.isNull() ) if( url.isEmpty() )
{ {
art->setPixmap( QPixmap( ":/noart.png" ) ); art->setPixmap( QPixmap( ":/noart.png" ) );
} }
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include "components/playlist/selector.hpp" #include "components/playlist/selector.hpp"
#include "qt4.hpp" #include "qt4.hpp"
#include <QVBoxLayout> #include <QVBoxLayout>
#include <QHeaderView> #include <QHeaderView>
#include <QTreeView> #include <QTreeView>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment