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

List:       kde-commits
Subject:    kdebase/kicker/applets/media
From:       Kévin Ottens <ervin () ipsquad ! net>
Date:       2004-11-05 14:53:27
Message-ID: 20041105145327.AD63A16DA7 () office ! kde ! org
[Download RAW message or body]

CVS commit by ervin: 

It's now possible to drop files on a medium if you have write access to it.


  M +2 -2      Makefile.am   1.3
  M +2 -2      mediaapplet.cpp   1.10
  M +17 -4     mediumbutton.cpp   1.8
  M +1 -0      mediumbutton.h   1.7


--- kdebase/kicker/applets/media/Makefile.am  #1.2:1.3
@@ -1,3 +1,3 @@
-INCLUDES = $(all_includes)
+INCLUDES = $(all_includes) -I$(top_srcdir)/libkonq
 
 kde_module_LTLIBRARIES = media_panelapplet.la
@@ -15,5 +15,5 @@
 
 media_panelapplet_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries)
-media_panelapplet_la_LIBADD = $(LIB_KDEUI) $(LIB_KIO)
+media_panelapplet_la_LIBADD = ../../../libkonq/libkonq.la $(LIB_KDEUI) $(LIB_KIO)
 
 messages: rc.cpp

--- kdebase/kicker/applets/media/mediaapplet.cpp  #1.9:1.10
@@ -49,4 +49,6 @@ MediaApplet::MediaApplet(const QString& 
                 setBackgroundMode(X11ParentRelative);
 
+        setAcceptDrops(true);
+        
         loadConfig();
         mButtonList.setAutoDelete(true);
@@ -219,6 +221,4 @@ void MediaApplet::slotRefreshItems(const
                 kdDebug()<<"MediaApplet::slotRefreshItems:"<<(*it.current()).url().url()<<endl;
 
-                it.current()->refresh();
-
                 QString mimetype = (*it.current()).mimetype();
                 bool found = false;

--- kdebase/kicker/applets/media/mediumbutton.cpp  #1.7:1.8
@@ -38,4 +38,7 @@
 #include <kurldrag.h>
 
+#include <konq_operations.h>
+
+
 MediumButton::MediumButton(QWidget *parent, const KFileItem &fileItem)
         : QButton(parent), mFileItem(fileItem)
@@ -73,5 +76,5 @@ MediumButton::MediumButton(QWidget *pare
         kapp->addKipcEventMask(KIPC::IconChanged);
 
-        setAcceptDrops(true);
+        setAcceptDrops(mFileItem.isWritable());
         connect(&mOpenTimer, SIGNAL(timeout()), SLOT(slotDragOpen()));
 }
@@ -89,4 +92,5 @@ void MediumButton::setFileItem(const KFi
 {
         mFileItem = fileItem;
+        setAcceptDrops(mFileItem.isWritable());
         QToolTip::remove(this);
         QToolTip::add(this, mFileItem.name());
@@ -220,7 +224,9 @@ void MediumButton::mousePressEvent(QMous
 void MediumButton::dragEnterEvent(QDragEnterEvent* e)
 {
+        if (mFileItem.isWritable())
+        {
         mOpenTimer.start(1000, true);
-
-        QButton::dragEnterEvent(e);
+                e->accept(true);
+        }
 }
 
@@ -232,4 +238,11 @@ void MediumButton::dragLeaveEvent(QDragL
 }
 
+void MediumButton::dropEvent(QDropEvent *e)
+{
+        mOpenTimer.stop();
+
+        KonqOperations::doDrop(&mFileItem, mFileItem.url(), e, this);
+}
+
 void MediumButton::slotDragOpen()
 {

--- kdebase/kicker/applets/media/mediumbutton.h  #1.6:1.7
@@ -52,4 +52,5 @@ protected:
         void dragEnterEvent( QDragEnterEvent* );
         void dragLeaveEvent( QDragLeaveEvent* );
+        void dropEvent(QDropEvent *e);
 
 protected slots:


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