← Back to branch summary

~ubuntu-branches/ubuntu/natty/muon/natty

« back to all changes in this revision

Viewing changes to libmuon/StatusWidget.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Thomas
  • Date: 2010-12-20 21:25:02 UTC
  • mfrom: (1.1.7 upstream)
  • Revision ID: james.westby@ubuntu.com-20101220212502-jah7iubxtsmzh3t8
Tags: 1.0.90-0ubuntu1
* New upstream release:
  - Remove linker fix patch, applied upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
libmuon/StatusWidget.cpp
44
44
    m_downloadLabel->setFrameStyle(QFrame::StyledPanel | QFrame::Sunken);
45
45
 
46
46
    m_xapianProgress = new QProgressBar(this);
47
 
    m_xapianProgress->setFormat(i18nc("@status", "Rebuilding Search Index"));
 
47
    m_xapianProgress->setFormat(i18nc("@info:status", "Rebuilding Search Index"));
48
48
    m_xapianProgress->hide();
49
49
}
50
50
 
62
62
void StatusWidget::updateStatus()
63
63
{
64
64
    int upgradeable = m_backend->packageCount(QApt::Package::Upgradeable);
65
 
    bool showChanges = (m_backend->markedPackages().count() > 0);
 
65
    bool showChanges = m_backend->areChangesMarked();
66
66
 
67
 
    QString availableText = i18np("1 package available, ", "%1 packages available, ", m_backend->packageCount());
68
 
    QString installText = i18n("%1 installed, ", m_backend->installedCount());
 
67
    QString availableText = i18ncp("@info:status", "1 package available, ", "%1 packages available, ", m_backend->packageCount());
 
68
    QString installText = i18nc("@info:status", "%1 installed, ", m_backend->installedCount());
69
69
    QString upgradeableText;
70
70
 
71
71
    if (upgradeable > 0 && showChanges) {
72
 
        upgradeableText = i18n("%1 upgradeable,", upgradeable);
 
72
        upgradeableText = i18nc("@info:status", "%1 upgradeable,", upgradeable);
73
73
    } else {
74
 
        upgradeableText = i18n("%1 upgradeable", upgradeable);
 
74
        upgradeableText = i18nc("@info:status", "%1 upgradeable", upgradeable);
75
75
        m_countsLabel->setText(availableText % installText % upgradeableText);
76
76
    }
77
77
 
83
83
        QString toRemoveText;
84
84
 
85
85
        if (toInstallOrUpgrade > 0) {
86
 
            toInstallOrUpgradeText = i18nc("Part of the status label", " %1 to install/upgrade", toInstallOrUpgrade);
 
86
            toInstallOrUpgradeText = i18nc("@info:status Part of the status label", " %1 to install/upgrade", toInstallOrUpgrade);
87
87
        }
88
88
 
89
89
        if (toRemove > 0 && toInstallOrUpgrade > 0) {
90
 
            toRemoveText = i18nc("Label for the number of packages pending removal when packages are also pending upgrade",
 
90
            toRemoveText = i18nc("@info:status Label for the number of packages pending removal when packages are also pending upgrade",
91
91
                                 ", %1 to remove", toRemove);
92
92
        } else if (toRemove > 0) {
93
 
            toRemoveText = i18nc("Label for the number of packages pending removal when there are only removals",
 
93
            toRemoveText = i18nc("@info:statsus Label for the number of packages pending removal when there are only removals",
94
94
                                 " %1 to remove", toRemove);
95
95
        }
96
96