kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-10-05 16:19:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Applications/15.08'

Browse source
This commit is contained in:
Frank Reininghaus 2015-09-03 20:33:48 +02:00
parent 90fd2be751 5ce01c864f
commit d4fafe5290
6 changed files with 28 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/kitemviews/kitemlistheader.cpp
View file

@ -83,5 +83,7 @@ KItemListHeader::KItemListHeader(KItemListView* listView) :
connect(m_headerWidget, &KItemListHeaderWidget::columnWidthChanged,
this, &KItemListHeader::columnWidthChanged);
connect(m_headerWidget, &KItemListHeaderWidget::columnWidthChangeFinished,
this, &KItemListHeader::columnWidthChangeFinished);
}

7
src/kitemviews/kitemlistheader.h
View file

@ -79,6 +79,13 @@ signals:
qreal currentWidth,
qreal previousWidth);
/**
* Is emitted if the user has released the mouse button after adjusting the
* width of a visible role.
*/
void columnWidthChangeFinished(const QByteArray& role,
qreal currentWidth);
private:
KItemListHeader(KItemListView* listView);

8
src/kitemviews/private/kitemlistheaderwidget.cpp
View file

@ -232,6 +232,13 @@ void KItemListHeaderWidget::mouseReleaseEvent(QGraphicsSceneMouseEvent* event)
break;
}
case ResizeRoleOperation: {
const QByteArray pressedRole = m_columns[m_pressedRoleIndex];
const qreal currentWidth = m_columnWidths.value(pressedRole);
emit columnWidthChangeFinished(pressedRole, currentWidth);
break;
}
case MoveRoleOperation:
m_movingRole.pixmap = QPixmap();
m_movingRole.x = 0;
@ -337,6 +344,7 @@ void KItemListHeaderWidget::mouseDoubleClickEvent(QGraphicsSceneMouseEvent* even
qreal currentWidth = columnWidth(role);
emit columnWidthChanged(role, currentWidth, previousWidth);
emit columnWidthChangeFinished(role, currentWidth);
}
}

7
src/kitemviews/private/kitemlistheaderwidget.h
View file

@ -75,6 +75,13 @@ signals:
qreal currentWidth,
qreal previousWidth);
/**
* Is emitted if the user has released the mouse button after adjusting the
* width of a visible role.
*/
void columnWidthChangeFinished(const QByteArray& role,
qreal currentWidth);
/**
* Is emitted if the position of the column has been changed.
*/

8
src/views/dolphinview.cpp
View file

@ -177,8 +177,8 @@ DolphinView::DolphinView(const QUrl& url, QWidget* parent) :
this, &DolphinView::slotVisibleRolesChangedByHeader);
connect(m_view, &DolphinItemListView::roleEditingCanceled,
this, &DolphinView::slotRoleEditingCanceled);
connect(m_view->header(), &KItemListHeader::columnWidthChanged,
this, &DolphinView::slotHeaderColumnWidthChanged);
connect(m_view->header(), &KItemListHeader::columnWidthChangeFinished,
this, &DolphinView::slotHeaderColumnWidthChangeFinished);
KItemListSelectionManager* selectionManager = controller->selectionManager();
connect(selectionManager, &KItemListSelectionManager::selectionChanged,
@ -971,10 +971,8 @@ void DolphinView::slotHeaderContextMenuRequested(const QPointF& pos)
delete menu;
}
void DolphinView::slotHeaderColumnWidthChanged(const QByteArray& role, qreal current, qreal previous)
void DolphinView::slotHeaderColumnWidthChangeFinished(const QByteArray& role, qreal current)
{
Q_UNUSED(previous);
const QList<QByteArray> visibleRoles = m_view->visibleRoles();
ViewProperties props(viewPropertiesUrl());

2
src/views/dolphinview.h
View file

@ -566,7 +566,7 @@ private slots:
void slotItemContextMenuRequested(int index, const QPointF& pos);
void slotViewContextMenuRequested(const QPointF& pos);
void slotHeaderContextMenuRequested(const QPointF& pos);
void slotHeaderColumnWidthChanged(const QByteArray& role, qreal current, qreal previous);
void slotHeaderColumnWidthChangeFinished(const QByteArray& role, qreal current);
void slotItemHovered(int index);
void slotItemUnhovered(int index);
void slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* event);