Hello community,
here is the log from the commit of package kdebase4-workspace
checked in at Mon Apr 28 18:10:00 CEST 2008.
--------
--- KDE/kdebase4-workspace/kdebase4-wallpapers.changes 2008-04-26 11:30:47.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdebase4-workspace/kdebase4-wallpapers.changes 2008-04-28 18:08:12.734975000 +0200
@@ -1,0 +2,7 @@
+Mon Apr 28 17:57:40 CEST 2008 - stbinner@suse.de
+
+- update Plasma diff from openSUSE Plasma branch: several bugfixes
+ including bnc#381704, bnc#379082, bnc#382510, bnc#377728,
+ bnc#382169, bnc#381191, bnc#382497
+
+-------------------------------------------------------------------
kdebase4-workspace.changes: same change
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase4-wallpapers.spec ++++++
--- /var/tmp/diff_new_pack.g29961/_old 2008-04-28 18:08:23.000000000 +0200
+++ /var/tmp/diff_new_pack.g29961/_new 2008-04-28 18:08:23.000000000 +0200
@@ -22,7 +22,7 @@
Summary: KDE 4 Wallpapers
Url: http://www.kde.org/
Version: 4.0.3
-Release: 18
+Release: 21
Source0: kdebase-workspace-%version.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
@@ -59,6 +59,10 @@
/usr/share/wallpapers
%changelog
+* Mon Apr 28 2008 stbinner@suse.de
+- update Plasma diff from openSUSE Plasma branch: several bugfixes
+ including bnc#381704, bnc#379082, bnc#382510, bnc#377728,
+ bnc#382169, bnc#381191, bnc#382497
* Wed Apr 23 2008 dmueller@suse.de
- use radiobuttons for sessions menu (bnc#382138)
* Mon Apr 21 2008 dmueller@suse.de
++++++ kdebase4-workspace.spec ++++++
--- /var/tmp/diff_new_pack.g29961/_old 2008-04-28 18:08:23.000000000 +0200
+++ /var/tmp/diff_new_pack.g29961/_new 2008-04-28 18:08:23.000000000 +0200
@@ -27,7 +27,7 @@
Summary: The KDE Workspace Components
Url: http://www.kde.org/
Version: 4.0.3
-Release: 18
+Release: 21
%define rversion 4.0.3
Source0: kdebase-workspace-%rversion.tar.bz2
Source2: titlebar_decor.png
@@ -644,6 +644,10 @@
/usr/%_lib/kde4/kgreet_*.so
%changelog
+* Mon Apr 28 2008 stbinner@suse.de
+- update Plasma diff from openSUSE Plasma branch: several bugfixes
+ including bnc#381704, bnc#379082, bnc#382510, bnc#377728,
+ bnc#382169, bnc#381191, bnc#382497
* Wed Apr 23 2008 dmueller@suse.de
- use radiobuttons for sessions menu (bnc#382138)
* Mon Apr 21 2008 dmueller@suse.de
++++++ kdm-make_it_cool.diff ++++++
--- /var/tmp/diff_new_pack.g29961/_old 2008-04-28 18:08:25.000000000 +0200
+++ /var/tmp/diff_new_pack.g29961/_new 2008-04-28 18:08:26.000000000 +0200
@@ -1,7 +1,5 @@
-Index: kdm/kfrontend/themer/kdmlist.cpp
-===================================================================
---- kdm/kfrontend/themer/kdmlist.cpp (Revision 774051)
-+++ kdm/kfrontend/themer/kdmlist.cpp (Arbeitskopie)
+--- kdm/kfrontend/themer/kdmlist.cpp
++++ kdm/kfrontend/themer/kdmlist.cpp
@@ -29,8 +29,6 @@
: KdmItem( parent, node )
{
@@ -11,10 +9,8 @@
// Read RECT TAGS
QDomNodeList childList = node.childNodes();
-Index: kdm/kfrontend/themer/kdmthemer.cpp
-===================================================================
---- kdm/kfrontend/themer/kdmthemer.cpp (Revision 774051)
-+++ kdm/kfrontend/themer/kdmthemer.cpp (Arbeitskopie)
+--- kdm/kfrontend/themer/kdmthemer.cpp
++++ kdm/kfrontend/themer/kdmthemer.cpp
@@ -228,11 +228,7 @@
else if (type == "svg")
newItem = new KdmPixmap( parent, subnode );
@@ -28,10 +24,8 @@
connect( newItem, SIGNAL(needUpdate( int, int, int, int )),
SLOT(update( int, int, int, int )) );
connect( newItem, SIGNAL(needPlacement()),
-Index: kdm/kfrontend/themer/kdmitem.cpp
-===================================================================
---- kdm/kfrontend/themer/kdmitem.cpp (Revision 774051)
-+++ kdm/kfrontend/themer/kdmitem.cpp (Arbeitskopie)
+--- kdm/kfrontend/themer/kdmitem.cpp
++++ kdm/kfrontend/themer/kdmitem.cpp
@@ -65,7 +65,6 @@
!modes.split( ",", QString::SkipEmptyParts ).contains( "console" ))))
{
@@ -48,10 +42,8 @@
}
}
-Index: kdm/kfrontend/kgreeter.h
-===================================================================
---- kdm/kfrontend/kgreeter.h (Revision 774051)
-+++ kdm/kfrontend/kgreeter.h (Arbeitskopie)
+--- kdm/kfrontend/kgreeter.h
++++ kdm/kfrontend/kgreeter.h
@@ -70,7 +70,7 @@
protected:
void installUserList();
@@ -61,10 +53,8 @@
void putSession( const QString &, const QString &, bool, const char * );
void insertSessions();
virtual void pluginSetup();
-Index: kdm/kfrontend/kgreeter.cpp
-===================================================================
---- kdm/kfrontend/kgreeter.cpp (Revision 774051)
-+++ kdm/kfrontend/kgreeter.cpp (Arbeitskopie)
+--- kdm/kfrontend/kgreeter.cpp
++++ kdm/kfrontend/kgreeter.cpp
@@ -63,20 +63,20 @@
class UserListView : public QListWidget {
++++++ kdm-use-radiobuttons.diff ++++++
--- /var/tmp/diff_new_pack.g29961/_old 2008-04-28 18:08:26.000000000 +0200
+++ /var/tmp/diff_new_pack.g29961/_new 2008-04-28 18:08:26.000000000 +0200
@@ -8,27 +8,49 @@
struct SessType {
QString name, type;
-@@ -81,6 +82,7 @@ class KGreeter : public KGDialog, public
+@@ -64,7 +65,7 @@ class KGreeter : public KGDialog, public
+ void accept();
+ void reject();
+ void slotUserClicked( QListWidgetItem * );
+- void slotSessionSelected( QAction * );
++ void slotSessionSelected();
+ void slotUserEntered();
+
+ protected:
+@@ -81,9 +82,10 @@ class KGreeter : public KGDialog, public
UserListView *userView;
QStringList *userList;
QMenu *sessMenu;
-+ QActionGroup* sessGroup;
++ QActionGroup *sessGroup;
QVector<SessType> sessionTypes;
int nNormals, nSpecials;
- QAction *curPrev, *curSel;
+- QAction *curPrev, *curSel;
++ QAction *curPrev;
+ bool prevValid;
+ bool needLoad;
+
--- kdm/kfrontend/kgreeter.cpp
+++ kdm/kfrontend/kgreeter.cpp
-@@ -164,6 +164,9 @@ KGreeter::KGreeter( bool framed )
- if (userView || userList)
- insertUsers();
+@@ -145,7 +145,6 @@ KGreeter::KGreeter( bool framed )
+ , nNormals( 0 )
+ , nSpecials( 0 )
+ , curPrev( 0 )
+- , curSel( 0 )
+ , prevValid( true )
+ , needLoad( false )
+ {
+@@ -166,7 +165,9 @@ KGreeter::KGreeter( bool framed )
-+ sessGroup = new QActionGroup(this);
-+ sessGroup->setExclusive(true);
-+
sessMenu = new QMenu( this );
connect( sessMenu, SIGNAL(triggered( QAction * )),
- SLOT(slotSessionSelected( QAction * )) );
-@@ -419,7 +422,7 @@ KGreeter::insertSessions()
+- SLOT(slotSessionSelected( QAction * )) );
++ SLOT(slotSessionSelected()) );
++
++ sessGroup = new QActionGroup( this );
+ insertSessions();
+
+ if (curPlugin < 0) {
+@@ -419,7 +420,7 @@ KGreeter::insertSessions()
putSession( "failsafe", i18n("Failsafe"), false, "failsafe" );
qSort( sessionTypes );
for (int i = 0; i < sessionTypes.size() && !sessionTypes[i].hid; i++) {
@@ -37,11 +59,57 @@
sessionTypes[i].action->setData( i );
sessionTypes[i].action->setCheckable( true );
switch (sessionTypes[i].prio) {
-@@ -427,6 +430,7 @@ KGreeter::insertSessions()
+@@ -427,6 +428,7 @@ KGreeter::insertSessions()
case 2: nNormals++; break;
}
}
-+ sessMenu->addActions(sessGroup->actions());
++ sessMenu->addActions( sessGroup->actions() );
+ }
+
+ void
+@@ -466,16 +468,9 @@ KGreeter::slotUserClicked( QListWidgetIt
+ }
+
+ void
+-KGreeter::slotSessionSelected( QAction *action )
++KGreeter::slotSessionSelected()
+ {
+- if (action != curSel) {
+- if (curSel)
+- curSel->setChecked( false );
+- if (action)
+- action->setChecked( true );
+- curSel = action;
+- verify->gplugActivity();
+- }
++ verify->gplugActivity();
+ }
+
+ void
+@@ -558,7 +553,7 @@ KGreeter::slotLoadPrevWM()
+ setPrevWM( sessionTypes[i].action );
+ return;
+ }
+- if (!curSel)
++ if (!sessGroup->checkedAction())
+ KFMsgBox::box( this, sorrybox,
+ i18n("Your saved session type '%1' is not valid any more.\n"
+ "Please select a new one, otherwise 'default' will be used.", sess ) );
+@@ -606,7 +601,7 @@ KGreeter::verifyClear()
+ {
+ curUser.clear();
+ slotUserEntered();
+- slotSessionSelected( 0 );
++ slotSessionSelected();
}
void
+@@ -617,7 +612,7 @@ KGreeter::verifyOk()
+ dName :
+ dName + '_' + verify->pluginName(),
+ verify->getEntity() );
+- if (curSel) {
++ if (QAction *curSel = sessGroup->checkedAction()) {
+ gSendInt( G_PutDmrc );
+ gSendStr( "Session" );
+ gSendStr( sessionTypes[curSel->data().toInt()].type.toUtf8() );
++++++ krunner.diff ++++++
--- /var/tmp/diff_new_pack.g29961/_old 2008-04-28 18:08:26.000000000 +0200
+++ /var/tmp/diff_new_pack.g29961/_new 2008-04-28 18:08:26.000000000 +0200
@@ -2,48 +2,192 @@
--- krunnerdialog.cpp
+++ krunnerdialog.cpp
-@@ -28,6 +28,7 @@
+@@ -23,36 +23,45 @@
+ #include <QResizeEvent>
+ #include <QMouseEvent>
+ #include <QX11Info>
++#include <QBitmap>
+
+ #include <KDebug>
#include <NETRootInfo>
- #include
participants (1)
-
root@Hilbert.suse.de