Changeset View
Changeset View
Standalone View
Standalone View
containmentactions/switchwindow/switch.cpp
| Show All 24 Lines | 168 | } else { | |||
|---|---|---|---|---|---|
| 169 | const QVariantList &desktopIds = m_virtualDesktopInfo->desktopIds(); | 169 | const QVariantList &desktopIds = m_virtualDesktopInfo->desktopIds(); | ||
| 170 | const QStringList &desktopNames = m_virtualDesktopInfo->desktopNames(); | 170 | const QStringList &desktopNames = m_virtualDesktopInfo->desktopNames(); | ||
| 171 | 171 | | |||
| 172 | if (m_mode == AllFlat) { | 172 | if (m_mode == AllFlat) { | ||
| 173 | for (int i = 0; i < desktopIds.count(); ++i) { | 173 | for (int i = 0; i < desktopIds.count(); ++i) { | ||
| 174 | const QVariant &desktop = desktopIds.at(i); | 174 | const QVariant &desktop = desktopIds.at(i); | ||
| 175 | 175 | | |||
| 176 | if (desktops.contains(desktop)) { | 176 | if (desktops.contains(desktop)) { | ||
| 177 | const QString &name = QStringLiteral("%1: %2").arg(QString::number(i), desktopNames.at(i)); | 177 | const QString &name = QStringLiteral("%1: %2").arg(QString::number(i + 1), desktopNames.at(i)); | ||
| 178 | QAction *a = new QAction(name, this); | 178 | QAction *a = new QAction(name, this); | ||
| 179 | a->setSeparator(true); | 179 | a->setSeparator(true); | ||
| 180 | m_actions << a; | 180 | m_actions << a; | ||
| 181 | m_actions << desktops.values(desktop); | 181 | m_actions << desktops.values(desktop); | ||
| 182 | } | 182 | } | ||
| 183 | } | 183 | } | ||
| 184 | 184 | | |||
| 185 | if (allDesktops.count()) { | 185 | if (allDesktops.count()) { | ||
| 186 | QAction *a = new QAction(i18nc("plasma_containmentactions_switchwindow", "All Desktops"), this); | 186 | QAction *a = new QAction(i18nc("plasma_containmentactions_switchwindow", "All Desktops"), this); | ||
| 187 | a->setSeparator(true); | 187 | a->setSeparator(true); | ||
| 188 | m_actions << a; | 188 | m_actions << a; | ||
| 189 | m_actions << allDesktops; | 189 | m_actions << allDesktops; | ||
| 190 | } | 190 | } | ||
| 191 | } else { // Submenus. | 191 | } else { // Submenus. | ||
| 192 | for (int i = 0; i < desktopIds.count(); ++i) { | 192 | for (int i = 0; i < desktopIds.count(); ++i) { | ||
| 193 | const QVariant &desktop = desktopIds.at(i); | 193 | const QVariant &desktop = desktopIds.at(i); | ||
| 194 | 194 | | |||
| 195 | if (desktops.contains(desktop)) { | 195 | if (desktops.contains(desktop)) { | ||
| 196 | const QString &name = QStringLiteral("%1: %2").arg(QString::number(i), desktopNames.at(i)); | 196 | const QString &name = QStringLiteral("%1: %2").arg(QString::number(i + 1), desktopNames.at(i)); | ||
| 197 | QMenu *subMenu = new QMenu(name); | 197 | QMenu *subMenu = new QMenu(name); | ||
| 198 | subMenu->addActions(desktops.values(desktop)); | 198 | subMenu->addActions(desktops.values(desktop)); | ||
| 199 | 199 | | |||
| 200 | QAction *a = new QAction(name, this); | 200 | QAction *a = new QAction(name, this); | ||
| 201 | a->setMenu(subMenu); | 201 | a->setMenu(subMenu); | ||
| 202 | m_actions << a; | 202 | m_actions << a; | ||
| 203 | } | 203 | } | ||
| 204 | } | 204 | } | ||
| Show All 24 Lines | |||||