Differential D4684 Diff 11543 src/scriptengines/qml/plasmoid/containmentinterface.cpp

Changeset View

Standalone View

View Options

src/scriptengines/qml/plasmoid/containmentinterface.cpp

Context not available.
509 foreach (const KPluginInfo &info, seenPlugins) { 509​ foreach (const KPluginInfo &info, seenPlugins) {
510 QAction *action; 510​ QAction *action;
511 if (!info.icon().isEmpty()) { 511​ if (!info.icon().isEmpty()) {
512 action = new QAction(QIcon::fromTheme(info.icon()), info.name()); 512​ action = new QAction(QIcon::fromTheme(info.icon()), info.name(), nullptr);
513 } else { 513​ } else {
514 action = new QAction(info.name()); 514​ action = new QAction(info.name(), nullptr);
515 } 515​ }
516 extraActions << action; 516​ extraActions << action;
517 if (choices) { 517​ if (choices) {
Context not available.
623 choices->addSection(i18n("Plasma Package")); 623​ choices->addSection(i18n("Plasma Package"));
624 installPlasmaPackageAction = choices->addAction(QIcon::fromTheme(QStringLiteral("application-x-plasma")), i18n("Install")); 624​ installPlasmaPackageAction = choices->addAction(QIcon::fromTheme(QStringLiteral("application-x-plasma")), i18n("Install"));
625 } else { 625​ } else {
626 QAction *action = new QAction(i18n("Plasma Package")); 626​ QAction *action = new QAction(i18n("Plasma Package"), nullptr);
627 action->setSeparator(true); 627​ action->setSeparator(true);
628 dropActions << action; 628​ dropActions << action;
629 629​
630 installPlasmaPackageAction = new QAction(QIcon::fromTheme(QStringLiteral("application-x-plasma")), i18n("Install")); 630​ installPlasmaPackageAction = new QAction(QIcon::fromTheme(QStringLiteral("application-x-plasma")), i18n("Install"), nullptr);
631 Q_ASSERT(dropJob); 631​ Q_ASSERT(dropJob);
632 dropActions << installPlasmaPackageAction; 632​ dropActions << installPlasmaPackageAction;
633 dropJob->setApplicationActions(dropActions); 633​ dropJob->setApplicationActions(dropActions);
Context not available.
673 if (choices) { 673​ if (choices) {
674 choices->addSection(i18n("Widgets")); 674​ choices->addSection(i18n("Widgets"));
675 } else { 675​ } else {
676 QAction *action = new QAction(i18n("Widgets")); 676​ QAction *action = new QAction(i18n("Widgets"), nullptr);
677 action->setSeparator(true); 677​ action->setSeparator(true);
678 dropActions << action; 678​ dropActions << action;
679 } 679​ }
Context not available.
681 qDebug() << info.name(); 681​ qDebug() << info.name();
682 QAction *action; 682​ QAction *action;
683 if (!info.icon().isEmpty()) { 683​ if (!info.icon().isEmpty()) {
684 action = new QAction(QIcon::fromTheme(info.icon()), info.name()); 684​ action = new QAction(QIcon::fromTheme(info.icon()), info.name(), nullptr);
685 } else { 685​ } else {
686 action = new QAction(info.name()); 686​ action = new QAction(info.name(), nullptr);
687 } 687​ }
688 688​
689 if (choices) { 689​ if (choices) {
Context not available.
699 }); 699​ });
700 } 700​ }
701 { 701​ {
702 QAction *action = new QAction(i18n("Icon")); 702​ QAction *action = new QAction(i18n("Icon"), nullptr);
703 if (choices) { 703​ if (choices) {
704 choices->addAction(action); 704​ choices->addAction(action);
705 } 705​ }
Context not available.
717 if (choices) { 717​ if (choices) {
718 choices->addSection(i18n("Wallpaper")); 718​ choices->addSection(i18n("Wallpaper"));
719 } else { 719​ } else {
720 QAction *action = new QAction(i18n("Wallpaper")); 720​ QAction *action = new QAction(i18n("Wallpaper"), nullptr);
721 action->setSeparator(true); 721​ action->setSeparator(true);
722 dropActions << action; 722​ dropActions << action;
723 } 723​ }
Context not available.
730 foreach (const KPluginInfo &info, wallpaperList) { 730​ foreach (const KPluginInfo &info, wallpaperList) {
731 QAction *action; 731​ QAction *action;
732 if (!info.icon().isEmpty()) { 732​ if (!info.icon().isEmpty()) {
733 action = new QAction(QIcon::fromTheme(info.icon()), info.name()); 733​ action = new QAction(QIcon::fromTheme(info.icon()), info.name(), nullptr);
734 } else { 734​ } else {
735 action = new QAction(info.name()); 735​ action = new QAction(info.name(), nullptr);
736 } 736​ }
737 737​
738 if (choices) { 738​ if (choices) {
Context not available.
761 choices->addSection(i18n("Widgets")); 761​ choices->addSection(i18n("Widgets"));
762 action = choices->addAction(i18n("Icon")); 762​ action = choices->addAction(i18n("Icon"));
763 } else { 763​ } else {
764 QAction *sep = new QAction(i18n("Widgets")); 764​ QAction *sep = new QAction(i18n("Widgets"), nullptr);
765 sep->setSeparator(true); 765​ sep->setSeparator(true);
766 dropActions << sep; 766​ dropActions << sep;
767 // we can at least create an icon as a link to the URL 767​ // we can at least create an icon as a link to the URL
768 action = new QAction(i18n("Icon")); 768​ action = new QAction(i18n("Icon"), nullptr);
769 dropActions << action; 769​ dropActions << action;
770 } 770​ }
771 771​
Context not available.