Merge lp:~3v1n0/unity-2d/secondary-activate-support-v2 into lp:unity-2d

[Marco Trevisan (Treviño)]

[panel] Add support to "secondary-activate" event on middle-click, needed both by bug #609860 and bug #812933. See the second for more informations.

Patch adapted to the unity-core branch.

[Florian Boucault (fboucault)]

Looks good and works as advertised.
Adding [panel] to commit message.

review: Approve

=== modified file 'panel/applets/common/indicatorentrywidget.cpp'
--- panel/applets/common/indicatorentrywidget.cpp	2011-08-03 09:01:59 +0000
+++ panel/applets/common/indicatorentrywidget.cpp	2011-08-08 16:31:34 +0000
@@ -309,16 +309,20 @@
     return pix;
 }
 
-void IndicatorEntryWidget::mousePressEvent(QMouseEvent*)
+void IndicatorEntryWidget::mousePressEvent(QMouseEvent* event)
 {
     UQ_RETURN_IF_FAIL(m_hasIcon || m_hasLabel);
-    showMenu(Qt::LeftButton);
+    if (event->button() != Qt::MiddleButton)
+	    showMenu(Qt::LeftButton);
 }
 
-void IndicatorEntryWidget::mouseReleaseEvent(QMouseEvent*)
+void IndicatorEntryWidget::mouseReleaseEvent(QMouseEvent* event)
 {
     UQ_VAR(this);
     update();
+
+    if (event->button() == Qt::MiddleButton && rect().contains(event->pos(), false))
+    	m_entry->SecondaryActivate(time(NULL));
 }
 
 void IndicatorEntryWidget::wheelEvent(QWheelEvent* event)