commit kdebase3

7 Dec 2006

Hello community,

here is the log from the commit of package kdebase3
checked in at Thu Dec 7 20:36:26 CET 2006.

--------

--- KDE/kdebase3/kdebase3.changes	2006-11-27 22:47:14.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdebase3/kdebase3.changes	2006-12-06 11:46:53.000000000 +0100
@@ -1,0 +2,24 @@
+Wed Dec  6 11:46:50 CET 2006 - stbinner@suse.de
+
+- make KDE protocol information use enhanced_browsing icon (#186707)
+- use upstream logout effect for 8-bit displays (#214543)
+
+-------------------------------------------------------------------
+Mon Dec  4 11:25:43 CET 2006 - stbinner@suse.de
+
+- remove UnitedLinux cruft from spec file
+- ksmserver: escape "&" properly in grub partition label
+- fix more the build for < 10.1
+
+-------------------------------------------------------------------
+Fri Dec  1 10:09:23 CET 2006 - stbinner@suse.de
+
+- fix build for < 10.1
+
+-------------------------------------------------------------------
+Fri Dec  1 04:20:22 CET 2006 - dmueller@suse.de
+
+- fix drag&drop of favourites on tab regression in kickoff
+- fix tooltips sometimes disappearing (#221616)
+
+-------------------------------------------------------------------

New:
----
  fix-kicker-containerarea-build.diff
  fix-ksmserver-partition-label.diff
  ioslaveinfo-icon.diff

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kdebase3.spec ++++++
--- /var/tmp/diff_new_pack.0x9eVQ/_old	2006-12-07 20:35:42.000000000 +0100
+++ /var/tmp/diff_new_pack.0x9eVQ/_new	2006-12-07 20:35:42.000000000 +0100
@@ -52,7 +52,7 @@
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Url:            http://www.kde.org/
 Version:        3.5.5
-Release:        76
+Release:        78
 %define	kde_version	3.5.5
 Source0:        kdebase-%{kde_version}.tar.bz2
 Source3:        startkde.suse.sh
@@ -196,6 +196,9 @@
 Patch190:       kcontrol-energy.diff
 Patch191:       set-media-enabled-to-false.diff
 Patch192:       3_5_BRANCH_607210.diff
+Patch193:       fix-ksmserver-partition-label.diff
+Patch194:       fix-kicker-containerarea-build.diff
+Patch195:       ioslaveinfo-icon.diff
 
 %description
 This package contains kdebase, one of the basic packages of the K
@@ -382,7 +385,7 @@
 Summary:        Set and list fileshares
 Group:          System/Management
 Version:        2.0
-Release:        205
+Release:        208
 
 %description -n fileshareset
 This package contains the the fileshareset utility to allow users to
@@ -554,6 +557,11 @@
 %patch190
 %patch191
 %patch192
+%patch193
+%if %suse_version < 1010
+%patch194
+%endif
+%patch195
 cp %SOURCE17 l10n/tw/flag.png
 . /etc/opt/kde3/common_options
 cd ../fileshareset2
@@ -652,7 +660,6 @@
 #
 # install pixmaps and configuration
 #
-mkdir -p $RPM_BUILD_ROOT/opt/kde3/share/UnitedLinux/addon-scripts/
 mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
 mkdir -p $RPM_BUILD_ROOT/etc/init.d/
 install -m 0644 %SOURCE9 ${RPM_BUILD_ROOT}/opt/kde3/share/apps/kdewizard/pics/wizard_small.png
@@ -797,9 +804,11 @@
   esac
 fi
 %endif
+%if %suse_version > 1000
 
 %post -n fileshareset
 %run_permissions
+%endif
 
 %postun kdm
 %insserv_cleanup
@@ -828,8 +837,6 @@
 %files
 %defattr(-,root,root)
 %doc AUTHORS COPYING README README.pam ../lame.spec ../README.mp3
-%dir /opt/kde3/share/UnitedLinux
-%dir /opt/kde3/share/UnitedLinux/addon-scripts/
 %dir /opt/kde3/share/icons/hicolor/*
 %dir /opt/kde3/%_lib/kconf_update_bin
 %dir /opt/kde3/share/apps/plugin
@@ -1520,6 +1527,18 @@
 %endif
 
 %changelog -n kdebase3
+* Wed Dec 06 2006 - stbinner@suse.de
+- make KDE protocol information use enhanced_browsing icon (#186707)
+- use upstream logout effect for 8-bit displays (#214543)
+* Mon Dec 04 2006 - stbinner@suse.de
+- remove UnitedLinux cruft from spec file
+- ksmserver: escape "&" properly in grub partition label
+- fix more the build for < 10.1
+* Fri Dec 01 2006 - stbinner@suse.de
+- fix build for < 10.1
+* Fri Dec 01 2006 - dmueller@suse.de
+- fix drag&drop of favourites on tab regression in kickoff
+- fix tooltips sometimes disappearing (#221616)
 * Mon Nov 27 2006 - dmueller@suse.de
 - refresh ksmserver-timed.diff to apply properly
 * Mon Nov 27 2006 - dmueller@suse.de




++++++ fix-kicker-containerarea-build.diff ++++++
--- kicker/kicker/core/containerarea.cpp	2006/12/04 10:27:16	1.173
+++ kicker/kicker/core/containerarea.cpp	2006/12/04 11:04:54
@@ -1764,7 +1764,7 @@
 
 void ContainerArea::destroyCachedGeometry()
 {
-    m_cachedGeometry.remove( static_cast< const QWidget* >( sender()));
+    m_cachedGeometry.remove( const_cast<QWidget*>(static_cast< const QWidget* >( sender())));
 }
 
 BaseContainer::List ContainerArea::containers(const QString& type) const
++++++ fix-ksmserver-partition-label.diff ++++++
--- ksmserver/shutdowndlg.cpp	2006/12/04 10:26:11	1.153
+++ ksmserver/shutdowndlg.cpp	2006/12/04 10:35:52
@@ -230,10 +230,12 @@
 	  int index = 0;
 	  for (QStringList::ConstIterator it = rebootOptions.begin(); it != rebootOptions.end(); ++it, ++index)
 	    {
+              QString label = (*it);
+              label=label.replace('&',"&&");
 	      if (index == cur)
-		targets->insertItem( *it + i18n("current option in boot loader", " (current)"), index);
+		targets->insertItem( label + i18n("current option in boot loader", " (current)"), index);
 	      else
-		targets->insertItem( *it, index );
+		targets->insertItem( label, index );
 	    }
 	  
 	  btnReboot->setPopup(targets);

++++++ ioslaveinfo-icon.diff ++++++
--- kcontrol/ioslaveinfo/ioslaveinfo.desktop	2006/12/05 14:07:55	1.1
+++ kcontrol/ioslaveinfo/ioslaveinfo.desktop	2006/12/05 14:08:12
@@ -73,7 +73,7 @@
 Comment[zu]=Ulwazi mayelana nemithetho elandelwayo ekhona
 DocPath=kinfocenter/protocols/index.html
 Exec=kcmshell ioslaveinfo
-Icon=history
+Icon=enhanced_browsing
 Keywords=Protocol,IO slaves,Slaves,Network,Information,Timeout
 Keywords[ar]=بروتوكول,IO Slaves,Slaves,الشبكة,معلومات الوقت المحدد
 Keywords[az]=Protokol, IO Kölələri, Kölələr, Şəbəkə,Mə'lumat, Vaxt Dolması







++++++ kickoff.diff ++++++
--- /var/tmp/diff_new_pack.0x9eVQ/_old	2006-12-07 20:35:46.000000000 +0100
+++ /var/tmp/diff_new_pack.0x9eVQ/_new	2006-12-07 20:35:46.000000000 +0100
@@ -263,10 +263,11 @@
  
  static const int DEFAULT_FRAMES_PER_SECOND = 30;
  
-@@ -72,7 +73,9 @@
+@@ -71,14 +72,16 @@
+       m_dissolveDelta(-1),
        m_direction(KPanelApplet::Up),
        m_dirty(false),
-       m_toolTipsEnabled(KickerSettings::showToolTips()),
+-      m_toolTipsEnabled(KickerSettings::showToolTips()),
 -      m_tippingFor(0)
 +      m_tippingFor(0),
 +      m_timer(0, "KickerTip::m_timer"),
@@ -274,7 +275,26 @@
  {
      setFocusPolicy(NoFocus);
      setBackgroundMode(NoBackground);
-@@ -193,7 +196,6 @@
+     resize(0, 0);
+     hide();
+     connect(&m_frameTimer, SIGNAL(timeout()), SLOT(internalUpdate()));
++    connect(kapp, SIGNAL(settingsChanged(SettingsCategory)), SLOT(slotSettingsChanged()));
+ }
+ 
+ KickerTip::~KickerTip()
+@@ -87,6 +90,11 @@
+     delete m_mimeFactory;
+ }
+ 
++void KickerTip::slotSettingsChanged()
++{
++    QToolTip::setGloballyEnabled(KickerSettings::showToolTips());
++}
++
+ void KickerTip::display()
+ {
+     if (!tippingEnabled())
+@@ -193,7 +201,6 @@
  void KickerTip::mousePressEvent(QMouseEvent * /*e*/)
  {
      m_timer.stop();
@@ -282,7 +302,7 @@
      hide();
  }
  
-@@ -394,8 +396,11 @@
+@@ -394,8 +401,11 @@
          m_tippingEnabled--;
      }
  
@@ -294,7 +314,33 @@
          m_self->hide();
      }
  }
-@@ -475,7 +480,6 @@
+@@ -410,6 +420,8 @@
+     m_tippingFor = 0;
+     m_frameTimer.stop();
+     QWidget::hide();
++
++    QToolTip::setGloballyEnabled(KickerSettings::showToolTips());
+ }
+ 
+ bool KickerTip::eventFilter(QObject *object, QEvent *event)
+@@ -438,7 +450,6 @@
+                 !qApp->activePopupWidget() &&
+                 !isTippingFor(widget))
+             {
+-                m_toolTipsEnabled = QToolTip::isGloballyEnabled();
+                 QToolTip::setGloballyEnabled(false);
+ 
+                 tipFor(widget);
+@@ -460,8 +471,6 @@
+             }
+             break;
+         case QEvent::Leave:
+-            QToolTip::setGloballyEnabled(m_toolTipsEnabled);
+-
+             m_timer.stop();
+ 
+             if (isTippingFor(widget) && isVisible())
+@@ -475,7 +484,6 @@
              break;
          case QEvent::MouseButtonPress:
              m_timer.stop();
@@ -302,6 +348,24 @@
              hide();
          default:
              break;
+--- libkicker/kickertip.h
++++ libkicker/kickertip.h
+@@ -92,6 +92,7 @@
+     void tipperDestroyed(QObject* o);
+     void internalUpdate();
+     void display();
++    void slotSettingsChanged();
+ 
+ private:
+     QBitmap m_mask;
+@@ -108,7 +109,6 @@
+     QTimer m_timer;
+     QTimer m_frameTimer;
+     bool m_dirty;
+-    bool m_toolTipsEnabled;
+ 
+     const QWidget* m_tippingFor;
+ 
 --- libkicker/panelbutton.cpp
 +++ libkicker/panelbutton.cpp
 @@ -42,6 +42,7 @@
@@ -6616,7 +6680,7 @@
      setFocusPolicy(NoFocus);
 --- kicker/ui/kickoff_bar.cpp
 +++ kicker/ui/kickoff_bar.cpp
-@@ -0,0 +1,172 @@
+@@ -0,0 +1,190 @@
 +/*****************************************************************
 +
 +   Copyright (c) 1996-2000 the kicker authors. See file AUTHORS.
@@ -6640,6 +6704,7 @@
 +******************************************************************/
 +
 +#include "kickoff_bar.h"
++#include "itemview.h"
 +
 +#include <qiconset.h>
 +#include <qpainter.h>
@@ -6652,6 +6717,7 @@
 +KickoffTabBar::KickoffTabBar(QWidget* parent, const char* name)
 +        : QTabBar(parent, name), m_tabsActivated(true)
 +{
++    setAcceptDrops(true);
 +}
 +
 +void KickoffTabBar::deactivateTabs(bool b)
@@ -6787,6 +6853,22 @@
 +    }
 +}
 +
++void KickoffTabBar::dragEnterEvent(QDragEnterEvent* event)
++{
++    event->accept(KMenuItemDrag::canDecode(event));
++}
++
++void KickoffTabBar::dragMoveEvent(QDragMoveEvent* event)
++{
++    QTab* t = selectTab(event->pos());
++
++    // ### uhhh, look away
++    if (t && t->identifier() == 0)
++    {
++        setCurrentTab(t);
++    }
++}
++
 +
 +// vim:cindent:sw=4:
 --- kicker/ui/media_watcher.h
@@ -7665,7 +7747,7 @@
 +</UI>
 --- kicker/ui/kickoff_bar.h
 +++ kicker/ui/kickoff_bar.h
-@@ -0,0 +1,46 @@
+@@ -0,0 +1,48 @@
 +/*****************************************************************
 +
 +   Copyright (c) 1996-2000 the kicker authors. See file AUTHORS.
@@ -7705,6 +7787,8 @@
 +    virtual void paint(QPainter*, QTab*, bool) const;
 +    virtual void paintLabel(QPainter* p, const QRect& br, QTab* t, bool has_focus) const;
 +    virtual void layoutTabs();
++    virtual void dragEnterEvent(QDragEnterEvent*);
++    virtual void dragMoveEvent(QDragMoveEvent*);
 +
 +private:
 +    bool m_tabsActivated;



++++++ mach_blass.diff ++++++
--- /var/tmp/diff_new_pack.0x9eVQ/_old	2006-12-07 20:35:46.000000000 +0100
+++ /var/tmp/diff_new_pack.0x9eVQ/_new	2006-12-07 20:35:46.000000000 +0100
@@ -1,6 +1,6 @@
---- ksmserver/shutdowndlg.cpp
-+++ ksmserver/shutdowndlg.cpp
-@@ -35,6 +35,7 @@
+--- ksmserver/shutdowndlg.cpp.sav	2006-11-28 18:18:41.000000000 +0100
++++ ksmserver/shutdowndlg.cpp	2006-11-28 18:25:15.000000000 +0100
+@@ -35,6 +35,7 @@ Copyright (C) 2000 Matthias Ettrich <ett
  #include <kuser.h>
  #include <kpixmap.h>
  #include <kimageeffect.h>
@@ -8,7 +8,7 @@
  #include <kdialog.h>
  #include <kseparator.h>
  
-@@ -48,6 +49,9 @@
+@@ -48,6 +49,9 @@ Copyright (C) 2000 Matthias Ettrich <ett
  
  #include "shutdowndlg.moc"
  
@@ -18,32 +18,50 @@
  KSMShutdownFeedback * KSMShutdownFeedback::s_pSelf = 0L;
  
  KSMShutdownFeedback::KSMShutdownFeedback()
-@@ -55,33 +59,92 @@
-    m_currentY( 0 )
+@@ -56,12 +60,22 @@ KSMShutdownFeedback::KSMShutdownFeedback
  {
      setBackgroundMode( QWidget::NoBackground );
--    setGeometry( QApplication::desktop()->geometry() );
+     setGeometry( QApplication::desktop()->geometry() );
 -    QTimer::singleShot( 10, this, SLOT( slotPaintEffect() ) );
-+    QRect geo( QApplication::desktop()->geometry() );
-+    setGeometry( geo );
-+    int dep = QPixmap::defaultDepth();
-+    if (dep == 24 || dep == 16)
-+        dep = 32;
-+    grabbed.create( geo.size(), dep);
-+    QTimer::singleShot( 0, this, SLOT( slotGrab() ) );
-     m_root.resize( width(), height() );
- }
+-    m_root.resize( width(), height() );
+-}
++    if( QPixmap::defaultDepth() > 8 )
++    {
++        grabbed.create( size(), 32 );
++        QTimer::singleShot( 0, this, SLOT( slotGrab() ) );
++    }
++    else
++    {
++        QTimer::singleShot( 10, this, SLOT( slotPaintEffectOld() ) );
++        m_root.resize( width(), height() );
++    }
++
+ 
++}
  
--
 -void KSMShutdownFeedback::slotPaintEffect()
-+void KSMShutdownFeedback::slotGrab()
++// the upstream KDE effect
++void KSMShutdownFeedback::slotPaintEffectOld()
  {
+     if ( m_currentY >= height() ) {
+         if ( backgroundMode() == QWidget::NoBackground ) {
+@@ -80,7 +94,76 @@ void KSMShutdownFeedback::slotPaintEffec
+     bitBlt( this, 0, m_currentY, &pixmap );
+     bitBlt( &m_root, 0, m_currentY, &pixmap );
+     m_currentY += 10;
+-    QTimer::singleShot( 1, this, SLOT( slotPaintEffect() ) );
++    QTimer::singleShot( 1, this, SLOT( slotPaintEffectOld() ) );
++}
++
++// the SUSE effect
++void KSMShutdownFeedback::slotGrab()
++{
 +    // we start the passed early
 +    if ( m_currentY * 4 >= height() * 3 && passed.isNull())
 +        passed.start();
 +
-     if ( m_currentY >= height() ) {
-+        slotPaintEffect();
++    if ( m_currentY >= height() ) {
++        slotPaintEffectNew();
 +        return;
 +    }
 +
@@ -56,80 +74,58 @@
 +    QTimer::singleShot(0, this, SLOT(slotGrab()));
 +}
 +
-+  void KSMShutdownFeedback::slotPaintEffect()
-+  {
++void KSMShutdownFeedback::slotPaintEffectNew()
++{
 +    const unsigned int shift_scale = 10;
 +    const unsigned int scale = 1 << shift_scale;
 +
 +    //kdDebug() << "passed before paint " << passed.elapsed() << endl;
-+    int current_fade = QMIN(scale, passed.elapsed() * scale / max_faded);
++    unsigned int current_fade = QMIN(scale, passed.elapsed() * scale / max_faded);
 +    QImage copy;
-+    if ( grabbed.depth() == 32 ) {
-+        copy.create( grabbed.size(), grabbed.depth() );
-+        unsigned int pixels = grabbed.width()*grabbed.height();
-+        QRgb *orig = ( QRgb* )grabbed.bits();
-+        QRgb *dest = ( QRgb* )copy.bits();
-+        QColor clr;
-+        int h, s, v;
-+
-+        int r, g, b, tg;
-+
-+        for ( unsigned int i = 0; i < pixels; ++i )
-+        {
-+            r = qRed( orig[i] );
-+            g = qGreen( orig[i] );
-+            b = qBlue( orig[i] );
-+
-+            // qGray formla
-+            tg = (r*11 + g*16 + b*5)/32;
-+            // make it a bit darker than gray
-+            tg = tg - tg / 5;
-+
-+            r = ( ( r << shift_scale ) + current_fade * ( tg - r ) ) >> shift_scale;
-+            g = ( ( g << shift_scale ) + current_fade * ( tg - g ) ) >> shift_scale;
-+            b = ( ( b << shift_scale ) + current_fade * ( tg - b ) ) >> shift_scale;
-+
-+            dest[i] = qRgb(r, g, b);
-+        }
++    copy.create( grabbed.size(), grabbed.depth() );
++    unsigned int pixels = grabbed.width()*grabbed.height();
++    QRgb *orig = ( QRgb* )grabbed.bits();
++    QRgb *dest = ( QRgb* )copy.bits();
++    QColor clr;
++
++    int r, g, b, tg;
++
++    for ( unsigned int i = 0; i < pixels; ++i )
++    {
++        r = qRed( orig[i] );
++        g = qGreen( orig[i] );
++        b = qBlue( orig[i] );
++
++        // qGray formla
++        tg = (r*11 + g*16 + b*5)/32;
++        // make it a bit darker than gray
++        tg = tg - tg / 5;
++
++        r = ( ( r << shift_scale ) + current_fade * ( tg - r ) ) >> shift_scale;
++        g = ( ( g << shift_scale ) + current_fade * ( tg - g ) ) >> shift_scale;
++        b = ( ( b << shift_scale ) + current_fade * ( tg - b ) ) >> shift_scale;
 +
-+    } else {
-+        // old code - now used for 8bit
-+        copy = grabbed;
-+        copy = KImageEffect::desaturate(copy, current_fade);
-+        copy = KImageEffect::fade(copy, 0.1 * current_fade, Qt::black);
++        dest[i] = qRgb(r, g, b);
 +    }
 +    //kdDebug() << "passed before bitBlt " << passed.elapsed() << endl;
 +    bitBlt( this, 0, 0, ©);
 +    //kdDebug() << "passed after bitBlt " << passed.elapsed() << endl;
 +
 +    if ( current_fade >= scale ) {
-         if ( backgroundMode() == QWidget::NoBackground ) {
-             setBackgroundMode( QWidget::NoBackground );
--            setBackgroundPixmap( m_root );
++        if ( backgroundMode() == QWidget::NoBackground ) {
++            setBackgroundMode( QWidget::NoBackground );
 +            setBackgroundPixmap( copy );
-         }
-         return;
-     }
- 
--    KPixmap pixmap;
--    pixmap = QPixmap::grabWindow( qt_xrootwin(), 0, m_currentY, width(), 10 );
--    QImage image = pixmap.convertToImage();
--    KImageEffect::blend( Qt::black, image, 0.4 );
--    KImageEffect::toGray( image, true );
--    pixmap.convertFromImage( image );
--    bitBlt( this, 0, m_currentY, &pixmap );
--    bitBlt( &m_root, 0, m_currentY, &pixmap );
--    m_currentY += 10;
--    QTimer::singleShot( 1, this, SLOT( slotPaintEffect() ) );
--}
-+    QTimer::singleShot( 0, this, SLOT( slotPaintEffect() ) );
-+  }
++        }
++        return;
++    }
++
++    QTimer::singleShot( 0, this, SLOT( slotPaintEffectNew() ) );
+ }
  
  //////
- 
---- ksmserver/shutdowndlg.h
-+++ ksmserver/shutdowndlg.h
-@@ -9,7 +9,9 @@
+--- ksmserver/shutdowndlg.h.sav	2006-11-28 18:18:41.000000000 +0100
++++ ksmserver/shutdowndlg.h	2006-11-28 18:23:14.000000000 +0100
+@@ -9,7 +9,9 @@ Copyright (C) 2000 Matthias Ettrich <ett
  
  #include <qpixmap.h>
  #include <qdialog.h>
@@ -139,10 +135,13 @@
  class QPushButton;
  class QVButtonGroup;
  class QPopupMenu;
-@@ -32,12 +34,15 @@
+@@ -31,13 +33,17 @@ protected:
+     ~KSMShutdownFeedback() {}
  
  private slots:
-     void slotPaintEffect();
+-    void slotPaintEffect();
++    void slotPaintEffectOld();
++    void slotPaintEffectNew();
 +    void slotGrab();
  
  private:

++++++ mach_blass_legacy.diff ++++++
--- /var/tmp/diff_new_pack.0x9eVQ/_old	2006-12-07 20:35:46.000000000 +0100
+++ /var/tmp/diff_new_pack.0x9eVQ/_new	2006-12-07 20:35:46.000000000 +0100
@@ -3,7 +3,7 @@
 @@ -34,6 +34,7 @@
  #include <kuser.h>
  #include <kpixmap.h>
- #include <kimageeffect.h>
+ #i nclude <kimageeffect.h>
 +#include <kpixmapeffect.h>
  #include <kdialog.h>
  #include <kseparator.h>






++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠suse.de

tags

participants (1)