[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdelibs
From: Joseph Wenninger <kde () jowenn ! at>
Date: 2005-09-29 7:42:19
Message-ID: 1127979739.539936.31885.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 465212 by jowenn:
KColorDrag -> K3ColorDrag and KColorMimeData (only static functions)
M +6 -0 KDE4PORTING.html
M +2 -2 kde3support/kdeui/Makefile.am
A kde3support/kdeui/k3colordrag.cpp kdeui/kcolordrag.cpp#465016 \
[License: LGPL (v2+) (wrong address)] A kde3support/kdeui/k3colordrag.h \
kdeui/kcolordrag.h#465016 [License: LGPL (v2+) (wrong address)] M +2 -2 \
kdeui/Makefile.am M +9 -11 kdeui/kcolorbutton.cpp
M +9 -11 kdeui/kcolordialog.cpp
D kdeui/kcolordrag.cpp
D kdeui/kcolordrag.h
A kdeui/kcolormimedata.cpp kdeui/kcolordrag.cpp#465016 [License: LGPL \
(v2+) (wrong address)] A kdeui/kcolormimedata.h \
kdeui/kcolordrag.h#465016 [License: LGPL (v2+) (wrong address)] M +6 -7 \
kdeui/kdualcolorbutton.cpp
--- trunk/KDE/kdelibs/KDE4PORTING.html #465211:465212
@@ -215,6 +215,12 @@
<H3><A NAME="kdeui">Changes in kdeui</A></H3>
+<H4>KColorDrag</H4>
+<ul>
+<li>has been moved as K3ColorDrag to kde3support</li>
+<li>use QMimeData direcly instead or KColorMimeData, which resambles most of \
KColorDrag</li> +</ul>
+
<H4>KAction</H4>
<ul>
<li>void activated( KAction::ActivationReason reason, Qt::ButtonState state ); -> \
void activated( KAction::ActivationReason reason, Qt::MouseButtons buttons, \
Qt::KeyboardModifiers modifiers );</li>
--- trunk/KDE/kdelibs/kde3support/kdeui/Makefile.am #465211:465212
@@ -6,9 +6,9 @@
libkde3ui_la_LDFLAGS = $(all_libraries)
libkde3ui_la_LIBADD = $(LIB_KPARTS)
-libkde3ui_la_SOURCES = k3dockwidget.cpp k3dockwidget_private.cpp k3popupmenu.cpp \
k3textedit.cpp +libkde3ui_la_SOURCES = k3dockwidget.cpp k3dockwidget_private.cpp \
k3popupmenu.cpp k3textedit.cpp k3colordrag.cpp
-include_HEADERS = k3dockwidget.h k3popupmenu.h k3textedit.h
+include_HEADERS = k3dockwidget.h k3popupmenu.h k3textedit.h k3colordrag.h
METASOURCES = AUTO
--- trunk/KDE/kdelibs/kdeui/Makefile.am #465211:465212
@@ -43,7 +43,7 @@
kseparator.h klineedit.h krestrictedline.h kcolorbutton.h kcolorbtn.h ksystemtray.h \
\ kbuttonbox.h keditcl.h kled.h keditlistbox.h kwizard.h kkeydialog.h kkeybutton.h \
kurllabel.h kruler.h kcursor.h kinputdialog.h kactivelabel.h kcharselect.h \
- kcolordrag.h knumvalidator.h kdialog.h kdialogbase.h kjanuswidget.h kaboutdialog.h \
\ + kcolormimedata.h knumvalidator.h kdialog.h kdialogbase.h kjanuswidget.h \
kaboutdialog.h \ kauthicon.h kmessagebox.h ksharedpixmap.h kdualcolorbtn.h \
kdualcolorbutton.h \ ktoolbarbutton.h ktoolbarradiogroup.h ktextbrowser.h kaction.h \
kactioncollection.h \ kactionclasses.h khelpmenu.h kcmodule.h kcmenumngr.h \
kactionshortcutlist.h kstdaction.h \ @@ -72,7 +72,7 @@
keditlistbox.cpp kscrollview.cpp kseparator.cpp krestrictedline.cpp \
kcolorbutton.cpp \ ksystemtray.cpp kbuttonbox.cpp keditcl1.cpp keditcl2.cpp kled.cpp \
\ kshortcutdialog_simple.ui3 kshortcutdialog_advanced.ui3 kshortcutdialog.cpp \
kkeybutton.cpp \
- kkeydialog.cpp kruler.cpp kcursor.cpp kcharselect.cpp kcolordrag.cpp \
knumvalidator.cpp \ + kkeydialog.cpp kruler.cpp kcursor.cpp kcharselect.cpp \
kcolormimedata.cpp knumvalidator.cpp \ kdialog.cpp kdialogbase.cpp kjanuswidget.cpp \
kaboutdialog.cpp kauthicon.cpp \ kmessagebox.cpp kdualcolorbutton.cpp \
ktoolbarradiogroup.cpp ktoolbarbutton.cpp \ ktextbrowser.cpp khelpmenu.cpp \
kcmenumngr.cpp kiconview.cpp klistbox.cpp kwordwrap.cpp \
--- trunk/KDE/kdelibs/kdeui/kcolorbutton.cpp #465211:465212
@@ -31,7 +31,7 @@
#include <QStyleOptionButton>
#include "kcolordialog.h"
#include "kcolorbutton.h"
-#include "kcolordrag.h"
+#include "kcolormimedata.h"
class KColorButton::KColorButtonPrivate
{
@@ -159,13 +159,13 @@
void KColorButton::dragEnterEvent( QDragEnterEvent *event)
{
- event->accept( KColorDrag::canDecode( event) && isEnabled());
+ event->accept( KColorMimeData::canDecode( event->mimeData()) && isEnabled());
}
void KColorButton::dropEvent( QDropEvent *event)
{
- QColor c;
- if( KColorDrag::decode( event, c)) {
+ QColor c=KColorMimeData::fromMimeData( event->mimeData());
+ if (c.isValid()) {
setColor(c);
}
}
@@ -175,12 +175,12 @@
KKey key( e );
if ( KStdAccel::copy().contains( key ) ) {
- QMimeSource* mime = new KColorDrag( color() );
- QApplication::clipboard()->setData( mime, QClipboard::Clipboard );
+ QMimeData *mime=new QMimeData;
+ KColorMimeData::setInMimeData(mime,color());
+ QApplication::clipboard()->setMimeData( mime, QClipboard::Clipboard );
}
else if ( KStdAccel::paste().contains( key ) ) {
- QColor color;
- KColorDrag::decode( QApplication::clipboard()->data( QClipboard::Clipboard ), \
color ); + QColor color=KColorMimeData::fromMimeData( \
QApplication::clipboard()->mimeData( QClipboard::Clipboard )); setColor( color );
}
else
@@ -198,9 +198,7 @@
if( (e->state() & Qt::LeftButton) &&
(e->pos()-mPos).manhattanLength() > KGlobalSettings::dndEventDelay() )
{
- // Drag color object
- KColorDrag *dg = new KColorDrag( color(), this);
- dg->dragCopy();
+ KColorMimeData::createDrag(color(),this)->start();
setDown(false);
}
}
--- trunk/KDE/kdelibs/kdeui/kcolordialog.cpp #465211:465212
@@ -60,7 +60,7 @@
#include <kimageeffect.h>
#include "kcolordialog.h"
-#include "kcolordrag.h"
+#include "kcolormimedata.h"
#include "kstaticdeleter.h"
#include <config.h>
#include <kdebug.h>
@@ -436,8 +436,7 @@
int cell = posToCell(mPos);
if ((cell != -1) && colors[cell].isValid())
{
- KColorDrag *d = new KColorDrag( colors[cell], this);
- d->dragCopy();
+ KColorMimeData::createDrag( colors[cell], this)->start();
}
}
}
@@ -445,13 +444,13 @@
void KColorCells::dragEnterEvent( QDragEnterEvent *event)
{
- event->accept( acceptDrags && KColorDrag::canDecode( event));
+ event->accept( acceptDrags && KColorMimeData::canDecode( event->mimeData()));
}
void KColorCells::dropEvent( QDropEvent *event)
{
- QColor c;
- if( KColorDrag::decode( event, c)) {
+ QColor c=KColorMimeData::fromMimeData(event->mimeData());
+ if( c.isValid()) {
int cell = posToCell(event->pos(), true);
setColor(cell,c);
}
@@ -521,19 +520,18 @@
{
// Drag color object
if( !(e->state() && Qt::LeftButton)) return;
- KColorDrag *d = new KColorDrag( color, this);
- d->dragCopy();
+ KColorMimeData::createDrag( color, this)->start();
}
void KColorPatch::dragEnterEvent( QDragEnterEvent *event)
{
- event->accept( KColorDrag::canDecode( event));
+ event->accept( KColorMimeData::canDecode( event->mimeData()));
}
void KColorPatch::dropEvent( QDropEvent *event)
{
- QColor c;
- if( KColorDrag::decode( event, c)) {
+ QColor c=KColorMimeData::fromMimeData(event->mimeData());
+ if(c.isValid()) {
setColor( c);
emit colorChanged( c);
}
--- trunk/KDE/kdelibs/kdeui/kdualcolorbutton.cpp #465211:465212
@@ -18,7 +18,7 @@
#include "kdualcolorbutton.h"
#include "kcolordialog.h"
-#include "kcolordrag.h"
+#include "kcolormimedata.h"
#include "dcolorarrow.xbm"
#include "dcolorreset.xpm"
#include <kglobalsettings.h>
@@ -163,13 +163,13 @@
void KDualColorButton::dragEnterEvent(QDragEnterEvent *ev)
{
- ev->accept(isEnabled() && KColorDrag::canDecode(ev));
+ ev->accept(isEnabled() && KColorMimeData::canDecode(ev->mimeData()));
}
void KDualColorButton::dropEvent(QDropEvent *ev)
{
- QColor c;
- if(KColorDrag::decode(ev, c)){
+ QColor c=KColorMimeData::fromMimeData(ev->mimeData());
+ if(c.isValid()){
if(curColor == Foreground){
fg.setColor(c);
emit fgChanged(c);
@@ -224,10 +224,9 @@
int delay = KGlobalSettings::dndEventDelay();
if(ev->x() >= mPos.x()+delay || ev->x() <= mPos.x()-delay ||
ev->y() >= mPos.y()+delay || ev->y() <= mPos.y()-delay) {
- KColorDrag *d = new KColorDrag( curColor == Foreground ?
+ KColorMimeData::createDrag( curColor == Foreground ?
fg.color() : bg.color(),
- this);
- d->dragCopy();
+ this)->start();
dragFlag = true;
}
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic