This commit is contained in:
parent
b35942ae9f
commit
559a29ba7d
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:4467de21120b3a71f923e31e04fdc63baf288803c9a475de4a097da946f6125a
|
||||
size 16410392
|
||||
oid sha256:264a68ca389ec9e466d439a01f38d7a8482771214c9267f66db1394d2494bd83
|
||||
size 16410688
|
||||
|
@ -3,7 +3,8 @@ Wed Sep 24 12:15:17 UTC 2014 - hrvoje.senjan@gmail.com
|
||||
|
||||
- Update to 5.0.95~git20140924
|
||||
* Many improvements for the Breeze style
|
||||
- Added openSUSE_colorscheme.diff: apply openSUSE colorscheme if exists
|
||||
* Honor look-n-feel setting in kdeglobals (needed for openSUSE
|
||||
branding)
|
||||
- Drop pkgconfig(x11) BuildRequires
|
||||
|
||||
-------------------------------------------------------------------
|
||||
|
@ -44,8 +44,6 @@ Group: System/GUI/KDE
|
||||
Url: http://www.kde.org
|
||||
#Source: http://download.kde.org/stable/plasma/%{version}/%{name}-%{version}.tar.xz
|
||||
Source: %{name}-%{version}.tar.xz
|
||||
# PATCH-FIX-OPENSUSE openSUSE_colorscheme.diff -- apply openSUSE colorscheme if exists
|
||||
Patch0: openSUSE_colorscheme.diff
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
%description
|
||||
@ -100,7 +98,6 @@ This package provides Breeze KWin decoration.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0 -p1
|
||||
|
||||
%build
|
||||
%cmake_kf5 -d build -- -DBUILD_po=OFF
|
||||
|
@ -1,55 +0,0 @@
|
||||
diff --git a/misc/kde4breeze/src/main.cpp b/misc/kde4breeze/src/main.cpp
|
||||
index 3d08694..0062cda 100644
|
||||
--- a/misc/kde4breeze/src/main.cpp
|
||||
+++ b/misc/kde4breeze/src/main.cpp
|
||||
@@ -32,7 +32,11 @@
|
||||
|
||||
void applyColorScheme(KConfig *other)
|
||||
{
|
||||
- QString src = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "color-schemes/Breeze.colors");
|
||||
+ QString src;
|
||||
+ src = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "kde4/apps/color-schemes/openSUSE.colors");
|
||||
+ if (src.isEmpty()) {
|
||||
+ src = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "color-schemes/Breeze.colors");
|
||||
+ }
|
||||
|
||||
KSharedConfigPtr config = KSharedConfig::openConfig(src);
|
||||
|
||||
@@ -64,7 +68,12 @@ void updateKdeGlobals()
|
||||
//use QtCurve only if installed
|
||||
const bool hasBreeze = QStyleFactory::keys().contains("Breeze");
|
||||
KConfigGroup group(&config, "General");
|
||||
+ QString filekde4 = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "kde4/apps/color-schemes/openSUSE.colors");
|
||||
+ if(!filekde4.isEmpty()){
|
||||
+ group.writeEntry("ColorScheme", "openSUSE");
|
||||
+ } else {
|
||||
group.writeEntry("ColorScheme", "Breeze");
|
||||
+ }
|
||||
if (hasBreeze) {
|
||||
group.writeEntry("widgetStyle", "Breeze");
|
||||
}
|
||||
@@ -78,7 +87,12 @@ void updateKdeGlobals()
|
||||
|
||||
KSharedConfig::Ptr kf5Config = KSharedConfig::openConfig("kdeglobals");
|
||||
KConfigGroup kf5Group(kf5Config, "General");
|
||||
+ QString filekf5 = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "color-schemes/openSUSE.colors");
|
||||
+ if(!filekf5.isEmpty()){
|
||||
+ kf5Group.writeEntry("ColorScheme", "openSUSE");
|
||||
+ } else {
|
||||
kf5Group.writeEntry("ColorScheme", "Breeze");
|
||||
+ }
|
||||
if (hasBreeze) {
|
||||
kf5Group.writeEntry("widgetStyle", "Breeze");
|
||||
}
|
||||
@@ -86,7 +100,11 @@ void updateKdeGlobals()
|
||||
kf5Group.sync();
|
||||
|
||||
KConfigGroup kf52Group(kf5Config, "KDE");
|
||||
+ if(!filekf5.isEmpty()){
|
||||
+ kf52Group.writeEntry("ColorScheme", "openSUSE");
|
||||
+ } else {
|
||||
kf52Group.writeEntry("ColorScheme", "Breeze");
|
||||
+ }
|
||||
if (hasBreeze) {
|
||||
kf52Group.writeEntry("widgetStyle", "Breeze");
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user