Hello community,
here is the log from the commit of package kdebase3
checked in at Sun Jan 14 00:56:51 CET 2007.
--------
--- KDE/kdebase3/kdebase3.changes 2007-01-11 19:21:30.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdebase3/kdebase3.changes 2007-01-13 20:24:03.000000000 +0100
@@ -1,0 +2,5 @@
+Sat Jan 13 20:22:24 CET 2007 - stbinner@suse.de
+
+- context menu entry in lock/lockout applet to switch button order
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase3.spec ++++++
--- /var/tmp/diff_new_pack.w11759/_old 2007-01-14 00:55:31.000000000 +0100
+++ /var/tmp/diff_new_pack.w11759/_new 2007-01-14 00:55:31.000000000 +0100
@@ -52,7 +52,7 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Url: http://www.kde.org/
Version: 3.5.5
-Release: 98
+Release: 99
%define kde_version 3.5.5
Source0: kdebase-%{kde_version}.tar.bz2
Source3: startkde.suse.sh
@@ -387,7 +387,7 @@
Summary: Set and list fileshares
Group: System/Management
Version: 2.0
-Release: 231
+Release: 232
%description -n fileshareset
This package contains the the fileshareset utility to allow users to
@@ -1531,6 +1531,8 @@
%endif
%changelog -n kdebase3
+* Sat Jan 13 2007 - stbinner@suse.de
+- context menu entry in lock/lockout applet to switch button order
* Thu Jan 11 2007 - stbinner@suse.de
- make krandrtray also rotate wacom-input devices (Fate #300713)
* Tue Jan 09 2007 - stbinner@suse.de
++++++ applet-lock-logout.diff ++++++
--- /var/tmp/diff_new_pack.w11759/_old 2007-01-14 00:55:32.000000000 +0100
+++ /var/tmp/diff_new_pack.w11759/_new 2007-01-14 00:55:32.000000000 +0100
@@ -1,14 +1,53 @@
+Index: kicker/applets/lockout/lockout.h
+===================================================================
+--- kicker/applets/lockout/lockout.h (revision 623009)
++++ kicker/applets/lockout/lockout.h (working copy)
+@@ -35,6 +35,7 @@
+
+ void slotLockPrefs();
+ void slotLogoutPrefs();
++ void slotButtonOrder();
+ void slotTransparent();
+ void slotIconChanged();
+
+@@ -46,6 +47,7 @@
+ QBoxLayout *layout;
+
+ bool bTransparent;
++ bool bAlternateButtonOrder;
+ };
+
+ #endif // LOCKOUT_H
Index: kicker/applets/lockout/lockout.cpp
===================================================================
---- kicker/applets/lockout/lockout.cpp (revision 601166)
+--- kicker/applets/lockout/lockout.cpp (revision 623009)
+++ kicker/applets/lockout/lockout.cpp (working copy)
-@@ -71,8 +71,14 @@
+@@ -31,6 +31,7 @@
+ #include
+ #include
+ #include
++#include
+
+ #include
+
+@@ -54,7 +55,7 @@
+ }
+
+ Lockout::Lockout( const QString& configFile, QWidget *parent, const char *name)
+- : KPanelApplet( configFile, KPanelApplet::Normal, 0, parent, name ), bTransparent( false )
++ : KPanelApplet( configFile, KPanelApplet::Normal, 0, parent, name ), bTransparent( false ), bAlternateButtonOrder( false )
+ {
+ KConfig *conf = config();
+ conf->setGroup("lockout");
+@@ -71,9 +72,17 @@
layout->setMargin( 0 );
layout->setSpacing( 0 );
- lockButton = new QToolButton( this, "lock");
- logoutButton = new QToolButton( this, "logout");
-+ if (conf->readBoolEntry("OriginalLayout",false)) {
++ bAlternateButtonOrder = !conf->readBoolEntry( "OriginalLayout",false );
+
++ if (bAlternateButtonOrder) {
+ lockButton = new QToolButton( this, "lock");
+ logoutButton = new QToolButton( this, "logout");
+ }
@@ -16,6 +55,65 @@
+ logoutButton = new QToolButton( this, "logout");
+ lockButton = new QToolButton( this, "lock");
+ }
-
++
lockButton->setBackgroundMode(X11ParentRelative);
logoutButton->setBackgroundMode(X11ParentRelative);
+
+@@ -212,11 +221,14 @@
+ popup->insertItem( SmallIcon( "lock" ), i18n("Lock Session"),
+ this, SLOT( lock() ) );
+ popup->insertSeparator();
++ popup->insertItem( i18n( "&Alternate Button Order" ), 90 );
+ popup->insertItem( i18n( "&Transparent" ), 100 );
+ popup->insertItem( SmallIcon( "configure" ),
+ i18n( "&Configure Screen Saver..." ),
+ this, SLOT( slotLockPrefs() ) );
+
++ popup->setItemChecked( 90, bAlternateButtonOrder );
++ popup->connectItem(90, this, SLOT( slotButtonOrder() ) );
+ popup->setItemChecked( 100, bTransparent );
+ popup->connectItem(100, this, SLOT( slotTransparent() ) );
+ if (conf->entryIsImmutable( "Transparent" ))
+@@ -233,11 +245,14 @@
+ popup->insertItem( SmallIcon( "exit" ), i18n("&Log Out..."),
+ this, SLOT( logout() ) );
+ popup->insertSeparator();
++ popup->insertItem( i18n( "&Alternate Button Order" ), 90 );
+ popup->insertItem( i18n( "&Transparent" ), 100 );
+ popup->insertItem( SmallIcon( "configure" ),
+ i18n( "&Configure Session Manager..." ),
+ this, SLOT( slotLogoutPrefs() ) );
+
++ popup->setItemChecked( 90, bAlternateButtonOrder );
++ popup->connectItem(90, this, SLOT( slotButtonOrder() ) );
+ popup->setItemChecked( 100, bTransparent );
+ popup->connectItem(100, this, SLOT( slotTransparent() ) );
+ if (conf->entryIsImmutable( "Transparent" ))
+@@ -272,6 +287,27 @@
+ conf->sync();
+ }
+
++void Lockout::slotButtonOrder()
++{
++ QObject* child = children()->getFirst();
++
++ if (bAlternateButtonOrder)
++ child = lockButton;
++ else
++ child = logoutButton;
++
++ removeChild(child);
++ insertChild(child);
++ update();
++
++ bAlternateButtonOrder = !bAlternateButtonOrder;
++
++ KConfig* conf = config();
++ conf->setGroup("lockout");
++ conf->writeEntry( "OriginalLayout", !bAlternateButtonOrder );
++ conf->sync();
++}
++
+ void Lockout::slotLogoutPrefs()
+ {
+ // Run the logout settings.
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org