From 46c0e1a99278b198848ad44903b4b3fbf5864f4c Mon Sep 17 00:00:00 2001 From: Michail Vourlakos Date: Thu, 3 Jun 2021 20:36:54 +0300 Subject: [PATCH] layout:expose explicitScreens --- app/layout/genericlayout.cpp | 2 +- app/layout/genericlayout.h | 2 +- app/settings/settingsdialog/layoutsmodel.cpp | 6 ++++++ app/settings/settingsdialog/layoutsmodel.h | 3 +++ 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/app/layout/genericlayout.cpp b/app/layout/genericlayout.cpp index 297790314..ff3f521b0 100644 --- a/app/layout/genericlayout.cpp +++ b/app/layout/genericlayout.cpp @@ -1501,7 +1501,7 @@ QList GenericLayout::subContainmentsOf(Plasma::Containment *containment) co return subs; } -QList GenericLayout::viewsScreens() +QList GenericLayout::viewsExplicitScreens() { Data::ViewsTable views = viewsTable(); QList screens; diff --git a/app/layout/genericlayout.h b/app/layout/genericlayout.h index 9c7dac6e8..4d59a66d0 100644 --- a/app/layout/genericlayout.h +++ b/app/layout/genericlayout.h @@ -131,7 +131,7 @@ public: //! that latteView QList unassignFromLayout(Plasma::Containment *latteContainment); - QList viewsScreens(); + QList viewsExplicitScreens(); Latte::Data::ViewsTable viewsTable() const; diff --git a/app/settings/settingsdialog/layoutsmodel.cpp b/app/settings/settingsdialog/layoutsmodel.cpp index 6dedea1f7..e0889beb5 100644 --- a/app/settings/settingsdialog/layoutsmodel.cpp +++ b/app/settings/settingsdialog/layoutsmodel.cpp @@ -851,6 +851,12 @@ const Latte::Data::LayoutsTable &Layouts::currentLayoutsData() return m_layoutsTable; } +const Latte::Data::ScreensTable &Layouts::screensData() +{ + Latte::Data::ScreensTable scrs; + return scrs; +} + void Layouts::setOriginalInMultipleMode(const bool &inmultiple) { setInMultipleMode(inmultiple); diff --git a/app/settings/settingsdialog/layoutsmodel.h b/app/settings/settingsdialog/layoutsmodel.h index 73f825bad..c35d667e5 100644 --- a/app/settings/settingsdialog/layoutsmodel.h +++ b/app/settings/settingsdialog/layoutsmodel.h @@ -12,6 +12,7 @@ #include "../../data/layoutdata.h" #include "../../data/layouticondata.h" #include "../../data/layoutstable.h" +#include "../../data/screendata.h" // Qt #include @@ -127,6 +128,8 @@ public: const Latte::Data::LayoutsTable ¤tLayoutsData(); const Latte::Data::LayoutsTable &originalLayoutsData(); + const Latte::Data::ScreensTable &screensData(); + void setOriginalInMultipleMode(const bool &inmultiple); void setOriginalData(Latte::Data::LayoutsTable &data);