Differential D2851 Diff 6902 kcmkwin/kwinrules/ruleswidget.cpp

Changeset View

Standalone View

View Options

kcmkwin/kwinrules/ruleswidget.cpp

Show First 20 Lines • Show All 292 Lines • ▼ Show 20 Line(s)
293} 293​}
294 294​
295int RulesWidget::comboToDesktop(int val) const 295​int RulesWidget::comboToDesktop(int val) const
296{ 296​{
297 if (val == desktop->count() - 1) 297​ if (val == desktop->count() - 1)
298 return NET::OnAllDesktops; 298​ return NET::OnAllDesktops;
299 return val + 1; 299​ return val + 1;
300} 300​}
301​
301#ifdef KWIN_BUILD_ACTIVITIES 302​#ifdef KWIN_BUILD_ACTIVITIES
302int RulesWidget::activityToCombo(QString d) const 303​int RulesWidget::activityToCombo(QString d) const
303{ 304​{
304 // TODO: ivan - do a multiselection list 305​ // TODO: ivan - do a multiselection list
305 for (int i = 0; i < activity->count(); i++) { 306​ for (int i = 0; i < activity->count(); i++) {
306 if (activity->itemData(i).toString() == d) { 307​ if (activity->itemData(i).toString() == d) {
307 return i; 308​ return i;
308 } 309​ }
Show All 21 Lines325{
330 #undef NULL_UUID 331​ #undef NULL_UUID
331 332​
332 if (m_activities->serviceStatus() == KActivities::Consumer::Running) { 333​ if (m_activities->serviceStatus() == KActivities::Consumer::Running) {
333 foreach (const QString & activityId, m_activities->activities(KActivities::Info::Running)) { 334​ foreach (const QString & activityId, m_activities->activities(KActivities::Info::Running)) {
334 const KActivities::Info info(activityId); 335​ const KActivities::Info info(activityId);
335 activity->addItem(info.name(), activityId); 336​ activity->addItem(info.name(), activityId);
336 } 337​ }
337 } 338​ }
339​
340​ auto rules = this->rules();
341​ if (rules->activityrule == Rules::UnusedSetRule) {
342​ enable_activity->setChecked(false);
343​ Ui::RulesWidgetBase::activity->setCurrentIndex(0);
344​ } else {
345​ enable_activity->setChecked(true);
346​ Ui::RulesWidgetBase::activity->setCurrentIndex(activityToCombo(m_selectedActivityId));
347​ }
348​ updateEnableactivity();
338} 349​}
339#endif 350​#endif
351​
340static int placementToCombo(Placement::Policy placement) 352​static int placementToCombo(Placement::Policy placement)
341{ 353​{
342 static const int conv[] = { 354​ static const int conv[] = {
343 1, // NoPlacement 355​ 1, // NoPlacement
344 0, // Default 356​ 0, // Default
345 0, // Unknown 357​ 0, // Unknown
346 6, // Random 358​ 6, // Random
347 2, // Smart 359​ 2, // Smart
▲ Show 20 Lines • Show All 119 Lines • ▼ Show 20 Line(s)454{
467 machine->setText(rules->clientmachine); 479​ machine->setText(rules->clientmachine);
468 machine_match->setCurrentIndex(rules->clientmachinematch); 480​ machine_match->setCurrentIndex(rules->clientmachinematch);
469 machineMatchChanged(); 481​ machineMatchChanged();
470 LINEEDIT_SET_RULE(position, positionToStr); 482​ LINEEDIT_SET_RULE(position, positionToStr);
471 LINEEDIT_SET_RULE(size, sizeToStr); 483​ LINEEDIT_SET_RULE(size, sizeToStr);
472 COMBOBOX_SET_RULE(desktop, desktopToCombo); 484​ COMBOBOX_SET_RULE(desktop, desktopToCombo);
473 SPINBOX_SET_RULE(screen, inc); 485​ SPINBOX_SET_RULE(screen, inc);
474#ifdef KWIN_BUILD_ACTIVITIES 486​#ifdef KWIN_BUILD_ACTIVITIES
487​ m_selectedActivityId = rules->activity;
475 COMBOBOX_SET_RULE(activity, activityToCombo); 488​ COMBOBOX_SET_RULE(activity, activityToCombo);
476#endif 489​#endif
477 CHECKBOX_SET_RULE(maximizehoriz,); 490​ CHECKBOX_SET_RULE(maximizehoriz,);
478 CHECKBOX_SET_RULE(maximizevert,); 491​ CHECKBOX_SET_RULE(maximizevert,);
479 CHECKBOX_SET_RULE(minimize,); 492​ CHECKBOX_SET_RULE(minimize,);
480 CHECKBOX_SET_RULE(shade,); 493​ CHECKBOX_SET_RULE(shade,);
481 CHECKBOX_SET_RULE(fullscreen,); 494​ CHECKBOX_SET_RULE(fullscreen,);
482 COMBOBOX_FORCE_RULE(placement, placementToCombo); 495​ COMBOBOX_FORCE_RULE(placement, placementToCombo);
▲ Show 20 Lines • Show All 455 Lines • Show Last 20 Lines