Layout for album art

diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp
index 7e8eeb1d63f7facec756caf58e1bc2043bbad8fd..96f42774037dd8903644d6679bacd60ac86077f3 100644 (file)
--- a/modules/gui/qt4/components/interface_widgets.cpp
+++ b/modules/gui/qt4/components/interface_widgets.cpp
@@ -27,8 +27,10 @@
 #include "main_interface.hpp"
 #include "input_manager.hpp"
 
+#include "pixmaps/art.xpm"
 #include <vlc/vout.h>
 
+#include <QPushButton>
 #include <QHBoxLayout>
 
 #define ICON_SIZE 128
@@ -160,9 +162,29 @@ void BackgroundWidget::resizeEvent( QResizeEvent *e )
 PlaylistWidget::PlaylistWidget( intf_thread_t *_p_intf ) : QFrame(NULL),
                                                             p_intf( _p_intf )
 {
+    QVBoxLayout *left = new QVBoxLayout( );
+    QHBoxLayout *middle = new QHBoxLayout;
+
     setFrameStyle(QFrame::StyledPanel | QFrame::Sunken );
     selector = new PLSelector( this, p_intf, THEPL );
     selector->setMaximumWidth( 130 );
+    left->addWidget( selector );
+
+    QPushButton *undockButton = new QPushButton( "UN", this );
+    undockButton->setMaximumWidth( 25 );
+    undockButton->setToolTip( qtr( "Undock playlist for main interface" ) );
+    QPushButton *sourcesButton = new QPushButton( "Sources", this );
+    sourcesButton->setToolTip( qtr( "Select additional stream sources" ) );
+    middle->addWidget( undockButton );
+    middle->addWidget( sourcesButton );
+    left->addLayout( middle );
+
+    QLabel *art = new QLabel( "" );
+    art->setMaximumHeight( 128 );
+    art->setMaximumWidth( 128 );
+    art->setScaledContents( true );
+    art->setPixmap( QPixmap( art_xpm ) ); //":/vlc128.png" ) );
+    left->addWidget( art );
 
     playlist_item_t *p_root = playlist_GetPreferredNode( THEPL,
                                                 THEPL->p_local_category );
@@ -172,8 +194,8 @@ PlaylistWidget::PlaylistWidget( intf_thread_t *_p_intf ) : QFrame(NULL),
 
     CONNECT( selector, activated( int ), rightPanel, setRoot( int ) );
 
-    QHBoxLayout *layout = new QHBoxLayout();
-    layout->addWidget( selector, 0 );
+    QHBoxLayout *layout = new QHBoxLayout(this);
+    layout->addLayout( left, 0 );
     layout->addWidget( rightPanel, 10 );
     setLayout( layout );
 }

diff --git a/modules/gui/qt4/main_interface.cpp b/modules/gui/qt4/main_interface.cpp
index afb6295eaf712f3772fd851aeb17c9312760cd99..f20475d59897f3df563bcc9aea81e083c59bca3e 100644 (file)
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -351,9 +351,10 @@ void MainInterface::playlist()
         PlaylistDialog::killInstance();
         playlistWidget = new PlaylistWidget( p_intf );
         ui.vboxLayout->insertWidget( 0, playlistWidget );
+
         fprintf( stderr, "BUG ! Do not set size if it has already been changed\n" );
         playlistWidget->widgetSize = settings->value( "playlistSize",
-                                               QSize( 600, 300 ) ).toSize();
+                                               QSize( 650, 310 ) ).toSize();
         playlistWidget->hide();
     }
     /// Todo, reset its size ?
@@ -378,6 +379,8 @@ void MainInterface::playlist()
     resize( mainSize );
 }
 
+/* Video widget cannot do this synchronously as it runs in another thread */
+/* Well, could it, actually ? Probably dangerous ... */
 void MainInterface::doComponentsUpdate()
 {
     calculateInterfaceSize();

diff --git a/modules/gui/qt4/pixmaps/art.xpm b/modules/gui/qt4/pixmaps/art.xpm
new file mode 100644 (file)
index 0000000..9b30eba
--- /dev/null
+++ b/modules/gui/qt4/pixmaps/art.xpm
@@ -0,0 +1,267 @@
+/* XPM */
+static char * art_xpm[] = {
+"128 128 136 2",
+"      c #FFFFFF",
+".     c #000000",
+"+     c #A8A8A8",
+"@     c #272727",
+"#     c #050505",
+"$     c #2E2E2E",
+"%     c #B8B8B8",
+"&     c #7C7C7C",
+"*     c #020202",
+"=     c #222222",
+"-     c #A9A9A9",
+";     c #AAAAAA",
+">     c #8C8C8C",
+",     c #686868",
+"'     c #919191",
+")     c #AEAEAE",
+"!     c #6A6A6A",
+"~     c #FDFDFD",
+"{     c #878787",
+"]     c #202020",
+"^     c #A1A1A1",
+"/     c #262626",
+"(     c #B2B2B2",
+"_     c #FEFEFE",
+":     c #252525",
+"<     c #232323",
+"[     c #9F9F9F",
+"}     c #B7B7B7",
+"|     c #2C2C2C",
+"1     c #A5A5A5",
+"2     c #D6D6D6",
+"3     c #969696",
+"4     c #5E5E5E",
+"5     c #E0E0E0",
+"6     c #F6F6F6",
+"7     c #121212",
+"8     c #C9C9C9",
+"9     c #1B1B1B",
+"0     c #FBFBFB",
+"a     c #B4B4B4",
+"b     c #111111",
+"c     c #3C3C3C",
+"d     c #FAFAFA",
+"e     c #303030",
+"f     c #444444",
+"g     c #C8C8C8",
+"h     c #D4D4D4",
+"i     c #4C4C4C",
+"j     c #858585",
+"k     c #3D3D3D",
+"l     c #DADADA",
+"m     c #5F5F5F",
+"n     c #B0B0B0",
+"o     c #141414",
+"p     c #313131",
+"q     c #CCCCCC",
+"r     c #DCDCDC",
+"s     c #626262",
+"t     c #131313",
+"u     c #F7F7F7",
+"v     c #DBDBDB",
+"w     c #5A5A5A",
+"x     c #BEBEBE",
+"y     c #242424",
+"z     c #C0C0C0",
+"A     c #FCFCFC",
+"B     c #F8F8F8",
+"C     c #ABABAB",
+"D     c #C1C1C1",
+"E     c #1E1E1E",
+"F     c #6C6C6C",
+"G     c #787878",
+"H     c #EAEAEA",
+"I     c #434343",
+"J     c #EBEBEB",
+"K     c #D7D7D7",
+"L     c #D2D2D2",
+"M     c #868686",
+"N     c #C6C6C6",
+"O     c #A0A0A0",
+"P     c #343434",
+"Q     c #DFDFDF",
+"R     c #636363",
+"S     c #6F6F6F",
+"T     c #8F8F8F",
+"U     c #2F2F2F",
+"V     c #393939",
+"W     c #E2E2E2",
+"X     c #D0D0D0",
+"Y     c #080808",
+"Z     c #040404",
+"`     c #AFAFAF",
+" .    c #D9D9D9",
+"..    c #323232",
+"+.    c #0D0D0D",
+"@.    c #A7A7A7",
+"#.    c #757575",
+"$.    c #7D7D7D",
+"%.    c #010101",
+"&.    c #F5F5F5",
+"*.    c #727272",
+"=.    c #B9B9B9",
+"-.    c #4E4E4E",
+";.    c #717171",
+">.    c #535353",
+",.    c #1D1D1D",
+"'.    c #CACACA",
+").    c #171717",
+"!.    c #A6A6A6",
+"~.    c #898989",
+"{.    c #6E6E6E",
+"].    c #181818",
+"^.    c #EEEEEE",
+"/.    c #BFBFBF",
+"(.    c #808080",
+"_.    c #424242",
+":.    c #333333",
+"<.    c #CECECE",
+"[.    c #5B5B5B",
+"}.    c #1C1C1C",
+"|.    c #989898",
+"1.    c #9D9D9D",
+"2.    c #4A4A4A",
+"3.    c #9C9C9C",
+"4.    c #191919",
+"5.    c #070707",
+"6.    c #9B9B9B",
+"7.    c #6B6B6B",
+"8.    c #7E7E7E",
+"9.    c #2A2A2A",
+"0.    c #A4A4A4",
+"a.    c #909090",
+"b.    c #ACACAC",
+"c.    c #DDDDDD",
+"d.    c #888888",
+"e.    c #030303",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                    . . . . .                                     . . .                           . . .                   . . . . . . .                 . . .                                   ",
+"                                                                                  . . . . . .                                     . . .                           . . .                   . . . . . . . .               . . . .                                 ",
+"                        . . .                                                     . . . . . .                                     . . .                           . . .                 . . . . . . . . . .           . . . . .                                 ",
+"                        . . .                                                     . . . . . . .                                   . . .                           . . .                 . . . .     . . . . .         . . . . .                                 ",
+"                      . . . .   . . . . . . .                                     . . . . . . .                                   . . .                         . . . .                 . . . .       . . . . .       . . . . . .                               ",
+"                      . . . .   . . . . . . .                                     . . .   . . .                                   . . . .                       . . . .                 . . .           . . . . . . . . . . . . .                               ",
+"                    . . . . . . . . . . . . . .           . . .                   . . . . . . .                                   . . . .                       . . . .                 . . .             . . . . . . . . . . . .                               ",
+"                . . . . . . . . . . .   . . . . .         . . .                   . . . . . . .                                     . . . .                     . . .                   . . .               . . . . . . . . . . .                               ",
+"                . . . . . . . . . . .     . . . .         . . .                 . . . . . . . .                                     . . . .                     . . .                   . . .                 . . . . . .   . . .                               ",
+"                . . . . . . . .             . . .         . . .                 . . . . . . . . . .                                   . . . .                   . . .                   . . .                   . . . . .   . . .                               ",
+"                . . . . .                   . . .         . . .                 . . . . . . . . . . . .                               . . . . .               . . . .                   . . .                   . . . .     . . .                               ",
+"                . . . . .                   . . .         . . . .               . . . . . . . . . . . . . .                             . . . .               . . . .                   . . .                               . . . .                             ",
+"                . . . . .                   . . .         . . . .               . . . . . .     . . . . . . . .                           . . . .             . . . .                   . . .                               . . . .                             ",
+"                . . . . . . . . . . . . . . . . .           . . .                 . . . . .         . . . . . . .                         . . . . .           . . .                     . . .                                 . . .                             ",
+"                . . . . . . . . . . . . . . . . .           . . . .               . . . . . .           . . . . . .                         . . . . .         . . .                     . . .                                 . . .                             ",
+"                . . . . . . . . . . . . . . . . .           . . . .                 . . . . .               . . . . .                         . . . . .       . . .                     . . .                                 . . .                             ",
+"                . . . .                     . . .             . . .                 . . . . .                 . . . .                           . . . .       . . .                     . . .                                 . . .                             ",
+"                . . . .                     . . .             . . .                 . . . . .                   . . .                             . . . .   . . . .                     . . .                                 . . .                             ",
+"                . . . .                     . . .             . . . .               . . . . .                   . . .                             . . . .   . . . .                                                                                             ",
+"                . . .                       . . .             . . . .                   . . . .                 . . .                               . . . . . . . .                                                                                             ",
+"                . . .                       . . .               . . . . . . . . . .     . . . .                 . . .                               . . . . . . .                                                                                               ",
+"                . . .                                           . . . . . . . . . .     . . . . .               . . .                               . . . . . . .                                                                                               ",
+"                . . .                                           . . . . . . . . . .       . . . . .             . . .                                 . . . . . .                                                                                               ",
+"                . . .                                           . . . . .                 . . . . .   . . . . . . . .                                                                                                                                           ",
+"                . . .                                                                         . . .   . . . . . . . .                                                                                                                                           ",
+"                . . .                                                                                 . . . . . . . .                                                                                                                                           ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                      . . .                                                                                                     ",
+"                                                                                                                                    . . . . . . . . . . . . . . . . . . . . . . .                                                                               ",
+"                                                                                              . . . . . . . . .                     . . . . . . . . . . . . . . . . . . . . . . .                                                                               ",
+"                                                                                          . . . . . . . . . . . .                   . . . . . . . . . . . . . . . . . . . . . . .                                                                               ",
+"                                                    . . . . . .                         . . . . . . . . . . . . . .                 . . .             . . .                                                                                                     ",
+"                                                . . . . . . . . .                       . . . . . .         . . . .                                   . . .                                                                                                     ",
+"                                            . . . . . . . . . . . .                     . . . .               . . . .                                 . . .                                                                                                     ",
+"                                          . . . . . . . . . . . . . .                   . . .                 . . . .                                 . . .                                                                                                     ",
+"                                          . . . . . .         . . . . .                 . . .                   . . . .                               . . .                                                                                                     ",
+"                                      . . . . .                 . . . . .               . . .                   . . . .                               . . .                                                                                                     ",
+"                                      . . . . .                   . . . . .             . . . . . . . . . . . . . . . .                               . . .                                               . . .                                                 ",
+"                                      . . . . .                     . . . .             . . . . . . . . . . . . . . . .                               . . . .                                             . . .                                                 ",
+"                                      . . . . .                       . . .             . . . . . . . . . . . . . . . .                               . . . .                                             . . .                                                 ",
+"                                      . . . . .                       . . .             . . . . . . . . . . .                                           . . .                                             . . .                                                 ",
+"                                      . . . . .                       . . . .           . . . . . . . . . . . . . .                                                                                       . . .                                                 ",
+"                                      . . . . .                       . . . .           . . .     . . . . . . . . . . . . .                                                                               . . .                                                 ",
+"                                      . . . . . . . . . . . . . .       . . .           . . .             . . . . . . . . . .                                                                             . . .                                                 ",
+"                                      . . . . . . . . . . . . . .       . . .           . . .                   . . . . . . .                                                                             . . .                                                 ",
+"                                      . . . . . . . . . . . . . .       . . .           . . .                           . . .                                                                             . . .                                                 ",
+"                                      . . . . .                         . . . .         . . .                                                     . . .                                                   . . .                                                 ",
+"                                      . . . . .                         . . . .         . . .                                                     . . .                                                   . . .                                                 ",
+"                                      . . . . .                         . . . .                                                                   . . .                                                   . . .                                                 ",
+"                                        . . . .                           . . .                                                                   . . .                                                   . . .                                                 ",
+"                                                                                                                                                  . . .                           . . . . . .             . . .                                                 ",
+"                                                                                                                                                  . . .                         . . . . . . . .           . . .                                                 ",
+"                                                          . . .                                                                                   . . .                         . . . . . . . . .         . . .                                                 ",
+"                                                          . . . .                                                                                 . . .                         . . . .   . . . . . .     . . .                                                 ",
+"                                                          . . . .                                                         . . . . . . . .         . . .                         . . .       . . . . .     . . .                                                 ",
+"                                                            . . .                                                       . . . . . . . . .         . . .                         . . .         . . . .     . . . . .                                             ",
+"                                                            . . . .                         . . . . . . . .             . . . . . . . . .         . . . .                       . . .         . . . .     . . . . . . . .                                       ",
+"              . . .                                         . . . .                         . . . . . . . . . .         . . . .     . . .         . . . .                       . . .     . . . . . .       . . . . . . .                                       ",
+"              . . .                                           . . .       . . .             . . . . . . . . . . .       . . .     . . . .           . . .                     . . . .     . . . . . .           . . . . .                                       ",
+"              . . .                                           . . .       . . .       . . . . .         . . . . .       . . .     . . . .           . . .                     . . . . . . . . . . .                                                             ",
+"              . . .                               . . .       . . .       . . .       . . . . .             . . .       . . .   . . . . .           . . .                     . . . . . . . . .                                                                 ",
+"              . . .               . . .           . . .       . . .     . . . .       . . . . .             . . .       . . .   . . . .             . . . .                     . . . . . . . .                                                                 ",
+"              . . .       . . . . . . .           . . .       . . .     . . . .       . . .                 . . .       . . . . . . . .             . . . .                                                                                                     ",
+"              . . .       . . . . . . .                       . . .   . . . . .       . . . .               . . .       . . . . . . .               . . . . .                                                                                                   ",
+"              . . .   . . . . . . . . .                       . . . . . . . .         . . . . . .         . . . .       . . . . . . .                 . . . . .                                                                                                 ",
+"              . . . . . . . . .                 . . . .       . . . . . . . . .       . . . . . . . . . . . . . .         . . . . .                   . . . . .                                                                                                 ",
+"              . . . . . . . . .                 . . . .         . . . . . . . . . .       . . . . . . . . . . . .                                         . . .                                                                                                 ",
+"              . . . . . . . .                   . . . . .       . . . . . . . . . . . .       . . . . . . . . .                                                                                                                                                 ",
+"              . . . . . . . . . .                 . . . .       . . .       . . . . . . . .                                                                                                                                                                     ",
+"              . . .     . . . . . . . . . .       . . . .       . . .           . . . . . .                                                                                                                                                                     ",
+"              . . . .     . . . . . . . . .         . . .       . . .               . . . .                                                                                                                                                                     ",
+"              . . . .         . . . . . . . .       . . .                                                                                                                                                                                                       ",
+"                . . .                 . . . .                                                                                                                                                                                                                   ",
+"                                        . . .                                                                                                                                                                                                                   ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                              .                                 ",
+". . . .     + @ # $ %       & .     . . * = -           . ;       > .   , '       ) !         ~ { ] # @ ^     . . * = -         & .     . . * / (     .         .     .     _ ' : # < [           } | # / 1     .     2 / 3       .           .         . . . . ",
+".           4 5 6 ; 7     8 9 .     .   0 a b           . c     d e .   d f g   h i d         j k h d l m     .   0 a b       8 9 .     .   d n o     .         .     .     > p q d r s           t ^ u v w     .   x y z         .           .               A ",
+".               B C e   6 | D .     .   0 a E           . F (   ^ G .     H k l I J           E K             .   0 a E     6 | D .     .   0 ( o     .         .     .     ] L                   / M N 6       . O P Q       .   .           .               R ",
+". . . .       . . b 8   S T   .     . . . U h           . v V _ e W .       X Y X             Z A   . . .     . . . U h     S T   .     . . * y `     . . . . . .     .     Z 0                    ., ..b 1     . +.@.        .   .           .             #.$.",
+".               6 - <   %.. . . .   .   &.*.=.          .   -.;.>.  .         .               ,.l       .     .   &.*.=.    %.. . . .   .             .         .     .     ] L                         X o     . '.).!.      .   .           .           ~.s   ",
+".           {.H &.@.].        .     .     u p ^.        .   /.. D   .         .               (._.v A v .     .     u p ^.        .     .             .         .     .     > :.<.0 Q R           [.l B @.b     .   h }.|.    .   .           .         1.2.0   ",
+".           3.4.5.P z         .     .       6.7.        .           .         .               A 8.9 Z 9.0.    .       6.7.        .     .             .         .     .     _ a.: # = 1.          !.@ Z / b.    .     c.= d.  .   . . . . .   . . . . . e.. . . ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                            . . .                                                                                                                                                                                               ",
+"              . . . . . . . . . .                           . . . .       . . .                                                                                                                                                                                 ",
+"            . . . . . . . . . . . .                         . . . .       . . .                                                                                                                                               . . . . . . . . . . . . .         ",
+"        . . . . . . . . . . . . . .                           . . . .     . . .                                               . . .           . . .                                                                         . . . . . . . . . . . . . . .       ",
+"        . . . . . .           . . . .                         . . . .     . . .                                               . . .           . . .                                                                       . . . . . . . . . . . . . . . .       ",
+"        . . . . .             . . . .                         . . . .     . . .                                               . . .           . . .                                                                       . . . . .                 . . . .     ",
+"        . . .                 . . . .                           . . .   . . . .                                               . . .           . . . .                                                                     . . . . .                 . . . . .   ",
+"        . . .                   . . .                           . . . . . . . .                 . . . . . .                   . . .           . . . .                                                                       . . . .                   . . . .   ",
+"        . . .                   . . . .   . . . . . . . .       . . . . . . . . . . . . . .     . . . . . . .                 . . . . . . . . . . . .   . . . . . .               . . .                                       . . .                   . . . .   ",
+"        . . .                   . . . .   . . . . . . . .       . . . . . . . . . . . . . .     . . . . . . .                 . . . . . . . .   . . . . . . . . . .       . . . . . . .             . . . . . . .             . . .                     . . . . ",
+"        . . . . . . . . . . . . . . . .   . . . . . . . .       . . . .   . . . . . . . . .     . . . . . . .                 . . . . . . . .   . . . . . . . . . .       . . . . . . .     . . . . . . . . . . . .           . . .                     . . . . ",
+"        . . . . . . . . . . . . . . . .   . . .   . . . .       . . . .   . . . .     . . .     . . .   . . .                 . . . .             . . .       . . . . .   . . . . . . .     . . . . . . . . . . . .           . . .                       . . . ",
+"        . . . . . . . . . . . . . . . . . . . . . . . .           . . .   . . . .   . . . .     . . . . . . .                 . . . .             . . .       . . . . .   . . .   . . . .   . . . . . . .   . . . .           . . .                       . . . ",
+"        . . .               . . . .     . . . . . . . .           . . .   . . . . . . . . .     . . . . . . . .               . . . . .           . . .         . . . .   . . . . . . . . .   . . .           . . .           . . .                       . . . ",
+"        . . .               . . . .     . . . . . . . .           . . .   . . . . . . . . .       . . . . . . .               . . . . .                           . . .   . . . . . . . . .   . . .           . . .           . . .                     . . . . ",
+"        . . .                 . . .         . . . .               . . .   . . . . . . . . . . . . . . . . . . . . .           . . . . . .                                 . . . . . . . . .   . . .           . . .           . . .             . . . . . . . . ",
+"        . . .             . . . . .         . . . . . . . . .     . . . . . . . . . . . . . . . . . . .   . . . . .             . . . . .                                                     . . .           . . .           . . .     . . . . . . . . . . . . ",
+"        . . .         . . . . . . .           . . . . . . . .     . . . . . . . . . . . . . . . . . . .   . . . . .             . . . . .                                                     . . .                           . . . . . . . . . . . . . . . .   ",
+"        . . . . . . . . . . . . . .           . . . . . . . .       . . . . . .                   . . .                                                                                       . . .                               . . . . . . . . . .           ",
+"              . . . . . . . . .                                     . . .                                                                                                                                                         . . . . . .                   ",
+"              . . . . . . .                                                                                                                                                                                                                                     ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                ",
+"                                                                                                                                                                                                                                                                "};