Ignore:
Timestamp:
Mar 29, 2012, 3:09:42 PM (13 years ago)
Author:
Silvan Scherrer
Message:

SMPlayer: update to latest svn

File:
1 edited

Legend:

Unmodified
Added
Removed
  • smplayer/vendor/current/src/prefadvanced.cpp

    r121 r127  
    2424#include <QColorDialog>
    2525
     26#define LOGS_TAB 3
     27
    2628PrefAdvanced::PrefAdvanced(QWidget * parent, Qt::WindowFlags f)
    2729        : PrefWidget(parent, f )
     
    4143#if !REPAINT_BACKGROUND_OPTION
    4244        repaint_video_background_check->hide();
     45#endif
     46
     47#ifndef LOG_MPLAYER
     48        mplayer_log_box->hide();
     49#endif
     50
     51#ifndef LOG_SMPLAYER
     52        smplayer_log_box->hide();
     53#endif
     54
     55#if !defined(LOG_MPLAYER) && !defined(LOG_SMPLAYER)
     56        advanced_tab->setTabEnabled(LOGS_TAB, false);
    4357#endif
    4458
     
    95109        setShowTagInTitle( pref->show_tag_in_window_title );
    96110
     111#ifdef LOG_MPLAYER
    97112        setLogMplayer( pref->log_mplayer );
    98113        setMplayerLogVerbose( pref->verbose_log );
     114        setSaveMplayerLog( pref->autosave_mplayer_log );
     115        setMplayerLogName( pref->mplayer_log_saveto );
     116#endif
     117
     118#ifdef LOG_SMPLAYER
    99119        setLogSmplayer( pref->log_smplayer );
    100120        setLogFilter( pref->log_filter );
    101 
    102     setSaveMplayerLog( pref->autosave_mplayer_log );
    103     setMplayerLogName( pref->mplayer_log_saveto );
    104 
    105121        setSaveSmplayerLog( pref->save_smplayer_log );
     122#endif
    106123
    107124        setUseShortNames( pref->use_short_pathnames );
     
    150167        }
    151168#endif
     169
     170#ifdef LOG_MPLAYER
    152171        pref->log_mplayer = logMplayer();
    153172        TEST_AND_SET( pref->verbose_log, mplayerLogVerbose() );
     173        pref->autosave_mplayer_log = saveMplayerLog();
     174        pref->mplayer_log_saveto = mplayerLogName();
     175#endif
     176
     177#ifdef LOG_SMPLAYER
    154178        pref->log_smplayer = logSmplayer();
    155179        pref->log_filter = logFilter();
    156     pref->autosave_mplayer_log = saveMplayerLog();
    157     pref->mplayer_log_saveto = mplayerLogName();
    158 
    159180        pref->save_smplayer_log = saveSmplayerLog();
     181#endif
    160182
    161183        pref->use_short_pathnames = useShortNames();
     
    305327
    306328// Log options
     329#ifdef LOG_MPLAYER
    307330void PrefAdvanced::setLogMplayer(bool b) {
    308331        log_mplayer_check->setChecked(b);
     
    321344}
    322345
     346void PrefAdvanced::setSaveMplayerLog(bool b) {
     347    log_mplayer_save_check->setChecked(b);
     348}
     349
     350bool PrefAdvanced::saveMplayerLog() {
     351    return log_mplayer_save_check->isChecked();
     352}
     353
     354void PrefAdvanced::setMplayerLogName(QString filter) {
     355    log_mplayer_save_name->setText(filter);
     356}
     357
     358QString PrefAdvanced::mplayerLogName() {
     359    return log_mplayer_save_name->text();
     360}
     361#endif
     362
     363#ifdef LOG_SMPLAYER
    323364void PrefAdvanced::setLogSmplayer(bool b) {
    324365        log_smplayer_check->setChecked(b);
     
    337378}
    338379
    339 
    340 void PrefAdvanced::setSaveMplayerLog(bool b) {
    341     log_mplayer_save_check->setChecked(b);
    342 }
    343 
    344 bool PrefAdvanced::saveMplayerLog() {
    345     return log_mplayer_save_check->isChecked();
    346 }
    347 
    348 void PrefAdvanced::setMplayerLogName(QString filter) {
    349     log_mplayer_save_name->setText(filter);
    350 }
    351 
    352 QString PrefAdvanced::mplayerLogName() {
    353     return log_mplayer_save_name->text();
    354 }
    355 
    356380void PrefAdvanced::setSaveSmplayerLog(bool b) {
    357381        log_smplayer_save_check->setChecked(b);
     
    361385    return log_smplayer_save_check->isChecked();
    362386}
    363 
     387#endif
    364388
    365389void PrefAdvanced::createHelp() {
     
    459483        addSectionTitle(tr("Logs"));
    460484
     485#ifdef LOG_SMPLAYER
    461486        setWhatsThis(log_smplayer_check, tr("Log SMPlayer output"),
    462487                tr("If this option is checked, SMPlayer will store the debugging "
     
    469494                tr("If this option is checked, the SMPlayer log wil be recorded to %1")
    470495          .arg( "<i>"+ Paths::configPath() + "/smplayer_log.txt</i>" ) );
    471 
     496#endif
     497
     498#ifdef LOG_MPLAYER
    472499        setWhatsThis(log_mplayer_check, tr("Log MPlayer output"),
    473500                tr("If checked, SMPlayer will store the output of MPlayer "
     
    485512                tr("Enter here the path and filename that will be used to save the "
    486513           "MPlayer log.") );
    487 
     514#endif
     515
     516#ifdef LOG_SMPLAYER
    488517        setWhatsThis(log_filter_edit, tr("Filter for SMPlayer logs"),
    489518                tr("This option allows to filter the SMPlayer messages that will "
     
    491520           "For instance: <i>^Core::.*</i> will display only the lines "
    492521           "starting with <i>Core::</i>") );
    493 
     522#endif
    494523}
    495524
Note: See TracChangeset for help on using the changeset viewer.