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

List:       kde-commits
Subject:    KDE/kdebase/kicker
From:       Pedro Suarez Casal <gauleng () gmail ! com>
Date:       2005-08-12 12:26:42
Message-ID: 1123849602.827905.3734.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 446074 by pedrosc:

Add support for larger lines in KickerTip and remove more Q3* classes

 M  +6 -5      applets/minipager/pagerbutton.cpp  
 M  +3 -3      kicker/core/applethandle.cpp  
 M  +32 -29    libkicker/kickertip.cpp  
 M  +2 -2      taskbar/taskcontainer.cpp  
 M  +3 -3      taskmanager/tasklmbmenu.cpp  
 M  +8 -6      taskmanager/taskmanager.cpp  
 M  +7 -7      taskmanager/taskmanager.h  


--- trunk/KDE/kdebase/kicker/applets/minipager/pagerbutton.cpp #446073:446074
@@ -459,8 +459,9 @@
             TaskDrag* drag = new TaskDrag(tasklist, this);
             QPoint offset(m_pager->clickPos.x() - (r.x() * w / dw),
                           m_pager->clickPos.y() - (r.y() * h / dh));
-            drag->setPixmap(windowImage, offset);
-            drag->dragMove();
+            drag->setPixmap(windowImage);
+            drag->setHotSpot(offset);
+            drag->start();
 
             if (isDown())
             {
@@ -481,7 +482,7 @@
         // ignore container drags
         return;
     }
-    else if (TaskDrag::canDecode(e))
+    else if (TaskDrag::canDecode(e->mimeData()))
     {
         // if it's a task drag don't switch the desktop, just accept it
         e->accept();
@@ -498,10 +499,10 @@
 
 void KMiniPagerButton::dropEvent(QDropEvent* e)
 {
-    if (TaskDrag::canDecode(e))
+    if (TaskDrag::canDecode(e->mimeData()))
     {
         e->accept();
-        Task::List tasks(TaskDrag::decode(e));
+        Task::List tasks(TaskDrag::decode(e->mimeData()));
 
         if (tasks.count() == 1)
         {
--- trunk/KDE/kdebase/kicker/kicker/core/applethandle.cpp #446073:446074
@@ -407,7 +407,7 @@
 void AppletHandleButton::paintEvent( QPaintEvent* )
 {
     QPainter p(this);
-    p.fillRect(rect(), colorGroup().brush(backgroundRole()));
+    p.fillRect(rect(), palette().brush(backgroundRole()));
 
     QStyleOptionFrame opt;
     opt.init(this);
@@ -465,14 +465,14 @@
         p.drawLine(0, h, 0, 0);
         p.drawLine(0, 0, w, 0);
 
-        p.setPen(colorGroup().dark());
+        p.setPen(palette().dark());
         p.drawLine(w, 0, w, h);
         p.drawLine(w, h, 0, h);
     }
 
     if (isOn() || isDown())
     {
-        p.setPen(colorGroup().dark());
+        p.setPen(palette().dark());
         p.drawLine(0, h, 0, 0);
         p.drawLine(0, 0, w, 0);
 
--- trunk/KDE/kdebase/kicker/libkicker/kickertip.cpp #446073:446074
@@ -244,17 +244,20 @@
     QTextBlock block = m_richText->document()->begin();
     qreal y = 0, maxWidth = 0;
     while(block.isValid()) {
-	QTextLayout *layout = block.layout();
-	layout->beginLayout();
-    	QTextLine line = layout->createLine();
-    	if(line.isValid()) {
-	    line.setLineWidth(400);
-	    line.setPosition(QPointF(line.x(), y));
-	    maxWidth = qMax(maxWidth, line.naturalTextWidth());
-	    y += line.height();
-	}
-    	layout->endLayout();
-	block = block.next();
+        QTextLayout *layout = block.layout();
+        layout->beginLayout();
+        while(1) {
+            QTextLine line = layout->createLine();
+            if(!line.isValid()) {
+                break;
+            }
+            line.setLineWidth(400);
+            line.setPosition(QPointF(line.x(), y));
+            maxWidth = qMax(maxWidth, line.naturalTextWidth());
+            y += line.height();
+        }
+        layout->endLayout();
+        block = block.next();
     }
 
     // determine text rectangle
@@ -313,24 +316,24 @@
 
     if (KickerSettings::mouseOversShowText())
     {
-	block = m_richText->document()->begin();
-	QColor background = palette().color(QPalette::Background).dark(115);
-	QColor foreground = palette().color(QPalette::Foreground);
-	int shadowOffset = QApplication::reverseLayout() ? -1 : 1;
-	QPointF posShadow = QPointF(5 + textX + shadowOffset, textY + 1);
-	QPointF posText = QPointF(5 + textX, textY);
-	while(block.isValid()) {
-		QTextLayout *layout = block.layout();
-        	// draw text shadow
-        	bufferPainter.setBrush(background);
-		bufferPainter.setPen(background);
-		layout->draw(&bufferPainter, posShadow);
-        	// draw text
-		bufferPainter.setBrush(foreground);
-		bufferPainter.setPen(foreground);
-		layout->draw(&bufferPainter, posText);
-		block = block.next();
-	}
+        block = m_richText->document()->begin();
+        QColor background = palette().color(QPalette::Background).dark(115);
+        QColor foreground = palette().color(QPalette::Foreground);
+        int shadowOffset = QApplication::reverseLayout() ? -1 : 1;
+        QPointF posShadow = QPointF(5 + textX + shadowOffset, textY + 1);
+        QPointF posText = QPointF(5 + textX, textY);
+        while(block.isValid()) {
+            QTextLayout *layout = block.layout();
+            // draw text shadow
+            bufferPainter.setBrush(background);
+            bufferPainter.setPen(background);
+            layout->draw(&bufferPainter, posShadow);
+            // draw text
+            bufferPainter.setBrush(foreground);
+            bufferPainter.setPen(foreground);
+            layout->draw(&bufferPainter, posText);
+            block = block.next();
+        }
     }
 }
 
--- trunk/KDE/kdebase/kicker/taskbar/taskcontainer.cpp #446073:446074
@@ -1157,7 +1157,7 @@
             drag->setPixmap(m_filteredTasks.first()->pixmap());
         }
 
-        drag->dragMove();
+        drag->start();
         return true;
     }
 
@@ -1254,7 +1254,7 @@
 void TaskContainer::dragEnterEvent( QDragEnterEvent* e )
 {
     // ignore task drags and applet drags
-    if (TaskDrag::canDecode(e) || PanelDrag::canDecode(e))
+    if (TaskDrag::canDecode(e->mimeData()) || PanelDrag::canDecode(e))
     {
         return;
     }
--- trunk/KDE/kdebase/kicker/taskmanager/tasklmbmenu.cpp #446073:446074
@@ -172,7 +172,7 @@
 void TaskLMBMenu::dragEnterEvent( QDragEnterEvent* e )
 {
     // ignore task drags
-    if (TaskDrag::canDecode(e))
+    if (TaskDrag::canDecode(e->mimeData()))
     {
         return;
     }
@@ -206,7 +206,7 @@
 void TaskLMBMenu::dragMoveEvent( QDragMoveEvent* e )
 {
     // ignore task drags
-    if (TaskDrag::canDecode(e))
+    if (TaskDrag::canDecode(e->mimeData()))
     {
         return;
     }
@@ -286,7 +286,7 @@
                 tasks.append(task);
                 TaskDrag* drag = new TaskDrag(tasks, this);
                 drag->setPixmap(task->pixmap());
-                drag->dragMove();
+                drag->start();
             }
         }
     }
--- trunk/KDE/kdebase/kicker/taskmanager/taskmanager.cpp #446073:446074
@@ -1473,7 +1473,7 @@
 }
 
 TaskDrag::TaskDrag(const Task::List& tasks, QWidget* source, const char* name)
-  : Q3StoredDrag("taskbar/task", source, name)
+  : QDrag(source)
 {
     QByteArray data;
     QDataStream stream(&data, QIODevice::WriteOnly);
@@ -1486,21 +1486,23 @@
         stream << (quint32)(*it)->window();
     }
 
-    setEncodedData(data);
+    QMimeData* mimeData = new QMimeData();
+    mimeData->setData("taskbar/task", data);
+    setMimeData(mimeData);
 }
 
 TaskDrag::~TaskDrag()
 {
 }
 
-bool TaskDrag::canDecode(const QMimeSource* e)
+bool TaskDrag::canDecode(const QMimeData* e)
 {
-    return e->provides("taskbar/task");
+    return e->hasFormat("taskbar/task");
 }
 
-Task::List TaskDrag::decode( const QMimeSource* e )
+Task::List TaskDrag::decode( const QMimeData* e )
 {
-    QByteArray data(e->encodedData("taskbar/task"));
+    QByteArray data(e->data("taskbar/task"));
     Task::List tasks;
 
     if (data.size())
--- trunk/KDE/kdebase/kicker/taskmanager/taskmanager.h #446073:446074
@@ -30,12 +30,12 @@
 #include <qobject.h>
 #include <qpixmap.h>
 #include <qpoint.h>
-#include <q3ptrlist.h>
+#include <QMimeData>
+#include <QMap>
 #include <qpixmap.h>
-#include <q3dragobject.h>
+#include <QDrag>
 #include <qrect.h>
-#include <q3valuelist.h>
-#include <q3valuevector.h>
+#include <QVector>
 
 #include <ksharedptr.h>
 #include <kstartupinfo.h>
@@ -479,7 +479,7 @@
 /**
  * Provids a drag object for tasks across desktops.
  */
-class KDE_EXPORT TaskDrag : public Q3StoredDrag
+class KDE_EXPORT TaskDrag : public QDrag
 {
 public:
     /**
@@ -492,13 +492,13 @@
     /**
      * Returns true if the mime source can be decoded to a TaskDrag.
      */
-    static bool canDecode( const QMimeSource* e );
+    static bool canDecode( const QMimeData* e );
 
     /**
      * Decodes the tasks from the mime source and returns them if successful.
      * Otherwise an empty task list is returned.
      */
-    static Task::List decode( const QMimeSource* e );
+    static Task::List decode( const QMimeData* e );
 };
 
 
[prev in list] [next in list] [prev in thread] [next in thread]