Commit b100f43e authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Qt4 - Make GNOME/KDE fanboys happy.

Remove unneeded code. Without qt4.2, you can't compile this GUI anyway.
parent 560b8d0c
......@@ -31,6 +31,7 @@
#include <QPushButton>
#include <QProgressBar>
#include <QMessageBox>
#include <QDialogButtonBox>
#include <assert.h>
......@@ -136,10 +137,27 @@ InteractionDialog::InteractionDialog( intf_thread_t *_p_intf,
else
/* Custom box, finish it */
{
QVLCFrame::doButtons( dialog, layout,
&defaultButton, p_dialog->psz_default_button,
&altButton, p_dialog->psz_alternate_button,
&otherButton, p_dialog->psz_other_button );
QDialogButtonBox *buttonBox = new QDialogButtonBox;
if( p_dialog->psz_default_button )
{
defaultButton = new QPushButton;
defaultButton->setFocus();
defaultButton->setText( qfu( p_dialog->psz_default_button ) );
buttonBox->addButton( defaultButton, QDialogButtonBox::AcceptRole );
}
if( p_dialog->psz_alternate_button )
{
altButton = new QPushButton;
altButton->setText( qfu( p_dialog->psz_alternate_button ) );
buttonBox->addButton( altButton, QDialogButtonBox::RejectRole );
}
if( p_dialog->psz_other_button )
{
otherButton = new QPushButton;
otherButton->setText( qfu( p_dialog->psz_other_button ) );
buttonBox->addButton( otherButton, QDialogButtonBox::ActionRole );
}
if( p_dialog->psz_default_button )
BUTTONACT( defaultButton, defaultB() );
if( p_dialog->psz_alternate_button )
......
......@@ -41,43 +41,6 @@
class QVLCFrame : public QWidget
{
public:
static QHBoxLayout* doButtons( QWidget *w, QBoxLayout *l,
QPushButton **defaul, char *psz_default,
QPushButton **alt, char *psz_alt,
QPushButton **other, char *psz_other )
{
#ifdef QT42
#else
QHBoxLayout *buttons_layout = new QHBoxLayout;
QSpacerItem *spacerItem = new QSpacerItem( 40, 20,
QSizePolicy::Expanding, QSizePolicy::Minimum);
buttons_layout->addItem( spacerItem );
if( psz_default )
{
*defaul = new QPushButton(0);
(*defaul)->setFocus();
buttons_layout->addWidget( *defaul );
(*defaul)->setText( qfu( psz_default ) );
}
if( psz_alt )
{
*alt = new QPushButton(0);
buttons_layout->addWidget( *alt );
(*alt)->setText( qfu( psz_alt ) );
}
if( psz_other )
{
*other = new QPushButton( 0 );
buttons_layout->addWidget( *other );
(*other)->setText( qfu( psz_other ) );
}
if( l )
l->addLayout( buttons_layout );
#endif
return buttons_layout;
};
QVLCFrame( intf_thread_t *_p_intf ) : QWidget( NULL ), p_intf( _p_intf )
{ };
virtual ~QVLCFrame() {};
......
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