Hello community,
here is the log from the commit of package kdebase4-workspace for
openSUSE:Factory checked in at 2013-07-08 07:34:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kdebase4-workspace (Old)
and /work/SRC/openSUSE:Factory/.kdebase4-workspace.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdebase4-workspace"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kdebase4-workspace/kdebase4-workspace.changes
2013-06-11 09:31:21.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.kdebase4-workspace.new/kdebase4-workspace.changes
2013-07-08 07:34:29.000000000 +0200
@@ -1,0 +2,64 @@
+Wed Jul 3 19:00:44 UTC 2013 - hrvoje.sen...@gmail.com
+
+- Added helper_actions_syspath.patch, which disables
+ org.kde.powerdevil.backlighthelper.syspath policy, until bnc#825256
+ gets resolved
+- Removed rpmlintrc file
+
+-------------------------------------------------------------------
+Tue Jul 2 12:16:28 UTC 2013 - tittiatc...@gmail.com
+
+- Use the new variable _kde_branding_version for the version of the
+ branding packages/requires.
+
+-------------------------------------------------------------------
+Thu Jun 27 18:08:27 UTC 2013 - tittiatc...@gmail.com
+
+- Update to 4.10.90
+ * KDE 4.11 Beta 2 release
+ * See http://www.kde.org/announcements/announce-4.11-beta2.php
+- Dropped enable-color-correction-only-after-contacting-kolormanager.diff
+ and pager diff, patches included in this release
+
+-------------------------------------------------------------------
+Sun Jun 23 01:39:14 UTC 2013 - hrvoje.sen...@gmail.com
+
+- Added enable-color-correction-only-after-contacting-kolormanager.diff
+ fixes kde#321217
+- Removed NetworkManager-devel from buildrequires, not needed anymore
+
+-------------------------------------------------------------------
+Thu Jun 20 16:12:48 UTC 2013 - wer...@suse.de
+
+- Make plymouth patch smart that is do only force standard X server
+ on the active console but not any other (bnc#809806)
+
+-------------------------------------------------------------------
+Mon Jun 17 19:51:18 UTC 2013 - hrvoje.sen...@gmail.com
+
+- Split out krandr modules and apps into separate package, so it
+ can be obsoleted by KScreen
+- Make main package recommends kscreen package
+
+-------------------------------------------------------------------
+Fri Jun 14 10:08:50 UTC 2013 - wba...@tmo.at
+
+- Changed plasma-kickoff-newly-collapsing.diff:
+ * Use the same sorting algorithm as the upstream code (respects
+ the current locale, f.e.)
+ * don't always ignore separators
+ * Show collapsed entries as "name (category)" instead of
+ "category (name)"
+ * cleanup/remove some unneeded/unused stuff
+
+-------------------------------------------------------------------
+Thu Jun 13 19:08:44 UTC 2013 - tittiatc...@gmail.com
+
+- Update to 4.10.80
+ * KDE 4.11 Beta 1 release
+ * See http://www.kde.org/announcements/announce-4.11-beta1.php
+- Dropped upstreamed patches: kdm-fix-greeteruid.patch,
+ systemd-session-management-support-in-the-workspace.patch,
+ dont-install-solid-netbackends.diff and storage.diff
+
+-------------------------------------------------------------------
Old:
----
dont-install-solid-netbackends.diff
kde-workspace-4.10.4.tar.xz
kdebase4-workspace-rpmlintrc
kdm-fix-greeteruid.patch
pager.diff
storage.diff
systemd-session-management-support-in-the-workspace.patch
New:
----
helper_actions_syspath.patch
kde-workspace-4.10.90.tar.xz
klipper.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase4-workspace.spec ++++++
--- /var/tmp/diff_new_pack.G44qTH/_old 2013-07-08 07:34:30.000000000 +0200
+++ /var/tmp/diff_new_pack.G44qTH/_new 2013-07-08 07:34:30.000000000 +0200
@@ -23,7 +23,7 @@
%endif
Name: kdebase4-workspace
-Version: 4.10.4
+Version: 4.10.90
Release: 0
Summary: The KDE Workspace Components
License: GPL-2.0+
@@ -32,7 +32,6 @@
%if !%{with_systemd}
BuildRequires: ConsoleKit-devel
%endif
-BuildRequires: NetworkManager-devel > 0.8.997
BuildRequires: fdupes
BuildRequires: gpsd-devel
BuildRequires: libQtWebKit-devel
@@ -61,10 +60,16 @@
BuildRequires: python-devel
BuildRequires: xcb-util-image-devel
BuildRequires: xcb-util-renderutil-devel
+BuildRequires: xcb-util-wm-devel
+BuildRequires: pkgconfig(xcb-keysyms)
%if %suse_version > 1220
BuildRequires: pkgconfig(glu)
%endif
-Source0:
http://download.kde.org/stable/%{version}/src/kde-workspace-%{version}.tar.xz
+# Unlock this when we get weston in Factory
+#%if %suse_version > 1230
+#BuildRequires: wayland-devel
+#%endif
+Source0:
http://download.kde.org/unstable/%{version}/src/kde-workspace-%{version}.tar.xz
Source1: rcksysguardd
Source2: titlebar_decor.png
Source3: kwin-cubecap.png
@@ -72,7 +77,6 @@
Source5: kdm
Source6: kdm-logrotate
Source7: ksysguardd.service
-Source91: %{name}-rpmlintrc
## KDM patches
# PATCH-FIX-OPENSUSE kdm-cope-with-new-grub.diff -- Don't look for
grub-set-default, we won't need it (bnc#771545)
Patch1: kdm-cope-with-new-grub.diff
@@ -105,9 +109,6 @@
# Patch is based on the changes within GDM to detect running plymouth
# and issue a quit to the plymouth daemon
Patch15: kdm_plymouth.patch
-# PATCH-FIX-UPSTREAM kdm-fix-greeteruid.patch Genkmdconf can now create the
kdm user and group. This means also
-# that KDM will run under the user kdm
-Patch16: kdm-fix-greeteruid.patch
## Workspace patches
# PATCH-FIX-OPENSUSE startkde.diff -- Injects branded startupconfigkeys to
users $KDEHOME, and adds %datadir/kde4/env
# to list of read enviroments
@@ -128,27 +129,20 @@
Patch56: plasma-kickoff-newly-collapsing.diff
# PATCH-FIX-OPENSUSE plasma-panel-resize-hint.diff -- Displays pixel size when
resizing panel
Patch57: plasma-panel-resize-hint.diff
-# PATCH-FIX-OPENSUSE dont-install-solid-netbackends.diff -- Excludes redundant
Network Management backends from building
-Patch58: dont-install-solid-netbackends.diff
# PATCH-FIX-OPENSUSE krunner-no-italics.diff -- Change italic krunner result
subtext to be smaller instead of italic (kde#307344)
Patch59: krunner-no-italics.diff
# PATCH-FIX-OPENSUSE plasma-disable-networkmanager.diff -- Makes it possible
to disable it on KDE start depending on sysconfig
Patch60: plasma-disable-networkmanager.diff
-%if %{with_systemd}
-# PATCH-FIX-UPSTREAM systemd-session-management-support-in-the-workspace.patch
-# This patch rewrites the reboot/shutdown code within workspace so that it
works with systemd.
-Patch61: systemd-session-management-support-in-the-workspace.patch
-%endif
# PATCH-FIX-OPENSUSE opensuse-homepage.diff -- Makes kickoff use openSUSE
homepage as default
Patch62: opensuse-homepage.diff
# PATCH-FIX-OPENSUSE opensuse-kinfocenter.diff (created by Alin M. Elena to
have some openSUSE distro info in kinfocenter)
Patch63: opensuse-kinfocenter.diff
-# PATCH-FIX-OPENSUSE storage.diff (created by Alin M. Elena to add unique
names for partitions in kinfocenter)
-Patch64: storage.diff
-# PATCH-FIX-OPENSUSE pager.diff -- Use plasma theme color for pager text
-Patch65: pager.diff
+# PATCH-FIX-UPSTREAM klipper.diff -- fix performance issue with Klipper see
https://bugs.kde.org/show_bug.cgi?id=238084
+Patch64: klipper.patch
+# PATCH-FIX-OPENSUSE helper_actions_syspath.patch -- disables
org.kde.powerdevil.backlighthelper.syspath policy, until bnc#825256 gets
resolved
+Patch1000: helper_actions_syspath.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Requires: %{name}-branding = %{version}
+Requires: %{name}-branding = %{_kde_branding_version}
Requires: %{name}-ksysguardd = %{version}
Requires: %{name}-liboxygenstyle = %{version}
# Requires /etc/xdg/menus/applications.menu (bnc#754104)
@@ -170,6 +164,7 @@
Recommends: plasma-addons
Recommends: plasmoid-quickaccess
Recommends: python-kdebase4
+Recommends: kscreen
Suggests: kdm
Requires(pre): permissions
%define debug_package_requires %{name} = %{version}-%{release}
kdelibs4-debuginfo
@@ -185,6 +180,8 @@
Obsoletes: kdebase4-workspace-plasma-engine-akonadi < %{version}
Provides: kdebase4-workspace-plasma-engine-akonadi = %{version}
%kde4_runtime_requires
+%kde4_pimlibs_requires
+%kde4_akonadi_requires
%define _dminitdir %{_kde4_prefix}/lib/X11/displaymanagers
%description
@@ -194,7 +191,7 @@
%package branding-upstream
Summary: The KDE Workspace Components
Group: System/GUI/KDE
-Provides: %{name}-branding = %{version}
+Provides: %{name}-branding = %{_kde_branding_version}
Requires: kdebase4-artwork = %{version}
Requires: kdebase4-wallpaper-default = %{version}
Supplements: packageand(%{name}:branding-upstream)
@@ -207,7 +204,7 @@
%package -n kdm-branding-upstream
Summary: KDE login and display manager - upstream branding
Group: System/GUI/KDE
-Provides: kdm-branding = %{version}
+Provides: kdm-branding = %{_kde_branding_version}
Requires(pre): %fillup_prereq
Supplements: packageand(kdm:branding-upstream)
Conflicts: otherproviders(kdm-branding)
@@ -234,7 +231,7 @@
Provides: kde4-kwin
Provides: windowmanager
%kde4_runtime_requires
-Requires: %{name}-branding = %{version}
+Requires: %{name}-branding = %{_kde_branding_version}
Provides: kdebase3:/opt/kde3/bin/kwin
%description -n kwin
@@ -267,7 +264,7 @@
%package -n kdm
Summary: KDE login and display manager
Group: System/GUI/KDE
-Requires: kdm-branding = %{version}
+Requires: kdm-branding = %{_kde_branding_version}
%if !%{with_systemd}
Requires: ConsoleKit-x11
%endif
@@ -312,6 +309,14 @@
Python bindings for Plasma, the KDE 4 desktop shell. These bindings
allow Plasmoids written in Python
+%package -n krandr
+Summary: KDE Screen management tools
+Group: System/GUI/KDE
+%kde4_runtime_requires
+
+%description -n krandr
+KDE Screen management tools
+
%prep
%setup -q -n kde-workspace-%{version}
## KDM patches
@@ -330,7 +335,6 @@
%patch13
%patch14 -p1
%patch15
-%patch16 -p1
## Workspace patches
%patch50
%patch51
@@ -338,18 +342,14 @@
%patch53
%patch54
%patch55
-%patch56
+%patch56 -p1
%patch57
-%patch58 -p1
%patch59 -p1
%patch60 -p1
-%if %{with_systemd}
-%patch61 -p1
-%endif
%patch62 -p1
%patch63 -p1
%patch64 -p1
-%patch65 -p1
+%patch1000 -p1
cp %{SOURCE3} kwin/effects/cube/data/cubecap.png
%build
@@ -568,8 +568,6 @@
%{_kde4_appsdir}/cmake
%{_kde4_libdir}/liblsofui.so
%{_kde4_modulesdir}/plugins/designer/ksysguardlsofwidgets.so
-%{_kde4_libdir}/libsolidcontrolifaces.so
-%{_kde4_libdir}/libsolidcontrol.so
%{_kde4_libdir}/libkworkspace.so
%{_kde4_libdir}/libkscreensaver.so
%{_kde4_libdir}/libprocesscore.so
@@ -603,6 +601,17 @@
%_kde4_servicesdir/plasma-scriptengine-runner-python.desktop
%_kde4_servicesdir/plasma-scriptengine-wallpaper-python.desktop
+%files -n krandr
+%defattr(-,root,root)
+%doc COPYING README
+%{_kde4_bindir}/krandrstartup
+%{_kde4_bindir}/krandrtray
+%{_kde4_applicationsdir}/krandrtray.desktop
+%{_kde4_modulesdir}/kcm_randr.so
+%{_kde4_modulesdir}/kded_randrmonitor.so
+%{_kde4_servicesdir}/kded/randrmonitor.desktop
+%{_kde4_servicesdir}/randr.desktop
+
%files -f filelists/exclude
%defattr(-,root,root)
#positives
@@ -619,6 +628,10 @@
%{_kde4_iconsdir}/Oxygen*
%{_kde4_iconsdir}/hicolor/*/*/*
%{_kde4_iconsdir}/oxygen/*/*
+%dir %{_kde4_iconsdir}/KDE_Classic
+%dir %{_kde4_iconsdir}/KDE_Classic/cursors
+%{_kde4_iconsdir}/KDE_Classic/*
+%{_kde4_iconsdir}/KDE_Classic/cursors/*
%{_kde4_libdir}/kconf_update_bin/
%dir %{_kde4_libdir}/strigi
%{_kde4_libdir}/strigi/strigita_font.so
@@ -677,8 +690,6 @@
%exclude %{_kde4_libdir}/libplasma-geolocation-interface.so
%exclude %{_kde4_libdir}/libprocesscore.so
%exclude %{_kde4_libdir}/libprocessui.so
-%exclude %{_kde4_libdir}/libsolidcontrol.so
-%exclude %{_kde4_libdir}/libsolidcontrolifaces.so
%exclude %{_kde4_libdir}/libsystemsettingsview.so
%exclude %{_kde4_libdir}/libtaskmanager.so
%exclude %{_kde4_libdir}/libweather_ion.so
@@ -699,5 +710,12 @@
%exclude %{_kde4_appsdir}/plasma-desktop/init
%exclude %{_kde4_appsdir}/plasma-netbook/init
%exclude %{_kde4_appsdir}/plasma/layout-templates
+%exclude %{_kde4_bindir}/krandrstartup
+%exclude %{_kde4_bindir}/krandrtray
+%exclude %{_kde4_applicationsdir}/krandrtray.desktop
+%exclude %{_kde4_modulesdir}/kcm_randr.so
+%exclude %{_kde4_modulesdir}/kded_randrmonitor.so
+%exclude %{_kde4_servicesdir}/kded/randrmonitor.desktop
+%exclude %{_kde4_servicesdir}/randr.desktop
%changelog
++++++ helper_actions_syspath.patch ++++++
diff -urNB
kde-workspace-4.10.90/powerdevil/daemon/backends/upower/backlight_helper_actions.actions
kde-workspace-4.10.90.new/powerdevil/daemon/backends/upower/backlight_helper_actions.actions
---
kde-workspace-4.10.90/powerdevil/daemon/backends/upower/backlight_helper_actions.actions
2013-06-25 20:20:02.000000000 +0200
+++
kde-workspace-4.10.90.new/powerdevil/daemon/backends/upower/backlight_helper_actions.actions
2013-07-03 20:56:32.244674680 +0200
@@ -289,8 +289,6 @@
Description[zh_TW]=系統政策不允許您設定亮度。
Policy=yes
-[org.kde.powerdevil.backlighthelper.syspath]
-Name=Get syspath
Name[ca]=Obtén el «syspath»
Name[cs]=Získat syspath
Name[es]=Obtener ruta del sistema
@@ -348,5 +346,3 @@
Description[x-test]=xxSystem policies prevent you from getting the syspathxx
Description[zh_CN]=系统安全策略不允许获取系统路径
Description[zh_TW]=系統政策不允許您取得系統路徑
-Policy=yes
-PolicyInactive=yes
++++++ kde-workspace-4.10.4.tar.xz -> kde-workspace-4.10.90.tar.xz ++++++
/work/SRC/openSUSE:Factory/kdebase4-workspace/kde-workspace-4.10.4.tar.xz
/work/SRC/openSUSE:Factory/.kdebase4-workspace.new/kde-workspace-4.10.90.tar.xz
differ: char 25, line 1
++++++ kdm_plymouth.patch ++++++
--- /var/tmp/diff_new_pack.G44qTH/_old 2013-07-08 07:34:30.000000000 +0200
+++ /var/tmp/diff_new_pack.G44qTH/_new 2013-07-08 07:34:30.000000000 +0200
@@ -1,6 +1,6 @@
--- kdm/backend/dm.c 2011-09-06 16:09:17.000000000 +0200
-+++ kdm/backend/dm.c 2011-09-07 16:23:59.017135854 +0200
-@@ -1347,6 +1347,81 @@
++++ kdm/backend/dm.c 2013-06-20 16:09:48.849938312 +0000
+@@ -1347,6 +1347,81 @@ getBusyVTs(void)
return activeVTs;
}
@@ -82,7 +82,7 @@
static void
allocateVT(struct display *d)
{
-@@ -1356,6 +1431,43 @@
+@@ -1356,6 +1431,47 @@ allocateVT(struct display *d)
if ((d->displayType & d_location) == dLocal &&
d->status == notRunning && !d->serverVT && d->reqSrvVT >= 0)
{
@@ -98,9 +98,11 @@
+ int vt;
+ vt = get_active_vt ();
+ if (vt > 0) {
-+ /* start the X server on the active vt */
-+ d->serverVT = vt;
-+ return;
++ if (d->reqSrvVT <= 0 || d->reqSrvVT == vt) {
++ /* start this X server on the active vt */
++ d->serverVT = vt;
++ return;
++ }
+ }
+ }
+ else {
@@ -117,8 +119,10 @@
+ int vt;
+ vt = get_active_vt();
+ if (vt > 0) {
-+ d->serverVT = vt;
-+ return;
++ if (d->reqSrvVT <= 0 || d->reqSrvVT == vt) {
++ d->serverVT = vt;
++ return;
++ }
+ }
+ }
+
++++++ klipper.patch ++++++
Subject: fix performance issue with Klipper
From: Filip Wieladek <fwi@tribogna.(none)>
Signed-Off-By: <name, optionally email>
Bug: kde#238084
Patch-upstream: no
>From 2d1cd043101b71c102d747c760a78fe85c17488a Mon Sep 17 00:00:00 2001
From: Filip Wieladek <fwi@tribogna.(none)>
Date: Mon, 4 Jun 2012 08:37:24 +0200
Subject: [PATCH 1/2] Fix flickering
---
klipper/klipperpopup.cpp | 24 +++++++++++-------------
klipper/popupproxy.cpp | 12 ++++++++----
klipper/popupproxy.h | 2 +-
3 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/klipper/klipperpopup.cpp b/klipper/klipperpopup.cpp
index bff2c25..ebdfdd6 100644
--- a/klipper/klipperpopup.cpp
+++ b/klipper/klipperpopup.cpp
@@ -163,12 +163,15 @@ void KlipperPopup::buildFromScratch() {
}
void KlipperPopup::rebuild( const QString& filter ) {
+ setFixedSize(size());
if (actions().isEmpty()) {
buildFromScratch();
} else {
for ( int i=0; i<m_nHistoryItems; i++ ) {
Q_ASSERT(TOP_HISTORY_ITEM_INDEX < actions().count());
- removeAction(actions().at(TOP_HISTORY_ITEM_INDEX));
+ QAction* action= actions().at(TOP_HISTORY_ITEM_INDEX);
+ removeAction(action);
+ delete action;
}
}
@@ -177,11 +180,7 @@ void KlipperPopup::rebuild( const QString& filter ) {
QRegExp filterexp( filter, caseSens );
QPalette palette = m_filterWidget->palette();
- if ( filterexp.isValid() ) {
- palette.setColor( m_filterWidget->foregroundRole(),
palette.color(foregroundRole()) );
- } else {
- palette.setColor( m_filterWidget->foregroundRole(), Qt::red );
- }
+ palette.setColor( m_filterWidget->foregroundRole(), filterexp.isValid() ?
palette.color(foregroundRole()) : Qt::red );
m_nHistoryItems = m_popupProxy->buildParent( TOP_HISTORY_ITEM_INDEX,
filterexp );
if ( m_nHistoryItems == 0 ) {
if ( m_history->empty() ) {
@@ -199,6 +198,7 @@ void KlipperPopup::rebuild( const QString& filter ) {
}
m_filterWidget->setPalette( palette );
m_dirty = false;
+ setFixedSize(sizeHint());
}
void KlipperPopup::plugAction( QAction* action ) {
@@ -269,13 +269,11 @@ void KlipperPopup::keyPressEvent( QKeyEvent* e ) {
QString lastString = m_filterWidget->text();
QApplication::sendEvent(m_filterWidget, e);
- if (m_filterWidget->text().isEmpty()) {
- if (m_filterWidgetAction->isVisible())
- m_filterWidget->setVisible(false);
- m_filterWidgetAction->setVisible(false);
- }
- else if (!m_filterWidgetAction->isVisible() )
- m_filterWidgetAction->setVisible(true);
+ bool visible= !m_filterWidget->text().isEmpty();
+ if (m_filterWidgetAction->isVisible() != visible) {
+ m_filterWidget->setVisible(visible);
+ m_filterWidgetAction->setVisible(visible);
+ }
if (m_filterWidget->text() != lastString) {
m_dirty = true;
diff --git a/klipper/popupproxy.cpp b/klipper/popupproxy.cpp
index 555f383..53042a6 100644
--- a/klipper/popupproxy.cpp
+++ b/klipper/popupproxy.cpp
@@ -48,11 +48,11 @@ PopupProxy::PopupProxy( KlipperPopup* parent, int
menu_height, int menu_width )
}
void PopupProxy::slotHistoryChanged() {
- deleteMoreMenus();
+ deleteMoreMenus(true);
}
-void PopupProxy::deleteMoreMenus() {
+void PopupProxy::deleteMoreMenus(bool delayed) {
const KMenu* myParent = parent();
if ( myParent != m_proxy_for_menu ) {
KMenu* delme = m_proxy_for_menu;
@@ -63,12 +63,16 @@ void PopupProxy::deleteMoreMenus() {
}
// We are called probably from within the menus event-handler
(triggered=>slotMoveToTop=>changed=>slotHistoryChanged=>deleteMoreMenus)
// what can result in a crash if we just delete the menu here (#155196
and #165154) So, delay the delete.
- delme->deleteLater();
+ if ( delayed ) {
+ delme->deleteLater();
+ } else {
+ delete delme;
+ }
}
}
int PopupProxy::buildParent( int index, const QRegExp& filter ) {
- deleteMoreMenus();
+ deleteMoreMenus(false);
// Start from top of history (again)
m_spill_uuid = parent()->history()->empty() ? QByteArray() :
parent()->history()->first()->uuid();
if ( filter.isValid() ) {
diff --git a/klipper/popupproxy.h b/klipper/popupproxy.h
index 910bd6e..c24bab4 100644
--- a/klipper/popupproxy.h
+++ b/klipper/popupproxy.h
@@ -76,7 +76,7 @@ private:
/**
* Delete all "More..." menus current created.
*/
- void deleteMoreMenus();
+ void deleteMoreMenus(bool delayed = false);
private:
KMenu* m_proxy_for_menu;
--
1.7.9.5
>From bab521d32564a61c50c8ea7722d9ecdf77bfb219 Mon Sep 17 00:00:00 2001
From: Filip Wieladek <fwi@tribogna.(none)>
Date: Mon, 4 Jun 2012 09:08:42 +0200
Subject: [PATCH 2/2] Fix flickering and add delay before rebuilding the popup
x
---
klipper/klipperpopup.cpp | 17 +++++++++++++++--
klipper/klipperpopup.h | 3 +++
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/klipper/klipperpopup.cpp b/klipper/klipperpopup.cpp
index ebdfdd6..b4cad63 100644
--- a/klipper/klipperpopup.cpp
+++ b/klipper/klipperpopup.cpp
@@ -37,6 +37,7 @@
namespace {
static const int TOP_HISTORY_ITEM_INDEX = 2;
+ static const int REBUILD_DELAY = 350;
}
// #define DEBUG_EVENTS__
@@ -105,7 +106,10 @@ KlipperPopup::KlipperPopup( History* history )
int menuWidth = ( screen.width() ) * 1/3;
m_popupProxy = new PopupProxy( this, menuHeight, menuWidth );
-
+ m_delayTimer = new QTimer( this );
+
+ m_delayTimer->setSingleShot( true );
+ connect( m_delayTimer, SIGNAL(timeout()), SLOT(timedRebuild()) );
connect( this, SIGNAL(aboutToShow()), SLOT(slotAboutToShow()) );
}
@@ -198,6 +202,7 @@ void KlipperPopup::rebuild( const QString& filter ) {
}
m_filterWidget->setPalette( palette );
m_dirty = false;
+ setFixedSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX);
setFixedSize(sizeHint());
}
@@ -277,7 +282,10 @@ void KlipperPopup::keyPressEvent( QKeyEvent* e ) {
if (m_filterWidget->text() != lastString) {
m_dirty = true;
- rebuild(m_filterWidget->text());
+ QPalette palette = m_filterWidget->palette();
+ palette.setColor(m_filterWidget->foregroundRole(),
palette.color(QPalette::Disabled, QPalette::WindowText) );
+ m_filterWidget->setPalette(palette);
+ m_delayTimer->start( REBUILD_DELAY );
}
break;
@@ -285,6 +293,11 @@ void KlipperPopup::keyPressEvent( QKeyEvent* e ) {
} //case
}
+void KlipperPopup::timedRebuild()
+{
+ rebuild(m_filterWidget->text());
+}
+
void KlipperPopup::slotSetTopActive()
{
diff --git a/klipper/klipperpopup.h b/klipper/klipperpopup.h
index 31beff2..bdc7548 100644
--- a/klipper/klipperpopup.h
+++ b/klipper/klipperpopup.h
@@ -20,6 +20,7 @@
#define KLIPPERPOPUP_H
#include <QtCore/QList>
+#include <QTimer>
#include <KMenu>
@@ -62,6 +63,7 @@ public Q_SLOTS:
* set the top history item active, to easy kb navigation
*/
void slotSetTopActive();
+ void timedRebuild();
private:
void rebuild( const QString& filter = QString() );
@@ -119,6 +121,7 @@ private:
*/
int m_nHistoryItems;
+ QTimer* m_delayTimer;
};
#endif
--
1.7.9.5
++++++ opensuse-kinfocenter.diff ++++++
--- /var/tmp/diff_new_pack.G44qTH/_old 2013-07-08 07:34:30.000000000 +0200
+++ /var/tmp/diff_new_pack.G44qTH/_new 2013-07-08 07:34:30.000000000 +0200
@@ -1,65 +1,7 @@
-diff --git a/kinfocenter/Modules/infosummary/defaultboxwidget.cpp
b/kinfocenter/Modules/infosummary/defaultboxwidget.cpp
-index 2d522ea..184735c 100644
---- a/kinfocenter/Modules/infosummary/defaultboxwidget.cpp
-+++ b/kinfocenter/Modules/infosummary/defaultboxwidget.cpp
-@@ -39,10 +39,10 @@ void DefaultBoxWidget::createDisplay()
- m_iconLabel = new QLabel();
- m_iconLabel->setAlignment(Qt::AlignCenter);
- m_iconLabel->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
--
-+
- QFont bFont;
- bFont.setBold(true);
--
-+
- m_info0Label = new QLabel();
- m_info0Label->setFont(bFont);
- m_info0NameLabel = new QLabel();
-@@ -55,7 +55,7 @@ void DefaultBoxWidget::createDisplay()
- m_info2Label->setFont(bFont);
- m_info2NameLabel = new QLabel();
-
-- m_layout->addWidget(m_iconLabel,1,1,3,1,Qt::AlignCenter);
-+ m_layout->addWidget(m_iconLabel,1,1,3,1,Qt::AlignCenter);
-
- m_layout->addWidget(m_info0Label,1,2,1,1);
- m_layout->addWidget(m_info0NameLabel,1,3,1,1);
-@@ -65,6 +65,7 @@ void DefaultBoxWidget::createDisplay()
-
- m_layout->addWidget(m_info2Label,3,2,1,1);
- m_layout->addWidget(m_info2NameLabel,3,3,1,1);
-+
- }
-
- void DefaultBoxWidget::setLabelTitles(const QString &first, const QString
&second, const QString &third)
-diff --git a/kinfocenter/Modules/infosummary/defaultboxwidget.h
b/kinfocenter/Modules/infosummary/defaultboxwidget.h
-index 2aa10be..271d666 100644
---- a/kinfocenter/Modules/infosummary/defaultboxwidget.h
-+++ b/kinfocenter/Modules/infosummary/defaultboxwidget.h
-@@ -42,8 +42,8 @@ class DefaultBoxWidget : public QGroupBox
- void setLabelOne(const QString &);
- void setLabelTwo(const QString &);
- void setLabelThree(const QString &);
-- void setIcon(const KIcon &icon);
--
-+ void setIcon(const KIcon &icon);
-+
- private:
- void createDisplay();
-
diff --git a/kinfocenter/Modules/infosummary/infosum.cpp
b/kinfocenter/Modules/infosummary/infosum.cpp
index 276d00c..c36c311 100644
--- a/kinfocenter/Modules/infosummary/infosum.cpp
+++ b/kinfocenter/Modules/infosummary/infosum.cpp
-@@ -47,7 +47,7 @@ void InfoSumPlugin::createDisplay()
- m_layout = new QVBoxLayout(this);
- m_layout->setAlignment(Qt::AlignTop);
- m_layout->setSpacing(10);
--
-+
- createOsBox();
- createCpuBox();
- //createMemBox(); // Awaiting Mem class from kdereview
@@ -58,12 +58,12 @@ void InfoSumPlugin::createDisplay()
void InfoSumPlugin::createOsBox()
{
@@ -76,19 +18,6 @@
osWidget->setLabelTwo(QString(KDE_VERSION_STRING));
osWidget->setLabelThree(osInfo->hostName());
osWidget->setWhatsThis(i18nc("OS whats this","This shows information about
your Operating System"));
-diff --git a/kinfocenter/Modules/infosummary/infosum.h
b/kinfocenter/Modules/infosummary/infosum.h
-index 463aebb..536a8b8 100644
---- a/kinfocenter/Modules/infosummary/infosum.h
-+++ b/kinfocenter/Modules/infosummary/infosum.h
-@@ -66,7 +66,7 @@ class InfoSumPlugin : public KCModule
- void createOsBox();
- void createCpuBox();
- void createMemBox();
-- void createHdBox();
-+ void createHdBox();
-
- QVBoxLayout *m_layout;
- };
diff --git a/kinfocenter/Modules/infosummary/osdepinfo.cpp
b/kinfocenter/Modules/infosummary/osdepinfo.cpp
index 34afecc..af1ec45 100644
--- a/kinfocenter/Modules/infosummary/osdepinfo.cpp
++++++ plasma-kickoff-newly-collapsing.diff ++++++
++++ 838 lines (skipped)
++++ between
/work/SRC/openSUSE:Factory/kdebase4-workspace/plasma-kickoff-newly-collapsing.diff
++++ and
/work/SRC/openSUSE:Factory/.kdebase4-workspace.new/plasma-kickoff-newly-collapsing.diff
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
