- tor-commits - lists.torproject.org

[arm/release] The mass gtk cleanup.
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit d79a8eb1aeb1d08ed0f23b2df0ad6f89b8997634 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Thu Jul 14 15:12:30 2011 +0500 The mass gtk cleanup. Add toolbar, move "sticky" panel to the notebook (the application looks much more consistent this way), add about dialog and fix various width/height issues. --- src/gui/arm.xml | 327 ++++++++++++++------------------------- src/gui/controller.py | 17 ++- src/gui/generalPanel.py | 123 +++++++++++++++ src/gui/graphing/graphStats.py | 2 + src/gui/stickyPanel.py | 123 --------------- 5 files changed, 257 insertions(+), 335 deletions(-) diff --git a/src/gui/arm.xml b/src/gui/arm.xml index f71d0b7..edcc42a 100644 --- a/src/gui/arm.xml +++ b/src/gui/arm.xml @@ -2,7 +2,7 @@ <interface> <requires lib="gtk+" version="2.16"/>  - <object class="GtkListStore" id="liststore_sticky"> + <object class="GtkListStore" id="liststore_general"> <columns>  <column type="gchararray"/> @@ -100,46 +100,10 @@ <object class="GtkMenu" id="menu_file"> <property name="visible">True</property> <child> - <object class="GtkImageMenuItem" id="imagemenuitem_new"> - <property name="label">gtk-new</property> - <property name="visible">True</property> - <property name="use_underline">True</property> - <property name="use_stock">True</property> - </object> - </child> - <child> - <object class="GtkImageMenuItem" id="imagemenuitem_open"> - <property name="label">gtk-open</property> - <property name="visible">True</property> - <property name="use_underline">True</property> - <property name="use_stock">True</property> - </object> - </child> - <child> - <object class="GtkImageMenuItem" id="imagemenuitem_save"> - <property name="label">gtk-save</property> - <property name="visible">True</property> - <property name="use_underline">True</property> - <property name="use_stock">True</property> - </object> - </child> - <child> - <object class="GtkImageMenuItem" id="imagemenuitem_saveas"> - <property name="label">gtk-save-as</property> - <property name="visible">True</property> - <property name="use_underline">True</property> - <property name="use_stock">True</property> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem" id="separatormenuitem_file"> - <property name="visible">True</property> - </object> - </child> - <child> - <object class="GtkImageMenuItem" id="imagemenuitem_exit"> + <object class="GtkImageMenuItem" id="imagemenuitem_quit"> <property name="label">gtk-quit</property> <property name="visible">True</property> + <property name="related_action">action_quit</property> <property name="use_underline">True</property> <property name="use_stock">True</property> </object> @@ -149,57 +113,6 @@ </object> </child> <child> - <object class="GtkMenuItem" id="menuitem_edit"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Edit</property> - <property name="use_underline">True</property> - <child type="submenu"> - <object class="GtkMenu" id="menu_edit"> - <property name="visible">True</property> - <child> - <object class="GtkImageMenuItem" id="imagemenuitem_cut"> - <property name="label">gtk-cut</property> - <property name="visible">True</property> - <property name="use_underline">True</property> - <property name="use_stock">True</property> - </object> - </child> - <child> - <object class="GtkImageMenuItem" id="imagemenuitem_copy"> - <property name="label">gtk-copy</property> - <property name="visible">True</property> - <property name="use_underline">True</property> - <property name="use_stock">True</property> - </object> - </child> - <child> - <object class="GtkImageMenuItem" id="imagemenuitem_paste"> - <property name="label">gtk-paste</property> - <property name="visible">True</property> - <property name="use_underline">True</property> - <property name="use_stock">True</property> - </object> - </child> - <child> - <object class="GtkImageMenuItem" id="imagemenuitem_delete"> - <property name="label">gtk-delete</property> - <property name="visible">True</property> - <property name="use_underline">True</property> - <property name="use_stock">True</property> - </object> - </child> - </object> - </child> - </object> - </child> - <child> - <object class="GtkMenuItem" id="menuitem_view"> - <property name="visible">True</property> - <property name="label" translatable="yes">_View</property> - <property name="use_underline">True</property> - </object> - </child> - <child> <object class="GtkMenuItem" id="menuitem_help"> <property name="visible">True</property> <property name="label" translatable="yes">_Help</property> @@ -211,6 +124,7 @@ <object class="GtkImageMenuItem" id="imagemenuitem_about"> <property name="label">gtk-about</property> <property name="visible">True</property> + <property name="related_action">action_about</property> <property name="use_underline">True</property> <property name="use_stock">True</property> </object> @@ -231,13 +145,48 @@ <property name="can_focus">True</property> <property name="orientation">vertical</property> <child> - <object class="GtkHPaned" id="hpaned_main"> - <property name="height_request">300</property> + <object class="GtkVBox" id="vbox_notebook"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkToolbar" id="toolbar_main"> + <property name="visible">True</property> + <child> + <object class="GtkToolButton" id="toolbutton_about"> + <property name="visible">True</property> + <property name="related_action">action_about</property> + <property name="use_action_appearance">True</property> + <property name="label" translatable="yes">About</property> + <property name="use_underline">True</property> + <property name="stock_id">gtk-about</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="toolbutton_quit"> + <property name="visible">True</property> + <property name="related_action">action_quit</property> + <property name="use_action_appearance">True</property> + <property name="label" translatable="yes">Quit</property> + <property name="use_underline">True</property> + <property name="stock_id">gtk-quit</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="position">0</property> + </packing> + </child> <child> <object class="GtkNotebook" id="notebook_main"> - <property name="width_request">300</property> <property name="visible">True</property> <property name="can_focus">True</property> <child> @@ -461,81 +410,44 @@ </packing> </child> <child> - <object class="GtkVBox" id="vbox_config"> + <object class="GtkScrolledWindow" id="scrolledwindow_general"> <property name="visible">True</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkLabel" id="label_config_top"> - <property name="visible">True</property> - <property name="label" translatable="yes">RelayBandwidthBurst (General Option) -Value: 0 B (default, DataSize, usage: N bytes|KB|MB|GB|TB) -Description: Limit the maximum token bucket size (also known as -the burst) for relayed traffic to the given number of bytes in -each direction. (Default: 0) </property> - <property name="use_markup">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> <child> - <object class="GtkScrolledWindow" id="scrolledwindow_config"> + <object class="GtkTreeView" id="treeview_general"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> + <property name="model">liststore_general</property> + <property name="headers_visible">False</property> + <property name="headers_clickable">False</property> + <property name="rules_hint">True</property> + <property name="search_column">0</property> <child> - <object class="GtkTreeView" id="treeview_config"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="model">liststore_config</property> - <property name="headers_visible">False</property> - <property name="headers_clickable">False</property> - <property name="search_column">0</property> + <object class="GtkTreeViewColumn" id="treeviewcolumn_general_key"> + <property name="title">column</property> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn_key"> - <property name="title">column</property> - <child> - <object class="GtkCellRendererText" id="cellrenderertext_config_key"/> - <attributes> - <attribute name="foreground">3</attribute> - <attribute name="markup">0</attribute> - </attributes> - </child> - </object> + <object class="GtkCellRendererText" id="cellrenderertext_general_key"/> + <attributes> + <attribute name="markup">0</attribute> + </attributes> </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn_general_value"> + <property name="title">column</property> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn_value"> - <property name="title">column</property> - <child> - <object class="GtkCellRendererText" id="cellrenderertext_config_value"/> - <attributes> - <attribute name="foreground">3</attribute> - <attribute name="markup">1</attribute> - </attributes> - </child> - </object> - </child> - <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn_desc"> - <property name="title">column</property> - <child> - <object class="GtkCellRendererText" id="cellrenderertext_config_desc"/> - <attributes> - <attribute name="foreground">3</attribute> - <attribute name="markup">2</attribute> - </attributes> - </child> - </object> + <object class="GtkCellRendererText" id="cellrenderertext_general_value"/> + <attributes> + <attribute name="foreground">2</attribute> + <attribute name="markup">1</attribute> + </attributes> </child> </object> </child> </object> - <packing> - <property name="position">1</property> - </packing> </child> </object> <packing> @@ -543,9 +455,9 @@ each direction. (Default: 0) </property> </packing> </child> <child type="tab"> - <object class="GtkLabel" id="label_notebook_config"> + <object class="GtkLabel" id="label_general"> <property name="visible">True</property> - <property name="label" translatable="yes">Configuration</property> + <property name="label" translatable="yes">General</property> </object> <packing> <property name="position">2</property> @@ -554,54 +466,7 @@ each direction. (Default: 0) </property> </child> </object> <packing> - <property name="resize">True</property> - <property name="shrink">False</property> - </packing> - </child> - <child> - <object class="GtkScrolledWindow" id="scrolledwindow_sticky"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> - <child> - <object class="GtkTreeView" id="treeview_sticky"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="model">liststore_sticky</property> - <property name="headers_visible">False</property> - <property name="headers_clickable">False</property> - <property name="rules_hint">True</property> - <property name="search_column">0</property> - <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn_sticky_key"> - <property name="title">column</property> - <child> - <object class="GtkCellRendererText" id="cellrenderertext_sticky_key"/> - <attributes> - <attribute name="markup">0</attribute> - </attributes> - </child> - </object> - </child> - <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn_sticky_value"> - <property name="title">column</property> - <child> - <object class="GtkCellRendererText" id="cellrenderertext_sticky_value"/> - <attributes> - <attribute name="foreground">2</attribute> - <attribute name="markup">1</attribute> - </attributes> - </child> - </object> - </child> - </object> - </child> - </object> - <packing> - <property name="resize">True</property> - <property name="shrink">False</property> + <property name="position">1</property> </packing> </child> </object> @@ -612,7 +477,6 @@ each direction. (Default: 0) </property> </child> <child> <object class="GtkScrolledWindow" id="scrolledwindow_log"> - <property name="height_request">100</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hscrollbar_policy">automatic</property> @@ -622,10 +486,13 @@ each direction. (Default: 0) </property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="model">liststore_log</property> + <property name="headers_clickable">False</property> <property name="rules_hint">True</property> + <property name="search_column">0</property> <child> <object class="GtkTreeViewColumn" id="treeviewcolumn_log_timestamp"> <property name="title">Time</property> + <property name="clickable">True</property> <property name="sort_indicator">True</property> <property name="sort_order">descending</property> <property name="sort_column_id">1</property> @@ -666,7 +533,7 @@ each direction. (Default: 0) </property> </child> </object> <packing> - <property name="resize">True</property> + <property name="resize">False</property> <property name="shrink">False</property> </packing> </child> @@ -678,4 +545,46 @@ each direction. (Default: 0) </property> </object> </child> </object> + <object class="GtkAboutDialog" id="aboutdialog"> + <property name="border_width">5</property> + <property name="type_hint">normal</property> + <property name="program_name">garm</property> + <property name="version">0.1</property> + <property name="copyright" translatable="yes">Copyright (C) 2011 Kamran Riaz Khan</property> + <property name="website">http://inspirated.com/</property> + <property name="website_label" translatable="yes">Blog</property> + <signal name="response" handler="on_aboutdialog_response"/> + <child internal-child="vbox"> + <object class="GtkVBox" id="aboutdialog_vbox"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <property name="spacing">2</property> + <child internal-child="action_area"> + <object class="GtkHButtonBox" id="aboutdialog_action_area"> + <property name="visible">True</property> + <property name="layout_style">end</property> + </object> + <packing> + <property name="expand">False</property> + <property name="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> + </object> + </child> + </object> + <object class="GtkAction" id="action_quit"> + <property name="label">Quit</property> + <property name="short_label">Quit</property> + <property name="tooltip">Quit</property> + <property name="stock_id">gtk-quit</property> + <signal name="activate" handler="on_action_quit_activate"/> + </object> + <object class="GtkAction" id="action_about"> + <property name="label">About</property> + <property name="short_label">About</property> + <property name="tooltip">About</property> + <property name="stock_id">gtk-about</property> + <signal name="activate" handler="on_action_about_activate"/> + </object> </interface> diff --git a/src/gui/controller.py b/src/gui/controller.py index 854e388..5736def 100644 --- a/src/gui/controller.py +++ b/src/gui/controller.py @@ -6,7 +6,7 @@ import time from util import log, torTools from connections import connPanel -from gui import logPanel, stickyPanel +from gui import logPanel, generalPanel from gui.graphing import bandwidthStats gobject.threads_init() @@ -29,8 +29,8 @@ class GuiController: self.connPanel.pack_widgets() self.connPanel.start() - self.stickyPanel = stickyPanel.StickyPanel(self.builder) - self.stickyPanel.pack_widgets() + self.generalPanel = generalPanel.GeneralPanel(self.builder) + self.generalPanel.pack_widgets() def run(self): window = self.builder.get_object('window_main') @@ -38,6 +38,17 @@ class GuiController: window.show_all() gtk.main() + def on_action_about_activate(self, widget, data=None): + dialog = self.builder.get_object('aboutdialog') + dialog.run() + + def on_aboutdialog_response(self, widget, responseid, data=None): + dialog = self.builder.get_object('aboutdialog') + dialog.hide() + + def on_action_quit_activate(self, widget, data=None): + gtk.main_quit() + def on_window_main_delete_event(self, widget, data=None): gtk.main_quit() diff --git a/src/gui/generalPanel.py b/src/gui/generalPanel.py new file mode 100644 index 0000000..b16cac5 --- /dev/null +++ b/src/gui/generalPanel.py @@ -0,0 +1,123 @@ +""" +General panel. +""" + +import random +import sys +import time + +from collections import deque + +import gobject +import gtk + +from cli.headerPanel import (HeaderPanel as CliHeaderPanel, VERSION_STATUS_COLORS) +from TorCtl import TorCtl +from util import connections, sysTools, gtkTools, uiTools, torTools + +class GeneralPanel(CliHeaderPanel): + def __init__(self, builder): + CliHeaderPanel.__init__(self, None, time.time()) + + self.builder = builder + self.filled = False + + gobject.idle_add(self._fill_entries) + gobject.timeout_add(3000, self._timeout_fill_entries) + + def pack_widgets(self): + pass + + def _timeout_fill_entries(self): + self._fill_entries() + + return True + + def _fill_entries(self): + self.valsLock.acquire() + + liststore = self.builder.get_object('liststore_general') + theme = gtkTools.Theme() + + liststore.clear() + + key = "arm" + value = "%s (%s %s)" % (self.vals['sys/hostname'], self.vals['sys/os'], self.vals['sys/version']) + row = (key, value, theme.colors['active']) + liststore.append(row) + + versionColor = VERSION_STATUS_COLORS[self.vals["tor/versionStatus"]] if \ + self.vals["tor/versionStatus"] in VERSION_STATUS_COLORS else "black" + key = "Tor" + value = "%s (%s)" % (self.vals['tor/version'], versionColor, self.vals['tor/versionStatus']) + row = (key, value, theme.colors['active']) + liststore.append(row) + + includeControlPort = True + key = "Relaying" + if self.vals["tor/orPort"]: + myAddress = "Unknown" + if self.vals["tor/orListenAddr"]: myAddress = self.vals["tor/orListenAddr"] + elif self.vals["tor/address"]: myAddress = self.vals["tor/address"] + + dirPortLabel = ", Dir Port: %s" % self.vals["tor/dirPort"] if self.vals["tor/dirPort"] != "0" else "" + + value = "%s%s%s" % (self.vals["tor/nickname"], " - " + myAddress, ":" + self.vals["tor/orPort"], dirPortLabel) + else: + if self._isTorConnected: + value = "Disabled" + else: + statusTime = torTools.getConn().getStatus()[1] + + if statusTime: + statusTimeLabel = time.strftime("%H:%M %m/%d/%Y, ", time.localtime(statusTime)) + else: statusTimeLabel = "" + + value = "%s%s" % ("Tor Disconnected", statusTimeLabel) + includeControlPort = False + row = (key, value, theme.colors['active']) + liststore.append(row) + + key = "Control Port" + if includeControlPort: + if self.vals["tor/isAuthPassword"]: authType = "password" + elif self.vals["tor/isAuthCookie"]: authType = "cookie" + else: authType = "open" + + authColor = "red" if authType == "open" else "green" + value = "%s (%s)" % (self.vals['tor/controlPort'], authColor, authType) + row = (key, value, theme.colors['active']) + liststore.append(row) + + + if self.vals["stat/rss"] != "0": memoryLabel = uiTools.getSizeLabel(int(self.vals["stat/rss"])) + else: memoryLabel = "0" + + if self.vals["tor/startTime"]: + if self.isPaused() or not self._isTorConnected: + uptimeLabel = uiTools.getShortTimeLabel(self.getPauseTime() - self.vals["tor/startTime"]) + else: + uptimeLabel = uiTools.getShortTimeLabel(time.time() - self.vals["tor/startTime"]) + + key = "CPU" + value = "%s%% Tor, %s%% arm" % (self.vals["stat/%torCpu"], self.vals["stat/%armCpu"]) + row = (key, value, theme.colors['active']) + liststore.append(row) + + key = "Memory" + value = "%s (%s%%)" % (memoryLabel, self.vals["stat/%mem"]) + row = (key, value, theme.colors['active']) + liststore.append(row) + + key = "PID" + value = "%s" % (self.vals["tor/pid"] if self._isTorConnected else "") + row = (key, value, theme.colors['active']) + liststore.append(row) + + key = "Uptime" + value = uptimeLabel + row = (key, value, theme.colors['active']) + liststore.append(row) + + self.valsLock.release() + diff --git a/src/gui/graphing/graphStats.py b/src/gui/graphing/graphStats.py index 250503d..c7d24bb 100644 --- a/src/gui/graphing/graphStats.py +++ b/src/gui/graphing/graphStats.py @@ -46,6 +46,8 @@ class GraphStats(TorCtl.PostEventListener): def _pack_graph_widget(self, name): graph = CaGraph() + graph.set_size_request(200, 200) + placeholder = self.builder.get_object('placeholder_graph_%s' % name) placeholder.pack_start(graph) diff --git a/src/gui/stickyPanel.py b/src/gui/stickyPanel.py deleted file mode 100644 index 145c452..0000000 --- a/src/gui/stickyPanel.py +++ /dev/null @@ -1,123 +0,0 @@ -""" -Sticky panel. -""" - -import random -import sys -import time - -from collections import deque - -import gobject -import gtk - -from cli.headerPanel import (HeaderPanel as CliHeaderPanel, VERSION_STATUS_COLORS) -from TorCtl import TorCtl -from util import connections, sysTools, gtkTools, uiTools, torTools - -class StickyPanel(CliHeaderPanel): - def __init__(self, builder): - CliHeaderPanel.__init__(self, None, time.time()) - - self.builder = builder - self.filled = False - - gobject.idle_add(self._fill_entries) - gobject.timeout_add(3000, self._timeout_fill_entries) - - def pack_widgets(self): - pass - - def _timeout_fill_entries(self): - self._fill_entries() - - return True - - def _fill_entries(self): - self.valsLock.acquire() - - liststore = self.builder.get_object('liststore_sticky') - theme = gtkTools.Theme() - - liststore.clear() - - key = "arm" - value = "%s (%s %s)" % (self.vals['sys/hostname'], self.vals['sys/os'], self.vals['sys/version']) - row = (key, value, theme.colors['active']) - liststore.append(row) - - versionColor = VERSION_STATUS_COLORS[self.vals["tor/versionStatus"]] if \ - self.vals["tor/versionStatus"] in VERSION_STATUS_COLORS else "black" - key = "Tor" - value = "%s (%s)" % (self.vals['tor/version'], versionColor, self.vals['tor/versionStatus']) - row = (key, value, theme.colors['active']) - liststore.append(row) - - includeControlPort = True - key = "Relaying" - if self.vals["tor/orPort"]: - myAddress = "Unknown" - if self.vals["tor/orListenAddr"]: myAddress = self.vals["tor/orListenAddr"] - elif self.vals["tor/address"]: myAddress = self.vals["tor/address"] - - dirPortLabel = ", Dir Port: %s" % self.vals["tor/dirPort"] if self.vals["tor/dirPort"] != "0" else "" - - value = "%s%s%s" % (self.vals["tor/nickname"], " - " + myAddress, ":" + self.vals["tor/orPort"], dirPortLabel) - else: - if self._isTorConnected: - value = "Disabled" - else: - statusTime = torTools.getConn().getStatus()[1] - - if statusTime: - statusTimeLabel = time.strftime("%H:%M %m/%d/%Y, ", time.localtime(statusTime)) - else: statusTimeLabel = "" - - value = "%s%s" % ("Tor Disconnected", statusTimeLabel) - includeControlPort = False - row = (key, value, theme.colors['active']) - liststore.append(row) - - key = "Control Port" - if includeControlPort: - if self.vals["tor/isAuthPassword"]: authType = "password" - elif self.vals["tor/isAuthCookie"]: authType = "cookie" - else: authType = "open" - - authColor = "red" if authType == "open" else "green" - value = "%s (%s)" % (self.vals['tor/controlPort'], authColor, authType) - row = (key, value, theme.colors['active']) - liststore.append(row) - - - if self.vals["stat/rss"] != "0": memoryLabel = uiTools.getSizeLabel(int(self.vals["stat/rss"])) - else: memoryLabel = "0" - - if self.vals["tor/startTime"]: - if self.isPaused() or not self._isTorConnected: - uptimeLabel = uiTools.getShortTimeLabel(self.getPauseTime() - self.vals["tor/startTime"]) - else: - uptimeLabel = uiTools.getShortTimeLabel(time.time() - self.vals["tor/startTime"]) - - key = "CPU" - value = "%s%% Tor, %s%% arm" % (self.vals["stat/%torCpu"], self.vals["stat/%armCpu"]) - row = (key, value, theme.colors['active']) - liststore.append(row) - - key = "Memory" - value = "%s (%s%%)" % (memoryLabel, self.vals["stat/%mem"]) - row = (key, value, theme.colors['active']) - liststore.append(row) - - key = "PID" - value = "%s" % (self.vals["tor/pid"] if self._isTorConnected else "") - row = (key, value, theme.colors['active']) - liststore.append(row) - - key = "Uptime" - value = uptimeLabel - row = (key, value, theme.colors['active']) - liststore.append(row) - - self.valsLock.release() -

1 0

[arm/release] Display placementLabel instead of timestamp for circuit lines.
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 473a6b53d584108492b3a21cc0036117cc02b9b4 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Wed Jul 13 14:44:13 2011 +0500 Display placementLabel instead of timestamp for circuit lines. --- src/gui/connections/circEntry.py | 3 +-- src/gui/connections/connPanel.py | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/connections/circEntry.py b/src/gui/connections/circEntry.py index 11876f8..deb720a 100644 --- a/src/gui/connections/circEntry.py +++ b/src/gui/connections/circEntry.py @@ -35,8 +35,7 @@ class CircLine(circEntry.CircLine, connEntry.ConnectionLine): dst = self.getDestinationLabel(100, includeLocale=True) etc = self.foreign.getNickname() - timeLabel = uiTools.getTimeLabel(time.time() - self.startTime) theme = gtkTools.Theme() - return (dst, etc, timeLabel, self.getType(), theme.colors['insensitive']) + return (dst, etc, self.placementLabel, self.getType(), theme.colors['insensitive']) diff --git a/src/gui/connections/connPanel.py b/src/gui/connections/connPanel.py index 3b980e1..e6a7c5b 100644 --- a/src/gui/connections/connPanel.py +++ b/src/gui/connections/connPanel.py @@ -69,8 +69,9 @@ class ConnectionPanel(CliConnectionPanel): cacheKey = calculateCacheKey(line) if self.cache.has_key(cacheKey): - timeLabel = "%d s" % (time.time() - line.startTime) - treestore.set_value(self.cache[cacheKey], 2, timeLabel) + if not isinstance(line, circEntry.CircLine): + timeLabel = "%d s" % (time.time() - line.startTime) + treestore.set_value(self.cache[cacheKey], 2, timeLabel) else: break

1 0

[arm/release] Merging krkhan's master branch
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 4f3c6b69ced8b25a522f740f522a2a3aac855b5b Merge: 02be67a aef4158 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jul 14 17:42:25 2011 -0700 Merging krkhan's master branch src/gui/arm.xml | 79 ++---------------------- src/gui/connections/__init__.py | 6 ++ src/gui/connections/circEntry.py | 41 +++++++++++++ src/gui/connections/connEntry.py | 61 +++++++++++++++++++ src/gui/connections/connPanel.py | 114 +++++++++++++++++++++++++++++++++++ src/gui/controller.py | 10 +++- src/gui/graphing/graphStats.py | 15 +++-- src/gui/logPanel.py | 21 ++++-- src/gui/stickyPanel.py | 123 ++++++++++++++++++++++++++++++++++++++ src/starter.py | 2 +- src/util/gtkTools.py | 21 +++++++ 11 files changed, 406 insertions(+), 87 deletions(-)

1 0

[arm/release] fix: typo in relay description
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit b962667988a3db663f0a4f159fb7b146395e8d26 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jul 13 20:23:51 2011 -0700 fix: typo in relay description caught by karsten --- src/settings.cfg | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/settings.cfg b/src/settings.cfg index 7e13d19..110a45c 100644 --- a/src/settings.cfg +++ b/src/settings.cfg @@ -437,7 +437,7 @@ wizard.label.opt Reuse => Circuit Duration wizard.description.general Cancel => Close without starting Tor. wizard.description.role Resume => Start Tor with the last configuration you made. -wizard.description.role Relay => Provides interconnections with other Tor relays. This is a safe and easy of making the network better. +wizard.description.role Relay => Provides interconnections with other Tor relays. This is a safe and easy way of making the network better. wizard.description.role Exit => Connects between Tor network and the outside Internet. This is a vital role, but can lead to abuse complaints. wizard.description.role Bridge => Non-public relay specifically for helping censored users. wizard.description.role Client => Use the network without contributing to it.

1 0

[arm/release] Derive sticky panel values from CLI HeaderPanel.
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 1bd068fab1fae856d7ca64114fcae03c769b9246 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Thu Jul 14 14:08:38 2011 +0500 Derive sticky panel values from CLI HeaderPanel. --- src/gui/arm.xml | 47 ------------------- src/gui/controller.py | 5 ++- src/gui/stickyPanel.py | 118 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 122 insertions(+), 48 deletions(-) diff --git a/src/gui/arm.xml b/src/gui/arm.xml index 67409ae..f71d0b7 100644 --- a/src/gui/arm.xml +++ b/src/gui/arm.xml @@ -11,53 +11,6 @@  <column type="gchararray"/> </columns> - <data> - <row> - <col id="0" translatable="yes">arm</col> - <col id="1" translatable="yes">orthanc (Linux 2.6.35.11-83.fc14)</col> - <col id="2" translatable="yes">black</col> - </row> - <row> - <col id="0" translatable="yes">Tor</col> - <col id="1" translatable="yes">0.2.1.28 (obsolete)</col> - <col id="2" translatable="yes">black</col> - </row> - <row> - <col id="0" translatable="yes">Relaying</col> - <col id="1" translatable="yes">Disabled</col> - <col id="2" translatable="yes">red</col> - </row> - <row> - <col id="0" translatable="yes">Control Port</col> - <col id="1" translatable="yes">9051 (open)</col> - <col id="2" translatable="yes">black</col> - </row> - <row> - <col id="0" translatable="yes">CPU Tor</col> - <col id="1" translatable="yes">0.0%</col> - <col id="2" translatable="yes">black</col> - </row> - <row> - <col id="0" translatable="yes">CPU arm</col> - <col id="1" translatable="yes">0.0%</col> - <col id="2" translatable="yes">black</col> - </row> - <row> - <col id="0" translatable="yes">Memory</col> - <col id="1" translatable="yes">20 MB (1.0%)</col> - <col id="2" translatable="yes">black</col> - </row> - <row> - <col id="0" translatable="yes">PID</col> - <col id="1" translatable="yes">3980</col> - <col id="2" translatable="yes">black</col> - </row> - <row> - <col id="0" translatable="yes">Uptime</col> - <col id="1" translatable="yes">01:01:34</col> - <col id="2" translatable="yes">black</col> - </row> - </data> </object> <object class="GtkTreeStore" id="treestore_conn"> <columns> diff --git a/src/gui/controller.py b/src/gui/controller.py index a69fdef..854e388 100644 --- a/src/gui/controller.py +++ b/src/gui/controller.py @@ -6,7 +6,7 @@ import time from util import log, torTools from connections import connPanel -from gui import logPanel +from gui import logPanel, stickyPanel from gui.graphing import bandwidthStats gobject.threads_init() @@ -29,6 +29,9 @@ class GuiController: self.connPanel.pack_widgets() self.connPanel.start() + self.stickyPanel = stickyPanel.StickyPanel(self.builder) + self.stickyPanel.pack_widgets() + def run(self): window = self.builder.get_object('window_main') diff --git a/src/gui/stickyPanel.py b/src/gui/stickyPanel.py new file mode 100644 index 0000000..89b5485 --- /dev/null +++ b/src/gui/stickyPanel.py @@ -0,0 +1,118 @@ +""" +Sticky panel. +""" + +import random +import sys +import time + +from collections import deque + +import gobject +import gtk + +from cli.headerPanel import (HeaderPanel as CliHeaderPanel, VERSION_STATUS_COLORS) +from TorCtl import TorCtl +from util import connections, sysTools, gtkTools, uiTools, torTools + +class StickyPanel(CliHeaderPanel): + def __init__(self, builder): + CliHeaderPanel.__init__(self, None, time.time()) + + self.builder = builder + + gobject.timeout_add(3000, self._fill_entries) + + def pack_widgets(self): + pass + + def _fill_entries(self): + self.valsLock.acquire() + + liststore = self.builder.get_object('liststore_sticky') + theme = gtkTools.Theme() + + liststore.clear() + + key = "arm" + value = "%s (%s %s)" % (self.vals['sys/hostname'], self.vals['sys/os'], self.vals['sys/version']) + row = (key, value, theme.colors['active']) + liststore.append(row) + + versionColor = VERSION_STATUS_COLORS[self.vals["tor/versionStatus"]] if \ + self.vals["tor/versionStatus"] in VERSION_STATUS_COLORS else "black" + key = "Tor" + value = "%s (%s)" % (self.vals['tor/version'], versionColor, self.vals['tor/versionStatus']) + row = (key, value, theme.colors['active']) + liststore.append(row) + + includeControlPort = True + key = "Relaying" + if self.vals["tor/orPort"]: + myAddress = "Unknown" + if self.vals["tor/orListenAddr"]: myAddress = self.vals["tor/orListenAddr"] + elif self.vals["tor/address"]: myAddress = self.vals["tor/address"] + + dirPortLabel = ", Dir Port: %s" % self.vals["tor/dirPort"] if self.vals["tor/dirPort"] != "0" else "" + + value = "%s%s%s" % (self.vals["tor/nickname"], " - " + myAddress, ":" + self.vals["tor/orPort"], dirPortLabel) + else: + if self._isTorConnected: + value = "Disabled" + else: + statusTime = torTools.getConn().getStatus()[1] + + if statusTime: + statusTimeLabel = time.strftime("%H:%M %m/%d/%Y, ", time.localtime(statusTime)) + else: statusTimeLabel = "" + + value = "%s%s" % ("Tor Disconnected", statusTimeLabel) + includeControlPort = False + row = (key, value, theme.colors['active']) + liststore.append(row) + + key = "Control Port" + if includeControlPort: + if self.vals["tor/isAuthPassword"]: authType = "password" + elif self.vals["tor/isAuthCookie"]: authType = "cookie" + else: authType = "open" + + authColor = "red" if authType == "open" else "green" + value = "%s (%s)" % (self.vals['tor/controlPort'], authColor, authType) + row = (key, value, theme.colors['active']) + liststore.append(row) + + + if self.vals["stat/rss"] != "0": memoryLabel = uiTools.getSizeLabel(int(self.vals["stat/rss"])) + else: memoryLabel = "0" + + if self.vals["tor/startTime"]: + if self.isPaused() or not self._isTorConnected: + uptimeLabel = uiTools.getShortTimeLabel(self.getPauseTime() - self.vals["tor/startTime"]) + else: + uptimeLabel = uiTools.getShortTimeLabel(time.time() - self.vals["tor/startTime"]) + + key = "CPU" + value = "%s%% Tor, %s%% arm" % (self.vals["stat/%torCpu"], self.vals["stat/%armCpu"]) + row = (key, value, theme.colors['active']) + liststore.append(row) + + key = "Memory" + value = "%s (%s%%)" % (memoryLabel, self.vals["stat/%mem"]) + row = (key, value, theme.colors['active']) + liststore.append(row) + + key = "PID" + value = "%s" % (self.vals["tor/pid"] if self._isTorConnected else "") + row = (key, value, theme.colors['active']) + liststore.append(row) + + key = "Uptime" + value = uptimeLabel + row = (key, value, theme.colors['active']) + liststore.append(row) + + self.valsLock.release() + + return True +

1 0

[arm/release] fix: minor clarification that any option will work
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 02be67ad6ae1e12d52b48829fd57a6154a1728e6 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jul 13 21:36:16 2011 -0700 fix: minor clarification that any option will work suggestion by armadev --- src/resources/torrcTemplate.txt | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/resources/torrcTemplate.txt b/src/resources/torrcTemplate.txt index 20b2efa..744a481 100644 --- a/src/resources/torrcTemplate.txt +++ b/src/resources/torrcTemplate.txt @@ -2,7 +2,7 @@ # edit this file then either... # - tell arm to reset tor by pressing 'x' # - run 'pkill -sighup tor' -# - restart tor +# - or restart tor # # Descriptions of all of these configuration attributes (and many more) are # available in the tor man page.

1 0

[arm/release] Fill panels immediately at launch instead of waiting for first timeout.
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit aef4158d0436449d696ad26d83b2dfd5c23505c1 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Thu Jul 14 14:15:55 2011 +0500 Fill panels immediately at launch instead of waiting for first timeout. --- src/gui/connections/connPanel.py | 10 +++++++--- src/gui/stickyPanel.py | 11 ++++++++--- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/gui/connections/connPanel.py b/src/gui/connections/connPanel.py index e6a7c5b..af9bf06 100644 --- a/src/gui/connections/connPanel.py +++ b/src/gui/connections/connPanel.py @@ -49,11 +49,17 @@ class ConnectionPanel(CliConnectionPanel): torCmdName = sysTools.getProcessName(torPid, "tor") connections.getResolver(torCmdName, torPid, "tor") - gobject.timeout_add(3000, self._fill_entries) + gobject.idle_add(self._fill_entries) + gobject.timeout_add(3000, self._timeout_fill_entries) def pack_widgets(self): pass + def _timeout_fill_entries(self): + self._fill_entries() + + return True + def _fill_entries(self): self.valsLock.acquire() @@ -106,5 +112,3 @@ class ConnectionPanel(CliConnectionPanel): self.valsLock.release() - return True - diff --git a/src/gui/stickyPanel.py b/src/gui/stickyPanel.py index 89b5485..145c452 100644 --- a/src/gui/stickyPanel.py +++ b/src/gui/stickyPanel.py @@ -20,12 +20,19 @@ class StickyPanel(CliHeaderPanel): CliHeaderPanel.__init__(self, None, time.time()) self.builder = builder + self.filled = False - gobject.timeout_add(3000, self._fill_entries) + gobject.idle_add(self._fill_entries) + gobject.timeout_add(3000, self._timeout_fill_entries) def pack_widgets(self): pass + def _timeout_fill_entries(self): + self._fill_entries() + + return True + def _fill_entries(self): self.valsLock.acquire() @@ -114,5 +121,3 @@ class StickyPanel(CliHeaderPanel): self.valsLock.release() - return True -

1 0

[arm/release] Changing "Use Low Ports" to "Use Popular Ports"
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 812590fe98d6f4d959d0729864adb5542719d4e3 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Jul 13 21:13:13 2011 -0700 Changing "Use Low Ports" to "Use Popular Ports" idea by armadev --- src/settings.cfg | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/settings.cfg b/src/settings.cfg index 110a45c..750ae9e 100644 --- a/src/settings.cfg +++ b/src/settings.cfg @@ -416,7 +416,7 @@ wizard.label.opt Notify => Issue Notification wizard.label.opt Bandwidth => Relay Speed wizard.label.opt Limit => Monthly Limit wizard.label.opt Client => Client Usage -wizard.label.opt Lowports => Low Relaying Ports +wizard.label.opt Lowports => Use Popular Ports wizard.label.opt Portforward => Port Forwarding wizard.label.opt Startup => Run At Startup wizard.label.opt Rshutdown => Shutdown With Arm

1 0

[arm/release] Removing the INCLUDE_GUI source flag
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 52852efe54e134a7fb471e5d8c89d4ee90f3ec75 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jul 14 17:49:19 2011 -0700 Removing the INCLUDE_GUI source flag It's still pretty rough but ready for some initial input. The header (renamed (as sticky), log, bandwidth graphs, and connection panels have all been implemented by Kamran. --- src/starter.py | 16 +++------------- 1 files changed, 3 insertions(+), 13 deletions(-) diff --git a/src/starter.py b/src/starter.py index 0564661..01acf24 100644 --- a/src/starter.py +++ b/src/starter.py @@ -30,7 +30,6 @@ import util.uiTools import TorCtl.TorCtl import TorCtl.TorUtil -INCLUDE_GUI = True LOG_DUMP_PATH = os.path.expanduser("~/.arm/log") DEFAULT_CONFIG = os.path.expanduser("~/.arm/armrc") CONFIG = {"startup.controlPassword": None, @@ -53,12 +52,8 @@ CONFIG = {"startup.controlPassword": None, "log.configDescriptions.persistance.saveFailed": util.log.NOTICE, "log.savingDebugLog": util.log.NOTICE} -if INCLUDE_GUI: - OPT = "gi:c:dbe:vh" - OPT_EXPANDED = ["gui", "interface=", "config=", "debug", "blind", "event=", "version", "help"] -else: - OPT = "i:c:dbe:vh" - OPT_EXPANDED = ["interface=", "config=", "debug", "blind", "event=", "version", "help"] +OPT = "gi:c:dbe:vh" +OPT_EXPANDED = ["gui", "interface=", "config=", "debug", "blind", "event=", "version", "help"] HELP_MSG = """Usage arm [OPTION] Terminal status monitor for Tor relays. @@ -79,11 +74,6 @@ arm -b -i 1643 hide connection data, attaching to control port 1643 arm -e we -c /tmp/cfg use this configuration file with 'WARN'/'ERR' events """ % (CONFIG["startup.interface.ipAddress"], CONFIG["startup.interface.port"], DEFAULT_CONFIG, LOG_DUMP_PATH, CONFIG["startup.events"], cli.logPanel.EVENT_LISTING) -# icky and temporary hack to remove the gui help option if it's unavailbe -if not INCLUDE_GUI: - helpComp = HELP_MSG.split("\n") - HELP_MSG = "\n".join(helpComp[:3] + helpComp[4:]) - # filename used for cached tor config descriptions CONFIG_DESC_FILENAME = "torConfigDesc.txt" @@ -310,7 +300,7 @@ if __name__ == '__main__': param["startup.interface.ipAddress"] = controlAddr param["startup.interface.port"] = controlPort - elif opt in ("-g", "--gui") and INCLUDE_GUI: launchGui = True + elif opt in ("-g", "--gui"): launchGui = True elif opt in ("-c", "--config"): configPath = arg # sets path of user's config elif opt in ("-d", "--debug"): isDebugMode = True # dumps all logs elif opt in ("-b", "--blind"):

1 0

[arm/release] Dropping "/s" when making torrc for rates
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit ec0cdb0f1499910fc85337ac20c2ab6352578cb6 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jul 9 18:25:12 2011 -0700 Dropping "/s" when making torrc for rates The wizard shows bandwidth rates (for instance "5 MB/s") but the torrc just wants the volume part. Dropping the "/s" for RelayBandwidthRate and RelayBandwidthBurst. --- src/cli/wizard.py | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index cf544a5..8aa1a23 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -493,14 +493,21 @@ def getTorrc(relayType, config): if isinstance(value, ConfigOption): value = value.getValue() + # truncates "/s" from the rate for RelayBandwidthRate entry + if key == Options.BANDWIDTH and value.endswith("/s"): + value = value[:-2] + templateOptions[key.upper()] = value templateOptions[relayType.upper()] = True templateOptions["LOW_PORTS"] = config[Options.LOWPORTS] # uses double the relay rate for bursts - relayRateComp = config[Options.BANDWIDTH].getValue().split(" ") - templateOptions["BURST"] = "%i %s" % (int(relayRateComp[0]) * 2, " ".join(relayRateComp[1:])) + bwOpt = Options.BANDWIDTH.upper() + + if templateOptions[bwOpt] != TOR_DEFAULTS[Options.BANDWIDTH]: + relayRateComp = templateOptions[bwOpt].split(" ") + templateOptions["BURST"] = "%i %s" % (int(relayRateComp[0]) * 2, " ".join(relayRateComp[1:])) # exit notice will be in our data directory dataDir = cli.controller.getController().getDataDirectory()

1 0