Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

beyaz boşuk ve dosya izni düzeltildi

Browse Source
This commit is contained in:
aydemir
2015-08-20 14:48:12 +03:00
parent 39fb69cd98
commit 9c26d27aa6
192 changed files with 68 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/kde/framework/kconfig/actions.py
Executable → Regular
+1 -1
View File
@@ -20,5 +20,5 @@ def build():
def install():
cmaketools.install()
pisitools.dodoc("README.md", "COPYING.LIB", "DESIGN", "TODO")
desktop/kde/framework/kconfig/files/0001-ensure-platform-window-resize-processing.patch
-42
View File
@@ -1,42 +0,0 @@
From 06632ddebeefa97594c19fc4ede5b89ed263b917 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20L=C3=BCbking?= <thomas.luebking@gmail.com>
Date: Sat, 2 Aug 2014 12:25:00 +0200
Subject: [PATCH] ensure platform window resize processing
---
src/gui/kwindowconfig.cpp | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/gui/kwindowconfig.cpp b/src/gui/kwindowconfig.cpp
index c3cefb7..a906cd5 100644
--- a/src/gui/kwindowconfig.cpp
+++ b/src/gui/kwindowconfig.cpp
@@ -21,6 +21,7 @@
#include "kwindowconfig.h"
+#include <QCoreApplication>
#include <QScreen>
#include <QWindow>
@@ -63,6 +64,7 @@ void KWindowConfig::restoreWindowSize(QWindow *window, const KConfigGroup &confi
if (!window) {
return;
}
+ window->create(); // ensure the platform window is created before attempting the resize
const QRect desk = window->screen()->geometry();
@@ -80,6 +82,9 @@ void KWindowConfig::restoreWindowSize(QWindow *window, const KConfigGroup &confi
// If window is maximized set maximized state and in all case set the size
window->resize(width, height);
+ // restoring the size will often happen before event processing
+ // -> force processing now to have the platform window pick the new size
+ QCoreApplication::processEvents();
if (isMaximized) {
window->setWindowState(Qt::WindowMaximized);
}
--
2.0.3
desktop/kde/framework/kconfig/files/session-restore.patch
-128
View File
@@ -1,128 +0,0 @@
From 9978cfd5ccd18509dd514b3a7ada8c158c209de1 Mon Sep 17 00:00:00 2001
From: Stefan Becker <chemobejk@gmail.com>
Date: Sat, 9 May 2015 17:16:27 +0300
Subject: [PATCH 1/3] Add KConfigGui::setSessionConfig()
When the application receives a saveState signal it needs to replace the
current KConfig object with a new one based on the QSessionManager
information. Add a new interface that accepts the new session id and key.
BUG: 346768
REVIEW: 123705
---
src/gui/kconfiggui.cpp | 41 ++++++++++++++++++++++++++++++++---------
src/gui/kconfiggui.h | 17 +++++++++++++++--
2 files changed, 47 insertions(+), 11 deletions(-)
diff --git a/src/gui/kconfiggui.cpp b/src/gui/kconfiggui.cpp
index 0048c60..67b6009 100644
--- a/src/gui/kconfiggui.cpp
+++ b/src/gui/kconfiggui.cpp
@@ -25,28 +25,51 @@
#include <kconfig.h>
+static QString configName(const QString &id, const QString &key)
+{
+ return(QLatin1String("session/") + QGuiApplication::applicationName() +
+ QLatin1Char('_') + id +
+ QLatin1Char('_') + key);
+}
+
static KConfig *s_sessionConfig = Q_NULLPTR;
KConfig *KConfigGui::sessionConfig()
{
- if (!s_sessionConfig) { // create an instance specific config object
- s_sessionConfig = new KConfig(sessionConfigName(), KConfig::SimpleConfig);
+#ifdef QT_NO_SESSIONMANAGER
+#error QT_NO_SESSIONMANAGER was set, this will not compile. Reconfigure Qt with Session management support.
+#endif
+ if (!hasSessionConfig()) {
+ // create the default instance specific config object
+ // from applications' -session command line parameter
+ s_sessionConfig = new KConfig(configName(qApp->sessionId(),
+ qApp->sessionKey()),
+ KConfig::SimpleConfig);
}
+
return s_sessionConfig;
}
+void KConfigGui::setSessionConfig(const QString &id, const QString &key)
+{
+ if (hasSessionConfig()) {
+ delete s_sessionConfig;
+ s_sessionConfig = Q_NULLPTR;
+ }
+
+ // create a new instance specific config object from supplied id & key
+ s_sessionConfig = new KConfig(configName(id, key),
+ KConfig::SimpleConfig);
+}
+
bool KConfigGui::hasSessionConfig()
{
return s_sessionConfig != Q_NULLPTR;
}
+#ifndef KDE_NO_DEPRECATED
QString KConfigGui::sessionConfigName()
{
-#ifdef QT_NO_SESSIONMANAGER
-#error QT_NO_SESSIONMANAGER was set, this will not compile. Reconfigure Qt with Session management support.
-#endif
- const QString sessionKey = qApp->sessionKey();
- const QString sessionId = qApp->sessionId();
- return QString(QLatin1String("session/%1_%2_%3")).arg(QGuiApplication::applicationName()).arg(sessionId).arg(sessionKey);
+ return sessionConfig()->name();
}
-
+#endif
diff --git a/src/gui/kconfiggui.h b/src/gui/kconfiggui.h
index 173400f..fe1f820 100644
--- a/src/gui/kconfiggui.h
+++ b/src/gui/kconfiggui.h
@@ -31,7 +31,7 @@ class KConfig;
namespace KConfigGui
{
/**
- * Returns the application session config object.
+ * Returns the current application session config object.
*
* @return A pointer to the application's instance specific
* KConfig object.
@@ -40,6 +40,16 @@ namespace KConfigGui
KCONFIGGUI_EXPORT KConfig *sessionConfig();
/**
+ * Replaces the current application session config object.
+ *
+ * @param id new session id
+ * @param key new session key
+ *
+ * @since 5.11
+ */
+KCONFIGGUI_EXPORT void setSessionConfig(const QString &id, const QString &key);
+
+/**
* Indicates if a session config has been created for that application
* (ie. if sessionConfig() got called at least once)
*
@@ -51,8 +61,11 @@ KCONFIGGUI_EXPORT bool hasSessionConfig();
* Returns the name of the application session
*
* @return the application session name
+ * @deprecated since 5.11, use sessionConfig()->name()
*/
-KCONFIGGUI_EXPORT QString sessionConfigName();
+#ifndef KDE_NO_DEPRECATED
+KCONFIGGUI_DEPRECATED QString sessionConfigName();
+#endif
}
#endif // KCONFIGGUI_H
--
2.4.1
desktop/kde/framework/kconfig/pspec.xml
Executable → Regular
+3 -7
View File
@@ -20,10 +20,6 @@
<Dependency>qt5-linguist</Dependency>
<Dependency>extra-cmake-modules</Dependency>
</BuildDependencies>
<Patches>
<!--<Patch level="1">0001-ensure-platform-window-resize-processing.patch</Patch>
<Patch level="1">session-restore.patch</Patch> -->
</Patches>
</Source>
<Package>
@@ -41,7 +37,7 @@
<Path fileType="doc">/usr/share/doc</Path>
</Files>
</Package>
<Package>
<Name>kconfig-devel</Name>
<Summary>Development files for kconfig</Summary>
@@ -52,7 +48,7 @@
<Files>
<Path fileType="header">/usr/include</Path>
<Path fileType="data">/usr/lib/cmake</Path>
<Path fileType="config">/usr/lib/pkgconfig</Path>
<Path fileType="config">/usr/lib/pkgconfig</Path>
</Files>
</Package>
@@ -77,6 +73,6 @@
<Comment>First Release.</Comment>
<Name>Stefan Gronewold(groni)</Name>
<Email>groni@pisilinux.org</Email>
</Update>
</Update>
</History>
</PISI>