← Back to branch summary

~siretart/vlc/ubuntu

« back to all changes in this revision

Viewing changes to modules/gui/qt4/components/simple_preferences.cpp

  • Committer: Reinhard Tartler
  • Date: 2008-09-26 06:45:40 UTC
  • mto: (21.2.1 vlc-0.9.3)
  • mto: This revision was merged to the branch mainline in revision 23.
  • Revision ID: siretart@tauware.de-20080926064540-0sd8zwmig33ksmy4
Tags: upstream-ubuntu-0.9.3
Import upstream version 0.9.3

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/gui/qt4/components/simple_preferences.cpp
2
2
 * simple_preferences.cpp : "Simple preferences"
3
3
 ****************************************************************************
4
4
 * Copyright (C) 2006-2008 the VideoLAN team
5
 
 * $Id: 87076b72dc13c58e5ef3343b3940d4641df5a3b7 $
 
5
 * $Id: d196990ea3053b2025487ac35cceb0085db89f7e $
6
6
 *
7
7
 * Authors: Clément Stenac <zorglub@videolan.org>
8
8
 *          Antoine Cellerier <dionoea@videolan.org>
193
193
            CONFIG_GENERIC( "directx-wallpaper" , Bool , NULL, wallpaperMode );
194
194
            CONFIG_GENERIC( "directx-device", StringList, NULL,
195
195
                            dXdisplayDevice );
 
196
            CONFIG_GENERIC( "directx-hw-yuv", Bool, NULL, hwYUVBox );
196
197
#else
197
198
            ui.directXBox->setVisible( false );
 
199
            ui.hwYUVBox->setVisible( false );
198
200
#endif
199
201
 
200
202
            CONFIG_GENERIC_FILE( "snapshot-path", Directory, NULL,
402
404
            /* Caching */
403
405
            /* Add the things to the ComboBox */
404
406
            #define addToCachingBox( str, cachingNumber ) \
405
 
                ui.cachingCombo->addItem( str, QVariant( cachingNumber ) );
406
 
            addToCachingBox( "Custom", CachingCustom );
407
 
            addToCachingBox( "Lowest latency", CachingLowest );
408
 
            addToCachingBox( "Low latency", CachingLow );
409
 
            addToCachingBox( "Normal", CachingNormal );
410
 
            addToCachingBox( "High latency", CachingHigh );
411
 
            addToCachingBox( "Higher latency", CachingHigher );
 
407
                ui.cachingCombo->addItem( qtr(str), QVariant( cachingNumber ) );
 
408
            addToCachingBox( N_("Custom"), CachingCustom );
 
409
            addToCachingBox( N_("Lowest latency"), CachingLowest );
 
410
            addToCachingBox( N_("Low latency"), CachingLow );
 
411
            addToCachingBox( N_("Normal"), CachingNormal );
 
412
            addToCachingBox( N_("High latency"), CachingHigh );
 
413
            addToCachingBox( N_("Higher latency"), CachingHigher );
412
414
 
413
415
#define TestCaC( name ) \
414
416
    b_cache_equal =  b_cache_equal && \
485
487
                            displayModeBox );
486
488
            CONFIG_GENERIC( "embedded-video", Bool, NULL, embedVideo );
487
489
            CONFIG_GENERIC( "qt-fs-controller", Bool, NULL, fsController );
 
490
            CONFIG_GENERIC( "qt-system-tray", Bool, NULL, systrayBox );
488
491
            CONFIG_GENERIC_FILE( "skins2-last", File, NULL, ui.fileSkin,
489
492
                    ui.skinBrowse );
490
493
 
523
526
            CONFIG_GENERIC( "freetype-rel-fontsize", IntegerList, NULL,
524
527
                            fontSize );
525
528
            CONFIG_GENERIC( "freetype-effect", IntegerList, NULL, effect );
 
529
            CONFIG_GENERIC_NO_BOOL( "sub-margin", Integer, NULL, subsPosition );
526
530
 
527
531
        END_SPREFS_CAT;
528
532