github-forks
/
latte-dock
mirror of https://github.com/KDE/latte-dock.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

More renaming.

Browse Source
work/plasma6
Lana Black 11 months ago
parent 6f55b053b6
commit eea133a3aa
18 changed files with 56 additions and 45 deletions
Show Stats Download Patch File Download Diff File

1
CMakeLists.txt
Unescape Escape View File

@ -51,6 +51,7 @@ find_package(KF6 ${KF6_MIN_VERSION} REQUIRED COMPONENTS
Kirigami2
NewStuff
Notifications
Package
Svg
WindowSystem
XmlGui

8
app/CMakeLists.txt
Unescape Escape View File

@ -73,12 +73,14 @@ target_link_libraries(latte-dock
KF6::KIOWidgets
KF6::Notifications
KF6::NewStuffWidgets
KF6::Package
KF6::Svg
# KF6::WaylandClient
KF6::XmlGui
Wayland::Client
Plasma
PlasmaActivities
PlasmaQuick
Plasma::Activities
Plasma::Plasma
Plasma::PlasmaQuick
)

4
app/data/activitydata.h
Unescape Escape View File

@ -16,8 +16,8 @@
#include <QIcon>
#include <QString>
//! KActivities
#include <KActivities/Info>
//! Plasma Activities
#include <PlasmaActivities/Info>
namespace Latte {
namespace Data {

2
app/data/viewdata.h
Unescape Escape View File

@ -16,7 +16,7 @@
#include <QString>
// Plasma
#include <Plasma>
#include <Plasma/Plasma>
namespace Latte {

2
app/declarativeimports/contextmenulayerquickitem.h
Unescape Escape View File

@ -17,7 +17,7 @@
#include <QObject>
// Plasma
#include <Plasma>
#include <Plasma/Applet>
namespace Plasma {
class Applet;

2
app/layout/abstractlayout.h
Unescape Escape View File

@ -13,7 +13,7 @@
#include <KConfigGroup>
// Plasma
#include <Plasma>
#include <Plasma/Plasma>
namespace Plasma {
class Types;

2
app/layout/genericlayout.h
Unescape Escape View File

@ -20,7 +20,7 @@
#include <QScreen>
// Plasma
#include <Plasma>
#include <Plasma/Plasma>
namespace Plasma {
class Applet;

2
app/plasma/extended/backgroundcache.h
Unescape Escape View File

@ -14,7 +14,7 @@
#include <QObject>
// Plasma
#include <Plasma>
#include <Plasma/Plasma>
// KDE
#include <KConfigGroup>

2
app/plasma/extended/backgroundtracker.h
Unescape Escape View File

@ -10,7 +10,7 @@
#include <QObject>
// Plasma
#include <Plasma>
#include <Plasma/Plasma>
namespace Latte{

20
app/plasma/extended/panelbackground.cpp
Unescape Escape View File

@ -32,7 +32,7 @@ PanelBackground::~PanelBackground()
{
}
bool PanelBackground::hasMask(Plasma::Svg *svg) const
bool PanelBackground::hasMask(KSvg::Svg *svg) const
{
if (!svg) {
return false;
@ -96,7 +96,7 @@ QString PanelBackground::prefixed(const QString &id)
return id;
}
QString PanelBackground::element(Plasma::Svg *svg, const QString &id)
QString PanelBackground::element(KSvg::Svg *svg, const QString &id)
{
if (!svg) {
return "";
@ -113,7 +113,7 @@ QString PanelBackground::element(Plasma::Svg *svg, const QString &id)
return "";
}
void PanelBackground::updateMaxOpacity(Plasma::Svg *svg)
void PanelBackground::updateMaxOpacity(KSvg::Svg *svg)
{
if (!svg) {
return;
@ -149,7 +149,7 @@ void PanelBackground::updateMaxOpacity(Plasma::Svg *svg)
emit maxOpacityChanged();
}
void PanelBackground::updatePaddings(Plasma::Svg *svg)
void PanelBackground::updatePaddings(KSvg::Svg *svg)
{
if (!svg) {
return;
@ -163,7 +163,7 @@ void PanelBackground::updatePaddings(Plasma::Svg *svg)
emit paddingsChanged();
}
void PanelBackground::updateRoundnessFromMask(Plasma::Svg *svg)
void PanelBackground::updateRoundnessFromMask(KSvg::Svg *svg)
{
if (!svg) {
return;
@ -317,7 +317,7 @@ void PanelBackground::updateRoundnessFromMask(Plasma::Svg *svg)
void PanelBackground::updateRoundnessFromShadows(Plasma::Svg *svg)
void PanelBackground::updateRoundnessFromShadows(KSvg::Svg *svg)
{
//! 1. Algorithm is choosing which corner shadow based on panel location
//! 2. For that corner discovers the maxOpacity (most solid shadow point) and
@ -494,7 +494,7 @@ void PanelBackground::updateRoundnessFromShadows(Plasma::Svg *svg)
emit roundnessChanged();
}
void PanelBackground::updateRoundnessFallback(Plasma::Svg *svg)
void PanelBackground::updateRoundnessFallback(KSvg::Svg *svg)
{
if (!svg) {
return;
@ -549,7 +549,7 @@ void PanelBackground::updateRoundnessFallback(Plasma::Svg *svg)
emit roundnessChanged();
}
void PanelBackground::updateShadow(Plasma::Svg *svg)
void PanelBackground::updateShadow(KSvg::Svg *svg)
{
if (!svg) {
return;
@ -651,7 +651,7 @@ void PanelBackground::updateShadow(Plasma::Svg *svg)
}
void PanelBackground::updateRoundness(Plasma::Svg *svg)
void PanelBackground::updateRoundness(KSvg::Svg *svg)
{
if (!svg) {
return;
@ -671,7 +671,7 @@ void PanelBackground::updateRoundness(Plasma::Svg *svg)
void PanelBackground::update()
{
Plasma::Svg *backSvg = new Plasma::Svg(this);
KSvg::Svg *backSvg = new KSvg::Svg(this);
backSvg->setImagePath(QStringLiteral("widgets/panel-background"));
backSvg->resize();

25
app/plasma/extended/panelbackground.h
Unescape Escape View File

@ -9,9 +9,12 @@
// Qt
#include <QObject>
// KF
#include <KSvg/FrameSvg>
#include <KSvg/Svg>
// Plasma
#include <Plasma>
#include <Plasma/FrameSvg>
#include <Plasma/Plasma>
namespace Latte {
namespace PlasmaExtended {
@ -64,19 +67,19 @@ signals:
void maxOpacityChanged();
private:
bool hasMask(Plasma::Svg *svg) const;
bool hasMask(KSvg::Svg *svg) const;
QString prefixed(const QString &id);
QString element(Plasma::Svg *svg, const QString &id);
QString element(KSvg::Svg *svg, const QString &id);
void updateMaxOpacity(Plasma::Svg *svg);
void updatePaddings(Plasma::Svg *svg);
void updateRoundness(Plasma::Svg *svg);
void updateShadow(Plasma::Svg *svg);
void updateMaxOpacity(KSvg::Svg *svg);
void updatePaddings(KSvg::Svg *svg);
void updateRoundness(KSvg::Svg *svg);
void updateShadow(KSvg::Svg *svg);
void updateRoundnessFromMask(Plasma::Svg *svg);
void updateRoundnessFromShadows(Plasma::Svg *svg);
void updateRoundnessFallback(Plasma::Svg *svg);
void updateRoundnessFromMask(KSvg::Svg *svg);
void updateRoundnessFromShadows(KSvg::Svg *svg);
void updateRoundnessFallback(KSvg::Svg *svg);
private:
int m_paddingTop{0};

4
app/plasma/extended/theme.cpp
Unescape Escape View File

@ -326,7 +326,7 @@ void Theme::updateBackgrounds()
void Theme::updateHasShadow()
{
Plasma::Svg *svg = new Plasma::Svg(this);
KSvg::Svg *svg = new KSvg::Svg(this);
svg->setImagePath(QStringLiteral("widgets/panel-background"));
svg->resize();
@ -498,7 +498,7 @@ void Theme::updateMarginsAreaValues()
m_marginsAreaBottom = 0;
m_marginsAreaRight = 0;
Plasma::Svg *svg = new Plasma::Svg(this);
KSvg::Svg *svg = new KSvg::Svg(this);
svg->setImagePath(QStringLiteral("widgets/panel-background"));
bool hasThickSeparatorMargins = svg->hasElement("thick-center");

5
app/plasma/extended/theme.h
Unescape Escape View File

@ -18,8 +18,11 @@
#include <KConfigGroup>
#include <KSharedConfig>
// KF
#include <KSvg/FrameSvg>
#include <KSvg/Svg>
// Plasma
#include <Plasma/FrameSvg>
#include <Plasma/Theme>
namespace Latte {

4
app/view/effects.h
Unescape Escape View File

@ -15,8 +15,10 @@
#include <QQuickView>
#include <QRect>
// KF
#include <KSvg/FrameSvg>
// Plasma
#include <Plasma/FrameSvg>
#include <Plasma/Theme>
namespace Latte {

10
app/view/panelshadows_p.h
Unescape Escape View File

@ -8,10 +8,10 @@
#include <QSet>
#include "plasma/framesvg.h"
#include "plasma/svg.h"
#include <KSvg/FrameSvg>
#include <KSvg/Svg>
class PanelShadows : public Plasma::Svg
class PanelShadows : public KSvg::Svg
{
Q_OBJECT
@ -21,10 +21,10 @@ public:
static PanelShadows *self();
void addWindow(QWindow *window, Plasma::FrameSvg::EnabledBorders enabledBorders = Plasma::FrameSvg::AllBorders);
void addWindow(QWindow *window, KSvg::FrameSvg::EnabledBorders enabledBorders = KSvg::FrameSvg::AllBorders);
void removeWindow(QWindow *window);
void setEnabledBorders(QWindow *window, Plasma::FrameSvg::EnabledBorders enabledBorders = Plasma::FrameSvg::AllBorders);
void setEnabledBorders(QWindow *window, KSvg::FrameSvg::EnabledBorders enabledBorders = KSvg::FrameSvg::AllBorders);
private:
class Private;

4
app/wm/abstractwindowinterface.h
Unescape Escape View File

@ -32,10 +32,10 @@
// KDE
#include <KSharedConfig>
#include <KActivities/Consumer>
#include <PlasmaActivities/Consumer>
// Plasma
#include <Plasma>
#include <Plasma/Plasma>
namespace Latte {

2
declarativeimports/core/quickwindowsystem.cpp
Unescape Escape View File

@ -12,7 +12,7 @@
// X11
#include <KWindowSystem>
#include <kx11extras.h>
#include <KX11Extras>
namespace Latte {

2
default.nix
Unescape Escape View File

@ -10,7 +10,7 @@ stdenv.mkDerivation {
src = ./.;
buildInputs = with kdePackages; [
plasma-activities plasma-sdk
plasma-activities plasma-activities.dev plasma-sdk
plasma-wayland-protocols qt6.full
xorg.libpthreadstubs xorg.libXdmcp xorg.libSM
wayland

Write Preview
Loading…
Cancel
Save