[Pkg-privacy-commits] [onioncircuits] 27/39: Merge remote-tracking branch 'origin/feature/11210-review-user-strings'
Sascha Steinbiss
sascha at steinbiss.name
Sun May 15 16:40:46 UTC 2016
This is an automated email from the git hooks/post-receive script.
sascha-guest pushed a commit to branch master
in repository onioncircuits.
commit 9eaa195aacbcb93a0c404ec4a66768615070a675
Merge: 2b5aa99 3de7ae3
Author: Alan <alan at boum.org>
Date: Sun May 15 13:54:02 2016 +0000
Merge remote-tracking branch 'origin/feature/11210-review-user-strings'
Conflicts:
onioncircuits
onioncircuits | 24 ++++++++----------------
onioncircuits.desktop | 2 +-
2 files changed, 9 insertions(+), 17 deletions(-)
diff --cc onioncircuits
index 2125f06,62a1aca..d48705e
--- a/onioncircuits
+++ b/onioncircuits
@@@ -104,10 -99,9 +102,9 @@@ class OnionCircuitsWindow(Gtk.Applicati
self._infobar = Gtk.InfoBar()
self._infobar.set_no_show_all(True)
- self._infobar_label = Gtk.Label("");
+ self._infobar_label = Gtk.Label("")
self._infobar_label.show()
self._infobar.get_content_area().add(self._infobar_label)
- self._infobar.add_button(_("OK"), Gtk.ResponseType.OK)
self._infobar.connect('response', lambda infobar, rid, data=None: self._infobar.hide())
grid.attach(self._infobar, 0, 0, 2, 1)
@@@ -142,19 -135,14 +139,19 @@@
# Circuit details
self._path = Gtk.ListBox()
self._path.set_selection_mode(Gtk.SelectionMode.NONE)
- self._placeholder = Gtk.Label(_("Click on a path to get details"))
- placeholder = Gtk.Label(_("Click on a circuit for more detail about its Tor relays."))
- placeholder.show()
- self._path.set_placeholder(placeholder)
- self._path.set_property('margin', 6)
- self._path.set_property('expand', True)
- self._path.set_property('halign', Gtk.Align.FILL)
- self._path.set_property('valign', Gtk.Align.FILL)
- grid.attach(self._path, 1, 1, 1, 1)
++ self._placeholder = Gtk.Label(_("Click on a circuit for more detail about its Tor relays."))
+ self._path.set_placeholder(self._placeholder)
+
+ scrolledwindow_path = Gtk.ScrolledWindow()
+ scrolledwindow_path.add(self._path)
+ scrolledwindow_path.set_property('margin', 6)
+ scrolledwindow_path.set_property('expand', True)
+ scrolledwindow_path.set_property('halign', Gtk.Align.FILL)
+ scrolledwindow_path.set_property('valign', Gtk.Align.FILL)
+ scrolledwindow_path.set_policy(
+ hscrollbar_policy=Gtk.PolicyType.AUTOMATIC,
+ vscrollbar_policy=Gtk.PolicyType.AUTOMATIC)
+ grid.attach(scrolledwindow_path, 1, 1, 1, 1)
self.show_all()
@@@ -319,9 -301,9 +311,9 @@@
:returns: **str** representing the circuit
"""
if circuit.path:
- circ_str = _(', ').join([nick for fp, nick in circuit.path])
+ circ_str = _(', ').join([nick if nick else fp for fp, nick in circuit.path])
else:
- circ_str = _("Building...")
+ circ_str = _("...")
return circ_str
def add_circuit(self, circuit):
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/onioncircuits.git
More information about the Pkg-privacy-commits
mailing list