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

List:       kde-commits
Subject:    Re: extragear/multimedia/amarok/src/configdialog/dialogs
From:       Seb Ruiz <ruiz () kde ! org>
Date:       2009-02-22 22:13:19
Message-ID: 60ebdd0b0902221413u5cb7b602l6aeaac94e65c5207 () mail ! gmail ! com
[Download RAW message or body]

Haha, I've got a bad track record for doing this. First to Hydrogen,
and now to you.

Well as I always say - the early bird gets the worm, the late one gets
to do the conflict merging.


2009/2/22 Nikolaj Hald Nielsen <nhnfreespirit@gmail.com>:
> ouch!
> 
> I am sitting on a pretty big patch to all this playlist layout code
> that changes the way it works quite significantly. Someone sent it in
> and we have been working on getting it ready to commit...
> 
> - Nikolaj
> 
> On Sun, Feb 22, 2009 at 4:45 AM, Seb Ruiz <ruiz@kde.org> wrote:
> > SVN commit 929769 by seb:
> > 
> > Add a label to the playlist layout config entry
> > 
> > M  +15 -1     GeneralConfig.cpp
> > 
> > 
> > --- trunk/extragear/multimedia/amarok/src/configdialog/dialogs/GeneralConfig.cpp \
> > #929768:929769 @@ -27,7 +27,10 @@
> > 
> > #include <KStandardDirs>
> > 
> > +#include <QHBoxLayout>
> > +#include <QLabel>
> > 
> > +
> > GeneralConfig::GeneralConfig( QWidget* parent )
> > > ConfigDialogBase( parent )
> > {
> > @@ -79,7 +82,18 @@
> > connect( kcfg_ExternalBrowser, SIGNAL( editTextChanged( const QString& ) ), \
> > parent, SLOT( updateButtons() ) ); 
> > Playlist::LayoutConfigWidget *layoutWidget = new Playlist::LayoutConfigWidget( \
> >                 playlistBox );
> > -    playlistBox->layout()->addWidget( layoutWidget );
> > +    layoutWidget->setSizePolicy( QSizePolicy::MinimumExpanding, \
> > QSizePolicy::Preferred ); +
> > +    QLabel *layoutLabel = new QLabel( i18n("Playlist layout:"), this );
> > +    layoutLabel->setSizePolicy( QSizePolicy::Maximum, QSizePolicy::Preferred );
> > +
> > +    QWidget *layoutBox = new QWidget( this );
> > +    QHBoxLayout *layout = new QHBoxLayout( layoutBox );
> > +    layout->addWidget( layoutLabel );
> > +    layout->addWidget( layoutWidget );
> > +    layoutBox->setLayout( layout );
> > +
> > +    playlistBox->layout()->addWidget( layoutBox );
> > }
> > 
> > GeneralConfig::~GeneralConfig()
> > 
> 



-- 
Seb Ruiz

http://www.sebruiz.net/
http://amarok.kde.org/


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