diff --git a/CMakeLists.txt b/CMakeLists.txt index fe5ba70ba..e1a4d92ff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,6 +22,7 @@ set(plasma_LIB_SRCS appletbrowser/kcategorizeditemsviewdelegate.cpp appletbrowser/kcategorizeditemsviewmodels.cpp appletbrowser/plasmaappletitemmodel.cpp + appletbrowser/customdragtreeview.cpp configxml.cpp containment.cpp corona.cpp diff --git a/appletbrowser/customdragtreeview.cpp b/appletbrowser/customdragtreeview.cpp new file mode 100644 index 000000000..3205bc62a --- /dev/null +++ b/appletbrowser/customdragtreeview.cpp @@ -0,0 +1,65 @@ +#include "kcategorizeditemsview_p.h" + +#define PIX_SIZE 64 +#define MAX_OFFSET 16 +#define MAX_COUNT 5 +#define min(A, B) (((A) < (B)) ? (A) : (B)) + +CustomDragTreeView::CustomDragTreeView(QWidget * parent) + : QTreeView(parent) {}; + +void CustomDragTreeView::startDrag ( Qt::DropActions supportedActions ) +{ + Q_UNUSED(supportedActions); + + // TODO: calculate real size for pixmap - using the icon sizes, not fixed + // like now + + if (!m_view) return; + + QModelIndexList indexes = selectedIndexes(); + if (indexes.count() > 0) { + QMimeData *data = model()->mimeData(indexes); + if (!data) { + return; + } + + int size = PIX_SIZE + (min(MAX_COUNT, indexes.count()) * MAX_OFFSET); + int off = MAX_OFFSET; + if (indexes.count() > MAX_COUNT) { + off = (MAX_OFFSET * MAX_COUNT) / indexes.count(); + } + + kDebug() << "Size: " << size << " Off: " << off << "\n"; + + QPixmap pixmap(size, size); + pixmap.fill(QColor(255, 255, 255, 0)); // TODO: Transparent. Now it flickers when it's transparent + QPainter painter(&pixmap); + QRect rect(0, 0, PIX_SIZE, PIX_SIZE); + + foreach (QModelIndex index, indexes) { + if (index.column() == 1) continue; + + KCategorizedItemsViewModels::AbstractItem * item = + m_view->getItemByProxyIndex(index); + + if (item) { + rect.setSize(item->icon().actualSize(QSize(PIX_SIZE, PIX_SIZE))); + //painter.fillRect(rect, QBrush(QColor(255, 255, 255))); // TODO: Use global palettes + item->icon().paint(&painter, rect); + rect.moveTopLeft(rect.topLeft() + QPoint(off, off)); + } + } + painter.end(); + + + QDrag *drag = new QDrag(this); + drag->setPixmap(pixmap); + drag->setMimeData(data); + drag->start(supportedActions); + //drag->setHotSpot(d->pressedPosition - rect.topLeft()); + //if (drag->start(supportedActions) == Qt::MoveAction) + // d->clearOrRemove(); + } +} + diff --git a/appletbrowser/customdragtreeview_p.h b/appletbrowser/customdragtreeview_p.h new file mode 100644 index 000000000..54fbbfa5f --- /dev/null +++ b/appletbrowser/customdragtreeview_p.h @@ -0,0 +1,18 @@ +#include +#include "kcategorizeditemsviewmodels_p.h" + +class KCategorizedItemsView; + +class CustomDragTreeView: public QTreeView +{ +public: + CustomDragTreeView(QWidget * parent = 0); + +protected: + void startDrag ( Qt::DropActions supportedActions ); + +private: + KCategorizedItemsView * m_view; + + friend class KCategorizedItemsView; +}; diff --git a/appletbrowser/kcategorizeditemsview.cpp b/appletbrowser/kcategorizeditemsview.cpp index c441912ee..d463b27a6 100644 --- a/appletbrowser/kcategorizeditemsview.cpp +++ b/appletbrowser/kcategorizeditemsview.cpp @@ -30,6 +30,8 @@ KCategorizedItemsView::KCategorizedItemsView(QWidget * parent, Qt::WindowFlags f m_modelItems(NULL), m_modelFilterItems(NULL), m_delegate(NULL) { setupUi(this); + itemsView->m_view = this; + textSearch->setClickMessage(i18n("Enter search phrase here")); connect(textSearch, SIGNAL(textChanged(QString)), diff --git a/appletbrowser/kcategorizeditemsview_p.h b/appletbrowser/kcategorizeditemsview_p.h index ce1beb56d..d05394eca 100644 --- a/appletbrowser/kcategorizeditemsview_p.h +++ b/appletbrowser/kcategorizeditemsview_p.h @@ -87,6 +87,7 @@ private: AbstractItem * getItemByProxyIndex(const QModelIndex & index) const; friend class KCategorizedItemsViewDelegate; + friend class CustomDragTreeView; }; //Q_DECLARE_METATYPE(KCategorizedItemsView::Filter) diff --git a/appletbrowser/kcategorizeditemsviewbase.ui b/appletbrowser/kcategorizeditemsviewbase.ui index f35bdf16a..86920f977 100644 --- a/appletbrowser/kcategorizeditemsviewbase.ui +++ b/appletbrowser/kcategorizeditemsviewbase.ui @@ -83,7 +83,7 @@ - + QFrame::NoFrame @@ -125,6 +125,11 @@ QLineEdit
klineedit.h
+ + CustomDragTreeView + QTreeView +
appletbrowser/customdragtreeview_p.h
+ comboFilters diff --git a/appletbrowser/kcategorizeditemsviewdelegate.cpp b/appletbrowser/kcategorizeditemsviewdelegate.cpp index 7b3775d16..292e1807b 100644 --- a/appletbrowser/kcategorizeditemsviewdelegate.cpp +++ b/appletbrowser/kcategorizeditemsviewdelegate.cpp @@ -46,7 +46,7 @@ KCategorizedItemsViewDelegate::KCategorizedItemsViewDelegate(QObject * parent) void KCategorizedItemsViewDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const { - + // Preparing needed data for painting int left = option.rect.left(); int top = option.rect.top(); @@ -64,28 +64,28 @@ void KCategorizedItemsViewDelegate::paint(QPainter *painter, KCategorizedItemsViewModels::AbstractItem * item = getItemByProxyIndex(index); if (!item) return; - + // Base Background painter->fillRect(option.rect, QBrush(backgroundColor)); - + if (index.column() == 0) { // Painting main column QStyleOptionViewItem local_option_title(option); QStyleOptionViewItem local_option_normal(option); - + local_option_title.font.setBold(true); local_option_title.font.setPointSize(local_option_title.font.pointSize() + 2); - + QLinearGradient gradient; - + QString title = item->name(); QString description = item->description(); - + // Painting - + // Text int textInner = 2 * UNIVERSAL_PADDING + MAIN_ICON_SIZE; - + painter->setPen(foregroundColor); painter->setFont(local_option_title.font); painter->drawText( @@ -99,20 +99,20 @@ void KCategorizedItemsViewDelegate::paint(QPainter *painter, top + UNIVERSAL_PADDING + MAIN_ICON_SIZE / 2, width - textInner, MAIN_ICON_SIZE / 2, Qt::AlignTop | Qt::AlignLeft, description); - + // Main icon item->icon().paint(painter, leftToRight ? left + UNIVERSAL_PADDING : left + width - UNIVERSAL_PADDING - MAIN_ICON_SIZE, top + UNIVERSAL_PADDING, MAIN_ICON_SIZE, MAIN_ICON_SIZE, Qt::AlignCenter, iconMode); - + // Counting the number of emblems for this item int emblemCount = 0; QPair < Filter, QIcon * > emblem; foreach (emblem, m_parent->m_emblems) { if (item->passesFiltering(emblem.first)) ++emblemCount; } - + // Gradient part of the background - fading of the text at the end if (leftToRight) { gradient = QLinearGradient(left + width - UNIVERSAL_PADDING - FADE_LENGTH, 0, @@ -126,13 +126,13 @@ void KCategorizedItemsViewDelegate::paint(QPainter *painter, gradient.setColorAt(0, backgroundColor); backgroundColor.setAlpha(0); gradient.setColorAt(1, backgroundColor); - + } - + QRect paintRect = option.rect; painter->setCompositionMode(QPainter::CompositionMode_SourceOver); painter->fillRect(paintRect, gradient); - + if (leftToRight) { gradient.setStart(left + width - emblemCount * (UNIVERSAL_PADDING + EMBLEM_ICON_SIZE) - FADE_LENGTH, 0); @@ -143,10 +143,10 @@ void KCategorizedItemsViewDelegate::paint(QPainter *painter, + emblemCount * (UNIVERSAL_PADDING + EMBLEM_ICON_SIZE), 0); gradient.setFinalStop(left + UNIVERSAL_PADDING + emblemCount * (UNIVERSAL_PADDING + EMBLEM_ICON_SIZE) + FADE_LENGTH, 0); - } + } paintRect.setHeight(UNIVERSAL_PADDING + MAIN_ICON_SIZE / 2); painter->fillRect(paintRect, gradient); - + // Emblems icons int emblemLeft = leftToRight ? (left + width - EMBLEM_ICON_SIZE) : left; // - FAV_ICON_SIZE - 2 * UNIVERSAL_PADDING foreach (emblem, m_parent->m_emblems) { @@ -164,13 +164,13 @@ void KCategorizedItemsViewDelegate::paint(QPainter *painter, } else { // Painting favorite icon column - + KCategorizedItemsViewModels::AbstractItem * item = getItemByProxyIndex(index); if (! (option.state & QStyle::State_MouseOver) && m_onFavoriteIconItem == item) m_onFavoriteIconItem = NULL; - + QIcon::Mode iconMode = QIcon::Normal; if (!item->isFavorite()) { iconMode = QIcon::Disabled; @@ -181,14 +181,14 @@ void KCategorizedItemsViewDelegate::paint(QPainter *painter, m_favoriteIcon.paint(painter, left + width - FAV_ICON_SIZE - UNIVERSAL_PADDING, top + UNIVERSAL_PADDING, FAV_ICON_SIZE, FAV_ICON_SIZE, Qt::AlignCenter, iconMode); - + const KIcon * icon = (item->isFavorite())? & m_favoriteRemoveIcon : & m_favoriteAddIcon; if ((option.state & QStyle::State_MouseOver) && (m_onFavoriteIconItem != item)) icon->paint(painter, left + width - EMBLEM_ICON_SIZE - UNIVERSAL_PADDING, top + UNIVERSAL_PADDING, EMBLEM_ICON_SIZE, EMBLEM_ICON_SIZE, Qt::AlignCenter, iconMode); - + } // Dividing line @@ -207,7 +207,7 @@ bool KCategorizedItemsViewDelegate::editorEvent(QEvent *event, if (index.column() == 1 && event->type() == QEvent::MouseButtonPress) { (m_onFavoriteIconItem = getItemByProxyIndex(index)) ->setFavorite(!getItemByProxyIndex(index)->isFavorite()); - + return true; } @@ -218,7 +218,7 @@ QSize KCategorizedItemsViewDelegate::sizeHint(const QStyleOptionViewItem &option const QModelIndex &index ) const { Q_UNUSED(option); - + //Q_UNUSED(index); //option. int width = (index.column() == 0) ? 0 : FAV_ICON_SIZE; @@ -244,7 +244,7 @@ KCategorizedItemsViewModels::AbstractItem * KCategorizedItemsViewDelegate::getIt KCategorizedItemsViewFilterDelegate::KCategorizedItemsViewFilterDelegate(QObject *parent) : QItemDelegate(parent) { kDebug() << "KCategorizedItemsViewFilterDelegate(QObject *parent)\n"; - + } void KCategorizedItemsViewFilterDelegate::paint(QPainter *painter, @@ -255,7 +255,7 @@ void KCategorizedItemsViewFilterDelegate::paint(QPainter *painter, } else { QStyleOptionViewItem separatorOption(option); int height = QItemDelegate::sizeHint(option, index).height() + 2 * DROPDOWN_PADDING; - + separatorOption.state &= ~(QStyle::State_Selected | QStyle::State_MouseOver | QStyle::State_HasFocus); separatorOption.rect.setTop(separatorOption.rect.top() + separatorOption.rect.height() - height);