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

List:       kde-commits
Subject:    kdebase/kicker/applets
From:       Kévin Ottens <ervin () ipsquad ! net>
Date:       2004-12-23 11:56:39
Message-ID: 20041223115639.848921BBFA () office ! kde ! org
[Download RAW message or body]

CVS commit by ervin: 

Now use correctly the brand new kicker tooltips.
Yeah! I even have some room to put useful content! ;-)


  M +7 -8      media/mediumbutton.cpp   1.11
  M +1 -1      media/mediumbutton.h   1.9
  M +3 -3      trash/trashapplet.cpp   1.4
  M +12 -4     trash/trashbutton.cpp   1.3
  M +1 -1      trash/trashbutton.h   1.2


--- kdebase/kicker/applets/media/mediumbutton.cpp  #1.10:1.11
@@ -25,5 +25,4 @@
 #include <qdrawutil.h>
 #include <qpopupmenu.h>
-#include <qtooltip.h>
 #include <qstyle.h>
 
@@ -57,8 +56,8 @@ MediumButton::MediumButton(QWidget *pare
 
         setAcceptDrops(mFileItem.isWritable());
-        QToolTip::remove(this);
-        QToolTip::add(this, mFileItem.name());
 
-        refreshIcon();
+        setTitle(mFileItem.name());
+
+        refreshType();
 
         connect(&mOpenTimer, SIGNAL(timeout()), SLOT(slotDragOpen()));
@@ -84,7 +83,6 @@ void MediumButton::setFileItem(const KFi
         mFileItem = fileItem;
         setAcceptDrops(mFileItem.isWritable());
-        QToolTip::remove(this);
-        QToolTip::add(this, mFileItem.name());
-        refreshIcon();
+        setTitle(mFileItem.name());
+        refreshType();
 }
 
@@ -116,7 +114,8 @@ void MediumButton::initPopup()
 }
 
-void MediumButton::refreshIcon()
+void MediumButton::refreshType()
 {
         KMimeType::Ptr mime = mFileItem.determineMimeType();
+        setTip( mime->comment() );
         setIcon( mime->icon(QString::null, false) );
 }

--- kdebase/kicker/applets/media/mediumbutton.h  #1.8:1.9
@@ -44,5 +44,5 @@ public:
 protected:
         QString tileName();
-        void refreshIcon();
+        void refreshType();
         void initPopup();
         void dragEnterEvent( QDragEnterEvent* );

--- kdebase/kicker/applets/trash/trashapplet.cpp  #1.3:1.4
@@ -115,5 +115,5 @@ void TrashApplet::slotClear()
         kdDebug()<<"MediaApplet::slotClear"<<endl;
 
-        mButton.setEmpty(true);
+        mButton.setItemCount(0);
 }
 
@@ -121,5 +121,5 @@ void TrashApplet::slotCompleted()
 {
         mCount = mpDirLister->items(KDirLister::AllItems).count();
-        mButton.setEmpty( mCount==0 );
+        mButton.setItemCount( mCount );
 }
 
@@ -127,5 +127,5 @@ void TrashApplet::slotDeleteItem(KFileIt
 {
         mCount--;
-        mButton.setEmpty( mCount==0 );
+        mButton.setItemCount( mCount );
 }
 

--- kdebase/kicker/applets/trash/trashbutton.cpp  #1.2:1.3
@@ -21,5 +21,4 @@
 
 #include <qpopupmenu.h>
-#include <qtooltip.h>
 
 #include <klocale.h>
@@ -47,5 +46,5 @@ TrashButton::TrashButton(QWidget *parent
         resize(20, 20);
 
-        QToolTip::add(this, i18n("Trash"));
+        setTitle(i18n("Trash"));
         setIcon( "trashcan_empty" );
 
@@ -63,13 +62,22 @@ TrashButton::~TrashButton()
 }
 
-void TrashButton::setEmpty(bool empty)
+void TrashButton::setItemCount(int count)
 {
-        if (empty)
+        if (count==0)
         {
                 setIcon( "trashcan_empty" );
+                setTip(i18n("Empty"));
         }
         else
         {
                 setIcon( "trashcan_full" );
+                if (count>1)
+                {
+                        setTip(i18n("%1 items").arg(count));
+                }
+                else
+                {
+                        setTip(i18n("One item"));
+                }
         }
 }

--- kdebase/kicker/applets/trash/trashbutton.h  #1.1:1.2
@@ -38,5 +38,5 @@ public:
         TrashButton(QWidget *parent);
         ~TrashButton();
-        void setEmpty(bool empty);
+        void setItemCount(int count);
         void setPanelPosition(KPanelApplet::Position position);
 


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