← Back to branch summary

~ubuntu-branches/ubuntu/lucid/kdebase/lucid

« back to all changes in this revision

Viewing changes to apps/plasma/applets/folderview/folderview.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Steve Stalcup, Jonathan Thomas, Steve Stalcup
  • Date: 2009-03-26 21:35:49 UTC
  • mfrom: (1.1.25 upstream)
  • Revision ID: james.westby@ubuntu.com-20090326213549-9b4u15a3pynbnrw6
Tags: 4:4.2.2-0ubuntu1
[Jonathan Thomas]
* Add kubuntu_09_trash_kcm_in_dolphin.diff to put the Trash KCM inside
  Dolphin's Configuration page. Can be removed in KDE 4.3.

[Steve Stalcup]
* New upstream release
* Bump KDE versions in debian/control
* Remove kubuntu_07_konsole_split_svn935623.diff
* Remove kubuntu_08_konsole_text_selection.diff

Show diffs side-by-side

added added

removed removed

Lines of Context:
apps/plasma/applets/folderview/folderview.cpp
433
433
    uiDisplay.sizeSlider->setRange(0, iconSizes.size() - 1);
434
434
    uiDisplay.sizeSlider->setValue(iconSizes.indexOf(iconSize().width()));
435
435
 
436
 
    uiDisplay.sortCombo->addItem(i18nc("Sort Icons", "Unsorted"), -1);
 
436
    // Only add "Unsorted" as an option when we're showing an icon view, since the list view
 
437
    // doesn't allow the user to rearrange the icons.
 
438
    if (m_iconView) {
 
439
        uiDisplay.sortCombo->addItem(i18nc("Sort Icons", "Unsorted"), -1);
 
440
    }
437
441
    uiDisplay.sortCombo->addItem(m_actionCollection.action("sort_name")->text(), KDirModel::Name);
438
442
    uiDisplay.sortCombo->addItem(m_actionCollection.action("sort_size")->text(), KDirModel::Size);
439
443
    uiDisplay.sortCombo->addItem(m_actionCollection.action("sort_type")->text(), KDirModel::Type);
594
598
        if (m_sortColumn != -1) {
595
599
            m_model->invalidate();
596
600
            m_model->sort(m_sortColumn, Qt::AscendingOrder);
 
601
        } else if (m_iconView) {
 
602
            m_iconView->setCustomLayout(true);
597
603
        }
598
604
        updateSortActionsState();
599
605
        cg.writeEntry("sortColumn", m_sortColumn);
1538
1544
 
1539
1545
    int nFolders = 0;
1540
1546
    int nFiles = 0;
1541
 
    foreach (const KFileItem &item, m_dirModel->dirLister()->items()) {
 
1547
    for (int row = 0; row < m_model->rowCount(); row++) {
 
1548
        const QModelIndex index = m_model->index(row, 0);
 
1549
        KFileItem item = m_model->itemForIndex(index);
1542
1550
        if (item.isDir()) {
1543
1551
            nFolders++;
1544
1552
        } else {