[vidalia-svn] r4162: Initial commit. Integrated the method responsible for reacti (vidalia/branches/domenikb/src/vidalia/network)

[borkdomenik@xxxxxxxxxxxxxxxxxxx]

Author: borkdomenik
Date: 2009-11-03 13:04:30 -0500 (Tue, 03 Nov 2009)
New Revision: 4162

Modified:
   vidalia/branches/domenikb/src/vidalia/network/TorMapWidgetInputHandler.cpp
   vidalia/branches/domenikb/src/vidalia/network/TorMapWidgetPopupMenu.cpp
   vidalia/branches/domenikb/src/vidalia/network/TorMapWidgetPopupMenu.h
Log:
Initial commit.
Integrated the method responsible for reaction of an users right click on the marble map.

Modified: vidalia/branches/domenikb/src/vidalia/network/TorMapWidgetInputHandler.cpp
===================================================================
--- vidalia/branches/domenikb/src/vidalia/network/TorMapWidgetInputHandler.cpp	2009-11-03 02:40:43 UTC (rev 4161)
+++ vidalia/branches/domenikb/src/vidalia/network/TorMapWidgetInputHandler.cpp	2009-11-03 18:04:30 UTC (rev 4162)
@@ -66,6 +66,7 @@
         m_widget->setCursor(Qt::OpenHandCursor);
       else
         m_widget->setCursor(Qt::PointingHandCursor);
+        //m_widget->setToolTip(tr("right click to include/exclude this country."));
       break;
 
     case QEvent::MouseMove:

Modified: vidalia/branches/domenikb/src/vidalia/network/TorMapWidgetPopupMenu.cpp
===================================================================
--- vidalia/branches/domenikb/src/vidalia/network/TorMapWidgetPopupMenu.cpp	2009-11-03 02:40:43 UTC (rev 4161)
+++ vidalia/branches/domenikb/src/vidalia/network/TorMapWidgetPopupMenu.cpp	2009-11-03 18:04:30 UTC (rev 4162)
@@ -15,6 +15,7 @@
 */
 
 #include "TorMapWidgetPopupMenu.h"
+#include "VMessageBox.h"
 #include "Vidalia.h"
 
 #include <MarbleModel.h>
@@ -45,6 +46,7 @@
       break;
 
     case Qt::RightButton:
+      featureRightClicked(pos);
       break;
 
     default:
@@ -81,6 +83,14 @@
 }
 
 void
+TorMapWidgetPopupMenu::featureRightClicked(const QPoint &pos)
+{
+  //TODO here comes the handling of a right click!
+  VMessageBox::warning(_widget, tr("Error"), tr("Left mouse click noticed."),
+                         VMessageBox::Ok);
+}
+
+void
 TorMapWidgetPopupMenu::relaySelected(QAction *action)
 {
   QString id = action->data().toString();

Modified: vidalia/branches/domenikb/src/vidalia/network/TorMapWidgetPopupMenu.h
===================================================================
--- vidalia/branches/domenikb/src/vidalia/network/TorMapWidgetPopupMenu.h	2009-11-03 02:40:43 UTC (rev 4161)
+++ vidalia/branches/domenikb/src/vidalia/network/TorMapWidgetPopupMenu.h	2009-11-03 18:04:30 UTC (rev 4162)
@@ -61,6 +61,15 @@
    */
   virtual void featureLeftClicked(const QPoint &pos);
 
+  /** Called when the user left-clicks on one or more placemarks at mouse
+   * position <b>pos</b>. If only one relay placemark exists at <b>pos</b>,
+   * then the displayRouterInfo() signal will be emitted. Otherwise, a
+   * popup menu will be displayed listing all placemarks at this location.
+   *
+   * \sa featureLeftClicked
+   */
+  virtual void featureRightClicked(const QPoint &pos);
+
 private slots:
   /** Called when the user selects a relay from the popup menu used to
    * disambiguate a location with multiple relay placemarks.