[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdebase/kicker/extensions/kasbar
From:       Richard J. Moore <rich () kde ! org>
Date:       2004-09-04 1:56:52
Message-ID: 20040904015652.317861EFF () office ! kde ! org
[Download RAW message or body]

CVS commit by rich: 

- Began making startup items work like other types of item.

- Fixed a regression that broke all the grouping code.


  M +18 -0     ChangeLog   1.7
  M +7 -8      kasgroupitem.cpp   1.13
  M +2 -0      kasgroupitem.h   1.10
  M +12 -3     kasitem.cpp   1.31
  M +2 -0      kasitem.h   1.21
  M +2 -3      kasstartupitem.cpp   1.17


--- kdebase/kicker/extensions/kasbar/ChangeLog  #1.6:1.7
@@ -1,2 +1,20 @@
+2004-09-04 Saturday 01:42  rich
+
+        * - You can now disable the frame around inactive boxes.
+
+          - Startup items now spin around their own center.
+
+2004-09-03 Friday 22:32  rich
+
+        * - Added support for the XShape extension, the unused space is now
+          masked so   that when you have a non-rectangular bar (by using
+          the 'Boxes per line'   setting) the unused space is truly unused.
+          To make this better, I need to   make it so that the box is
+          always populated from the screen edge outwards.
+
+2004-08-29 Sunday 00:27  rich
+
+        * Update changelog
+
 2004-08-29 Sunday 00:27  rich
 

--- kdebase/kicker/extensions/kasbar/kasgroupitem.cpp  #1.12:1.13
@@ -57,4 +57,5 @@
 #include <qwmatrix.h>
 
+#include <kdebug.h>
 #include <kglobal.h>
 #include <kwin.h>
@@ -228,16 +228,15 @@ void KasGroupItem::paint( QPainter *p )
 KasPopup *KasGroupItem::createPopup()
 {
-    if ( items.count() ) {
         KasPopup *pop = new KasPopup( this );
         KasTasker *bar = kasbar()->createChildBar( ( bar->orientation() == \
Horizontal ) ? Vertical : Horizontal, pop );  
+    if ( items.count() ) {
         for ( Task *t = items.first(); t != 0; t = items.next() ) {
             bar->addTask( t );
         }
+    }
 
-        pop->adjustSize();
+    pop->resize( bar->size() );
         return pop;
-    }
-    return 0;
 
 //     // Test code

--- kdebase/kicker/extensions/kasbar/kasgroupitem.h  #1.9:1.10
@@ -1,2 +1,4 @@
+// -*- c++ -*-
+
 /* kasgroupitem.h
 **

--- kdebase/kicker/extensions/kasbar/kasitem.cpp  #1.30:1.31
@@ -89,5 +89,5 @@ KasItem::KasItem( KasBar *parent )
      title( i18n( "Kasbar" ) ),
      mouseOver( false ), activated( false ), customPopup( false ), groupItem( false \
                ),
-     prog( -1 )
+     frame(true), prog( -1 )
 {
     update();
@@ -132,4 +132,13 @@ void KasItem::setProgress( int percent )
 }
 
+void KasItem::setShowFrame( bool yes )
+{
+    if ( frame == yes )
+        return;
+
+    frame = yes;
+    update();
+}
+
 void KasItem::mouseEnter()
 {
@@ -244,5 +253,5 @@ void KasItem::hidePopup()
 void KasItem::togglePopup()
 {
-   if ( pop )
+   if ( activated )
       hidePopup();
    else
@@ -264,5 +273,5 @@ void KasItem::paintFrame( QPainter *p )
        p->drawRect(0, 0, extent(), extent());
    }
-   else if ( kasbar()->paintInactiveFrames() ) {
+   else if ( frame && kasbar()->paintInactiveFrames() ) {
        qDrawShadePanel(p, 0, 0, extent(), extent(), colorGroup(), false, 2);
        p->setPen(Qt::black);

--- kdebase/kicker/extensions/kasbar/kasitem.h  #1.20:1.21
@@ -158,4 +158,5 @@ public slots:
     void setIcon( const QPixmap &icon );
     void setProgress( int percent );
+    void setShowFrame( bool yes );
 
     /** Shows the items popup. */
@@ -227,4 +228,5 @@ private:
     bool customPopup;
     bool groupItem;
+    bool frame;
     int prog;
 };

--- kdebase/kicker/extensions/kasbar/kasstartupitem.cpp  #1.16:1.17
@@ -79,4 +79,5 @@ KasStartupItem::KasStartupItem( KasBar *
     setText( startup_->text() );
     setIcon( icon() );
+    setShowFrame( false );
 
     //
@@ -171,7 +172,5 @@ void KasStartupItem::paint( QPainter *p 
     p->translate( -extent()/2, -extent()/2 );
 
-    paintLabel( p );
-    paintBackground( p );
-    paintIcon( p );
+    KasItem::paint( p );
 
     p->restore();


[prev in list] [next in list] [prev in thread] [next in thread]