[vidalia-svn] r4163: added the menu items for including/excluding a country. so f (vidalia/branches/domenikb/src/vidalia/network)

[borkdomenik@xxxxxxxxxxxxxxxxxxx]

Author: borkdomenik
Date: 2009-11-04 10:38:01 -0500 (Wed, 04 Nov 2009)
New Revision: 4163

Modified:
   vidalia/branches/domenikb/src/vidalia/network/TorMapWidgetPopupMenu.cpp
   vidalia/branches/domenikb/src/vidalia/network/TorMapWidgetPopupMenu.h
Log:
added the menu items for including/excluding a country. so far all in the ui stuff, now functionality has to be connected.

Modified: vidalia/branches/domenikb/src/vidalia/network/TorMapWidgetPopupMenu.cpp
===================================================================
--- vidalia/branches/domenikb/src/vidalia/network/TorMapWidgetPopupMenu.cpp	2009-11-03 18:04:30 UTC (rev 4162)
+++ vidalia/branches/domenikb/src/vidalia/network/TorMapWidgetPopupMenu.cpp	2009-11-04 15:38:01 UTC (rev 4163)
@@ -35,6 +35,11 @@
   _leftClickMenu = new QMenu(widget);
   connect(_leftClickMenu, SIGNAL(triggered(QAction*)),
           this, SLOT(relaySelected(QAction*)));
+  
+  _rightClickMenu = new QMenu(widget);
+  
+  connect(_rightClickMenu, SIGNAL(triggered(QAction*)),
+          this, SLOT(includeExcludeCountrySelected(QAction*)));
 }
 
 void
@@ -86,8 +91,21 @@
 TorMapWidgetPopupMenu::featureRightClicked(const QPoint &pos)
 {
   //TODO here comes the handling of a right click!
-  VMessageBox::warning(_widget, tr("Error"), tr("Left mouse click noticed."),
+	_rightClickMenu->clear();
+  QAction *excludeAct  = new QAction(tr("Exclude from circuit"), this);
+  QAction *includeAct  = new QAction(tr("Include in circuit"), this);
+  _rightClickMenu->addAction(includeAct);
+  _rightClickMenu->addAction(excludeAct);
+  QAction* action = _rightClickMenu->exec(_widget->mapToGlobal(pos));
+  if (action == excludeAct) {
+    VMessageBox::warning(_widget, tr("Error"), tr("Exclude selected."),
                          VMessageBox::Ok);
+      //emit zoomToCircuit(circuitItem->id());
+  } else if(action == includeAct) {
+	VMessageBox::warning(_widget, tr("Error"), tr("Include selected."),
+                         VMessageBox::Ok);
+      //emit zoomToCircuit(circuitItem->id());
+  }  
 }
 
 void
@@ -98,3 +116,17 @@
     emit displayRouterInfo(id);
 }
 
+void
+TorMapWidgetPopupMenu::includeExcludeCountrySelected(QAction *action) {
+  QString id = action->data().toString();
+  if (id == "excludeAct") {
+    VMessageBox::warning(_widget, tr("Error"), tr("Exclude selected."),
+                         VMessageBox::Ok);
+      //emit zoomToCircuit(circuitItem->id());
+  } else if(id == "includeAct") {
+	VMessageBox::warning(_widget, tr("Error"), tr("Include selected."),
+                         VMessageBox::Ok);
+      //emit zoomToCircuit(circuitItem->id());
+  } 
+}
+

Modified: vidalia/branches/domenikb/src/vidalia/network/TorMapWidgetPopupMenu.h
===================================================================
--- vidalia/branches/domenikb/src/vidalia/network/TorMapWidgetPopupMenu.h	2009-11-03 18:04:30 UTC (rev 4162)
+++ vidalia/branches/domenikb/src/vidalia/network/TorMapWidgetPopupMenu.h	2009-11-04 15:38:01 UTC (rev 4163)
@@ -76,6 +76,8 @@
    */
   void relaySelected(QAction *action);
 
+  void includeExcludeCountrySelected(QAction *action);
+
 private:
   /** The parent map widget on which the popup menu is displayed.
    */
@@ -84,6 +86,10 @@
   /** Menu displayed when the user left-clicks on one or more placemarks.
    */
   QMenu *_leftClickMenu;
+
+  /** Menu displayed when the user left-clicks on one or more placemarks.
+   */
+  QMenu *_rightClickMenu;
 };
 
 #endif