tor-commits August 2012

tor-commits@lists.torproject.org

19 participants
901 discussions

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 04 Aug '12

04 Aug '12

commit add8bd2fa755400bfb51bfc6765bd2644f347c9a Author: Translation commit bot <translation(a)torproject.org> Date: Sat Aug 4 02:15:07 2012 +0000 Update translations for vidalia --- zh_CN/vidalia_zh_CN.po | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/zh_CN/vidalia_zh_CN.po b/zh_CN/vidalia_zh_CN.po index aa46e92..5cdf475 100644 --- a/zh_CN/vidalia_zh_CN.po +++ b/zh_CN/vidalia_zh_CN.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2012-08-04 01:44+0000\n" +"PO-Revision-Date: 2012-08-04 02:13+0000\n" "Last-Translator: xtoaster <zhazhenzhong(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -207,7 +207,7 @@ msgid "" "You've checked the autoconfiguration option for the ControlPort, but " "provided no Data Directory. Please add one, or uncheck the \"Configure " "ControlPort automatically\" option." -msgstr "" +msgstr "您选择启用 ControlPort 自动配置选项，但没有提供数据目录（DataDirectory）。请添加目录或取消 \"自动配置 ControlPort \"选项。" msgctxt "AdvancedPage" msgid "" @@ -239,11 +239,11 @@ msgstr "Vidalia 无法载入选中的语言。" msgctxt "AppearancePage" msgid "" "System Icon Preferences (changes will take effect when you restart Vidalia)" -msgstr "" +msgstr "系统图标配置(Vidalia重启后生效)" msgctxt "AppearancePage" msgid "Show the Tray Icon and Dock Icon (default)" -msgstr "" +msgstr "显示托盘及停靠图标(默认)" msgctxt "AppearancePage" msgid "Hide the Tray Icon" @@ -251,7 +251,7 @@ msgstr "隐藏托盘图标" msgctxt "AppearancePage" msgid "Hide the Dock Icon" -msgstr "" +msgstr "隐藏停靠图标" msgctxt "BandwidthGraph" msgid "Since:" @@ -1315,7 +1315,7 @@ msgstr "无法自动重启Vidalia。请手动重启Vidalia。" msgctxt "CrashReportDialog" msgid "Please fill a ticket in:" -msgstr "" +msgstr "请填写错误报告:" msgctxt "CrashReportDialog" msgid "" @@ -1334,7 +1334,7 @@ msgctxt "CrashReportDialog" msgid "" "with a description of what you were doing before the application crashed, " "along with the following files corresponding to the crash report:" -msgstr "" +msgstr "请描述您在程序崩溃前所作的操作，及如下与崩溃报告有关的文件。" msgctxt "GeneralPage" msgid "Executables (*.exe)" @@ -2090,7 +2090,7 @@ msgstr "任何通过此连接发送的数据都可能被监听，如有必要， msgctxt "MainWindow" msgid "Bootstrapping torrc from %1 to %2" -msgstr "" +msgstr "网络引导中 torrc 从 %1 到 %2" msgctxt "MainWindow" msgid "(probably Telnet)" @@ -2104,7 +2104,7 @@ msgctxt "MainWindow" msgid "" "One of your applications %1 appears to be making a potentially unencrypted " "and unsafe connection to port %2." -msgstr "" +msgstr "您的某一程序 %1 似乎正在与端口 %2 建立可能的未加密/不安全连接。" msgctxt "MainWindow" msgid "failed (%1)" @@ -2122,14 +2122,14 @@ msgid "" "\n" "Here's the last error message:\n" "%2" -msgstr "" +msgstr "Vidalia 无法连接 Tor 原因是无法访问文件: %1\n\n下面是最后的错误信息:\n%2" msgctxt "MainWindow" msgid "" "It seems Tor has stopped running since Vidalia started it.\n" "\n" "See the Advanced Message Log for more information." -msgstr "" +msgstr "Tor 似乎在被 Vidalia 调用后停止了运行。\n\n进一步信息请看高级消息日志。" msgctxt "MainWindow" msgid "" @@ -3118,11 +3118,11 @@ msgstr "自动发布我的网桥地址" msgctxt "ServerPage" msgid "Relay traffic for the Tor network (exit relay)" -msgstr "" +msgstr "Tor 网络的中继流量(出口节点)" msgctxt "ServerPage" msgid "Relay traffic inside the Tor network (non-exit relay)" -msgstr "" +msgstr "Tor 网络的中继流量(非出口节点)" msgctxt "ServerPage" msgid "Mirror the Relay Directory" @@ -3565,7 +3565,7 @@ msgstr "您没有选择任何文本。请选择一些文本，或勾选“全部 msgctxt "TorrcDialog" msgid "Error at line %1: \"%2\"" -msgstr "" +msgstr "错误 Error at line %1: \"%2\"" msgctxt "TorrcDialog" msgid "Error" @@ -3797,7 +3797,7 @@ msgstr "无法打开日志文件 '%1': %2" msgctxt "Vidalia" msgid "Value required for parameter :" -msgstr "" +msgstr "参数所需的设定值:" msgctxt "Vidalia" msgid "Invalid language code specified:"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 04 Aug '12

04 Aug '12

commit e2f4c40f7b266741236d3e5e4a26b3150df09a1a Author: Translation commit bot <translation(a)torproject.org> Date: Sat Aug 4 01:45:08 2012 +0000 Update translations for vidalia --- zh_CN/vidalia_zh_CN.po | 26 +++++++++++++------------- 1 files changed, 13 insertions(+), 13 deletions(-) diff --git a/zh_CN/vidalia_zh_CN.po b/zh_CN/vidalia_zh_CN.po index d4e719d..aa46e92 100644 --- a/zh_CN/vidalia_zh_CN.po +++ b/zh_CN/vidalia_zh_CN.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2012-08-04 01:12+0000\n" +"PO-Revision-Date: 2012-08-04 01:44+0000\n" "Last-Translator: xtoaster <zhazhenzhong(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -3368,14 +3368,14 @@ msgid "" "Tor detected that your DNS provider is providing false responses for domains" " that do not exist. Some ISPs and other DNS providers, such as OpenDNS, are " "known to do this in order to display their own search or advertising pages." -msgstr "" +msgstr "Tor 发现您的 DNS 服务提供商会对无效域名返回假结果。一些网络服务商及DNS提供商，例如 OpenDNS ，被发现会通过这种方式显示自己的搜索或广告页面。" msgctxt "StatusEventWidget" msgid "" "Tor detected that your DNS provider is providing false responses for well " "known domains. Since clients rely on Tor network relays to provide accurate " "DNS repsonses, your relay will not be configured as an exit relay." -msgstr "" +msgstr "Tor 发现您的 DNS 服务提供商对一些知名的站点域名返回假结果。因为客户端依赖于Tor网络节点提供准确的DNS结果，您的节点将无法配置为出口节点。" msgctxt "StatusEventWidget" msgid "Checking Server Port Reachability" @@ -3406,30 +3406,30 @@ msgid "" "happen if you are behind a router or firewall that requires you to set up " "port forwarding. If %1:%2 is not your correct IP address and server port, " "please check your relay's configuration." -msgstr "" +msgstr "其他Tor客户端无法连接到您节点的服务端口（ServerPort）。如果您处于路由器或防火墙后面，可能发生这种情况，您需要设置端口转发。如果 %1:%2 不是您的IP地址和端口，请加查您的节点配置。" msgctxt "StatusEventWidget" msgid "Checking Directory Port Reachability" -msgstr "" +msgstr "检查目录端口（DirectoryPort）连通性。" msgctxt "StatusEventWidget" msgid "" "Tor is trying to determine if your relay's directory port is reachable from " "the Tor network by connecting to itself at %1:%2. This test could take " "several minutes." -msgstr "" +msgstr "Tor 正通过连接 %1:%2 确定您的目录端口（DirectoryPort）是否可以通过 Tor 网络访问。测试过程可能花费几分钟时间。" msgctxt "StatusEventWidget" msgid "Directory Port Reachability Test Successful!" -msgstr "" +msgstr "目录端口（DirectoryPort）连通性测试成功!" msgctxt "StatusEventWidget" msgid "Your relay's directory port is reachable from the Tor network!" -msgstr "" +msgstr "您节点的目录端口（DirectoryPort）可以通过Tor网络连接。" msgctxt "StatusEventWidget" msgid "Directory Port Reachability Test Failed" -msgstr "" +msgstr "目录端口（DirectoryPort）连通性测试失败!" msgctxt "StatusEventWidget" msgid "" @@ -3437,17 +3437,17 @@ msgid "" "happen if you are behind a router or firewall that requires you to set up " "port forwarding. If %1:%2 is not your correct IP address and directory port," " please check your relay's configuration." -msgstr "" +msgstr "其他Tor客户端无法连接您节点的目录端口（DirectoryPort）。如果您处于路由器或防火墙后面，可能发生这种情况，您需要设置端口转发。如果 %1:%2 不是您的IP地址和端口，请加查您的节点配置。" msgctxt "StatusEventWidget" msgid "Relay Descriptor Rejected" -msgstr "" +msgstr "节点描述符被拒绝" msgctxt "StatusEventWidget" msgid "" "Your relay's descriptor, which enables clients to connect to your relay, was" " rejected by the directory server at %1:%2. The reason given was: %3" -msgstr "" +msgstr "您的节点描述符，它令客户端可以连接您的中继节点，被目录服务器 %1:%2 拒绝。原因是: %3" msgctxt "StatusEventWidget" msgid "Your Relay is Online" @@ -3459,7 +3459,7 @@ msgid "" "see an increase in network traffic shown by the Bandwidth Graph within a few" " hours as more clients learn about your relay. Thank you for contributing to" " the Tor network!" -msgstr "" +msgstr "您的中继节点目前在线可以为Tor客户端服务了。几个小时后随着更多的客户端得知您的节点，在带宽图中您应可以看到网络流量的增长。" msgctxt "Stream" msgid "New"

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 04 Aug '12

04 Aug '12

commit f7b165384cbba1901e342ceb1a7937f473ecd663 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Aug 4 01:15:31 2012 +0000 Update translations for https_everywhere --- es/https-everywhere.properties | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/es/https-everywhere.properties b/es/https-everywhere.properties index fe1d21c..543c2aa 100644 --- a/es/https-everywhere.properties +++ b/es/https-everywhere.properties @@ -1,5 +1,5 @@ https-everywhere.menu.globalEnable = Habilitar HTTPS Everywhere https-everywhere.menu.globalDisable = Deshabilitar HTTPS Everywhere -# https-everywhere.menu.enableDisable = Enable / Disable Rules -# https-everywhere.menu.noRules = (No Rules for This Page) +https-everywhere.menu.enableDisable = Activar / Desactivar reglas +https-everywhere.menu.noRules = (Sin reglas para esta página) # https-everywhere.menu.unknownRules = (Rules for This Page Unknown)

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 04 Aug '12

04 Aug '12

commit aa315245c03a4dda71f3de1418b8d370afed1199 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Aug 4 01:15:09 2012 +0000 Update translations for vidalia --- zh_CN/vidalia_zh_CN.po | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/zh_CN/vidalia_zh_CN.po b/zh_CN/vidalia_zh_CN.po index c85bc3a..d4e719d 100644 --- a/zh_CN/vidalia_zh_CN.po +++ b/zh_CN/vidalia_zh_CN.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2012-08-04 00:42+0000\n" +"PO-Revision-Date: 2012-08-04 01:12+0000\n" "Last-Translator: xtoaster <zhazhenzhong(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" @@ -3285,7 +3285,7 @@ msgid "" "the past compared to the source \"%2\". If your clock is not correct, Tor " "will not be able to function. Please verify your computer displays the " "correct time." -msgstr "Tor 发现您的系统时钟较源 \"%2\" 时滞 %1 秒。如果您的时钟误差太大，Tor无法正常中作，请确认您的电脑时间正确。" +msgstr "Tor 发现您的系统时钟较源 \"%2\" 慢 %1 秒。如果您的时钟误差太大，Tor无法正常中作，请确认电脑时间准确。" msgctxt "StatusEventWidget" msgid "" @@ -3293,7 +3293,7 @@ msgid "" "the future compared to the source \"%2\". If your clock is not correct, Tor " "will not be able to function. Please verify your computer displays the " "correct time." -msgstr "" +msgstr "Tor 发现您的系统时钟较源 \"%2\" 快 %1 秒。如果您的时钟误差太大，Tor无法正常中作，请确认电脑时间准确。" msgctxt "StatusEventWidget" msgid "Your Computer's Clock is Potentially Incorrect" @@ -3305,14 +3305,14 @@ msgid "" "unencrypted connection through Tor to port %1. Sending unencrypted " "information over the Tor network is dangerous and not recommended. For your " "protection, Tor has automatically closed this connection." -msgstr "" +msgstr "您的某一程序尝试通过Tor的 %1 端口建立非加密连接。通过Tor网络发送未加密数据是危险的，不推荐这样做。为了保护您，Tor自动关闭了此连接。" msgctxt "StatusEventWidget" msgid "" "One of the applications on your computer may have attempted to make an " "unencrypted connection through Tor to port %1. Sending unencrypted " "information over the Tor network is dangerous and not recommended." -msgstr "" +msgstr "您的某一程序尝试通过Tor的 %1 端口建立非加密连接。通过Tor网络发送未加密数据是危险的，不推荐这样做。" msgctxt "StatusEventWidget" msgid "Potentially Dangerous Connection!" @@ -3324,7 +3324,7 @@ msgid "" "using a protocol that may leak information about your destination. Please " "ensure you configure your applications to use only SOCKS4a or SOCKS5 with " "remote hostname resolution." -msgstr "" +msgstr "您的某一程序通过 Tor 与 \"%1\" 建立了连接，其连接协议可能泄漏有关您所访问目标站点的信息。请确认您的程序配置为仅使用 Socks4a 或启用主机名远程解析的 Socks5 协议。" msgctxt "StatusEventWidget" msgid "Unknown SOCKS Protocol" @@ -3335,7 +3335,7 @@ msgid "" "One of your applications tried to establish a connection through Tor using a" " protocol that Tor does not understand. Please ensure you configure your " "applications to use only SOCKS4a or SOCKS5 with remote hostname resolution." -msgstr "" +msgstr "您的某一程序尝试以 Tor 无法理解的协议通过 Tor 建立连接，请确认您的程序配置为仅使用 Socks4a 或启用主机名远程解析的 Socks5 协议。" msgctxt "StatusEventWidget" msgid "Invalid Destination Hostname" @@ -3346,7 +3346,7 @@ msgid "" "One of your applications tried to establish a connection through Tor to " "\"%1\", which Tor does not recognize as a valid hostname. Please check your " "application's configuration." -msgstr "" +msgstr "您的某一程序尝试通过 Tor 与无效主机名 \"%1\" 建立连接。请检查您的程序配置。" msgctxt "StatusEventWidget" msgid "External IP Address Changed"

1 0

[translation/vidalia] Update translations for vidalia
by translation＠torproject.org 04 Aug '12

04 Aug '12

commit e5eae779be961c01e26aa1fca7daac7a08c2a37b Author: Translation commit bot <translation(a)torproject.org> Date: Sat Aug 4 00:45:08 2012 +0000 Update translations for vidalia --- zh_CN/vidalia_zh_CN.po | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/zh_CN/vidalia_zh_CN.po b/zh_CN/vidalia_zh_CN.po index 64aede1..c85bc3a 100644 --- a/zh_CN/vidalia_zh_CN.po +++ b/zh_CN/vidalia_zh_CN.po @@ -5,13 +5,14 @@ # Kevin Chen <szescxz(a)126.com>, 2011. # runasand <runa.sandvik(a)gmail.com>, 2011. # <szescxz(a)126.com>, 2011. +# <zhazhenzhong(a)gmail.com>, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-03-21 17:52+0000\n" -"PO-Revision-Date: 2012-08-01 10:52+0000\n" -"Last-Translator: Christopher Meng <cickumqt(a)gmail.com>\n" +"PO-Revision-Date: 2012-08-04 00:42+0000\n" +"Last-Translator: xtoaster <zhazhenzhong(a)gmail.com>\n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -155,7 +156,7 @@ msgstr "路径：" msgctxt "AdvancedPage" msgid "Use Unix domain socket (ControlSocket)" -msgstr "" +msgstr "控制方式(ControlSocket)使用 Unix domain socket" msgctxt "AdvancedPage" msgid "Edit current torrc" @@ -167,19 +168,19 @@ msgstr "注意：这将会编辑当前已加载的torrc" msgctxt "AdvancedPage" msgid "ControlSocket path doesn't exist." -msgstr "" +msgstr "ControlSocket 的路径不存在" msgctxt "AdvancedPage" msgid "" "The specified Tor configuration file location contains characters that " "cannot be represented in your system's current 8-bit character encoding." -msgstr "" +msgstr "所指定的 Tor 配置文件位置包含系统当前8-bit字符编码所不支持的字符。" msgctxt "AdvancedPage" msgid "" "The specified Tor data directory location contains characters that cannot be" " represented in your system's current 8-bit character encoding." -msgstr "" +msgstr "所指定的 Tor 数据目录位置包含系统当前8-bit字符编码所不支持的字符。" msgctxt "AdvancedPage" msgid "Warning" @@ -195,7 +196,7 @@ msgstr "Tor配置文件 (torrc);;所有文件 (*)" msgctxt "AdvancedPage" msgid "Select a file to use for Tor socket path" -msgstr "" +msgstr "选择作为 Tor Socket 路径的文件" msgctxt "AdvancedPage" msgid "Configure ControlPort automatically" @@ -2085,7 +2086,7 @@ msgid "" "Anything sent over this connection could be monitored. Please check your " "application's configuration and use only encrypted protocols, such as SSL, " "if possible." -msgstr "" +msgstr "任何通过此连接发送的数据都可能被监听，如有必要，请检查您的程序配置，并仅使用加密协议，如 SSL 。" msgctxt "MainWindow" msgid "Bootstrapping torrc from %1 to %2" @@ -3284,7 +3285,7 @@ msgid "" "the past compared to the source \"%2\". If your clock is not correct, Tor " "will not be able to function. Please verify your computer displays the " "correct time." -msgstr "" +msgstr "Tor 发现您的系统时钟较源 \"%2\" 时滞 %1 秒。如果您的时钟误差太大，Tor无法正常中作，请确认您的电脑时间正确。" msgctxt "StatusEventWidget" msgid ""

1 0

[vidalia-plugins/master] Subclass QWidget to handle hidden service widgets
by chiiph＠torproject.org 04 Aug '12

04 Aug '12

commit 460acc2c3688e50de5babe0ef65130ab9a48181e Author: Feroze Naina <ferozenaina(a)gmail.com> Date: Sat Jul 21 15:51:40 2012 +0530 Subclass QWidget to handle hidden service widgets --- hiddenservice/customWidget.ui | 15 +++++- hiddenservice/hiddenservice.js | 110 +++++++++------------------------------- hiddenservice/hswidget.js | 107 ++++++++++++++++++++++++++++++++++++++ hiddenservice/info.xml | 1 + 4 files changed, 147 insertions(+), 86 deletions(-) diff --git a/hiddenservice/customWidget.ui b/hiddenservice/customWidget.ui index 2345872..c96e584 100644 --- a/hiddenservice/customWidget.ui +++ b/hiddenservice/customWidget.ui @@ -31,7 +31,7 @@ <property name="minimumSize"> <size> <width>410</width> - <height>150</height> + <height>170</height> </size> </property> <property name="title"> @@ -115,9 +115,15 @@ <height>0</height> </size> </property> + <property name="minimum"> + <number>1</number> + </property> <property name="maximum"> <number>65535</number> </property> + <property name="value"> + <number>80</number> + </property> </widget> </item> <item row="4" column="2"> @@ -152,6 +158,13 @@ </property> </widget> </item> + <item row="6" column="2"> + <widget class="QLabel" name="lineError"> + <property name="text"> + <string/> + </property> + </widget> + </item> </layout> </widget> </item> diff --git a/hiddenservice/hiddenservice.js b/hiddenservice/hiddenservice.js index 606a759..862856e 100644 --- a/hiddenservice/hiddenservice.js +++ b/hiddenservice/hiddenservice.js @@ -8,23 +8,26 @@ var hiddenservice = { removeServices: function() { torrc.clear(["HiddenServiceDir", "HiddenServicePort"]); - for(i = 0; i < this.customwidget.length; i++) { - if (this.chkBox[i].checkState() == Qt.Unchecked) { - torrc.setValue("HiddenServiceDir", this.hidservdir[i]); - torrc.setValue("HiddenServicePort", this.hidservport[i]); + for(var i = 0; i < this.customwidget.length; i++) { + if (this.customwidget[i].checked() == false) { + torrc.setValue("HiddenServiceDir", this.hidservdir[i]); + torrc.setValue("HiddenServicePort", this.hidservport[i]); + } + + else { + this.customwidget[i].hide(); + this.listLayout.removeWidget(this.customwidget[i]); } } torrc.apply(torControl); - this.updateList(); this.btnRemove.enabled = false; }, updateList: function() { - try{ - for(i = 0; i < this.customwidget.length; i++) { + for(var i = 0; i < this.customwidget.length; i++) { this.customwidget[i].hide(); this.listLayout.removeWidget(this.customwidget[i]); } @@ -35,51 +38,15 @@ var hiddenservice = { this.hidservport = torrc.value("HiddenServicePort"); this.customwidget = new Array(); - this.grpBox = new Array(); - this.lineDir = new Array(); - this.spinPort = new Array(); - this.lineAddress = new Array(); - this.lineName = new Array(); - this.chkBox = new Array(); - this.btnBrowse = new Array(); - - this.address = new QHostAddress(); this.listLayout = this.scrollArea.widget().layout(); while(this.listLayout.count() > 1) this.listLayout.takeAt(0); var loader = new QUiLoader(this.containerWidget); - for(i = 0; i< this.hidservdir.length; i++) { - this.customwidget[i] = loader.load(new QFile(pluginPath + "/hiddenservice/customWidget.ui")); - this.grpBox[i] = this.customwidget[i].children()[findWidget(this.customwidget[i], "groupBox")]; - this.lineDir[i] = this.grpBox[i].children()[findWidget(this.grpBox[i], "lineDir")]; - this.spinPort[i] = this.grpBox[i].children()[findWidget(this.grpBox[i], "spinPort")]; - this.lineAddress[i] = this.grpBox[i].children()[findWidget(this.grpBox[i], "lineAddress")]; - this.lineName[i] = this.grpBox[i].children()[findWidget(this.grpBox[i], "lineName")]; - this.chkBox[i] = this.grpBox[i].children()[findWidget(this.grpBox[i], "checkBox")]; - this.btnBrowse[i] = this.grpBox[i].children()[findWidget(this.grpBox[i], "btnBrowse")]; - - var file = new QFile(this.hidservdir[i] + "/hostname"); - if(file.open(QIODevice.ReadOnly)) - { - var textStream = new QTextStream(file); - this.lineName[i].setText(textStream.readLine()); - } - - this.lineDir[i].setText(this.hidservdir[i]); - this.spinPort[i].value = this.hidservport[i].split(" ")[0]; - if (this.hidservport[i].split(" ")[1]) - this.lineAddress[i].setText(this.hidservport[i].split(" ")[1]); - else - this.lineAddress[i].setText("127.0.0.1"); - - this.chkBox[i]['stateChanged(int)'].connect(this, this.enableRemove); - this.lineDir[i]['textEdited(QString)'].connect(this, this.enableApply); - this.spinPort[i]['valueChanged(int)'].connect(this, this.enableApply); - this.lineAddress[i]['textEdited(QString)'].connect(this, this.enableApply); - this.btnBrowse[i]['clicked()'].connect(this, this.browseDir); - + for(var i = 0; i< this.hidservdir.length; i++) { + this.customwidget[i] = new HSWidget(i, this); + this.customwidget[i].setParent(this); this.listLayout.insertWidget(0, this.customwidget[i], 0, 0); } @@ -87,53 +54,40 @@ var hiddenservice = { this.btnDiscard.enabled = false; }, - browseDir: function() { - QFileDialog.getExistingDirectory(this, "Browse Directory", "/home"); - }, applyServices: function() { torrc.clear(["HiddenServiceDir", "HiddenServicePort"]); - for(i = this.customwidget.length-1; i >= 0; i--) { - torrc.setValue("HiddenServiceDir", this.lineDir[i].text); - torrc.setValue("HiddenServicePort", this.spinPort[i].value + " " + this.lineAddress[i].text); + for(var i = this.customwidget.length-1; i >= 0; i--) { + this.customwidget[i].apply(); } torrc.apply(torControl); this.updateList(); - this.btnApply.enabled = false; - this.btnDiscard.enabled = false; }, - enableApply: function() { + toggleApply: function() { this.btnDiscard.enabled = true; - if(this.sanityCheck()) + if(this.sanityCheck()) this.btnApply.enabled = true; else this.btnApply.enabled = false; }, sanityCheck: function() { - for(i = 0; i < this.customwidget.length; i++) { - var ip = this.lineAddress[i].text.split(":"); - var port = this.spinPort[i].value; - - if(! this.address.setAddress(ip[0])) - return false; - if(port < 1 || port >65535) - return false; - if(ip[1] < 1 || ip[1] > 65535) + for(var i = 0; i < this.customwidget.length; i++) { + if (! this.customwidget[i].sanityHS()) return false; } - return true; + return true; }, enableRemove: function() { this.btnRemove.enabled = false; - for (i = 0; i < this.hidservdir.length; i++) { - if(this.chkBox[i].checkState() == Qt.Checked) { + for (var i = 0; i < this.customwidget.length; i++) { + if (this.customwidget[i].checked()) { this.btnRemove.enabled = true; break; } @@ -141,24 +95,10 @@ var hiddenservice = { }, addService: function() { + var pos = this.customwidget.length; + this.customwidget.push(new HSWidget(pos, this)); - var loader = new QUiLoader(this.containerWidget); - this.customwidget.push(loader.load(new QFile(pluginPath + "/hiddenservice/customWidget.ui"))); - var pos = this.customwidget.length-1; - - this.grpBox[pos] = this.customwidget[pos].children()[findWidget(this.customwidget[pos], "groupBox")]; - this.lineDir[pos] = this.grpBox[pos].children()[findWidget(this.grpBox[pos], "lineDir")]; - this.spinPort[pos] = this.grpBox[pos].children()[findWidget(this.grpBox[pos], "spinPort")]; - this.lineAddress[pos] = this.grpBox[i].children()[findWidget(this.grpBox[pos], "lineAddress")]; - this.lineName[pos] = this.grpBox[pos].children()[findWidget(this.grpBox[pos], "lineName")]; - this.chkBox[pos] = this.grpBox[pos].children()[findWidget(this.grpBox[pos], "checkBox")]; - - this.chkBox[pos]['stateChanged(int)'].connect(this, this.enableRemove); - this.lineDir[pos]['textEdited(QString)'].connect(this, this.enableApply); - this.spinPort[pos]['valueChanged(int)'].connect(this, this.enableApply); - this.lineAddress[pos]['textEdited(QString)'].connect(this, this.enableApply); - - this.listLayout.insertWidget(0, this.customwidget[this.customwidget.length-1], 0, 0); + this.listLayout.insertWidget(0, this.customwidget[pos], 0, 0); }, diff --git a/hiddenservice/hswidget.js b/hiddenservice/hswidget.js new file mode 100644 index 0000000..77f058d --- /dev/null +++ b/hiddenservice/hswidget.js @@ -0,0 +1,107 @@ +importExtension("qt"); +importExtension("qt.core"); +importExtension("qt.gui"); + +function HSWidget(index, parent) { + QWidget.call(this, parent); + + this.pluginParent = parent; + + var widgetui = new QFile(pluginPath + "/hiddenservice/customWidget.ui"); + var loader = new QUiLoader(); + widgetui.open(QIODevice.ReadOnly); + + this.address = new QHostAddress(); + + this.customwidget = loader.load(widgetui); + + this.grpBox = this.customwidget.children()[findWidget(this.customwidget, "groupBox")]; + this.lineDir = this.grpBox.children()[findWidget(this.grpBox, "lineDir")]; + this.spinPort = this.grpBox.children()[findWidget(this.grpBox, "spinPort")]; + this.lineAddress = this.grpBox.children()[findWidget(this.grpBox, "lineAddress")]; + this.lineName = this.grpBox.children()[findWidget(this.grpBox, "lineName")]; + this.chkBox = this.grpBox.children()[findWidget(this.grpBox, "checkBox")]; + this.btnBrowse = this.grpBox.children()[findWidget(this.grpBox, "btnBrowse")]; + this.lineError = this.grpBox.children()[findWidget(this.grpBox, "lineError")]; + + try { + this.hidservdir = torrc.value("HiddenServiceDir")[index]; + this.hidservport = torrc.value("HiddenServicePort")[index]; + var file = new QFile(this.hidservdir + "/hostname"); + if(file.open(QIODevice.ReadOnly)) + { + var textStream = new QTextStream(file); + this.lineName.setText(textStream.readLine()); + } + + this.lineDir.setText(this.hidservdir); + this.spinPort.value = this.hidservport.split(" ")[0]; + + if (this.hidservport.split(" ")[1]) + this.lineAddress.setText(this.hidservport.split(" ")[1]); + else + this.lineAddress.setText("127.0.0.1"); + } + catch(err) {} + + this.lineError.hide(); + + this.chkBox['stateChanged(int)'].connect(this, this.enableRemove); + this.lineDir['textChanged(QString)'].connect(this, this.toggleApply); + this.spinPort['valueChanged(int)'].connect(this, this.toggleApply); + this.lineAddress['textEdited(QString)'].connect(this, this.toggleApply); + this.btnBrowse['clicked()'].connect(this, this.browseDir); + + var layout = new QVBoxLayout(this); + layout.addWidget(this.customwidget, 0, 0); +} + +HSWidget.prototype = new QWidget(); + +HSWidget.prototype.browseDir = function() { + dir = QFileDialog.getExistingDirectory(this, "Browse Directory", "/home"); + if (dir) + this.lineDir.setText(dir); +} + +HSWidget.prototype.apply = function() { + torrc.setValue("HiddenServiceDir", this.lineDir.text); + torrc.setValue("HiddenServicePort", this.spinPort.value + " " + this.lineAddress.text); +} + +HSWidget.prototype.toggleApply = function() { + this.pluginParent.toggleApply(); +} + +HSWidget.prototype.sanityHS = function() { + var ip = this.lineAddress.text.split(":"); + var port = this.spinPort.value; + + if(! this.address.setAddress(ip[0])) { + this.lineError.text = "Invalid IP address"; + this.lineError.show(); + return false; + } + + if (ip[1]) { + if(/\D/.test(ip[1]) || ip[1] < 1 || ip[1] > 65535) { + this.lineError.text = "Invalid port address"; + this.lineError.show(); + return false; + } + } + + this.lineError.hide(); + return true; +} + +HSWidget.prototype.enableRemove = function() { + this.pluginParent.enableRemove(); +} + +HSWidget.prototype.checked = function() { + if (this.chkBox.checkState() == Qt.Checked) + return true; + else + return false; +} diff --git a/hiddenservice/info.xml b/hiddenservice/info.xml index 0460e12..06660c3 100644 --- a/hiddenservice/info.xml +++ b/hiddenservice/info.xml @@ -5,6 +5,7 @@ <type persistent="false" gui="true" /> <files> <file>hiddenservice.js</file> + <file>hswidget.js</file> </files> <namespace>hiddenservice</namespace> </VidaliaPlugin>

1 0

[vidalia-plugins/master] Set event Bandwidth so the graph works
by chiiph＠torproject.org 04 Aug '12

04 Aug '12

commit 54be496f6080d999c666abe865706673c6365784 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Sun Jul 22 14:13:22 2012 -0300 Set event Bandwidth so the graph works --- bwgraph/bwgraph.js | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/bwgraph/bwgraph.js b/bwgraph/bwgraph.js index a733b58..c9d7068 100644 --- a/bwgraph/bwgraph.js +++ b/bwgraph/bwgraph.js @@ -15,16 +15,17 @@ var bwgraph = { start: function() { vdebug("Bwhistory@start"); - torControl["bandwidthUpdate(quint64, quint64)"].connect(this, this.saveBandwidth); this.createGUI(); this.loadSettings(); this.recv = parseInt(this.tab.getSetting(this.Sent, 0)); this.sent = parseInt(this.tab.getSetting(this.Recv, 0)); this.from = this.tab.getSetting(this.From, ""); + torControl.setEvent(TorEvents.Bandwidth); if(this.from.length == 0) this.from = QDateTime.currentDateTime().toString(); + torControl["bandwidthUpdate(quint64, quint64)"].connect(this, this.saveBandwidth); }, saveBandwidth: function(recv, sent) {

1 0

[vidalia-plugins/master] Add hidden service configuration plugin
by chiiph＠torproject.org 04 Aug '12

04 Aug '12

commit 63bb27bcfc0036ab693225018da1e70d88dadbcf Author: Feroze Naina <ferozenaina(a)gmail.com> Date: Sat Jun 30 16:19:49 2012 +0530 Add hidden service configuration plugin --- hiddenservice/containerWidget.ui | 171 +++++++++++++++++++++++++++++ hiddenservice/customWidget.ui | 162 ++++++++++++++++++++++++++++ hiddenservice/hiddenservice.js | 219 ++++++++++++++++++++++++++++++++++++++ hiddenservice/info.xml | 10 ++ 4 files changed, 562 insertions(+), 0 deletions(-) diff --git a/hiddenservice/containerWidget.ui b/hiddenservice/containerWidget.ui new file mode 100644 index 0000000..426dd89 --- /dev/null +++ b/hiddenservice/containerWidget.ui @@ -0,0 +1,171 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>Form</class> + <widget class="QWidget" name="Form"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>668</width> + <height>628</height> + </rect> + </property> + <property name="windowTitle"> + <string>Form</string> + </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="2" column="0"> + <spacer name="horizontalSpacer_2"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="1" column="0" colspan="5"> + <widget class="QScrollArea" name="scrollArea"> + <property name="minimumSize"> + <size> + <width>600</width> + <height>400</height> + </size> + </property> + <property name="widgetResizable"> + <bool>true</bool> + </property> + <widget class="QWidget" name="scrollAreaWidgetContents"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>642</width> + <height>522</height> + </rect> + </property> + <layout class="QVBoxLayout" name="verticalLayout_2"> + <item> + <spacer name="verticalSpacer"> + <property name="orientation"> + <enum>Qt::Vertical</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>20</width> + <height>495</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + </widget> + </item> + <item row="2" column="1"> + <widget class="QPushButton" name="btnApply"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="text"> + <string>Apply</string> + </property> + </widget> + </item> + <item row="0" column="4"> + <widget class="QPushButton" name="btnRemove"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="maximumSize"> + <size> + <width>32</width> + <height>32</height> + </size> + </property> + <property name="text"> + <string/> + </property> + <property name="icon"> + <iconset resource="../../vidalia/src/vidalia/res/vidalia.qrc"> + <normaloff>:/images/22x22/list-remove.png</normaloff>:/images/22x22/list-remove.png</iconset> + </property> + <property name="iconSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> + <property name="flat"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="2" column="2" colspan="3"> + <widget class="QPushButton" name="btnDiscard"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="text"> + <string>Discard Changes</string> + </property> + <property name="default"> + <bool>false</bool> + </property> + </widget> + </item> + <item row="0" column="3"> + <widget class="QPushButton" name="btnAdd"> + <property name="minimumSize"> + <size> + <width>0</width> + <height>0</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>32</width> + <height>32</height> + </size> + </property> + <property name="text"> + <string/> + </property> + <property name="icon"> + <iconset resource="../../vidalia/src/vidalia/res/vidalia.qrc"> + <normaloff>:/images/22x22/list-add.png</normaloff>:/images/22x22/list-add.png</iconset> + </property> + <property name="iconSize"> + <size> + <width>22</width> + <height>22</height> + </size> + </property> + <property name="flat"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="0" column="0" colspan="3"> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>40</width> + <height>0</height> + </size> + </property> + </spacer> + </item> + </layout> + </widget> + <resources> + <include location="../../vidalia/src/vidalia/res/vidalia.qrc"/> + </resources> + <connections/> +</ui> diff --git a/hiddenservice/customWidget.ui b/hiddenservice/customWidget.ui new file mode 100644 index 0000000..2345872 --- /dev/null +++ b/hiddenservice/customWidget.ui @@ -0,0 +1,162 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>Form</class> + <widget class="QWidget" name="Form"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>488</width> + <height>173</height> + </rect> + </property> + <property name="minimumSize"> + <size> + <width>400</width> + <height>0</height> + </size> + </property> + <property name="windowTitle"> + <string>Form</string> + </property> + <layout class="QVBoxLayout" name="verticalLayout"> + <item> + <widget class="QGroupBox" name="groupBox"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Minimum"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>410</width> + <height>150</height> + </size> + </property> + <property name="title"> + <string/> + </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="4" column="1"> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>Port</string> + </property> + </widget> + </item> + <item row="2" column="2"> + <widget class="QLineEdit" name="lineDir"> + <property name="minimumSize"> + <size> + <width>100</width> + <height>0</height> + </size> + </property> + <property name="placeholderText"> + <string/> + </property> + </widget> + </item> + <item row="1" column="1"> + <widget class="QLabel" name="label_3"> + <property name="text"> + <string>Name</string> + </property> + </widget> + </item> + <item row="1" column="2" colspan="2"> + <widget class="QLineEdit" name="lineName"> + <property name="inputMask"> + <string/> + </property> + <property name="readOnly"> + <bool>true</bool> + </property> + </widget> + </item> + <item row="2" column="1"> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Directory</string> + </property> + </widget> + </item> + <item row="2" column="3" alignment="Qt::AlignRight"> + <widget class="QPushButton" name="btnBrowse"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Maximum" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>25</width> + <height>0</height> + </size> + </property> + <property name="text"> + <string>Browse</string> + </property> + </widget> + </item> + <item row="4" column="3"> + <widget class="QSpinBox" name="spinPort"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Ignored" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>50</width> + <height>0</height> + </size> + </property> + <property name="maximum"> + <number>65535</number> + </property> + </widget> + </item> + <item row="4" column="2"> + <widget class="QLineEdit" name="lineAddress"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="text"> + <string>127.0.0.1</string> + </property> + </widget> + </item> + <item row="5" column="1" colspan="2"> + <widget class="QCheckBox" name="checkBox"> + <property name="sizePolicy"> + <sizepolicy hsizetype="Maximum" vsizetype="Fixed"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="minimumSize"> + <size> + <width>25</width> + <height>0</height> + </size> + </property> + <property name="text"> + <string>Mark for removal</string> + </property> + </widget> + </item> + </layout> + </widget> + </item> + </layout> + </widget> + <resources/> + <connections/> +</ui> diff --git a/hiddenservice/hiddenservice.js b/hiddenservice/hiddenservice.js new file mode 100644 index 0000000..606a759 --- /dev/null +++ b/hiddenservice/hiddenservice.js @@ -0,0 +1,219 @@ +importExtension("qt"); +importExtension("qt.core"); +importExtension("qt.gui"); +importExtension("qt.uitools"); +importExtension("qt.network"); + +var hiddenservice = { + removeServices: function() { + torrc.clear(["HiddenServiceDir", "HiddenServicePort"]); + + for(i = 0; i < this.customwidget.length; i++) { + if (this.chkBox[i].checkState() == Qt.Unchecked) { + torrc.setValue("HiddenServiceDir", this.hidservdir[i]); + torrc.setValue("HiddenServicePort", this.hidservport[i]); + } + } + + torrc.apply(torControl); + + this.updateList(); + this.btnRemove.enabled = false; + }, + + updateList: function() { + + try{ + for(i = 0; i < this.customwidget.length; i++) { + this.customwidget[i].hide(); + this.listLayout.removeWidget(this.customwidget[i]); + } + } + catch(err){} + + this.hidservdir = torrc.value("HiddenServiceDir"); + this.hidservport = torrc.value("HiddenServicePort"); + + this.customwidget = new Array(); + this.grpBox = new Array(); + this.lineDir = new Array(); + this.spinPort = new Array(); + this.lineAddress = new Array(); + this.lineName = new Array(); + this.chkBox = new Array(); + this.btnBrowse = new Array(); + + this.address = new QHostAddress(); + + this.listLayout = this.scrollArea.widget().layout(); + while(this.listLayout.count() > 1) this.listLayout.takeAt(0); + + var loader = new QUiLoader(this.containerWidget); + + for(i = 0; i< this.hidservdir.length; i++) { + this.customwidget[i] = loader.load(new QFile(pluginPath + "/hiddenservice/customWidget.ui")); + this.grpBox[i] = this.customwidget[i].children()[findWidget(this.customwidget[i], "groupBox")]; + this.lineDir[i] = this.grpBox[i].children()[findWidget(this.grpBox[i], "lineDir")]; + this.spinPort[i] = this.grpBox[i].children()[findWidget(this.grpBox[i], "spinPort")]; + this.lineAddress[i] = this.grpBox[i].children()[findWidget(this.grpBox[i], "lineAddress")]; + this.lineName[i] = this.grpBox[i].children()[findWidget(this.grpBox[i], "lineName")]; + this.chkBox[i] = this.grpBox[i].children()[findWidget(this.grpBox[i], "checkBox")]; + this.btnBrowse[i] = this.grpBox[i].children()[findWidget(this.grpBox[i], "btnBrowse")]; + + var file = new QFile(this.hidservdir[i] + "/hostname"); + if(file.open(QIODevice.ReadOnly)) + { + var textStream = new QTextStream(file); + this.lineName[i].setText(textStream.readLine()); + } + + this.lineDir[i].setText(this.hidservdir[i]); + this.spinPort[i].value = this.hidservport[i].split(" ")[0]; + if (this.hidservport[i].split(" ")[1]) + this.lineAddress[i].setText(this.hidservport[i].split(" ")[1]); + else + this.lineAddress[i].setText("127.0.0.1"); + + this.chkBox[i]['stateChanged(int)'].connect(this, this.enableRemove); + this.lineDir[i]['textEdited(QString)'].connect(this, this.enableApply); + this.spinPort[i]['valueChanged(int)'].connect(this, this.enableApply); + this.lineAddress[i]['textEdited(QString)'].connect(this, this.enableApply); + this.btnBrowse[i]['clicked()'].connect(this, this.browseDir); + + this.listLayout.insertWidget(0, this.customwidget[i], 0, 0); + } + + this.btnApply.enabled = false; + this.btnDiscard.enabled = false; + }, + + browseDir: function() { + QFileDialog.getExistingDirectory(this, "Browse Directory", "/home"); + }, + + applyServices: function() { + torrc.clear(["HiddenServiceDir", "HiddenServicePort"]); + + for(i = this.customwidget.length-1; i >= 0; i--) { + torrc.setValue("HiddenServiceDir", this.lineDir[i].text); + torrc.setValue("HiddenServicePort", this.spinPort[i].value + " " + this.lineAddress[i].text); + } + + torrc.apply(torControl); + + this.updateList(); + this.btnApply.enabled = false; + this.btnDiscard.enabled = false; + }, + + enableApply: function() { + this.btnDiscard.enabled = true; + if(this.sanityCheck()) + this.btnApply.enabled = true; + else + this.btnApply.enabled = false; + }, + + sanityCheck: function() { + for(i = 0; i < this.customwidget.length; i++) { + var ip = this.lineAddress[i].text.split(":"); + var port = this.spinPort[i].value; + + if(! this.address.setAddress(ip[0])) + return false; + if(port < 1 || port >65535) + return false; + if(ip[1] < 1 || ip[1] > 65535) + return false; + } + + return true; + }, + + enableRemove: function() { + this.btnRemove.enabled = false; + for (i = 0; i < this.hidservdir.length; i++) { + if(this.chkBox[i].checkState() == Qt.Checked) { + this.btnRemove.enabled = true; + break; + } + } + }, + + addService: function() { + + var loader = new QUiLoader(this.containerWidget); + this.customwidget.push(loader.load(new QFile(pluginPath + "/hiddenservice/customWidget.ui"))); + var pos = this.customwidget.length-1; + + this.grpBox[pos] = this.customwidget[pos].children()[findWidget(this.customwidget[pos], "groupBox")]; + this.lineDir[pos] = this.grpBox[pos].children()[findWidget(this.grpBox[pos], "lineDir")]; + this.spinPort[pos] = this.grpBox[pos].children()[findWidget(this.grpBox[pos], "spinPort")]; + this.lineAddress[pos] = this.grpBox[i].children()[findWidget(this.grpBox[pos], "lineAddress")]; + this.lineName[pos] = this.grpBox[pos].children()[findWidget(this.grpBox[pos], "lineName")]; + this.chkBox[pos] = this.grpBox[pos].children()[findWidget(this.grpBox[pos], "checkBox")]; + + this.chkBox[pos]['stateChanged(int)'].connect(this, this.enableRemove); + this.lineDir[pos]['textEdited(QString)'].connect(this, this.enableApply); + this.spinPort[pos]['valueChanged(int)'].connect(this, this.enableApply); + this.lineAddress[pos]['textEdited(QString)'].connect(this, this.enableApply); + + this.listLayout.insertWidget(0, this.customwidget[this.customwidget.length-1], 0, 0); + }, + + + start: function() { + vdebug("HiddenService@start"); + }, + + buildGUI: function() { + vdebug("HiddenService@buildGUI"); + + this.tab = new VidaliaTab("Configure hidden services", "HiddenService"); + + var containerui = new QFile(pluginPath + "/hiddenservice/containerWidget.ui"); + var loader = new QUiLoader(this.tab); + containerui.open(QIODevice.ReadOnly); + + this.containerwidget = loader.load(containerui); + + var layout = new QVBoxLayout(); + layout.addWidget(this.containerwidget, 0, Qt.AlignCenter); + this.tab.setLayout(layout); + + this.scrollArea = this.containerwidget.children()[findWidget(this.containerwidget, "scrollArea")]; + if(this.scrollArea == null) + return this.tab; + + this.btnAdd = this.containerwidget.children()[findWidget(this.containerwidget, "btnAdd")]; + if(this.btnAdd == null) + return this.tab; + + this.btnRemove = this.containerwidget.children()[findWidget(this.containerwidget, "btnRemove")]; + if(this.btnRemove == null) + return this.tab; + + this.btnApply = this.containerwidget.children()[findWidget(this.containerwidget, "btnApply")]; + if(this.btnApply == null) + return this.tab; + + this.btnDiscard = this.containerwidget.children()[findWidget(this.containerwidget, "btnDiscard")]; + if(this.btnDiscard == null) + return this.tab; + + this.updateList(); + + this.btnRemove['clicked()'].connect(this, this.removeServices); + this.btnAdd['clicked()'].connect(this, this.addService); + this.btnApply['clicked()'].connect(this, this.applyServices); + this.btnDiscard['clicked()'].connect(this, this.updateList); + + containerui.close(); + + return this.tab; + }, + + stop: function() { + vdebug("Tutorial@stop"); + }, +}; diff --git a/hiddenservice/info.xml b/hiddenservice/info.xml new file mode 100644 index 0000000..0460e12 --- /dev/null +++ b/hiddenservice/info.xml @@ -0,0 +1,10 @@ +<VidaliaPlugin> + <name>Hidden Service</name> + <date>7/05/2012</date> + <author>feroze</author> + <type persistent="false" gui="true" /> + <files> + <file>hiddenservice.js</file> + </files> + <namespace>hiddenservice</namespace> +</VidaliaPlugin>

1 0

[vidalia-plugins/master] Add icon to hidden service plugin
by chiiph＠torproject.org 04 Aug '12

04 Aug '12

commit 95ac54a6cc74f769709c7e62bab73cfee9280e3d Author: Feroze Naina <ferozenaina(a)gmail.com> Date: Thu Jul 26 00:46:47 2012 +0530 Add icon to hidden service plugin --- hiddenservice/info.xml | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/hiddenservice/info.xml b/hiddenservice/info.xml index 06660c3..d3a71fc 100644 --- a/hiddenservice/info.xml +++ b/hiddenservice/info.xml @@ -8,4 +8,5 @@ <file>hswidget.js</file> </files> <namespace>hiddenservice</namespace> + <icon>:/images/16x16/preferences-system.png</icon> </VidaliaPlugin>

1 0

[vidalia-plugins/master] Merge remote-tracking branch 'feroze/hiddenservice'
by chiiph＠torproject.org 04 Aug '12

04 Aug '12

commit 72657005d5b0d88561bbd76f3088bfdc06f495be Merge: 54be496 95ac54a Author: Tomás Touceda <chiiph(a)torproject.org> Date: Fri Aug 3 21:35:43 2012 -0300 Merge remote-tracking branch 'feroze/hiddenservice' hiddenservice/containerWidget.ui | 171 +++++++++++++++++++++++++++++++++++++ hiddenservice/customWidget.ui | 175 ++++++++++++++++++++++++++++++++++++++ hiddenservice/hiddenservice.js | 159 ++++++++++++++++++++++++++++++++++ hiddenservice/hswidget.js | 107 +++++++++++++++++++++++ hiddenservice/info.xml | 12 +++ 5 files changed, 624 insertions(+), 0 deletions(-)

1 0

← Newer
1
...
72
73
74
75
76
77
78
...
91
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits August 2012