Differential D15599 Diff 43754 containmentactions/switchwindow/switch.cpp

Changeset View

Standalone View

View Options

containmentactions/switchwindow/switch.cpp

Show First 20 Lines • Show All 138 Lines • ▼ Show 20 Line(s)132 if (m_mode == CurrentDesktop) {
139 m_actions << desktops.values(-1); 139​ m_actions << desktops.values(-1);
140 140​
141 } else { 141​ } else {
142 int numDesktops = KWindowSystem::numberOfDesktops(); 142​ int numDesktops = KWindowSystem::numberOfDesktops();
143 if (m_mode == AllFlat) { 143​ if (m_mode == AllFlat) {
144 for (int i = 1; i <= numDesktops; ++i) { 144​ for (int i = 1; i <= numDesktops; ++i) {
145 if (desktops.contains(i)) { 145​ if (desktops.contains(i)) {
146 QString name = KWindowSystem::desktopName(i); 146​ QString name = KWindowSystem::desktopName(i);
147 name = QStringLiteral("%1: %2").arg(i).arg(name); 147​ name = QStringLiteral("%1: %2").arg(QString::number(i), name);
148 QAction *a = new QAction(name, this); 148​ QAction *a = new QAction(name, this);
149 a->setSeparator(true); 149​ a->setSeparator(true);
150 m_actions << a; 150​ m_actions << a;
151 m_actions << desktops.values(i); 151​ m_actions << desktops.values(i);
152 } 152​ }
153 } 153​ }
154 if (desktops.contains(-1)) { 154​ if (desktops.contains(-1)) {
155 QAction *a = new QAction(i18nc("plasma_containmentactions_switchwindow", "All Desktops"), this); 155​ QAction *a = new QAction(i18nc("plasma_containmentactions_switchwindow", "All Desktops"), this);
156 a->setSeparator(true); 156​ a->setSeparator(true);
157 m_actions << a; 157​ m_actions << a;
158 m_actions << desktops.values(-1); 158​ m_actions << desktops.values(-1);
159 } 159​ }
160 160​
161 } else { //submenus 161​ } else { //submenus
162 for (int i = 1; i <= numDesktops; ++i) { 162​ for (int i = 1; i <= numDesktops; ++i) {
163 if (desktops.contains(i)) { 163​ if (desktops.contains(i)) {
164 QString name = KWindowSystem::desktopName(i); 164​ QString name = KWindowSystem::desktopName(i);
165 name = QStringLiteral("%1: %2").arg(i).arg(name); 165​ name = QStringLiteral("%1: %2").arg(QString::number(i), name);
166 QMenu *subMenu = new QMenu(name); 166​ QMenu *subMenu = new QMenu(name);
167 subMenu->addActions(desktops.values(i)); 167​ subMenu->addActions(desktops.values(i));
168 168​
169 QAction *a = new QAction(name, this); 169​ QAction *a = new QAction(name, this);
170 a->setMenu(subMenu); 170​ a->setMenu(subMenu);
171 m_actions << a; 171​ m_actions << a;
172 } 172​ }
173 } 173​ }
▲ Show 20 Lines • Show All 93 Lines • Show Last 20 Lines