tor-commits July 2016

tor-commits@lists.torproject.org

21 participants
1271 discussions

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 16 Jul '16

16 Jul '16

commit 1186af4161b85f04e2344bc18945fc5921b835d2 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jul 16 06:45:03 2016 +0000 Update translations for bridgedb --- hi/LC_MESSAGES/bridgedb.po | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/hi/LC_MESSAGES/bridgedb.po b/hi/LC_MESSAGES/bridgedb.po index 520c6a9..a20020a 100644 --- a/hi/LC_MESSAGES/bridgedb.po +++ b/hi/LC_MESSAGES/bridgedb.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-07-16 06:14+0000\n" +"PO-Revision-Date: 2016-07-16 06:24+0000\n" "Last-Translator: Shubham Singh <kalyanwat2(a)gmail.com>\n" "Language-Team: Hindi (http://www.transifex.com/otf/torproject/language/hi/)\n" "MIME-Version: 1.0\n" @@ -178,7 +178,7 @@ msgstr "आपने आवृति दर की सीमा पार कर #: bridgedb/strings.py:50 msgid "" "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" -msgstr "" +msgstr "आदेश: (क्रमशः एक से अधिक विकल्प उल्लेखित करने के लिए आदेशों को एक साथ जोड़ें)" #. TRANSLATORS: Please DO NOT translate the word "BridgeDB". #: bridgedb/strings.py:53 @@ -188,7 +188,7 @@ msgstr "BridgeDB में आपका स्वागत हैं!" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". #: bridgedb/strings.py:55 msgid "Currently supported transport TYPEs:" -msgstr "" +msgstr "वर्तमान में समर्थित Transport TYPEs:" #: bridgedb/strings.py:56 #, python-format @@ -251,7 +251,7 @@ msgstr "" #: bridgedb/strings.py:101 msgid "What are bridges?" -msgstr "" +msgstr "bridges क्या हैं?" #: bridgedb/strings.py:102 #, python-format @@ -317,7 +317,7 @@ msgstr "" #: bridgedb/strings.py:140 msgid "Enter the characters from the image above..." -msgstr "" +msgstr "ऊपर के चित्र से अक्षर डाले." #: bridgedb/strings.py:144 msgid "How to start using your bridges" @@ -357,18 +357,18 @@ msgstr "" #: bridgedb/strings.py:167 msgid "Displays this message." -msgstr "" +msgstr "यह सन्देश दिखाएं." #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the #. same non-Pluggable Transport bridges described above as being #. "plain-ol'-vanilla" bridges. #: bridgedb/strings.py:171 msgid "Request vanilla bridges." -msgstr "" +msgstr "vanilla bridges के लिए निवेदन करें." #: bridgedb/strings.py:172 msgid "Request IPv6 bridges." -msgstr "" +msgstr "IPv6 bridges के लिए निवेदन करें." #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". #: bridgedb/strings.py:174 @@ -379,4 +379,4 @@ msgstr "" #. TRANSLATORS: Please DO NOT translate "GnuPG". #: bridgedb/strings.py:177 msgid "Get a copy of BridgeDB's public GnuPG key." -msgstr "" +msgstr "BridgeDB की सार्वजनिक GnuPG कुंजी प्राप्त करें."

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 16 Jul '16

16 Jul '16

commit 3ecb05229118020c85079702251ebc0ed0d80c4a Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jul 16 06:15:03 2016 +0000 Update translations for bridgedb --- hi/LC_MESSAGES/bridgedb.po | 55 +++++++++++++++++++++++----------------------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/hi/LC_MESSAGES/bridgedb.po b/hi/LC_MESSAGES/bridgedb.po index af53bef..520c6a9 100644 --- a/hi/LC_MESSAGES/bridgedb.po +++ b/hi/LC_MESSAGES/bridgedb.po @@ -4,13 +4,14 @@ # # Translators: # Bineet kumar gaur <bineetkumar(a)live.in>, 2014 +# Shubham Singh <kalyanwat2(a)gmail.com>, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-03-21 16:27+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2016-07-16 06:14+0000\n" +"Last-Translator: Shubham Singh <kalyanwat2(a)gmail.com>\n" "Language-Team: Hindi (http://www.transifex.com/otf/torproject/language/hi/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -32,35 +33,35 @@ msgstr "" #. "Tor Browser" #: bridgedb/https/server.py:167 msgid "Sorry! Something went wrong with your request." -msgstr "" +msgstr "क्षमा करें ! आपका अनुरोध पूरा नहीं किया जा सका." #: bridgedb/https/templates/base.html:79 msgid "Report a Bug" -msgstr "" +msgstr "किसी त्रुटी के बारें में बताएं " #: bridgedb/https/templates/base.html:82 msgid "Source Code" -msgstr "" +msgstr "संकेत लिपि का स्त्रोत " #: bridgedb/https/templates/base.html:85 msgid "Changelog" -msgstr "" +msgstr "परिवर्तनसूची " #: bridgedb/https/templates/base.html:88 msgid "Contact" -msgstr "" +msgstr "संपर्क करें " #: bridgedb/https/templates/bridges.html:35 msgid "Select All" -msgstr "" +msgstr "सब कुछ चुने " #: bridgedb/https/templates/bridges.html:40 msgid "Show QRCode" -msgstr "" +msgstr "QRcode दिखाएं " #: bridgedb/https/templates/bridges.html:52 msgid "QRCode for your bridge lines" -msgstr "" +msgstr "आपकी bridge lines के लिए QRCode " #. TRANSLATORS: Please translate this into some silly way to say #. "There was a problem!" in your language. For example, @@ -69,58 +70,58 @@ msgstr "" #: bridgedb/https/templates/bridges.html:67 #: bridgedb/https/templates/bridges.html:125 msgid "Uh oh, spaghettios!" -msgstr "" +msgstr "अरे नहीं , Spaghettios!" #: bridgedb/https/templates/bridges.html:68 msgid "It seems there was an error getting your QRCode." -msgstr "" +msgstr "ऐसा लग रहा है आपके QRCode को प्राप्त करने में कुछ त्रुटी हुई." #: bridgedb/https/templates/bridges.html:73 msgid "" "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" " your bridge lines onto mobile and other devices." -msgstr "" +msgstr "यह QRCode आपकी bridge lines रखता हैं. अपनी bridge lines को मोबाइल और दुसरे उपकरणों में प्रतिलिपि प्राप्त करने के लिए इसे QRCode Reader से Scan करें ." #: bridgedb/https/templates/bridges.html:131 msgid "There currently aren't any bridges available..." -msgstr "" +msgstr "इस समय कोई bridge उपलब्ध नहीं हैं ..." #: bridgedb/https/templates/bridges.html:132 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " "type!" -msgstr "" +msgstr "शायद आपको %sपीछे जाकर %sदुबारा से दूसरा bridge type का चयन करने की कोशिश करनी चाहिए!" #: bridgedb/https/templates/index.html:11 #, python-format msgid "Step %s1%s" -msgstr "" +msgstr "चरण %s1%s" #: bridgedb/https/templates/index.html:13 #, python-format msgid "Download %s Tor Browser %s" -msgstr "" +msgstr "%s Tor Browser %s डाउनलोड करें." #: bridgedb/https/templates/index.html:25 #, python-format msgid "Step %s2%s" -msgstr "" +msgstr "चरण %s2%s" #: bridgedb/https/templates/index.html:27 #, python-format msgid "Get %s bridges %s" -msgstr "" +msgstr "%s bridges %s प्राप्त हो रहे हैं " #: bridgedb/https/templates/index.html:36 #, python-format msgid "Step %s3%s" -msgstr "" +msgstr "चरण %s3%s" #: bridgedb/https/templates/index.html:38 #, python-format msgid "Now %s add the bridges to Tor Browser %s" -msgstr "" +msgstr "अब %s bridges को Tor Browser से जोड़ें %s" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -129,7 +130,7 @@ msgstr "" #: bridgedb/https/templates/options.html:38 #, python-format msgid "%sJ%sust give me bridges!" -msgstr "" +msgstr "%sकेवल%s bridges दीजिये !" #: bridgedb/https/templates/options.html:51 msgid "Advanced Options" @@ -157,22 +158,22 @@ msgstr "%sजी%s हाँ!" #: bridgedb/https/templates/options.html:147 #, python-format msgid "%sG%set Bridges" -msgstr "" +msgstr "%sB%sridges प्राप्त हो रहे हैं." #: bridgedb/strings.py:43 msgid "[This is an automated message; please do not reply.]" -msgstr "" +msgstr "[यह एक स्वचालित सन्देश हैं; कृप्या जवाब न दें.]" #: bridgedb/strings.py:45 msgid "Here are your bridges:" -msgstr "" +msgstr "ये रहे आपके bridges:" #: bridgedb/strings.py:47 #, python-format msgid "" "You have exceeded the rate limit. Please slow down! The minimum time between\n" "emails is %s hours. All further emails during this time period will be ignored." -msgstr "" +msgstr "आपने आवृति दर की सीमा पार कर ली है. कृपया गति कम करें! \nEmails के बीच का न्यूनतम समय %s घंटे हैं. इस समय सीमा में आने वाले Emails अनदेखे कर दिए जायेगे. " #: bridgedb/strings.py:50 msgid "" @@ -182,7 +183,7 @@ msgstr "" #. TRANSLATORS: Please DO NOT translate the word "BridgeDB". #: bridgedb/strings.py:53 msgid "Welcome to BridgeDB!" -msgstr "" +msgstr "BridgeDB में आपका स्वागत हैं!" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". #: bridgedb/strings.py:55

1 0

[translation/torbirdy_completed] Update translations for torbirdy_completed
by translation＠torproject.org 16 Jul '16

16 Jul '16

commit 8bfaa47610a17812c8b6de284a5d7f123473dda0 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jul 16 05:46:00 2016 +0000 Update translations for torbirdy_completed --- hi/torbirdy.dtd | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/hi/torbirdy.dtd b/hi/torbirdy.dtd new file mode 100644 index 0000000..e7428f1 --- /dev/null +++ b/hi/torbirdy.dtd @@ -0,0 +1,58 @@ +<!ENTITY torbirdy.accountprefs.title "खाता विन्यास"> +<!ENTITY torbirdy.accountprefs.startup.label "शुरु होते ही नए संदेशों की जाँच करें"> +<!ENTITY torbirdy.accountprefs.startup.key "C"> +<!ENTITY torbirdy.accountprefs.minutes.label "सभी नए संदेशों की जाँच करें"> +<!ENTITY torbirdy.accountprefs.minutes.key "y"> +<!ENTITY torbirdy.accountprefs.minutes.trail.label "मिनट"> +<!ENTITY torbirdy.accountprefs.cancel.button "रद्द करें "> +<!ENTITY torbirdy.accountprefs.save.button "संचय करें "> +<!ENTITY torbirdy.accountprefs.save.key "s"> + +<!ENTITY torbirdy.prefs.title "टॉरबर्डी प्राथमिकताएं"> +<!ENTITY torbirdy.prefs.save.button "संचय करें "> +<!ENTITY torbirdy.prefs.save.key "s"> +<!ENTITY torbirdy.prefs.cancel.button "रद्द करें "> +<!ENTITY torbirdy.prefs.extra2.button "Restore Defaults"> +<!ENTITY torbirdy.prefs.extra2.key "d"> +<!ENTITY torbirdy.prefs.testproxy.button "Proxy Settings जाँचे "> +<!ENTITY torbirdy.prefs.testproxy.key "n"> +<!ENTITY torbirdy.prefs.proxy.label "Proxy"> +<!ENTITY torbirdy.prefs.privacy.label "निजता"> +<!ENTITY torbirdy.prefs.enigmail.label "इनिग्मेल"> +<!ENTITY torbirdy.prefs.recommended.text "टॉरबर्डी (टॉर) के लिए अनुशंसित प्रोक्सी सेटिंग्स का प्रयोग करें"> +<!ENTITY torbirdy.prefs.recommended.key "r"> +<!ENTITY torbirdy.prefs.anonservice.text "एक अज्ञातीकरण सेवा चुनें"> +<!ENTITY torbirdy.prefs.anonservice.key "a"> +<!ENTITY torbirdy.prefs.customsettings.text "व्यवहारिक प्रोक्सी सेटिंग का उपयोग करे"> +<!ENTITY torbirdy.prefs.customsettings.key "c"> +<!ENTITY torbirdy.prefs.socks_host.label "SOCKS आतिथेय :"> +<!ENTITY torbirdy.prefs.socks_host.key "h"> +<!ENTITY torbirdy.prefs.socks_port.label "पोर्ट/द्वार :"> +<!ENTITY torbirdy.prefs.socks_port.key "P/प"> +<!ENTITY torbirdy.prefs.torification.label "पारदर्शी Torification (चेतावनी: चयनित transproxy या टॉर राउटर की आवश्यकता)"> +<!ENTITY torbirdy.prefs.torification.key "टी "> +<!ENTITY torbirdy.prefs.global "वैश्विक"> +<!ENTITY torbirdy.prefs.imap.label "IMAP खाते के लिये पुश ई-मेल समर्थन को सक्षम करें [डिफ़ॉल्ट: अक्षम]"> +<!ENTITY torbirdy.prefs.imap.key "P"> +<!ENTITY torbirdy.prefs.startup_folder.label "स्टार्टअप होने पर अंतिम बार एक्सेस किये गए मेल फोल्डर को चुने. [डिफ़ॉल्ट: अक्षम]"> +<!ENTITY torbirdy.prefs.startup_folder.key "i"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "इनक्रिप्टेट (गोपनीकृत) संदेशों में प्राप्तकर्ता की कुंजी न प्रेषित करें [मानक स्थिति: प्रेषित]"> +<!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> +<!ENTITY torbirdy.prefs.confirmemail.label "यदि इनिग्मेल सक्रिय है, तो ई मेल प्रेषित करने से पूर्व पुष्टि करें [मानक स्थिति: पुष्टि न करें]"> +<!ENTITY torbirdy.prefs.confirmemail.key "c"> +<!ENTITY torbirdy.prefs.emailwizard.label "थंडरबर्ड का स्वचालित ई मेल कन्फिगरेशन विज़र्ड सक्षम करें [मानक: अक्षम]"> +<!ENTITY torbirdy.prefs.emailwizard.key "P/प"> +<!ENTITY torbirdy.prefs.automatic.label "सभी खातों के लिए नये संदेशों कि स्वतः जाँच करें [मानक: अक्षम]"> +<!ENTITY torbirdy.prefs.automatic.key "f"> +<!ENTITY torbirdy.prefs.account_specific "खाता विशिष्ट"> +<!ENTITY torbirdy.prefs.select_account.key "C"> +<!ENTITY torbirdy.prefs.select_account.label "खाता चुनें"> +<!ENTITY torbirdy.prefs.enigmail.keyserver.label "उपयोग करने के लिए Keyserver(s):"> +<!ENTITY torbirdy.prefs.enigmail.keyserver.key "k"> + +<!ENTITY torbirdy.panel.usetor.label "Tor Onion Router का प्रयोग कीजिये."> +<!ENTITY torbirdy.panel.usejondo.label "JonDo (Premium) का उपयोग करें "> +<!ENTITY torbirdy.panel.usewhonix.label "Whonix का उपयोग करें"> +<!ENTITY torbirdy.panel.preferences.label "TorBirdy Preferences खोलें "> + +<!ENTITY torbirdy.firstrun.title "TorBirdy First-Run">

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 16 Jul '16

16 Jul '16

commit 132f68acfc63c5075674337504a772e8e2ef24b9 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jul 16 05:45:50 2016 +0000 Update translations for torbirdy --- hi/torbirdy.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hi/torbirdy.dtd b/hi/torbirdy.dtd index fd816c3..e7428f1 100644 --- a/hi/torbirdy.dtd +++ b/hi/torbirdy.dtd @@ -34,7 +34,7 @@ <!ENTITY torbirdy.prefs.global "वैश्विक"> <!ENTITY torbirdy.prefs.imap.label "IMAP खाते के लिये पुश ई-मेल समर्थन को सक्षम करें [डिफ़ॉल्ट: अक्षम]"> <!ENTITY torbirdy.prefs.imap.key "P"> -<!ENTITY torbirdy.prefs.startup_folder.label "Select last accessed mail folder on startup [default: disabled]"> +<!ENTITY torbirdy.prefs.startup_folder.label "स्टार्टअप होने पर अंतिम बार एक्सेस किये गए मेल फोल्डर को चुने. [डिफ़ॉल्ट: अक्षम]"> <!ENTITY torbirdy.prefs.startup_folder.key "i"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.label "इनक्रिप्टेट (गोपनीकृत) संदेशों में प्राप्तकर्ता की कुंजी न प्रेषित करें [मानक स्थिति: प्रेषित]"> <!ENTITY torbirdy.prefs.enigmail_throwkeyid.key "r"> @@ -47,7 +47,7 @@ <!ENTITY torbirdy.prefs.account_specific "खाता विशिष्ट"> <!ENTITY torbirdy.prefs.select_account.key "C"> <!ENTITY torbirdy.prefs.select_account.label "खाता चुनें"> -<!ENTITY torbirdy.prefs.enigmail.keyserver.label "Keyserver(s) to use: "> +<!ENTITY torbirdy.prefs.enigmail.keyserver.label "उपयोग करने के लिए Keyserver(s):"> <!ENTITY torbirdy.prefs.enigmail.keyserver.key "k"> <!ENTITY torbirdy.panel.usetor.label "Tor Onion Router का प्रयोग कीजिये.">

1 0

[nyx/master] Panel pydocs
by atagar＠torproject.org 15 Jul '16

15 Jul '16

commit a4ca8e7b00b7c249699e7388c4fb8711afe66638 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jul 15 09:46:44 2016 -0700 Panel pydocs Proper sphinx pydocs for the panel module. --- nyx/panel/__init__.py | 108 +++++++++++++++++++++++++++--------------------- nyx/panel/config.py | 2 +- nyx/panel/connection.py | 2 +- nyx/panel/graph.py | 2 +- nyx/panel/header.py | 2 +- nyx/panel/log.py | 2 +- nyx/panel/torrc.py | 2 +- test/panel/header.py | 2 +- test/panel/torrc.py | 8 ++-- 9 files changed, 72 insertions(+), 58 deletions(-) diff --git a/nyx/panel/__init__.py b/nyx/panel/__init__.py index 96a39bd..bfc4e6c 100644 --- a/nyx/panel/__init__.py +++ b/nyx/panel/__init__.py @@ -3,6 +3,27 @@ """ Panels consisting the nyx interface. + +**Module Overview:** + +:: + + KeyHandler - keyboard input a panel accepts + +- handle - triggers the keyboard action + + Panel - panel within the interface + |- DaemonPanel - panel that triggers actions at a set rate + | |- run - starts triggering daemon actions + | +- stop - stops triggering daemon actions + | + |- get_top - top position we're rendered into on the screen + |- set_top - sets top position within the screen + |- get_height - height occupied by the panel + | + |- set_visible - toggles panel visiblity + |- key_handlers - keyboard input accepted by the panel + |- get_preferred_size - dimensions when rendered + +- redraw - renders the panel content """ import collections @@ -63,56 +84,64 @@ class KeyHandler(collections.namedtuple('Help', ['key', 'description', 'current' class Panel(object): """ - Common parent for interface panels, providing the ability to pause and - configure dimensions. + Panel within the nyx interface. """ def __init__(self): - self._visible = False self._top = 0 - - def set_visible(self, is_visible): - """ - Toggles if the panel is visible or not. - - Arguments: - is_visible - panel is redrawn when requested if true, skipped otherwise - """ - - self._visible = is_visible + self._visible = False def get_top(self): """ - Provides the top position used for subwindows. + Provides our top position in the overall screen. + + :returns: **int** with the top coordinate """ return self._top def set_top(self, top): """ - Changes the position where subwindows are placed within its parent. + Changes the position where we're rendered in the screen. - Arguments: - top - positioning of top within parent + :param int top: top position within the sceen """ - if self._top != top: - self._top = top + self._top = top def get_height(self): """ - Provides the height used by this panel. + Provides the height occupied by this panel. :returns: **int** for the height of the panel or **None** if unlimited """ return None + def set_visible(self, is_visible): + """ + Toggles if the panel is visible or not. + + :param bool is_visible: shows panel if **True**, hides otherwise + """ + + self._visible = is_visible + + def key_handlers(self): + """ + Provides keyboard input this panel supports. + + :returns: **tuple** of :class:`~nyx.panel.KeyHandler` instances + """ + + return () + def get_preferred_size(self): """ - Provides the dimensions the subwindow would use when next redrawn, given - that none of the properties of the panel or parent change before then. This - returns a tuple of (height, width). + Provides the dimensions the subwindow would use when next redrawn if none + of its properties change. + + :returns: **tuple** of the form **(height, width)** """ with nyx.curses.raw_screen() as stdscr: @@ -128,40 +157,25 @@ class Panel(object): return (new_height, new_width) - def key_handlers(self): - """ - Provides options this panel supports. This is a tuple of - :class:`~nyx.panel.KeyHandler` instances. - """ - - return () - - def draw(self, subwindow): - """ - Draws display's content. This is meant to be overwritten by - implementations and not called directly (use redraw() instead). The - dimensions provided are the drawable dimensions, which in terms of width is - a column less than the actual space. - - Arguments: - subwindow - window content is drawn into - """ - - pass - def redraw(self): """ - Clears display and redraws its content. This can skip redrawing content if - able (ie, the subwindow's unchanged), instead just refreshing the display. + Renders our panel's content to the screen. """ if not self._visible: return # not currently visible - nyx.curses.draw(self.draw, top = self._top, height = self.get_height()) + nyx.curses.draw(self._draw, top = self._top, height = self.get_height()) + + def _draw(self, subwindow): + pass class DaemonPanel(Panel, threading.Thread): + """ + Panel that triggers its _update() method at a set rate. + """ + def __init__(self, update_rate): Panel.__init__(self) threading.Thread.__init__(self) diff --git a/nyx/panel/config.py b/nyx/panel/config.py index cbbaa92..f5d9dd9 100644 --- a/nyx/panel/config.py +++ b/nyx/panel/config.py @@ -240,7 +240,7 @@ class ConfigPanel(nyx.panel.Panel): nyx.panel.KeyHandler('s', 'sort ordering', self.show_sort_dialog), ) - def draw(self, subwindow): + def _draw(self, subwindow): contents = self._get_config_options() selected, scroll = self._scroller.selection(contents, subwindow.height - DETAILS_HEIGHT) is_scrollbar_visible = len(contents) > subwindow.height - DETAILS_HEIGHT diff --git a/nyx/panel/connection.py b/nyx/panel/connection.py index bd78a9b..497df5c 100644 --- a/nyx/panel/connection.py +++ b/nyx/panel/connection.py @@ -400,7 +400,7 @@ class ConnectionPanel(nyx.panel.DaemonPanel): return tuple(options) - def draw(self, subwindow): + def _draw(self, subwindow): controller = tor_controller() nyx_controller = nyx.controller.get_controller() entries = self._entries diff --git a/nyx/panel/graph.py b/nyx/panel/graph.py index e5f9cc7..4a4e125 100644 --- a/nyx/panel/graph.py +++ b/nyx/panel/graph.py @@ -557,7 +557,7 @@ class GraphPanel(nyx.panel.Panel): self._accounting_stats_paused = copy.copy(self._accounting_stats) self._stats_paused = dict([(key, type(self._stats[key])(self._stats[key])) for key in self._stats]) - def draw(self, subwindow): + def _draw(self, subwindow): if not self.displayed_stat: return diff --git a/nyx/panel/header.py b/nyx/panel/header.py index 5f33f4f..31f9970 100644 --- a/nyx/panel/header.py +++ b/nyx/panel/header.py @@ -141,7 +141,7 @@ class HeaderPanel(nyx.panel.DaemonPanel): nyx.panel.KeyHandler('r', action = _reconnect), ) - def draw(self, subwindow): + def _draw(self, subwindow): vals = self._vals # local reference to avoid concurrency concerns self._last_width = subwindow.width is_wide = self.is_wide() diff --git a/nyx/panel/log.py b/nyx/panel/log.py index 02cd7fe..2eac0b5 100644 --- a/nyx/panel/log.py +++ b/nyx/panel/log.py @@ -250,7 +250,7 @@ class LogPanel(nyx.panel.DaemonPanel): if is_pause: self._event_log_paused = self._event_log.clone() - def draw(self, subwindow): + def _draw(self, subwindow): scroll = self._scroller.location(self._last_content_height, subwindow.height - 1) nyx_controller = nyx.controller.get_controller() diff --git a/nyx/panel/torrc.py b/nyx/panel/torrc.py index 6927e0c..dfe331d 100644 --- a/nyx/panel/torrc.py +++ b/nyx/panel/torrc.py @@ -108,7 +108,7 @@ class TorrcPanel(panel.Panel): nyx.panel.KeyHandler('l', 'line numbering', _toggle_line_numbers, 'on' if self._show_line_numbers else 'off'), ) - def draw(self, subwindow): + def _draw(self, subwindow): scroll = self._scroller.location(self._last_content_height - 1, subwindow.height - 1) if self._torrc_content is None: diff --git a/test/panel/header.py b/test/panel/header.py index c14b404..2951747 100644 --- a/test/panel/header.py +++ b/test/panel/header.py @@ -79,7 +79,7 @@ class TestHeaderPanel(unittest.TestCase): sampling_mock.return_value = test_sampling() panel = nyx.panel.header.HeaderPanel() - self.assertEqual(EXPECTED_PANEL, test.render(panel.draw).content) + self.assertEqual(EXPECTED_PANEL, test.render(panel._draw).content) @patch('nyx.panel.header.tor_controller') @patch('nyx.tracker.get_resource_tracker') diff --git a/test/panel/torrc.py b/test/panel/torrc.py index 96d222c..732ec63 100644 --- a/test/panel/torrc.py +++ b/test/panel/torrc.py @@ -54,7 +54,7 @@ class TestGraphPanel(unittest.TestCase): @patch('nyx.panel.torrc.tor_controller', Mock()) def test_draw_with_content(self): panel = nyx.panel.torrc.TorrcPanel() - self.assertEqual(RENDERED_DEFAULT, test.render(panel.draw).content) + self.assertEqual(RENDERED_DEFAULT, test.render(panel._draw).content) @require_curses @patch('nyx.panel.torrc._read_torrc', Mock(return_value = TORRC.splitlines())) @@ -63,7 +63,7 @@ class TestGraphPanel(unittest.TestCase): def test_draw_without_comments(self): panel = nyx.panel.torrc.TorrcPanel() panel._show_comments = False - self.assertEqual(RENDERED_WITHOUT_COMMENTS, test.render(panel.draw).content) + self.assertEqual(RENDERED_WITHOUT_COMMENTS, test.render(panel._draw).content) @require_curses @patch('nyx.panel.torrc._read_torrc', Mock(return_value = TORRC.splitlines())) @@ -72,7 +72,7 @@ class TestGraphPanel(unittest.TestCase): def test_draw_without_line_numbers(self): panel = nyx.panel.torrc.TorrcPanel() panel._show_line_numbers = False - self.assertEqual(RENDERED_WITHOUT_LINE_NUMBERS, test.render(panel.draw).content) + self.assertEqual(RENDERED_WITHOUT_LINE_NUMBERS, test.render(panel._draw).content) @require_curses @patch('nyx.panel.torrc._read_torrc', Mock(side_effect = IOError("[Errno 2] No such file or directory: '/path/to/torrc'"))) @@ -81,4 +81,4 @@ class TestGraphPanel(unittest.TestCase): def test_draw_with_error(self): panel = nyx.panel.torrc.TorrcPanel() panel._show_line_numbers = False - self.assertEqual(RENDERED_WITH_ERROR, test.render(panel.draw).content) + self.assertEqual(RENDERED_WITH_ERROR, test.render(panel._draw).content)

1 0

[nyx/master] Combine get_height() and get_preferred_size()
by atagar＠torproject.org 15 Jul '16

15 Jul '16

commit f777422689c02f289b65a2bfd8629fed5d09cbb4 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jul 15 09:59:35 2016 -0700 Combine get_height() and get_preferred_size() Our get_height() provided our maximum height while get_preferred_size() provided our actual dimensions. On reflection both of these were dumb... * We never care about our maximum height except to calculate our real dimensions. * We never care about our width so get_preferred_size() was really just providing our height. So combining these into a single get_height() method that provides our actual height. Much simpler. --- nyx/panel/__init__.py | 26 ++------------------------ nyx/panel/config.py | 2 +- nyx/panel/connection.py | 2 +- nyx/panel/graph.py | 4 +++- nyx/panel/header.py | 6 ++++-- nyx/panel/log.py | 2 +- nyx/panel/torrc.py | 2 +- 7 files changed, 13 insertions(+), 31 deletions(-) diff --git a/nyx/panel/__init__.py b/nyx/panel/__init__.py index bfc4e6c..85d1b78 100644 --- a/nyx/panel/__init__.py +++ b/nyx/panel/__init__.py @@ -22,7 +22,6 @@ Panels consisting the nyx interface. | |- set_visible - toggles panel visiblity |- key_handlers - keyboard input accepted by the panel - |- get_preferred_size - dimensions when rendered +- redraw - renders the panel content """ @@ -113,10 +112,10 @@ class Panel(object): """ Provides the height occupied by this panel. - :returns: **int** for the height of the panel or **None** if unlimited + :returns: **int** for the height of the panel """ - return None + return max(0, nyx.curses.screen_size().height - self._top) def set_visible(self, is_visible): """ @@ -136,27 +135,6 @@ class Panel(object): return () - def get_preferred_size(self): - """ - Provides the dimensions the subwindow would use when next redrawn if none - of its properties change. - - :returns: **tuple** of the form **(height, width)** - """ - - with nyx.curses.raw_screen() as stdscr: - new_height, new_width = stdscr.getmaxyx() - - new_height = max(0, new_height - self._top) - new_width = max(0, new_width) - - set_height = self.get_height() - - if set_height is not None: - new_height = min(new_height, set_height) - - return (new_height, new_width) - def redraw(self): """ Renders our panel's content to the screen. diff --git a/nyx/panel/config.py b/nyx/panel/config.py index f5d9dd9..7640b99 100644 --- a/nyx/panel/config.py +++ b/nyx/panel/config.py @@ -200,7 +200,7 @@ class ConfigPanel(nyx.panel.Panel): def key_handlers(self): def _scroll(key): - page_height = self.get_preferred_size()[0] - DETAILS_HEIGHT + page_height = self.get_height() - DETAILS_HEIGHT is_changed = self._scroller.handle_key(key, self._get_config_options(), page_height) if is_changed: diff --git a/nyx/panel/connection.py b/nyx/panel/connection.py index 497df5c..cac6490 100644 --- a/nyx/panel/connection.py +++ b/nyx/panel/connection.py @@ -314,7 +314,7 @@ class ConnectionPanel(nyx.panel.DaemonPanel): def key_handlers(self): def _scroll(key): - page_height = self.get_preferred_size()[0] - 1 + page_height = self.get_height() - 1 if self._show_details: page_height -= (DETAILS_HEIGHT + 1) diff --git a/nyx/panel/graph.py b/nyx/panel/graph.py index 4a4e125..9dd3244 100644 --- a/nyx/panel/graph.py +++ b/nyx/panel/graph.py @@ -478,6 +478,8 @@ class GraphPanel(nyx.panel.Panel): Provides the height of the content. """ + max_height = nyx.panel.Panel.get_height(self) + if not self.displayed_stat: return 0 @@ -488,7 +490,7 @@ class GraphPanel(nyx.panel.Panel): if self.displayed_stat == GraphStat.BANDWIDTH and accounting_stats: height += 3 - return height + return min(max_height, height) def set_graph_height(self, new_graph_height): self._graph_height = max(1, new_graph_height) diff --git a/nyx/panel/header.py b/nyx/panel/header.py index 31f9970..f08afd7 100644 --- a/nyx/panel/header.py +++ b/nyx/panel/header.py @@ -90,10 +90,12 @@ class HeaderPanel(nyx.panel.DaemonPanel): panel's maximum width. """ + max_height = nyx.panel.DaemonPanel.get_height(self) + if self._vals.is_relay: - return 5 if self.is_wide() else 7 + return min(max_height, 5 if self.is_wide() else 7) else: - return 4 if self.is_wide() else 5 + return min(max_height, 4 if self.is_wide() else 5) def send_newnym(self): """ diff --git a/nyx/panel/log.py b/nyx/panel/log.py index 2eac0b5..0437e0f 100644 --- a/nyx/panel/log.py +++ b/nyx/panel/log.py @@ -207,7 +207,7 @@ class LogPanel(nyx.panel.DaemonPanel): def key_handlers(self): def _scroll(key): - page_height = self.get_preferred_size()[0] - 1 + page_height = self.get_height() - 1 is_changed = self._scroller.handle_key(key, self._last_content_height, page_height) if is_changed: diff --git a/nyx/panel/torrc.py b/nyx/panel/torrc.py index dfe331d..3682f7f 100644 --- a/nyx/panel/torrc.py +++ b/nyx/panel/torrc.py @@ -90,7 +90,7 @@ class TorrcPanel(panel.Panel): def key_handlers(self): def _scroll(key): - page_height = self.get_preferred_size()[0] - 1 + page_height = self.get_height() - 1 is_changed = self._scroller.handle_key(key, self._last_content_height, page_height) if is_changed:

1 0

[nyx/master] Drop get_width() method
by atagar＠torproject.org 15 Jul '16

15 Jul '16

commit 537ca9dc3047a3fd0b29c669f6f60375ba7642d0 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jul 15 08:40:14 2016 -0700 Drop get_width() method Had it for symmetry with get_height() but was unused. The header and graph panels override get_height() so we still need that for the moment. --- nyx/controller.py | 5 ++++- nyx/panel/__init__.py | 30 ++++++++---------------------- 2 files changed, 12 insertions(+), 23 deletions(-) diff --git a/nyx/controller.py b/nyx/controller.py index fc38185..c5b90d6 100644 --- a/nyx/controller.py +++ b/nyx/controller.py @@ -278,7 +278,10 @@ class Controller(object): for panel_impl in display_panels: panel_impl.set_top(occupied_content) - occupied_content += panel_impl.get_height() + height = panel_impl.get_height() + + if height: + occupied_content += height # apparently curses may cache display contents unless we explicitely # request a redraw here... diff --git a/nyx/panel/__init__.py b/nyx/panel/__init__.py index 1d6ae9f..b572d66 100644 --- a/nyx/panel/__init__.py +++ b/nyx/panel/__init__.py @@ -71,11 +71,7 @@ class Panel(object): def __init__(self): self._visible = False - self._top = 0 - self._left = 0 - self._height = -1 - self._width = -1 def set_visible(self, is_visible): """ @@ -107,17 +103,12 @@ class Panel(object): def get_height(self): """ - Provides the height used for subwindows (-1 if it isn't limited). - """ + Provides the height used by this panel. - return self._height - - def get_width(self): - """ - Provides the width used for subwindows (-1 if it isn't limited). + :returns: **int** for the height of the panel or **None** if unlimited """ - return self._width + return None def get_preferred_size(self): """ @@ -129,15 +120,13 @@ class Panel(object): with nyx.curses.raw_screen() as stdscr: new_height, new_width = stdscr.getmaxyx() - set_height, set_width = self.get_height(), self.get_width() new_height = max(0, new_height - self._top) - new_width = max(0, new_width - self._left) + new_width = max(0, new_width) - if set_height != -1: - new_height = min(new_height, set_height) + set_height = self.get_height() - if set_width != -1: - new_width = min(new_width, set_width) + if set_height is not None: + new_height = min(new_height, set_height) return (new_height, new_width) @@ -173,10 +162,7 @@ class Panel(object): if not self._visible or HALT_ACTIVITY: return - height = self.get_height() if self.get_height() != -1 else None - width = self.get_width() if self.get_width() != -1 else None - - nyx.curses.draw(self.draw, top = self._top, width = width, height = height) + nyx.curses.draw(self.draw, top = self._top, height = self.get_height()) class DaemonPanel(Panel, threading.Thread):

1 0

[nyx/master] Drop legacy draw methods
by atagar＠torproject.org 15 Jul '16

15 Jul '16

commit 1191b1600e334f53aa81373b8a4a95cde0dd7f82 Merge: 8db8db6 f777422 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jul 15 10:02:24 2016 -0700 Drop legacy draw methods Now that we're using curses.py for rendering we can clean up our panel. Vastly simpler now. nyx/controller.py | 51 +++-- nyx/curses.py | 19 ++ nyx/menu.py | 16 +- nyx/panel/__init__.py | 536 ++++++------------------------------------------ nyx/panel/config.py | 14 +- nyx/panel/connection.py | 20 +- nyx/panel/graph.py | 30 +-- nyx/panel/header.py | 19 +- nyx/panel/log.py | 23 +-- nyx/panel/torrc.py | 14 +- nyx/starter.py | 3 +- test/panel/header.py | 3 +- test/panel/torrc.py | 8 +- 13 files changed, 198 insertions(+), 558 deletions(-)

1 0

[nyx/master] IPv6 addresses caused connection panel sorting to error
by atagar＠torproject.org 15 Jul '16

15 Jul '16

commit 19b60afb3c008102e5d9bb4c04b44e0267e1e916 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jul 15 10:32:21 2016 -0700 IPv6 addresses caused connection panel sorting to error Our connection panel converts addresses to integers to sort its lines. This assumed addresses were IPv4, causing a stacktrace if you had connections to/from any IPv6 addresses. --- nyx/panel/connection.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/nyx/panel/connection.py b/nyx/panel/connection.py index cac6490..afcf457 100644 --- a/nyx/panel/connection.py +++ b/nyx/panel/connection.py @@ -135,13 +135,9 @@ class Entry(object): if attr == SortAttr.IP_ADDRESS: if self.is_private(): return 255 ** 4 # orders at the end - - ip_value = 0 - - for octet in line.connection.remote_address.split('.'): - ip_value = ip_value * 255 + int(octet) - - return ip_value * 65536 + line.connection.remote_port + else: + address_int = connection.address_to_int(line.connection.remote_address) + return address_int * 65536 + line.connection.remote_port elif attr == SortAttr.PORT: return line.connection.remote_port elif attr == SortAttr.FINGERPRINT:

1 0

[nyx/master] Moving HALT_ACTIVITY to curses module
by atagar＠torproject.org 15 Jul '16

15 Jul '16

commit 03820fcafbd30b8209e8aeadb3b68d6e0b330e1f Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jul 15 08:57:19 2016 -0700 Moving HALT_ACTIVITY to curses module Flag is for preventing further curses activity so this is where it belongs. Expanding it to cover get_str() (... maybe that's why I've occasionally had nyx freeze?) and be covered by the curses lock. --- nyx/curses.py | 19 +++++++++++++++++++ nyx/panel/__init__.py | 8 ++------ nyx/starter.py | 3 +-- 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/nyx/curses.py b/nyx/curses.py index ed8b87b..6e605a7 100644 --- a/nyx/curses.py +++ b/nyx/curses.py @@ -18,6 +18,7 @@ if we want Windows support in the future too. curses_attr - curses encoded text attribute screen_size - provides the dimensions of our screen screenshot - dump of the present on-screen content + halt - prevents further curses rendering during shutdown is_color_supported - checks if terminal supports color output get_color_override - provides color we override requests with @@ -99,6 +100,7 @@ from nyx import msg, log CURSES_SCREEN = None CURSES_LOCK = threading.RLock() +HALT_ACTIVITY = False # Text colors and attributes. These are *very* commonly used so including # shorter aliases (so they can be referenced as just GREEN or BOLD). @@ -283,6 +285,9 @@ def str_input(x, y, initial_text = ''): return key with CURSES_LOCK: + if HALT_ACTIVITY: + return None + try: curses.curs_set(1) # show cursor except curses.error: @@ -354,6 +359,17 @@ def screenshot(): return '\n'.join(lines).rstrip() +def halt(): + """ + Prevents further rendering of curses content while python's shutting down. + """ + + global HALT_ACTIVITY + + with CURSES_LOCK: + HALT_ACTIVITY = True + + def is_color_supported(): """ Checks if curses currently supports rendering colors. @@ -497,6 +513,9 @@ def draw(func, left = 0, top = 0, width = None, height = None, background = None """ with CURSES_LOCK: + if HALT_ACTIVITY: + return + dimensions = screen_size() subwindow_width = max(0, dimensions.width - left) subwindow_height = max(0, dimensions.height - top) diff --git a/nyx/panel/__init__.py b/nyx/panel/__init__.py index b572d66..96a39bd 100644 --- a/nyx/panel/__init__.py +++ b/nyx/panel/__init__.py @@ -21,8 +21,6 @@ __all__ = [ 'torrc', ] -HALT_ACTIVITY = False # prevents curses redraws if set - class KeyHandler(collections.namedtuple('Help', ['key', 'description', 'current'])): """ @@ -157,10 +155,8 @@ class Panel(object): able (ie, the subwindow's unchanged), instead just refreshing the display. """ - # skipped if not currently visible or activity has been halted - - if not self._visible or HALT_ACTIVITY: - return + if not self._visible: + return # not currently visible nyx.curses.draw(self.draw, top = self._top, height = self.get_height()) diff --git a/nyx/starter.py b/nyx/starter.py index b9df29a..5f89526 100644 --- a/nyx/starter.py +++ b/nyx/starter.py @@ -18,7 +18,6 @@ import nyx import nyx.arguments import nyx.controller import nyx.curses -import nyx.panel import nyx.tracker import stem @@ -95,7 +94,7 @@ def main(config): except KeyboardInterrupt: pass # skip printing a stack trace finally: - nyx.panel.HALT_ACTIVITY = True + nyx.curses.halt() _shutdown_daemons(controller)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits July 2016