Merge remote-tracking branch 'origin/Applications/16.12'

wilder
Montel Laurent 9 years ago
commit ae1d2952dc
  1. 1
      CMakeLists.txt
  2. 9
      src/widgets/favoritecollectionwidget.cpp
  3. 4
      src/widgets/favoritecollectionwidget.h

@ -19,7 +19,6 @@ include(ECMQtDeclareLoggingCategory)
include(ECMAddTests)
include(ECMCoverageOption)
set(PIM_VERSION "5.4.40")
set(MAILCOMMON_LIB_VERSION ${PIM_VERSION})
set(AKONADIMIME_LIB_VERSION "5.4.40")

@ -30,6 +30,7 @@
#include <QPainter>
#include <QFontDatabase>
#include <QMouseEvent>
using namespace MailCommon;
@ -68,6 +69,14 @@ FavoriteCollectionWidget::~FavoriteCollectionWidget()
delete d;
}
void FavoriteCollectionWidget::mousePressEvent(QMouseEvent *e)
{
const bool buttonPressedIsMiddle = (e->button() == Qt::MidButton);
Q_EMIT prefereCreateNewTab(buttonPressedIsMiddle);
Akonadi::EntityListView::mousePressEvent(e);
}
void FavoriteCollectionWidget::updateMode()
{
switch (viewMode()) {

@ -50,6 +50,10 @@ protected Q_SLOTS:
protected:
void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE;
void mousePressEvent(QMouseEvent *e) Q_DECL_OVERRIDE;
Q_SIGNALS:
void prefereCreateNewTab(bool);
private:
void createMenu(KActionCollection *ac);
class Private;

Loading…
Cancel
Save