[vidalia-svn] r3224: Update the router list headers, circuit list headers, circui (vidalia/trunk/src/vidalia/network)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-10-12 22:11:07 -0400 (Sun, 12 Oct 2008)
New Revision: 3224

Modified:
   vidalia/trunk/src/vidalia/network/circuitlistwidget.cpp
   vidalia/trunk/src/vidalia/network/circuitlistwidget.h
   vidalia/trunk/src/vidalia/network/netviewer.cpp
   vidalia/trunk/src/vidalia/network/routerlistwidget.cpp
   vidalia/trunk/src/vidalia/network/routerlistwidget.h
   vidalia/trunk/src/vidalia/network/streamitem.cpp
   vidalia/trunk/src/vidalia/network/streamitem.h
Log:
Update the router list headers, circuit list headers, circuit and stream
statuses, and router descriptor details when the UI is retranslated.


Modified: vidalia/trunk/src/vidalia/network/circuitlistwidget.cpp
===================================================================
--- vidalia/trunk/src/vidalia/network/circuitlistwidget.cpp	2008-10-13 02:03:35 UTC (rev 3223)
+++ vidalia/trunk/src/vidalia/network/circuitlistwidget.cpp	2008-10-13 02:11:07 UTC (rev 3224)
@@ -48,6 +48,21 @@
                        SLOT(closeSelectedConnections()));
 }
 
+/** Called when the user changes the UI translation. */
+void
+CircuitListWidget::retranslateUi()
+{
+  setHeaderLabels(QStringList() << tr("Connection") << tr("Status"));
+  for (int i = 0; i < topLevelItemCount(); i++) {
+    CircuitItem *circuitItem = dynamic_cast<CircuitItem *>(topLevelItem(i));
+    circuitItem->update(circuitItem->circuit());
+
+    foreach (StreamItem *streamItem, circuitItem->streams()) {
+      streamItem->update(streamItem->stream());
+    }
+  }
+}
+
 /** Called when the user requests a context menu on a circuit or stream in the
  * list and displays a context menu appropriate for whichever type of item is
  * currently selected. */

Modified: vidalia/trunk/src/vidalia/network/circuitlistwidget.h
===================================================================
--- vidalia/trunk/src/vidalia/network/circuitlistwidget.h	2008-10-13 02:03:35 UTC (rev 3223)
+++ vidalia/trunk/src/vidalia/network/circuitlistwidget.h	2008-10-13 02:11:07 UTC (rev 3224)
@@ -49,6 +49,8 @@
   void addStream(const Stream &stream);
   /** Returns a list of circuits currently in the widget. */
   QList<Circuit> circuits();
+  /** Called when the user changes the UI translation. */
+  void retranslateUi();
 
 signals:
   /** Emitted when a circuit item is selected. */

Modified: vidalia/trunk/src/vidalia/network/netviewer.cpp
===================================================================
--- vidalia/trunk/src/vidalia/network/netviewer.cpp	2008-10-13 02:03:35 UTC (rev 3223)
+++ vidalia/trunk/src/vidalia/network/netviewer.cpp	2008-10-13 02:11:07 UTC (rev 3224)
@@ -119,6 +119,26 @@
 NetViewer::retranslateUi()
 {
   ui.retranslateUi(this);
+  ui.treeRouterList->retranslateUi();
+  ui.treeCircuitList->retranslateUi();
+
+  if (ui.treeRouterList->selectedItems().size()) {
+    QList<RouterDescriptor> routers;
+    foreach (QTreeWidgetItem *item, ui.treeRouterList->selectedItems()) {
+      routers << dynamic_cast<RouterListItem *>(item)->descriptor();
+    }
+    ui.textRouterInfo->display(routers);
+  } else if (ui.treeCircuitList->selectedItems().size()) {
+    QList<RouterDescriptor> routers;
+    QTreeWidgetItem *item = ui.treeCircuitList->selectedItems()[0];
+    Circuit circuit = dynamic_cast<CircuitItem*>(item)->circuit();
+    foreach (QString id, circuit.routerIDs()) {
+      RouterListItem *item = ui.treeRouterList->findRouterById(id);
+      if (item)
+        routers.append(item->descriptor());
+    }
+    ui.textRouterInfo->display(routers);
+  }
 }
 
 /** Display the network map window. If there are geoip requests waiting in the

Modified: vidalia/trunk/src/vidalia/network/routerlistwidget.cpp
===================================================================
--- vidalia/trunk/src/vidalia/network/routerlistwidget.cpp	2008-10-13 02:03:35 UTC (rev 3223)
+++ vidalia/trunk/src/vidalia/network/routerlistwidget.cpp	2008-10-13 02:11:07 UTC (rev 3224)
@@ -40,6 +40,15 @@
           this, SLOT(customContextMenuRequested(QPoint)));
 }
 
+/** Called when the user changes the UI translation. */
+void
+RouterListWidget::retranslateUi()
+{
+  setHeaderLabels(QStringList() << QString("")
+                                << QString("")
+                                << tr("Relay"));
+}
+
 /** Called when the user requests a context menu for a router in the list. A
  * context menu will be displayed providing a list of actions, including
  * zooming in on the server. */

Modified: vidalia/trunk/src/vidalia/network/routerlistwidget.h
===================================================================
--- vidalia/trunk/src/vidalia/network/routerlistwidget.h	2008-10-13 02:03:35 UTC (rev 3223)
+++ vidalia/trunk/src/vidalia/network/routerlistwidget.h	2008-10-13 02:11:07 UTC (rev 3224)
@@ -52,6 +52,8 @@
   RouterListItem* findRouterById(QString id);
   /** Deselects all currently selected routers. */
   void deselectAll();
+  /** Called when the user changes the UI translation. */
+  void retranslateUi();
 
 signals:
   /** Emitted when the user selects a router from the list. */

Modified: vidalia/trunk/src/vidalia/network/streamitem.cpp
===================================================================
--- vidalia/trunk/src/vidalia/network/streamitem.cpp	2008-10-13 02:03:35 UTC (rev 3223)
+++ vidalia/trunk/src/vidalia/network/streamitem.cpp	2008-10-13 02:11:07 UTC (rev 3224)
@@ -21,9 +21,6 @@
 /** Constructor */
 StreamItem::StreamItem(const Stream &stream)
 {
-  /* Save the stream's id */
-  _id = stream.id();
-  
   /* Update the status and target */
   update(stream);
 }
@@ -32,6 +29,7 @@
 void
 StreamItem::update(const Stream &stream)
 {
+  _stream = stream;
   setText(CircuitListWidget::ConnectionColumn, stream.target());
   setToolTip(CircuitListWidget::ConnectionColumn, stream.target());
   setText(CircuitListWidget::StatusColumn, stream.statusString());

Modified: vidalia/trunk/src/vidalia/network/streamitem.h
===================================================================
--- vidalia/trunk/src/vidalia/network/streamitem.h	2008-10-13 02:03:35 UTC (rev 3223)
+++ vidalia/trunk/src/vidalia/network/streamitem.h	2008-10-13 02:11:07 UTC (rev 3224)
@@ -27,13 +27,14 @@
   /** Constructor */
   StreamItem(const Stream &stream);
 
+  Stream stream() const { return _stream; }
   /** Updates the status of this stream item. */
   void update(const Stream &stream);
   /** Returns the ID of the stream associated with this tree item. */
-  StreamId id() const { return _id; }
+  StreamId id() const { return _stream.id(); }
   
 private:
-  StreamId _id; /**< ID for this stream. */
+  Stream _stream;
 };
 
 #endif