controlLayout = new QGridLayout( );
controlLayout->setSpacing( 0 );
-#if QT43
- controlLayout->setContentsMargins( 9, 6, 9, 6 );
-#else
- controlLayout->setMargin( 6 );
-#endif
+ controlLayout->setLayoutMargins( 9, 6, 9, 6, 6 );
if( !b_fsCreation )
setLayout( controlLayout );
QGridLayout *fsLayout = new QGridLayout( this );
controlLayout->setSpacing( 0 );
- #if QT43
- controlLayout->setContentsMargins( 5, 1, 5, 1 );
- #else
- controlLayout->setMargin( 5 );
- #endif
+ controlLayout->setLayoutMargins( 5, 1, 5, 1, 5 );
fsLayout->addWidget( slowerButton, 0, 0 );
slider->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Minimum);
/*****************************************************************************
* simple_preferences.cpp : "Simple preferences"
****************************************************************************
- * Copyright (C) 2006-2007 the VideoLAN team
+ * Copyright (C) 2006-2008 the VideoLAN team
* $Id$
*
* Authors: Clément Stenac <zorglub@videolan.org>
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
CONNECT( ui.outputModule, currentIndexChanged( int ),
this, updateAudioOptions( int ) );
- // File exists everywhere
+ /* File output exists on all platforms */
CONFIG_GENERIC_FILE( "audiofile-file" , File , ui.fileLabel,
ui.fileName, ui.fileBrowseButton );
/* Margins */
tree_panel_l->setMargin( 1 );
-#if HAS_QT43
- main_panel_l->setContentsMargins( 6, 0, 0, 3 );
-#else
- main_panel_l->setMargin( 3 );
-#endif
+ main_panel_l->setLayoutMargins( 6, 0, 0, 3, 3 );
for( int i = 0; i < SPrefsMax ; i++ ) simple_panels[i] = NULL;
#define TOGGLEV( x ) { if( x->isVisible() ) x->hide(); \
else x->show(); }
+#if QT43
+ #define setLayoutMargins( a, b, c, d, e) setContentsMargins( a, b, c, d )
+#else
+ #define setLayoutMargins( a, b, c, d, e) setMargin( e )
+#endif
+
enum {
-DialogEventType = 0,
-IMEventType = 100,
-PLEventType = 200
+ DialogEventType = 0,
+ IMEventType = 100,
+ PLEventType = 200
};
static int DialogEvent_Type = QEvent::User + DialogEventType + 1;