X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/6a338f28e5cbdfb51aa391815453fe52c33ec590..18a976c435e85fa2556b1a1abb6de41392003d7d:/src/kitemviews/kitemlistcontroller.h diff --git a/src/kitemviews/kitemlistcontroller.h b/src/kitemviews/kitemlistcontroller.h index 9ac4c76e6..e9b70cdda 100644 --- a/src/kitemviews/kitemlistcontroller.h +++ b/src/kitemviews/kitemlistcontroller.h @@ -25,10 +25,11 @@ #include +#include "kitemset.h" + #include #include #include -#include class KItemModelBase; class KItemListKeyboardSearchManager; @@ -64,6 +65,8 @@ class LIBDOLPHINPRIVATE_EXPORT KItemListController : public QObject Q_PROPERTY(KItemModelBase* model READ model WRITE setModel) Q_PROPERTY(KItemListView *view READ view WRITE setView) Q_PROPERTY(SelectionBehavior selectionBehavior READ selectionBehavior WRITE setSelectionBehavior) + Q_PROPERTY(AutoActivationBehavior autoActivationBehavior READ autoActivationBehavior WRITE setAutoActivationBehavior) + Q_PROPERTY(MouseDoubleClickAction mouseDoubleClickAction READ mouseDoubleClickAction WRITE setMouseDoubleClickAction) public: enum SelectionBehavior { @@ -72,7 +75,22 @@ public: MultiSelection }; - KItemListController(QObject* parent = 0); + enum AutoActivationBehavior { + ActivationAndExpansion, + ExpansionOnly + }; + + enum MouseDoubleClickAction { + ActivateAndExpandItem, + ActivateItemOnly + }; + + /** + * @param model Model of the controller. The ownership is passed to the controller. + * @param view View of the controller. The ownership is passed to the controller. + * @param parent Optional parent object. + */ + KItemListController(KItemModelBase* model, KItemListView* view, QObject* parent = 0); virtual ~KItemListController(); void setModel(KItemModelBase* model); @@ -86,6 +104,12 @@ public: void setSelectionBehavior(SelectionBehavior behavior); SelectionBehavior selectionBehavior() const; + void setAutoActivationBehavior(AutoActivationBehavior behavior); + AutoActivationBehavior autoActivationBehavior() const; + + void setMouseDoubleClickAction(MouseDoubleClickAction action); + MouseDoubleClickAction mouseDoubleClickAction() const; + /** * Sets the delay in milliseconds when dragging an object above an item * until the item gets activated automatically. A value of -1 indicates @@ -106,12 +130,11 @@ public: /** * If set to true, the signals itemActivated() and itemsActivated() are emitted - * after a single-click of the left mouse button. If set to false, a double-click - * is required. Per default the setting from KGlobalSettings::singleClick() is - * used. + * after a single-click of the left mouse button. If set to false (the default), + * the setting from KGlobalSettings::singleClick() is used. */ - void setSingleClickActivation(bool singleClick); - bool singleClickActivation() const; + void setSingleClickActivationEnforced(bool singleClick); + bool singleClickActivationEnforced() const; virtual bool showEvent(QShowEvent* event); virtual bool hideEvent(QHideEvent* event); @@ -143,7 +166,7 @@ signals: * Is emitted if more than one item has been activated by pressing Return/Enter * when having a selection. */ - void itemsActivated(const QSet& indexes); + void itemsActivated(const KItemSet& indexes); void itemMiddleClicked(int index); @@ -177,14 +200,18 @@ signals: /** * Is emitted if a mouse-button has been pressed above an item. + * If the index is smaller than 0, the mouse-button has been pressed + * above the viewport. */ - void itemPressed(int index, Qt::MouseButton button); + void mouseButtonPressed(int itemIndex, Qt::MouseButtons buttons); /** * Is emitted if a mouse-button has been released above an item. - * It is assured that the signal itemPressed() has been emitted before. + * It is assured that the signal mouseButtonPressed() has been emitted before. + * If the index is smaller than 0, the mouse-button has been pressed + * above the viewport. */ - void itemReleased(int index, Qt::MouseButton button); + void mouseButtonReleased(int itemIndex, Qt::MouseButtons buttons); void itemExpansionToggleClicked(int index); @@ -192,9 +219,23 @@ signals: * Is emitted if a drop event is done above the item with the index * \a index. If \a index is < 0 the drop event is done above an * empty area of the view. + * TODO: Introduce a new signal viewDropEvent(QGraphicsSceneDragDropEvent), + * which is emitted if the drop event occurs on an empty area in + * the view, and make sure that index is always >= 0 in itemDropEvent(). */ void itemDropEvent(int index, QGraphicsSceneDragDropEvent* event); + /** + * Is emitted if a drop event is done between the item with the index + * \a index and the previous item. + */ + void aboveItemDropEvent(int index, QGraphicsSceneDragDropEvent* event); + + /** + * Is emitted if the Escape key is pressed. + */ + void escapePressed(); + void modelChanged(KItemModelBase* current, KItemModelBase* previous); void viewChanged(KItemListView* current, KItemListView* previous); @@ -257,11 +298,20 @@ private: */ qreal keyboardAnchorPos(int index) const; + /** + * Dependent on the selection-behavior the extendedSelectionRegion-property + * of the KItemListStyleOption from the view should be adjusted: If no + * rubberband selection is used the property should be enabled. + */ + void updateExtendedSelectionRegion(); + private: - bool m_singleClickActivation; + bool m_singleClickActivationEnforced; bool m_selectionTogglePressed; bool m_clearSelectionIfItemsAreNotDragged; SelectionBehavior m_selectionBehavior; + AutoActivationBehavior m_autoActivationBehavior; + MouseDoubleClickAction m_mouseDoubleClickAction; KItemModelBase* m_model; KItemListView* m_view; KItemListSelectionManager* m_selectionManager; @@ -277,7 +327,7 @@ private: * the current selection it is remembered in m_oldSelection before the * rubberband gets activated. */ - QSet m_oldSelection; + KItemSet m_oldSelection; /** * Assuming a view is given with a vertical scroll-orientation, grouped items and