← Back to branch summary

~vininim/mixxx/hackish

« back to all changes in this revision

Viewing changes to mixxx/src/widget/wtracktableview.cpp

  • Committer: Mika Haulo
  • Date: 2011-02-15 19:52:31 UTC
  • mto: This revision was merged to the branch mainline in revision 2644.
  • Revision ID: mika@haulo.fi-20110215195231-p9d5oz6869ii31rd
Review fixes

Show diffs side-by-side

added added

removed removed

Lines of Context:
mixxx/src/widget/wtracktableview.cpp
336
336
        for (int i = 0; i < numPlaylists; ++i) {
337
337
            int iPlaylistId = playlistDao.getPlaylistId(i);
338
338
 
339
 
            if (!playlistDao.isPlaylistLocked(iPlaylistId) &&
340
 
                !playlistDao.isHidden(iPlaylistId)) {
 
339
            if (!playlistDao.isHidden(iPlaylistId)) {
341
340
                
342
341
                QString playlistName = playlistDao.getPlaylistName(iPlaylistId);
343
342
                // No leak because making the menu the parent means they will be
344
343
                // auto-deleted
345
344
                QAction* pAction = new QAction(playlistName, m_pPlaylistMenu);
 
345
                bool locked = playlistDao.isPlaylistLocked(iPlaylistId);
 
346
                pAction->setEnabled(!locked);
346
347
                m_pPlaylistMenu->addAction(pAction);
347
348
                m_playlistMapper.setMapping(pAction, iPlaylistId);
348
349
                connect(pAction, SIGNAL(triggered()), &m_playlistMapper, SLOT(map()));
358
359
        int numCrates = crateDao.crateCount();
359
360
        for (int i = 0; i < numCrates; ++i) {
360
361
            int iCrateId = crateDao.getCrateId(i);
361
 
            if (!crateDao.isCrateLocked(iCrateId)) {
362
 
                // No leak because making the menu the parent means they will be
363
 
                // auto-deleted
364
 
                QAction* pAction = new QAction(crateDao.crateName(iCrateId), m_pCrateMenu);
365
 
                m_pCrateMenu->addAction(pAction);
366
 
                m_crateMapper.setMapping(pAction, iCrateId);
367
 
                connect(pAction, SIGNAL(triggered()), &m_crateMapper, SLOT(map()));
368
 
            }
 
362
            // No leak because making the menu the parent means they will be
 
363
            // auto-deleted
 
364
            QAction* pAction = new QAction(crateDao.crateName(iCrateId), m_pCrateMenu);
 
365
            bool locked = crateDao.isCrateLocked(iCrateId);
 
366
            pAction->setEnabled(!locked);
 
367
            m_pCrateMenu->addAction(pAction);
 
368
            m_crateMapper.setMapping(pAction, iCrateId);
 
369
            connect(pAction, SIGNAL(triggered()), &m_crateMapper, SLOT(map()));
369
370
        }
370
371
 
371
372
        m_pMenu->addMenu(m_pCrateMenu);
372
373
    }
373
374
 
374
 
    if (!modelHasCapabilities(TrackModel::TRACKMODELCAPS_LOCKED)) {
375
 
        m_pMenu->addSeparator();
376
 
        m_pMenu->addAction(m_pRemoveAct);
377
 
    }
378
 
 
 
375
    bool locked = modelHasCapabilities(TrackModel::TRACKMODELCAPS_LOCKED);
 
376
    m_pRemoveAct->setEnabled(!locked);
 
377
    m_pMenu->addSeparator();
 
378
    m_pMenu->addAction(m_pRemoveAct);
379
379
    m_pPropertiesAct->setEnabled(oneSongSelected);
380
380
    m_pMenu->addAction(m_pPropertiesAct);
381
381