Hello community, here is the log from the commit of package kdebase4-workspace for openSUSE:Factory checked in at 2012-01-11 15:37:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebase4-workspace (Old) and /work/SRC/openSUSE:Factory/.kdebase4-workspace.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdebase4-workspace", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebase4-workspace/kdebase4-workspace.changes 2011-12-20 14:30:11.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdebase4-workspace.new/kdebase4-workspace.changes 2012-01-11 15:38:02.000000000 +0100 @@ -27,0 +28,5 @@ +Sat Nov 26 18:44:48 UTC 2011 - [email protected] + +- show window size in characters if resizing terminal (bnc#703594) + +------------------------------------------------------------------- @@ -32,0 +38,6 @@ +Tue Nov 22 20:41:08 UTC 2011 - [email protected] + +- Fix slow KDE logout/shutdown dialog apearance + (bnc#729823,kde#265405) + +------------------------------------------------------------------- @@ -59,0 +71,5 @@ +Thu Nov 17 13:13:35 UTC 2011 - [email protected] + +- Unbreak signalling remaining time on the battery + +------------------------------------------------------------------- Old: ---- changeset_r245a56e4ef07519282ef1176af59a4f1f1798ca4.diff changeset_r3b6514d12639be222e520e4ff9a776be1017c05b.diff New: ---- 94b134f9-kworkspace-async-shutdown-dialog.diff bnc703594_geometry_size_chars_terminal.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-workspace.spec ++++++ --- /var/tmp/diff_new_pack.qI1N2l/_old 2012-01-11 15:38:04.000000000 +0100 +++ /var/tmp/diff_new_pack.qI1N2l/_new 2012-01-11 15:38:04.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package kdebase4-workspace # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: kdebase4-workspace Version: 4.7.4 Release: 0 @@ -95,8 +96,8 @@ Patch201: plasma-notifications-kill-timer.diff Patch202: plasma-disable-networkmanager.diff Patch211: disable-python-support.diff -Patch213: changeset_r3b6514d12639be222e520e4ff9a776be1017c05b.diff -Patch214: changeset_r245a56e4ef07519282ef1176af59a4f1f1798ca4.diff +Patch212: 94b134f9-kworkspace-async-shutdown-dialog.diff +Patch213: bnc703594_geometry_size_chars_terminal.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 1200 @@ -327,8 +328,8 @@ %patch201 -p1 %patch202 -p1 %patch211 +%patch212 -p1 %patch213 -p1 -%patch214 -p1 cp %{SOURCE3} kwin/effects/cube/data/cubecap.png %build ++++++ python-kdebase4.spec ++++++ --- /var/tmp/diff_new_pack.qI1N2l/_old 2012-01-11 15:38:04.000000000 +0100 +++ /var/tmp/diff_new_pack.qI1N2l/_new 2012-01-11 15:38:04.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-kdebase4 # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - Name: python-kdebase4 Version: 4.7.4 Release: 0 ++++++ 94b134f9-kworkspace-async-shutdown-dialog.diff ++++++ commit 94b134f964c5fe4f0588e2db70c076c56a3a8091 Author: Aaron Seigo <[email protected]> Date: Fri Sep 30 14:31:55 2011 +0200 attempt to make requestShutdown more friendly: non-blocking, not require a sync of the xserver diff --git a/libs/kworkspace/kworkspace.cpp b/libs/kworkspace/kworkspace.cpp index 396de3e..0ce17b3 100644 --- a/libs/kworkspace/kworkspace.cpp +++ b/libs/kworkspace/kworkspace.cpp @@ -174,29 +174,25 @@ static void cleanup_sm() } #endif -bool requestShutDown( - ShutdownConfirm confirm, ShutdownType sdtype, ShutdownMode sdmode ) +void requestShutDown(ShutdownConfirm confirm, ShutdownType sdtype, ShutdownMode sdmode) { #ifdef Q_WS_X11 - QApplication::syncX(); - kapp->updateRemoteUserTimestamp( "org.kde.ksmserver" ); /* use ksmserver's dcop interface if necessary */ if ( confirm == ShutdownConfirmYes || sdtype != ShutdownTypeDefault || sdmode != ShutdownModeDefault ) { org::kde::KSMServerInterface ksmserver("org.kde.ksmserver", "/KSMServer", QDBusConnection::sessionBus()); - QDBusReply<void> reply = ksmserver.logout((int)confirm, (int)sdtype, (int)sdmode); - return (reply.isValid()); + ksmserver.logout((int)confirm, (int)sdtype, (int)sdmode); + return; } + if( helper == NULL ) { helper = new KRequestShutdownHelper(); qAddPostRoutine(cleanup_sm); } - return helper->requestShutdown( confirm ); -#else - return false; + helper->requestShutdown( confirm ); #endif } diff --git a/libs/kworkspace/kworkspace.h b/libs/kworkspace/kworkspace.h index 2516c3a..8868bf6 100644 --- a/libs/kworkspace/kworkspace.h +++ b/libs/kworkspace/kworkspace.h @@ -110,10 +110,8 @@ namespace KWorkSpace * ShutdownConfirm * @param sdtype The action to take after logging out. ShutdownType * @param sdmode If/When the action should be taken. ShutdownMode - * @return true on success, false if the session manager could not be - * contacted. */ - KDE_EXPORT bool requestShutDown( ShutdownConfirm confirm = ShutdownConfirmDefault, + KDE_EXPORT void requestShutDown( ShutdownConfirm confirm = ShutdownConfirmDefault, ShutdownType sdtype = ShutdownTypeDefault, ShutdownMode sdmode = ShutdownModeDefault ); ++++++ bnc703594_geometry_size_chars_terminal.diff ++++++ Subject: export the baseincrement size to the effectwindow and utilize it in the windowgeometry effect From: Thomas Lübking <[email protected]> Bug: bnc#703594 Patch-upstream: kde >= 4.8 Modified the line "#define KWIN_EFFECT_API_VERSION_MINOR 181" with s/181/180 to match with 4.7.2 commit 3b6514d12639be222e520e4ff9a776be1017c05b Author: Thomas Lübking <[email protected]> Date: Wed Nov 2 23:05:03 2011 +0100 export the baseincrement size to the effectwindow and utilize it in the windowgeometry effect BUG: 283518 REVIEW: 103033 FIXED-IN: 4.8 --- kwin/client.h | 1 + kwin/effects.cpp | 6 ++++++ kwin/effects.h | 1 + kwin/effects/windowgeometry/windowgeometry.cpp | 4 +++- kwin/geometry.cpp | 5 +++++ kwin/libkwineffects/kwineffects.h | 7 ++++++- 6 files changed, 22 insertions(+), 2 deletions(-) --- a/kwin/client.h +++ b/kwin/client.h @@ -126,6 +126,7 @@ public: QSize minSize() const; QSize maxSize() const; + QSize basicUnit() const; virtual QPoint clientPos() const; // Inside of geometry() virtual QSize clientSize() const; virtual QRect visibleRect() const; --- a/kwin/effects.cpp +++ b/kwin/effects.cpp @@ -1370,6 +1370,12 @@ int EffectWindowImpl::height() const return toplevel->height(); } +QSize EffectWindowImpl::basicUnit() const +{ + Client *client = dynamic_cast<Client*>(toplevel); + return client ? client->basicUnit() : QSize(1,1); +} + QRect EffectWindowImpl::geometry() const { return toplevel->geometry(); --- a/kwin/effects.h +++ b/kwin/effects.h @@ -246,6 +246,7 @@ public: virtual int y() const; virtual int width() const; virtual int height() const; + virtual QSize basicUnit() const; virtual QRect geometry() const; virtual QRegion shape() const; virtual int screen() const; --- a/kwin/effects/windowgeometry/windowgeometry.cpp +++ b/kwin/effects/windowgeometry/windowgeometry.cpp @@ -157,7 +157,9 @@ void WindowGeometry::slotWindowStepUserM dx = r.width() - r2.width(); dy = r.height() - r2.height(); - myMeasure[1]->setText( i18nc(myResizeString, r.width(), r.height(), number(dx), number(dy) ) ); + const QSize baseInc = w->basicUnit(); + Q_ASSERT(baseInc.width() && baseInc.height()); + myMeasure[1]->setText( i18nc(myResizeString, r.width()/baseInc.width(), r.height()/baseInc.height(), number(dx/baseInc.width()), number(dy/baseInc.height()) ) ); // calc width for bottomright element, superfluous otherwise dx = r.right() - r2.right(); --- a/kwin/geometry.cpp +++ b/kwin/geometry.cpp @@ -1566,6 +1566,11 @@ QSize Client::maxSize() const return rules()->checkMaxSize(QSize(xSizeHint.max_width, xSizeHint.max_height)); } +QSize Client::basicUnit() const +{ + return QSize(xSizeHint.width_inc, xSizeHint.height_inc); +} + /*! Auxiliary function to inform the client about the current window configuration. --- a/kwin/libkwineffects/kwineffects.h +++ b/kwin/libkwineffects/kwineffects.h @@ -166,7 +166,7 @@ X-KDE-Library=kwin4_effect_cooleffect #define KWIN_EFFECT_API_MAKE_VERSION( major, minor ) (( major ) << 8 | ( minor )) #define KWIN_EFFECT_API_VERSION_MAJOR 0 -#define KWIN_EFFECT_API_VERSION_MINOR 180 +#define KWIN_EFFECT_API_VERSION_MINOR 182 #define KWIN_EFFECT_API_VERSION KWIN_EFFECT_API_MAKE_VERSION( \ KWIN_EFFECT_API_VERSION_MAJOR, KWIN_EFFECT_API_VERSION_MINOR ) @@ -1087,6 +1087,11 @@ public: virtual int y() const = 0; virtual int width() const = 0; virtual int height() const = 0; + /** + * By how much the window wishes to grow/shrink at least. Usually QSize(1,1). + * MAY BE DISOBEYED BY THE WM! It's only for information, do NOT rely on it at all. + */ + virtual QSize basicUnit() const = 0; virtual QRect geometry() const = 0; virtual QRegion shape() const = 0; virtual int screen() const = 0; commit 245a56e4ef07519282ef1176af59a4f1f1798ca4 Author: Thomas Lübking <[email protected]> Date: Sun Nov 13 18:38:03 2011 +0100 use contentsrect to calculate window size if baseUnit isn't 1,1 BUG: 283518 diff --git a/kwin/effects/windowgeometry/windowgeometry.cpp b/kwin/effects/windowgeometry/windowgeometry.cpp index 43de301..a9fd796 100644 --- a/kwin/effects/windowgeometry/windowgeometry.cpp +++ b/kwin/effects/windowgeometry/windowgeometry.cpp @@ -158,8 +158,12 @@ void WindowGeometry::slotWindowStepUserMovedResized(EffectWindow *w, const QRect dy = r.height() - r2.height(); const QSize baseInc = w->basicUnit(); - Q_ASSERT(baseInc.width() && baseInc.height()); - myMeasure[1]->setText( i18nc(myResizeString, r.width()/baseInc.width(), r.height()/baseInc.height(), number(dx/baseInc.width()), number(dy/baseInc.height()) ) ); + if (baseInc != QSize(1,1)) { + Q_ASSERT(baseInc.width() && baseInc.height()); + const QSize csz = w->contentsRect().size(); + myMeasure[1]->setText( i18nc(myResizeString, csz.width()/baseInc.width(), csz.height()/baseInc.height(), number(dx/baseInc.width()), number(dy/baseInc.height()) ) ); + } else + myMeasure[1]->setText( i18nc(myResizeString, r.width(), r.height(), number(dx), number(dy) ) ); // calc width for bottomright element, superfluous otherwise dx = r.right() - r2.right(); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
