Daniel Vrátil
9 years ago
parent
8ae16f8fd4
commit
2f9852330e
@ -1,2 +1,3 @@
|
|||||||
/plasma-desktop-5.5.2.tar.xz
|
/plasma-desktop-5.5.2.tar.xz
|
||||||
/plasma-desktop-5.5.3.tar.xz
|
/plasma-desktop-5.5.3.tar.xz
|
||||||
|
/plasma-desktop-5.5.4.tar.xz
|
||||||
|
|||||||
@ -1,25 +0,0 @@
|
|||||||
From 456100e0f9770534f1bfbb79183f598733936961 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Eike Hein <hein@kde.org>
|
|
||||||
Date: Wed, 6 Jan 2016 20:05:59 +0100
|
|
||||||
Subject: [PATCH 1/4] Fix favorites scripting in Kickoff.
|
|
||||||
|
|
||||||
---
|
|
||||||
applets/kickoff/package/contents/ui/Kickoff.qml | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/applets/kickoff/package/contents/ui/Kickoff.qml b/applets/kickoff/package/contents/ui/Kickoff.qml
|
|
||||||
index 8a8c9c5..573804c 100644
|
|
||||||
--- a/applets/kickoff/package/contents/ui/Kickoff.qml
|
|
||||||
+++ b/applets/kickoff/package/contents/ui/Kickoff.qml
|
|
||||||
@@ -70,7 +70,7 @@ Item {
|
|
||||||
Connections {
|
|
||||||
target: plasmoid.configuration
|
|
||||||
|
|
||||||
- onFavoriteAppsChanged: {
|
|
||||||
+ onFavoritesChanged: {
|
|
||||||
globalFavorites.favorites = plasmoid.configuration.favorites;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
--
|
|
||||||
2.5.0
|
|
||||||
|
|
||||||
@ -1,63 +0,0 @@
|
|||||||
From aa99711fe71235ba6a1e4431c43d690673457e26 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Eike Hein <hein@kde.org>
|
|
||||||
Date: Wed, 6 Jan 2016 20:38:12 +0100
|
|
||||||
Subject: [PATCH 2/4] Fix inconsistent margins, add missing listview margin,
|
|
||||||
drop non-scalable measurements.
|
|
||||||
|
|
||||||
---
|
|
||||||
desktoppackage/contents/explorer/WidgetExplorer.qml | 11 ++---------
|
|
||||||
1 file changed, 2 insertions(+), 9 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/desktoppackage/contents/explorer/WidgetExplorer.qml b/desktoppackage/contents/explorer/WidgetExplorer.qml
|
|
||||||
index 94cc46b..b7fc76f 100644
|
|
||||||
--- a/desktoppackage/contents/explorer/WidgetExplorer.qml
|
|
||||||
+++ b/desktoppackage/contents/explorer/WidgetExplorer.qml
|
|
||||||
@@ -33,7 +33,7 @@ import org.kde.plasma.private.shell 2.0
|
|
||||||
Item {
|
|
||||||
id: main
|
|
||||||
|
|
||||||
- width: Math.max(heading.paintedWidth, units.iconSizes.enormous * 2 + units.smallSpacing * 4 + 20)
|
|
||||||
+ width: Math.max(heading.paintedWidth, units.iconSizes.enormous * 2 + units.smallSpacing * 4 + units.gridUnit * 2)
|
|
||||||
height: 800//Screen.height
|
|
||||||
|
|
||||||
property QtObject containment
|
|
||||||
@@ -197,9 +197,6 @@ Item {
|
|
||||||
top: parent.top
|
|
||||||
left: parent.left
|
|
||||||
right: parent.right
|
|
||||||
- topMargin: 0
|
|
||||||
- leftMargin: units.smallSpacing
|
|
||||||
- rightMargin: units.smallSpacing
|
|
||||||
}
|
|
||||||
columns: 2
|
|
||||||
|
|
||||||
@@ -260,7 +257,6 @@ Item {
|
|
||||||
right: parent.right
|
|
||||||
bottom: bottomBar.top
|
|
||||||
topMargin: units.smallSpacing
|
|
||||||
- leftMargin: units.smallSpacing
|
|
||||||
bottomMargin: units.smallSpacing
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -280,7 +276,7 @@ Item {
|
|
||||||
|
|
||||||
activeFocusOnTab: true
|
|
||||||
keyNavigationWraps: true
|
|
||||||
- cellWidth: width / 2
|
|
||||||
+ cellWidth: (width - units.smallSpacing) / 2
|
|
||||||
cellHeight: cellWidth + units.gridUnit * 4 + units.smallSpacing * 2
|
|
||||||
|
|
||||||
delegate: AppletDelegate {}
|
|
||||||
@@ -329,9 +325,6 @@ Item {
|
|
||||||
left: parent.left
|
|
||||||
right: parent.right
|
|
||||||
bottom: parent.bottom
|
|
||||||
- leftMargin: units.smallSpacing
|
|
||||||
- rightMargin: units.smallSpacing
|
|
||||||
- bottomMargin: units.smallSpacing
|
|
||||||
}
|
|
||||||
|
|
||||||
spacing: units.smallSpacing
|
|
||||||
--
|
|
||||||
2.5.0
|
|
||||||
|
|
||||||
@ -1,99 +0,0 @@
|
|||||||
From 12a64ed82308b9a368d42f641fb23da8b18c3000 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Eike Hein <hein@kde.org>
|
|
||||||
Date: Sat, 9 Jan 2016 01:56:26 +0100
|
|
||||||
Subject: [PATCH 3/4] Add missing appletInterface prop.
|
|
||||||
|
|
||||||
BUG:357638
|
|
||||||
---
|
|
||||||
applets/kicker/plugin/computermodel.cpp | 15 +++++++++++++++
|
|
||||||
applets/kicker/plugin/computermodel.h | 6 ++++++
|
|
||||||
applets/kickoff/package/contents/ui/ComputerView.qml | 2 ++
|
|
||||||
3 files changed, 23 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/applets/kicker/plugin/computermodel.cpp b/applets/kicker/plugin/computermodel.cpp
|
|
||||||
index ffbe6d0..cff2928 100644
|
|
||||||
--- a/applets/kicker/plugin/computermodel.cpp
|
|
||||||
+++ b/applets/kicker/plugin/computermodel.cpp
|
|
||||||
@@ -140,6 +140,7 @@ ComputerModel::ComputerModel(QObject *parent) : ForwardingModel(parent)
|
|
||||||
, m_systemAppsModel(new FavoritesModel(this))
|
|
||||||
, m_filteredPlacesModel(new FilteredPlacesModel(this))
|
|
||||||
, m_appNameFormat(AppEntry::NameOnly)
|
|
||||||
+, m_appletInterface(nullptr)
|
|
||||||
{
|
|
||||||
connect(m_systemAppsModel, &FavoritesModel::favoritesChanged, this, &ComputerModel::systemApplicationsChanged);
|
|
||||||
m_systemAppsModel->setFavorites(QStringList() << "systemsettings.desktop");
|
|
||||||
@@ -176,6 +177,20 @@ void ComputerModel::setAppNameFormat(int format)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
+QObject *ComputerModel::appletInterface() const
|
|
||||||
+{
|
|
||||||
+ return m_appletInterface;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+void ComputerModel::setAppletInterface(QObject *appletInterface)
|
|
||||||
+{
|
|
||||||
+ if (m_appletInterface != appletInterface) {
|
|
||||||
+ m_appletInterface = appletInterface;
|
|
||||||
+
|
|
||||||
+ emit appletInterfaceChanged();
|
|
||||||
+ }
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
QStringList ComputerModel::systemApplications() const
|
|
||||||
{
|
|
||||||
return m_systemAppsModel->favorites();
|
|
||||||
diff --git a/applets/kicker/plugin/computermodel.h b/applets/kicker/plugin/computermodel.h
|
|
||||||
index bd811a2..ba82d7a 100644
|
|
||||||
--- a/applets/kicker/plugin/computermodel.h
|
|
||||||
+++ b/applets/kicker/plugin/computermodel.h
|
|
||||||
@@ -75,6 +75,7 @@ class ComputerModel : public ForwardingModel
|
|
||||||
Q_OBJECT
|
|
||||||
|
|
||||||
Q_PROPERTY(int appNameFormat READ appNameFormat WRITE setAppNameFormat NOTIFY appNameFormatChanged)
|
|
||||||
+ Q_PROPERTY(QObject* appletInterface READ appletInterface WRITE setAppletInterface NOTIFY appletInterfaceChanged)
|
|
||||||
Q_PROPERTY(QStringList systemApplications READ systemApplications WRITE setSystemApplications NOTIFY systemApplicationsChanged)
|
|
||||||
|
|
||||||
public:
|
|
||||||
@@ -86,6 +87,9 @@ class ComputerModel : public ForwardingModel
|
|
||||||
int appNameFormat() const;
|
|
||||||
void setAppNameFormat(int format);
|
|
||||||
|
|
||||||
+ QObject *appletInterface() const;
|
|
||||||
+ void setAppletInterface(QObject *appletInterface);
|
|
||||||
+
|
|
||||||
QStringList systemApplications() const;
|
|
||||||
void setSystemApplications(const QStringList &apps);
|
|
||||||
|
|
||||||
@@ -95,6 +99,7 @@ class ComputerModel : public ForwardingModel
|
|
||||||
|
|
||||||
Q_SIGNALS:
|
|
||||||
void appNameFormatChanged() const;
|
|
||||||
+ void appletInterfaceChanged() const;
|
|
||||||
void systemApplicationsChanged() const;
|
|
||||||
|
|
||||||
private Q_SLOTS:
|
|
||||||
@@ -106,6 +111,7 @@ class ComputerModel : public ForwardingModel
|
|
||||||
FavoritesModel *m_systemAppsModel;
|
|
||||||
FilteredPlacesModel *m_filteredPlacesModel;
|
|
||||||
AppEntry::NameFormat m_appNameFormat;
|
|
||||||
+ QObject *m_appletInterface;
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif
|
|
||||||
diff --git a/applets/kickoff/package/contents/ui/ComputerView.qml b/applets/kickoff/package/contents/ui/ComputerView.qml
|
|
||||||
index bfdc5f8..0cb189d 100644
|
|
||||||
--- a/applets/kickoff/package/contents/ui/ComputerView.qml
|
|
||||||
+++ b/applets/kickoff/package/contents/ui/ComputerView.qml
|
|
||||||
@@ -28,6 +28,8 @@ BaseView {
|
|
||||||
|
|
||||||
appNameFormat: rootModel.appNameFormat
|
|
||||||
|
|
||||||
+ appletInterface: plasmoid
|
|
||||||
+
|
|
||||||
favoritesModel: globalFavorites
|
|
||||||
|
|
||||||
Component.onCompleted: {
|
|
||||||
--
|
|
||||||
2.5.0
|
|
||||||
|
|
||||||
@ -1,19 +0,0 @@
|
|||||||
diff -up plasma-desktop-5.5.3/kcms/kfontinst/lib/FcEngine.cpp.font_preview plasma-desktop-5.5.3/kcms/kfontinst/lib/FcEngine.cpp
|
|
||||||
--- plasma-desktop-5.5.3/kcms/kfontinst/lib/FcEngine.cpp.font_preview 2016-01-06 06:12:23.000000000 -0600
|
|
||||||
+++ plasma-desktop-5.5.3/kcms/kfontinst/lib/FcEngine.cpp 2016-01-09 09:53:10.864286301 -0600
|
|
||||||
@@ -537,7 +537,14 @@ QImage CFcEngine::Xft::toImage(int w, in
|
|
||||||
if (!xImage) {
|
|
||||||
return QImage();
|
|
||||||
}
|
|
||||||
- return QImage(xImage->data, xImage->width, xImage->height, xImage->stride, QImage::Format_ARGB32_Premultiplied, &cleanupXImage, xImage);
|
|
||||||
+ QImage::Format format = QImage::Format_RGB32;
|
|
||||||
+ switch (DefaultDepth(QX11Info::display(), 0)) {
|
|
||||||
+ case 32: format = QImage::Format_ARGB32_Premultiplied; break;
|
|
||||||
+ case 16: format = QImage::Format_RGB16; break;
|
|
||||||
+ case 8: format = QImage::Format_Grayscale8; break;
|
|
||||||
+ default: break;
|
|
||||||
+ }
|
|
||||||
+ return QImage(xImage->data, xImage->width, xImage->height, xImage->stride, format, &cleanupXImage, xImage);
|
|
||||||
}
|
|
||||||
|
|
||||||
inline int point2Pixel(int point)
|
|
||||||
Loading…
Reference in new issue