Revert "Template Manager: ban double-click"

This reverts commit 5487769838570ba5f1b35529689321e1842bae31.
Come back to a more consistant UI:
- single click for selection. CTRL modifier for multi-selection
- double click for action
- removed item's checkbox
- get rid of the selection mode
- no hover on items

Change-Id: I82863c77ed6a45410242a244545505a5b898ba56

9 files changed, 10 insertions, 36 deletions

diff --git a/sfx2/inc/sfx2/templateabstractview.hxx b/sfx2/inc/sfx2/templateabstractview.hxx
index 0ab599ecc43b..4eb7e6f6c687 100644
--- a/sfx2/inc/sfx2/templateabstractview.hxx
+++ b/sfx2/inc/sfx2/templateabstractview.hxx
@@ -106,7 +106,7 @@ public:
 
     void setOverlayItemStateHdl (const Link &aLink) { maOverlayItemStateHdl = aLink; }
 
-    void setOverlayClickHdl (const Link &rLink);
+    void setOverlayDblClickHdl (const Link &rLink);
 
     void setOverlayCloseHdl (const Link &rLink);
 
@@ -122,15 +122,11 @@ protected:
 
     virtual void DrawItem (ThumbnailViewItem *pItem);
 
-    virtual void OnSelectionMode (bool bMode);
-
     DECL_LINK(OverlayItemStateHdl, const ThumbnailViewItem*);
-    DECL_LINK(OverlaySelectionModeHdl, bool*);
 
 protected:
 
     TemplateView *mpItemView;
-    bool mbInSelectionModeHdl;
     Link maOverlayItemStateHdl;
 };
 
diff --git a/sfx2/inc/sfx2/templatelocalview.hxx b/sfx2/inc/sfx2/templatelocalview.hxx
index 58debca6b941..9a101f271e99 100644
--- a/sfx2/inc/sfx2/templatelocalview.hxx
+++ b/sfx2/inc/sfx2/templatelocalview.hxx
@@ -75,7 +75,7 @@ public:
 
 private:
 
-    virtual void OnItemClicked (ThumbnailViewItem *pRegionItem);
+    virtual void OnItemDblClicked (ThumbnailViewItem *pRegionItem);
 
     DECL_LINK(ChangeNameHdl, TemplateView*);
 
diff --git a/sfx2/inc/sfx2/templatelocalviewitem.hxx b/sfx2/inc/sfx2/templatelocalviewitem.hxx
index 80330b25889d..739f70ed46af 100644
--- a/sfx2/inc/sfx2/templatelocalviewitem.hxx
+++ b/sfx2/inc/sfx2/templatelocalviewitem.hxx
@@ -22,7 +22,7 @@ public:
     BitmapEx maPreview2;
     std::vector<TemplateItemProperties> maTemplates;
 
-    TemplateLocalViewItem (ThumbnailView &rView, Window *pParent);
+    TemplateLocalViewItem (ThumbnailView &rView);
 
     virtual ~TemplateLocalViewItem ();
 
diff --git a/sfx2/inc/sfx2/templateremoteviewitem.hxx b/sfx2/inc/sfx2/templateremoteviewitem.hxx
index 396b9652e4ee..63f2c7d8ce20 100644
--- a/sfx2/inc/sfx2/templateremoteviewitem.hxx
+++ b/sfx2/inc/sfx2/templateremoteviewitem.hxx
@@ -17,7 +17,7 @@ class TemplateRemoteViewItem : public ThumbnailViewItem
 {
 public:
 
-    TemplateRemoteViewItem (ThumbnailView &rView, Window *pParent);
+    TemplateRemoteViewItem (ThumbnailView &rView);
 
     virtual ~TemplateRemoteViewItem ();
 
diff --git a/sfx2/inc/sfx2/templateview.hxx b/sfx2/inc/sfx2/templateview.hxx
index fee955b52301..881c68dc3514 100644
--- a/sfx2/inc/sfx2/templateview.hxx
+++ b/sfx2/inc/sfx2/templateview.hxx
@@ -37,7 +37,7 @@ public:
 
     void InsertItems (const std::vector<TemplateItemProperties> &rTemplates);
 
-    void setClickHdl (const Link &rLink) { maClickHdl = rLink; }
+    void setDblClickHdl (const Link &rLink) { maDblClickHdl = rLink; }
 
     void setChangeNameHdl (const Link &rLink) { maChangeNameHdl = rLink; }
 
@@ -49,7 +49,7 @@ protected:
 
     virtual void MouseButtonDown (const MouseEvent &rMEvt);
 
-    virtual void OnItemClicked (ThumbnailViewItem *pItem);
+    virtual void OnItemDblClicked (ThumbnailViewItem *pItem);
 
     DECL_LINK (ChangeNameHdl, void*);
 
@@ -59,7 +59,7 @@ private:
     bool mbRenderTitle;
     sal_uInt16 mnId;
     OUString maName;
-    Link maClickHdl;
+    Link maDblClickHdl;
     Link maChangeNameHdl;
     Link maCloseHdl;
 
diff --git a/sfx2/inc/sfx2/templateviewitem.hxx b/sfx2/inc/sfx2/templateviewitem.hxx
index 992af40f1dea..9a7d35850c1b 100644
--- a/sfx2/inc/sfx2/templateviewitem.hxx
+++ b/sfx2/inc/sfx2/templateviewitem.hxx
@@ -16,7 +16,7 @@ class TemplateViewItem : public ThumbnailViewItem
 {
 public:
 
-    TemplateViewItem (ThumbnailView &rView, Window *pParent);
+    TemplateViewItem (ThumbnailView &rView);
 
     virtual ~TemplateViewItem ();
 
diff --git a/sfx2/inc/sfx2/thumbnailview.hxx b/sfx2/inc/sfx2/thumbnailview.hxx
index 023c56965e70..6ebe23f2ddec 100644
--- a/sfx2/inc/sfx2/thumbnailview.hxx
+++ b/sfx2/inc/sfx2/thumbnailview.hxx
@@ -233,15 +233,12 @@ public:
 
     long            GetScrollWidth() const;
 
-    void setSelectionMode (bool mode);
-
     void filterItems (const boost::function<bool (const ThumbnailViewItem*) > &func);
 
     void sortItems (const boost::function<bool (const ThumbnailViewItem*,
                                                 const ThumbnailViewItem*) > &func);
 
     void setItemStateHdl (const Link &aLink) { maItemStateHdl = aLink; }
-    void setSelectionModeHdl (const Link &aLink) { maSelectionModeHdl = aLink; }
 
 protected:
 
@@ -249,8 +246,6 @@ protected:
 
     virtual void MouseButtonUp( const MouseEvent& rMEvt );
 
-    virtual void MouseMove( const MouseEvent& rMEvt );
-
     virtual void Command( const CommandEvent& rCEvt );
 
     virtual void Paint( const Rectangle& rRect );
@@ -275,9 +270,7 @@ protected:
 
     virtual void DrawItem (ThumbnailViewItem *pItem);
 
-    virtual void OnSelectionMode (bool bMode);
-
-    virtual void OnItemClicked (ThumbnailViewItem *pItem);
+    virtual void OnItemDblClicked (ThumbnailViewItem *pItem);
 
 protected:
 
@@ -327,11 +320,9 @@ protected:
     bool mbScroll : 1;
     bool mbIsTransientChildrenDisabled : 1;
     bool mbHasVisibleItems : 1;
-    bool mbSelectionMode;
     Color maColor;
 
     Link maItemStateHdl;
-    Link maSelectionModeHdl;
     ThumbnailItemAttributes *mpItemAttrs;
     drawinglayer::processor2d::BaseProcessor2D *mpProcessor;
     boost::function<bool (const ThumbnailViewItem*) > maFilterFunc;
diff --git a/sfx2/inc/sfx2/thumbnailviewitem.hxx b/sfx2/inc/sfx2/thumbnailviewitem.hxx
index 96cdc5ce790c..0a7f08acd5ec 100644
--- a/sfx2/inc/sfx2/thumbnailviewitem.hxx
+++ b/sfx2/inc/sfx2/thumbnailviewitem.hxx
@@ -71,7 +71,7 @@ public:
     rtl::OUString maTitle;
     ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >* mpxAcc;
 
-    ThumbnailViewItem (ThumbnailView &rView, Window *pParent);
+    ThumbnailViewItem (ThumbnailView &rView);
 
     virtual ~ThumbnailViewItem ();
 
@@ -102,8 +102,6 @@ public:
 
     const Point& getPrev1Pos () const { return maPrev1Pos; }
 
-    void setSelectionMode (bool mode);
-
     void setSelectClickHdl (const Link &link);
 
     virtual void Paint (drawinglayer::processor2d::BaseProcessor2D *pProcessor,
@@ -112,18 +110,12 @@ public:
     static drawinglayer::primitive2d::BorderLinePrimitive2D*
         createBorderLine (const basegfx::B2DPoint &rStart, const basegfx::B2DPoint &rEnd);
 
-private:
-
-    DECL_LINK (OnClick, CheckBox *);
-
 protected:
 
-    bool mbMode;
     Point maTextPos;
     Point maPrev1Pos;
     Rectangle maDrawArea;
     Link maClickHdl;
-    CheckBox *mpSelectBox;
 };
 
 #endif // THUMBNAILVIEWITEM_HXX
diff --git a/sfx2/inc/templatedlg.hxx b/sfx2/inc/templatedlg.hxx
index 8e70039d14c1..c0d1284249c5 100644
--- a/sfx2/inc/templatedlg.hxx
+++ b/sfx2/inc/templatedlg.hxx
@@ -57,9 +57,6 @@ private:
 
     DECL_LINK(CloseOverlayHdl, void*);
 
-    DECL_LINK(OnClickSelectionMode, ImageButton*);
-    DECL_LINK(SelectionModeHdl, bool*);
-
     DECL_LINK(TBXViewHdl, void*);
     DECL_LINK(TBXActionHdl, void*);
     DECL_LINK(TBXTemplateHdl, void*);
@@ -124,7 +121,6 @@ private:
     PushButton aButtonPresents;
     PushButton aButtonSheets;
     PushButton aButtonDraws;
-    ImageButton maButtonSelMode;
     Control *mpToolbars;
 
     Edit *mpSearchEdit;
@@ -143,7 +139,6 @@ private:
     std::set<const ThumbnailViewItem*> maSelFolders;
 
     bool mbIsSaveMode;  ///< Flag that indicates if we are in save mode or not.
-    bool mbInSelectionModeHdl; ///< Flag avoiding selection mode handler loop
     com::sun::star::uno::Reference< com::sun::star::frame::XModel > m_xModel;
     com::sun::star::uno::Reference< com::sun::star::frame::XComponentLoader > mxDesktop;
 };