Changeset e43f1917217e06cceb4ecac4fc4ecf86f6c8a90c

Show
Ignore:
Timestamp:
15/06/08 00:25:37 (6 months ago)
Author:
Jean-Baptiste Kempf <jb@videolan.org>
git-committer:
Jean-Baptiste Kempf <jb@videolan.org> 1213482337 -0700
git-parent:

[9af5ad61ebdb2f706a991b228ddb2aa36bc925d5]

git-author:
Jean-Baptiste Kempf <jb@videolan.org> 1213482324 -0700
Message:

Introduce setLayoutMargins for layout margins difference between Qt4.2 and Qt4.3

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/gui/qt4/components/interface_widgets.cpp

    re39bc8a re43f191  
    389389 
    390390    controlLayout->setSpacing( 0 ); 
    391 #if QT43 
    392     controlLayout->setContentsMargins( 9, 6, 9, 6 ); 
    393 #else 
    394     controlLayout->setMargin( 6 ); 
    395 #endif 
     391    controlLayout->setLayoutMargins( 9, 6, 9, 6, 6 ); 
    396392 
    397393    if( !b_fsCreation ) 
    …… 
    828824    QGridLayout *fsLayout = new QGridLayout( this ); 
    829825    controlLayout->setSpacing( 0 ); 
    830     #if QT43 
    831     controlLayout->setContentsMargins( 5, 1, 5, 1 ); 
    832     #else 
    833     controlLayout->setMargin( 5 ); 
    834     #endif 
     826    controlLayout->setLayoutMargins( 5, 1, 5, 1, 5 ); 
    835827 
    836828    fsLayout->addWidget( slowerButton, 0, 0 ); 

  • modules/gui/qt4/components/simple_preferences.cpp

    rc75dafa re43f191  
    22 * simple_preferences.cpp : "Simple preferences" 
    33 **************************************************************************** 
    4  * Copyright (C) 2006-2007 the VideoLAN team 
     4 * Copyright (C) 2006-2008 the VideoLAN team 
    55 * $Id$ 
    66 * 
    …… 
    2323 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. 
    2424 *****************************************************************************/ 
     25 
    2526#ifdef HAVE_CONFIG_H 
    2627# include "config.h" 
    …… 
    298299                     this, updateAudioOptions( int ) ); 
    299300 
    300        // File exists everywhere 
     301            /* File output exists on all platforms */ 
    301302            CONFIG_GENERIC_FILE( "audiofile-file" , File , ui.fileLabel, 
    302303                                 ui.fileName, ui.fileBrowseButton ); 

  • modules/gui/qt4/dialogs/preferences.cpp

    r62d91d4 re43f191  
    104104    /* Margins */ 
    105105    tree_panel_l->setMargin( 1 ); 
    106 #if HAS_QT43 
    107     main_panel_l->setContentsMargins( 6, 0, 0, 3 ); 
    108 #else 
    109     main_panel_l->setMargin( 3 ); 
    110 #endif 
     106    main_panel_l->setLayoutMargins( 6, 0, 0, 3, 3 ); 
    111107 
    112108    for( int i = 0; i < SPrefsMax ; i++ ) simple_panels[i] = NULL; 

  • modules/gui/qt4/qt4.hpp

    r3561b9b re43f191  
    101101            else  x->show(); } 
    102102 
     103#if QT43 
     104    #define setLayoutMargins( a, b, c, d, e) setContentsMargins( a, b, c, d ) 
     105#else 
     106    #define setLayoutMargins( a, b, c, d, e) setMargin( e ) 
     107#endif 
     108 
    103109enum { 
    104 DialogEventType = 0, 
    105 IMEventType     = 100, 
    106 PLEventType     = 200 
     110    DialogEventType = 0, 
     111    IMEventType     = 100, 
     112    PLEventType     = 200 
    107113}; 
    108114