summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--MANIFEST.in1
-rw-r--r--README.translators5
-rwxr-xr-xsetup.py2
-rwxr-xr-xtormonitor13
4 files changed, 16 insertions, 5 deletions
diff --git a/MANIFEST.in b/MANIFEST.in
index a6c32cc..9f37009 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,5 @@
include README
+include README.translators
include tormonitor
include tormonitor.desktop
include tormonitor.svg
diff --git a/README.translators b/README.translators
new file mode 100644
index 0000000..176330d
--- /dev/null
+++ b/README.translators
@@ -0,0 +1,5 @@
+The POT file can be generated with:
+
+ ./setup.py build_i18n
+
+This command depends on python3-distutils-extra.
diff --git a/setup.py b/setup.py
index 09c09e1..117280f 100755
--- a/setup.py
+++ b/setup.py
@@ -20,7 +20,7 @@ from distutils.core import setup, Command
from DistUtilsExtra.command import *
setup(name='tormonitor',
- version='0.1',
+ version='0.2',
description='a GTK applicaton to display Tor circuits and streams',
author='Tails developers',
author_email='tails@boum.org',
diff --git a/tormonitor b/tormonitor
index 5944a1d..123bdd6 100755
--- a/tormonitor
+++ b/tormonitor
@@ -93,7 +93,6 @@ class TorMonitorWindow(Gtk.ApplicationWindow):
self.set_titlebar(headerbar)
grid = Gtk.Grid()
- grid.set_column_homogeneous(True)
self.add(grid)
self._infobar = Gtk.InfoBar()
@@ -127,6 +126,9 @@ class TorMonitorWindow(Gtk.ApplicationWindow):
scrolledwindow_circuits.set_property('expand', True)
scrolledwindow_circuits.set_property('halign', Gtk.Align.FILL)
scrolledwindow_circuits.set_property('valign', Gtk.Align.FILL)
+ scrolledwindow_circuits.set_policy(
+ hscrollbar_policy=Gtk.PolicyType.NEVER,
+ vscrollbar_policy=Gtk.PolicyType.AUTOMATIC)
grid.attach(scrolledwindow_circuits, 0, 1, 1, 1)
# Circuit details
@@ -414,15 +416,18 @@ class TorMonitorWindow(Gtk.ApplicationWindow):
:var stem.response.events.StreamEvent stream: the stream
"""
stream_iter = self._stream_to_iter[stream.id]
- if stream.circ_id != self._treestore.get_value(stream_iter, 1):
- # The stream doesn't belong its parent circuit anymore. Remove it.
+ circuit_iter = self._treestore.iter_parent(stream_iter)
+ if stream.circ_id != self._treestore.get_value(circuit_iter, 1):
+ # The stream doesn't belong to its parent circuit anymore. Remove it.
self.remove_stream(stream)
if stream.circ_id:
# The stream has a new circuit, add it with its new parent.
stream_iter = self.add_stream(stream)
else:
# The stream didn't change parent. Update it.
- self._treestore.set(stream_iter, 2, self.stream_label(stream))
+ #
+ # We should not update the stream label because this would
+ # replace the hostname by its IP address.
if stream.status:
self._treestore.set(stream_iter, 3, str(stream.status).capitalize())