Changeset 739

Show
Ignore:
Timestamp:
08/28/07 20:06:51 (12 months ago)
Author:
daelstorm
Message:

Properly read 'show tickers' option from config; use readBoolEntry

Files:
1 modified

Legend:

Unmodified
Added
Removed

  • museek+/trunk/sources/museeq/mainwin.cpp

    r728 r739  
    120120 
    121121        mMenuSettings->setItemEnabled(3, false); 
    122         mMenuSettings->setItemChecked(3, museeq->mShowTickers); 
    123         mMenuSettings->setItemEnabled(4, false); 
    124         mMenuSettings->setItemChecked(4, museeq->mShowStatusLog); 
    125         mMenuSettings->setItemChecked(5, museeq->mShowTimestamps); 
    126         mMenuSettings->setItemEnabled(8, true); 
    127         mMenuSettings->setItemChecked(8, museeq->mUsetray); 
     122         
    128123         
    129124        menuBar()->insertItem(tr("&Settings"), mMenuSettings); 
    … …  
    264259        connect(museeq->driver(), SIGNAL(userStatus(const QString&, uint)), SLOT(slotUserStatus(const QString&, uint))); 
    265260        QSettings settings; 
    266         QString showStatusLog = settings.readEntry("/TheGraveyard.org/Museeq/showStatusLog"); 
    267         if (! showStatusLog.isEmpty() and (showStatusLog == "true" || showStatusLog == true)) { 
    268                 museeq->mShowStatusLog = true; 
    269         } else if (! showStatusLog.isEmpty() and (showStatusLog == "false" || showStatusLog == false)) { 
    270                 museeq->mShowStatusLog = false; 
    271         } 
     261        museeq->mShowStatusLog = settings.readBoolEntry("/TheGraveyard.org/Museeq/showStatusLog", FALSE); 
     262 
    272263        if ( ! museeq->mShowStatusLog) 
    273264                mLog->hide(); 
    … …  
    327318        museeq->mColorRemote = settings.readEntry("/TheGraveyard.org/Museeq/colorRemote"); 
    328319        museeq->mColorTime = settings.readEntry("/TheGraveyard.org/Museeq/colorTime"); 
    329         QString showTimestamps = settings.readEntry("/TheGraveyard.org/Museeq/showTimestamps"); 
    330         QString showIPinLog = settings.readEntry("/TheGraveyard.org/Museeq/showIPinLog"); 
    331         QString showAlertsInLog = settings.readEntry("/TheGraveyard.org/Museeq/showAlertsInLog"); 
     320        museeq->mShowTickers = settings.readBoolEntry("/TheGraveyard.org/Museeq/showTickers", FALSE); 
     321        museeq->mShowTimestamps = settings.readBoolEntry("/TheGraveyard.org/Museeq/showTimestamps", FALSE); 
     322        museeq->mIPLog = settings.readBoolEntry("/TheGraveyard.org/Museeq/showIPinLog", FALSE); 
     323        museeq->mOnlineAlert = settings.readBoolEntry("/TheGraveyard.org/Museeq/showAlertsInLog", FALSE); 
    332324         
    333325        if (! museeq->mFontTime.isEmpty()) { 
    … …  
    358350                mSettingsDialog->STimeText->setText(museeq->mColorTime); 
    359351        } 
    360         if (! showTimestamps.isEmpty() and (showTimestamps == "true" || showTimestamps == true)) { 
    361                 museeq->mShowTimestamps = true; 
    362                 mMenuSettings->setItemChecked(5, true); 
    363         } else if (! showTimestamps.isEmpty() and (showTimestamps == "false" || showTimestamps == false)) { 
    364                 museeq->mShowTimestamps = false; 
    365                 mMenuSettings->setItemChecked(5, false); 
    366         } 
    367         if (! showIPinLog.isEmpty() and (showIPinLog == "true" || showIPinLog == true)) { 
    368                 mSettingsDialog->SIPLog->setChecked(true); 
    369                 museeq->mIPLog = true; 
    370                  
    371         } else if (! showIPinLog.isEmpty() and (showIPinLog == "false" || showIPinLog == false)){ 
    372                 mSettingsDialog->SIPLog->setChecked(false); 
    373                 museeq->mIPLog = false; 
    374         } 
    375         if (! showAlertsInLog.isEmpty() and (showAlertsInLog == "true" || showAlertsInLog == true)) { 
    376                 mSettingsDialog->SOnlineAlerts->setChecked(true); 
    377                 museeq->mOnlineAlert = true; 
    378         } else if (! showAlertsInLog.isEmpty() and (showAlertsInLog == "false" || showAlertsInLog == false)){ 
    379                 mSettingsDialog->SOnlineAlerts->setChecked(false); 
    380                 museeq->mOnlineAlert = false; 
    381         } 
     352 
     353         
     354        mMenuSettings->setItemChecked(3, museeq->mShowTickers); 
     355        mMenuSettings->setItemChecked(4, museeq->mShowStatusLog); 
     356        mMenuSettings->setItemChecked(5, museeq->mShowTimestamps); 
     357        mMenuSettings->setItemChecked(8, museeq->mUsetray); 
     358        mSettingsDialog->SOnlineAlerts->setChecked(museeq->mOnlineAlert); 
     359        mSettingsDialog->SIPLog->setChecked(museeq->mIPLog); 
    382360        box->setEnabled(false); 
    383361        daemon = new QProcess(this);