- tor-commits - lists.torproject.org

[arm/master] Use tuple instead of dict to init panel (for maintaining order).
by atagar＠torproject.org 11 Aug '11

11 Aug '11

commit aea32ec50157270b4e7f3835496dd2c358444931 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sun Jul 17 16:11:01 2011 +0500 Use tuple instead of dict to init panel (for maintaining order). --- src/gui/controller.py | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/gui/controller.py b/src/gui/controller.py index 7172aa7..bf2e0f9 100644 --- a/src/gui/controller.py +++ b/src/gui/controller.py @@ -19,15 +19,15 @@ class GuiController: self.builder.add_from_file(filename) self.builder.connect_signals(self) - self.panels = { - logPanel.LogPanel : None, - bandwidthStats.BandwidthStats : None, - connPanel.ConnectionPanel : None, - generalPanel.GeneralPanel : None } - - for panel in self.panels.keys(): - self.panels[panel] = panel(self.builder) - self.panels[panel].pack_widgets() + panelClasses = (logPanel.LogPanel, + bandwidthStats.BandwidthStats, + connPanel.ConnectionPanel, + generalPanel.GeneralPanel) + self.panels = {} + + for panelClass in panelClasses: + self.panels[panelClass] = panelClass(self.builder) + self.panels[panelClass].pack_widgets() def run(self): window = self.builder.get_object('window_main')

1 0

[arm/master] Use dict of panels to reduce statement duplication.
by atagar＠torproject.org 11 Aug '11

11 Aug '11

commit d6fae9bf53f39279f56b968ee8a71de15a129ada Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sun Jul 17 05:05:56 2011 +0500 Use dict of panels to reduce statement duplication. --- src/gui/arm.xml | 2 +- src/gui/controller.py | 20 +++++++++----------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/gui/arm.xml b/src/gui/arm.xml index 56c9620..56112c9 100644 --- a/src/gui/arm.xml +++ b/src/gui/arm.xml @@ -79,7 +79,7 @@ </columns> </object> <object class="GtkWindow" id="window_main"> - <property name="title" translatable="yes">arm</property> + <property name="title" translatable="yes">garm</property> <property name="default_width">640</property> <property name="default_height">480</property> <signal name="delete_event" handler="on_window_main_delete_event"/> diff --git a/src/gui/controller.py b/src/gui/controller.py index e6ffcbd..7172aa7 100644 --- a/src/gui/controller.py +++ b/src/gui/controller.py @@ -19,17 +19,15 @@ class GuiController: self.builder.add_from_file(filename) self.builder.connect_signals(self) - self.logPanel = logPanel.LogPanel(self.builder) - self.logPanel.pack_widgets() - - self.bwStats = bandwidthStats.BandwidthStats(self.builder) - self.bwStats.pack_widgets() - - self.connPanel = connPanel.ConnectionPanel(self.builder) - self.connPanel.pack_widgets() - - self.generalPanel = generalPanel.GeneralPanel(self.builder) - self.generalPanel.pack_widgets() + self.panels = { + logPanel.LogPanel : None, + bandwidthStats.BandwidthStats : None, + connPanel.ConnectionPanel : None, + generalPanel.GeneralPanel : None } + + for panel in self.panels.keys(): + self.panels[panel] = panel(self.builder) + self.panels[panel].pack_widgets() def run(self): window = self.builder.get_object('window_main')

1 0

[arm/master] Add authors.
by atagar＠torproject.org 11 Aug '11

11 Aug '11

commit 82d89ad3fd63c898e8865242f11178483c24f52b Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sun Jul 17 16:24:24 2011 +0500 Add authors. --- src/gui/arm.xml | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/gui/arm.xml b/src/gui/arm.xml index 56112c9..2b9ad95 100644 --- a/src/gui/arm.xml +++ b/src/gui/arm.xml @@ -1228,6 +1228,8 @@ the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read <http://www.gnu.org/philosophy/why-not-lgpl.html>. </property> + <property name="authors">Kamran Riaz Khan <krkhan(a)inspirated.com> +Damian Johnson <atagar1(a)gmail.com></property> <signal name="response" handler="on_aboutdialog_response"/> <child internal-child="vbox"> <object class="GtkVBox" id="aboutdialog_vbox">

1 0

[arm/master] Merge branch 'master' of git://git.torproject.org/arm
by atagar＠torproject.org 11 Aug '11

11 Aug '11

commit b20560d03191f0d9db63bc092f41b166ed2790bf Merge: c63b742 dc04a95 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Wed Jul 20 15:51:09 2011 +0500 Merge branch 'master' of git://git.torproject.org/arm src/cli/controller.py | 5 +++-- src/cli/logPanel.py | 7 +++++++ 2 files changed, 10 insertions(+), 2 deletions(-)

1 0

[arm/master] Connections panel cleanup.
by atagar＠torproject.org 11 Aug '11

11 Aug '11

commit 68160bc14ee145c3ad736b2a0c33c6dc40ee1829 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Thu Jul 21 04:09:16 2011 +0500 Connections panel cleanup. The older method relied on changing __class__ attributes of CLI entries in order to add get_listing_row() methods to them. Changing __class__ directly is a bad practice, hence GUI entries now *wrap* CLI entries instead of inherting them. Summary: * Each CLI entry instance is mapped via cache key to a GUI entry instance. * The GUI entry instance is stored inside the treestore rows. * After every timeout, the entry lines returned by the CLI conn panel are mapped to GUI instances (using cache, if applicable) and the resulting GUI entry line is searched in treestore. If one isn't found, the whole treestore is cleared and refreshed. The whole treestore refreshing still doesn't sound very nice. Since if a circuit is expanded by clicking the drop-down, a new connection taking place would close the expander. One possible approach of addressing the refresh would be to: * Add new entries to treestore when they aren't found in the latter * Delete old entries from treestore when they aren't found in CLI panel This should theoretically produce 1-1 mapping between CLI panel's entryLines and the treestore. --- src/gui/arm.xml | 30 +++++++------ src/gui/connections/circEntry.py | 31 ++++++-------- src/gui/connections/connEntry.py | 42 +++++++++---------- src/gui/connections/connPanel.py | 87 +++++++++++++++++++++++++------------- 4 files changed, 107 insertions(+), 83 deletions(-) diff --git a/src/gui/arm.xml b/src/gui/arm.xml index 6c206fd..3b28423 100644 --- a/src/gui/arm.xml +++ b/src/gui/arm.xml @@ -12,20 +12,6 @@ <column type="gchararray"/> </columns> </object> - <object class="GtkTreeStore" id="treestore_conn"> - <columns> -  - <column type="gchararray"/> -  - <column type="gchararray"/> -  - <column type="gchararray"/> -  - <column type="gchararray"/> -  - <column type="gchararray"/> - </columns> - </object> <object class="GtkListStore" id="liststore_log"> <columns>  @@ -54,6 +40,22 @@ <column type="gchararray"/> </columns> </object> + <object class="GtkTreeStore" id="treestore_conn"> + <columns> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="GObject"/> + </columns> + </object> <object class="GtkWindow" id="window_main"> <property name="title" translatable="yes">garm</property> <property name="default_width">640</property> diff --git a/src/gui/connections/circEntry.py b/src/gui/connections/circEntry.py index abbb631..04d3208 100644 --- a/src/gui/connections/circEntry.py +++ b/src/gui/connections/circEntry.py @@ -4,38 +4,33 @@ Connection panel entries for client circuits. import time -from cli.connections import circEntry, entries +from cli.connections import entries from gui.connections import connEntry from util import gtkTools, uiTools -class CircEntry(circEntry.CircEntry): - @classmethod - def convert_to_gui(self, instance): - instance.__class__ = self - -class CircHeaderLine(circEntry.CircHeaderLine, connEntry.ConnectionLine): - @classmethod - def convert_to_gui(self, instance): - instance.__class__ = self +class CircHeaderLine(connEntry.ConnectionLine): + def __init__(self, cliLine): + connEntry.ConnectionLine.__init__(self, cliLine) def get_listing_row(self, listingType): row = connEntry.ConnectionLine.get_listing_row(self, listingType) theme = gtkTools.Theme() - return row[:-1] + (theme.colors['active'],) + return row[:-2] + (theme.colors['active'], self) + +class CircLine(connEntry.ConnectionLine): + def __init__(self, cliLine): + connEntry.ConnectionLine.__init__(self, cliLine) -class CircLine(circEntry.CircLine, connEntry.ConnectionLine): - @classmethod - def convert_to_gui(self, instance): - instance.__class__ = self + self.parentIter = None def get_listing_row(self, listingType): dst, etc = "", "" if listingType == entries.ListingType.IP_ADDRESS: - dst = self.getDestinationLabel(100, includeLocale=True) - etc = self.foreign.getNickname() + dst = self.cliLine.getDestinationLabel(100, includeLocale=True) + etc = self.cliLine.foreign.getNickname() theme = gtkTools.Theme() - return (dst, etc, self.placementLabel, self.getType(), theme.colors['insensitive']) + return (dst, etc, self.cliLine.placementLabel, self.cliLine.getType(), theme.colors['insensitive'], self) diff --git a/src/gui/connections/connEntry.py b/src/gui/connections/connEntry.py index f8bcc84..6f4baed 100644 --- a/src/gui/connections/connEntry.py +++ b/src/gui/connections/connEntry.py @@ -5,36 +5,34 @@ Connection panel entries related to actual connections to or from the system import time -from cli.connections import connEntry, entries +import gobject + +from cli.connections import entries from cli.connections.connEntry import Category, CONFIG from util import gtkTools, torTools, uiTools -class ConnectionEntry(connEntry.ConnectionEntry): - @classmethod - def convert_to_gui(self, instance): - instance.__class__ = self +class ConnectionLine(gobject.GObject): + def __init__(self, cliLine): + gobject.GObject.__init__(self) -class ConnectionLine(connEntry.ConnectionLine): - @classmethod - def convert_to_gui(self, instance): - instance.__class__ = self + self.cliLine = cliLine def get_listing_row(self, listingType): conn = torTools.getConn() - myType = self.getType() - dstAddress = self.getDestinationLabel(26, includeLocale = True) - localPort = ":%s" % self.local.getPort() if self.includePort else "" + myType = self.cliLine.getType() + dstAddress = self.cliLine.getDestinationLabel(26, includeLocale = True) + localPort = ":%s" % self.cliLine.local.getPort() if self.cliLine.includePort else "" src, dst, etc = "", "", "" if listingType == entries.ListingType.IP_ADDRESS: - myExternalIpAddr = conn.getInfo("address", self.local.getIpAddr()) - addrDiffer = myExternalIpAddr != self.local.getIpAddr() + myExternalIpAddr = conn.getInfo("address", self.cliLine.local.getIpAddr()) + addrDiffer = myExternalIpAddr != self.cliLine.local.getIpAddr() isExpansionType = not myType in (Category.SOCKS, Category.HIDDEN, Category.CONTROL) if isExpansionType: srcAddress = myExternalIpAddr + localPort - else: srcAddress = self.local.getIpAddr() + localPort + else: srcAddress = self.cliLine.local.getIpAddr() + localPort if myType in (Category.SOCKS, Category.CONTROL): src = dstAddress @@ -43,19 +41,19 @@ class ConnectionLine(connEntry.ConnectionLine): src = srcAddress dst = dstAddress - if addrDiffer and isExpansionType and self.includeExpandedIpAddr and CONFIG["features.connection.showColumn.expandedIp"]: - internalAddress = self.local.getIpAddr() + localPort + if addrDiffer and isExpansionType and self.cliLine.includeExpandedIpAddr and CONFIG["features.connection.showColumn.expandedIp"]: + internalAddress = self.cliLine.local.getIpAddr() + localPort if myType == Category.INBOUND: (src, dst) = (src, internalAddress) else: (src, dst) = (internalAddress, src) - etc = self.getEtcContent(100, listingType) + etc = self.cliLine.getEtcContent(100, listingType) else: - src = "%s:%s" % (self.local.ipAddr, self.local.port) - dst = "%s:%s" % (self.foreign.ipAddr, self.foreign.port) + src = "%s:%s" % (self.cliLine.local.ipAddr, self.cliLine.local.port) + dst = "%s:%s" % (self.cliLine.foreign.ipAddr, self.cliLine.foreign.port) - timeLabel = uiTools.getTimeLabel(time.time() - self.startTime) + timeLabel = uiTools.getTimeLabel(time.time() - self.cliLine.startTime) theme = gtkTools.Theme() - return (src, dst, timeLabel, self.getType(), theme.colors['insensitive']) + return (src, dst, timeLabel, self.cliLine.getType(), theme.colors['insensitive'], self) diff --git a/src/gui/connections/connPanel.py b/src/gui/connections/connPanel.py index 4ab0ed8..55669f9 100644 --- a/src/gui/connections/connPanel.py +++ b/src/gui/connections/connPanel.py @@ -17,37 +17,48 @@ from gui.connections import circEntry, connEntry from util import connections, sysTools, uiTools, torTools from TorCtl import TorCtl -REFRESH_RATE = 3 - -def convert_to_gui(instance): - cliToGuiMap = [ (cliCircEntry.CircEntry, circEntry.CircEntry), - (cliCircEntry.CircHeaderLine, circEntry.CircHeaderLine), +class GuiConverter: + cliToGuiMap = [ (cliCircEntry.CircHeaderLine, circEntry.CircHeaderLine), (cliCircEntry.CircLine, circEntry.CircLine), - (cliConnEntry.ConnectionEntry, connEntry.ConnectionEntry), (cliConnEntry.ConnectionLine, connEntry.ConnectionLine)] - for (cliClass, guiClass) in cliToGuiMap: - if isinstance(instance, cliClass): - guiClass.convert_to_gui(instance) - break + def __init__(self): + self._cache = {} + + def __call__(self, cliInstance): + cacheKey = self._calculate_cache_key(cliInstance) + + if self._cache.has_key(cacheKey): + return self._cache[cacheKey] + + line = None + + for (cliClass, guiClass) in GuiConverter.cliToGuiMap: + if isinstance(cliInstance, cliClass): + line = guiClass(cliInstance) + self._cache[cacheKey] = line + break + + return line -def calculate_cache_key(entryLine): - local = (entryLine.local.ipAddr, entryLine.local.port) - foreign = (entryLine.foreign.ipAddr, entryLine.foreign.port) + def _calculate_cache_key(self, entryLine): + local = (entryLine.local.ipAddr, entryLine.local.port) + foreign = (entryLine.foreign.ipAddr, entryLine.foreign.port) - return (entryLine.__class__, local, foreign) + return (entryLine.__class__, local, foreign) + +convert_to_gui = GuiConverter() class ConnectionPanel(CliConnectionPanel): def __init__(self, builder): CliConnectionPanel.__init__(self, None) self.builder = builder - self.cache = {} conn = torTools.getConn() torPid = conn.getMyPid() - torCmdName = sysTools.getProcessName(torPid, "tor") - connections.getResolver(torCmdName, torPid, "tor") + torCmdName = sysTools.getProcessName(torPid, 'tor') + connections.getResolver(torCmdName, torPid, 'tor') gobject.idle_add(self._fill_entries) gobject.timeout_add(3000, self._timeout_fill_entries) @@ -70,14 +81,15 @@ class ConnectionPanel(CliConnectionPanel): # first pass checks whether we have enough entries cached to not update the treeview index = 0 - for line in self._entryLines: - convert_to_gui(line) - cacheKey = calculate_cache_key(line) + for cliLine in self._entryLines: + line = convert_to_gui(cliLine) + + treeIter = self._treestore_get_iter(line) - if self.cache.has_key(cacheKey): + if treeIter: if not isinstance(line, circEntry.CircLine): - timeLabel = "%d s" % (time.time() - line.startTime) - treeStore.set_value(self.cache[cacheKey], 2, timeLabel) + timeLabel = "%d s" % (time.time() - line.cliLine.startTime) + treeStore.set_value(treeIter, 2, timeLabel) else: break @@ -91,10 +103,10 @@ class ConnectionPanel(CliConnectionPanel): treeStore.clear() headerIter = None - for line in self._entryLines: - convert_to_gui(line) + for cliLine in self._entryLines: + line = convert_to_gui(cliLine) - if isinstance(line, connEntry.ConnectionLine) and line.isUnresolvedApp(): + if isinstance(line, connEntry.ConnectionLine) and line.cliLine.isUnresolvedApp(): self._resolveApps() row = line.get_listing_row(self._listingType) @@ -107,8 +119,25 @@ class ConnectionPanel(CliConnectionPanel): else: currentIter = treeStore.append(None, row) - cacheKey = calculate_cache_key(line) - self.cache[cacheKey] = currentIter - self.valsLock.release() + def _treestore_get_iter(self, line): + def match_func(model, treeIter, data): + column, key = data + value = model.get_value(treeIter, column) + return value == key + + def search(model, treeIter, func, data): + while treeIter: + if func(model, treeIter, data): + return treeIter + result = search(model, model.iter_children(treeIter), func, data) + if result: return result + treeIter = model.iter_next(treeIter) + return None + + treeStore = self.builder.get_object('treestore_conn') + matchIter = search(treeStore, treeStore.iter_children(None), match_func, (5, line)) + + return matchIter +

1 0

[arm/master] Merge branch 'master' of git://git.torproject.org/arm
by atagar＠torproject.org 11 Aug '11

11 Aug '11

commit c63b7426b89a3be97ba28dff345ef4d60ba78d52 Merge: 82d89ad e9a02dd Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sun Jul 17 17:15:38 2011 +0500 Merge branch 'master' of git://git.torproject.org/arm ChangeLog | 53 +++++++++++++++++++++++++++++++++++++++++++++++++ install | 2 +- setup.py | 3 +- src/gui/__init__.py | 2 +- src/gui/controller.py | 13 +++++++++-- src/prereq.py | 6 +++- src/util/__init__.py | 2 +- src/util/panel.py | 1 - src/util/torConfig.py | 2 +- src/version.py | 4 +- 10 files changed, 75 insertions(+), 13 deletions(-) diff --cc src/gui/controller.py index bf2e0f9,4979ea1..19b9513 --- a/src/gui/controller.py +++ b/src/gui/controller.py @@@ -13,21 -13,31 +13,28 @@@ gobject.threads_init( class GuiController: def __init__(self): - filename = 'src/gui/arm.xml' - self.builder = gtk.Builder() - self.builder.add_from_file(filename) + + try: + self.builder.add_from_file('src/gui/arm.xml') + except: + # when installed the above path doesn't work (the 'src' prefix doesn't + # exist and whichever path it's working off of doens't seem to exist), + # so using absolute path instead + + self.builder.add_from_file('/usr/share/arm/gui/arm.xml') + self.builder.connect_signals(self) - self.logPanel = logPanel.LogPanel(self.builder) - self.logPanel.pack_widgets() - - self.bwStats = bandwidthStats.BandwidthStats(self.builder) - self.bwStats.pack_widgets() - - self.connPanel = connPanel.ConnectionPanel(self.builder) - self.connPanel.pack_widgets() - self.connPanel.start() + panelClasses = (logPanel.LogPanel, + bandwidthStats.BandwidthStats, + connPanel.ConnectionPanel, + generalPanel.GeneralPanel) + self.panels = {} - self.generalPanel = generalPanel.GeneralPanel(self.builder) - self.generalPanel.pack_widgets() + for panelClass in panelClasses: + self.panels[panelClass] = panelClass(self.builder) + self.panels[panelClass].pack_widgets() def run(self): window = self.builder.get_object('window_main')

1 0

[arm/master] Initial commit for config panel.
by atagar＠torproject.org 11 Aug '11

11 Aug '11

commit 86944555219eaa43bc7d14aa87082ed831877997 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Wed Jul 20 17:04:57 2011 +0500 Initial commit for config panel. List values and show desc in the text view. --- src/gui/arm.xml | 155 ++++++++++++++++++++++++++++++++++++------------ src/gui/configPanel.py | 59 ++++++++++++++++++ src/gui/controller.py | 3 +- 3 files changed, 178 insertions(+), 39 deletions(-) diff --git a/src/gui/arm.xml b/src/gui/arm.xml index 2b9ad95..6c206fd 100644 --- a/src/gui/arm.xml +++ b/src/gui/arm.xml @@ -26,56 +26,32 @@ <column type="gchararray"/> </columns> </object> - <object class="GtkListStore" id="liststore_config"> + <object class="GtkListStore" id="liststore_log"> <columns> -  +  + <column type="gulong"/> +  <column type="gchararray"/> -  +  <column type="gchararray"/> -  +  <column type="gchararray"/>  <column type="gchararray"/> </columns> - <data> - <row> - <col id="0" translatable="yes">BandwidthRate</col> - <col id="1" translatable="yes">5242880</col> - <col id="2" translatable="yes">Average bandwidth usage limit</col> - <col id="3" translatable="yes">#368918</col> - </row> - <row> - <col id="0" translatable="yes">BandwidthBurst</col> - <col id="1" translatable="yes">10485760</col> - <col id="2" translatable="yes">Maximum bandwidth usage limit</col> - <col id="3" translatable="yes">#368918</col> - </row> - <row> - <col id="0" translatable="yes">RelayBandwidthBurst</col> - <col id="1" translatable="yes">0 B</col> - <col id="2" translatable="yes">Maximum bandwidth usage limit for relaying</col> - <col id="3" translatable="yes">#368918</col> - </row> - <row> - <col id="0" translatable="yes">ControlPort</col> - <col id="1" translatable="yes">9051</col> - <col id="2" translatable="yes">Port providing access to tor controllers (arm, vidalia, etc)</col> - <col id="3" translatable="yes">#368918</col> - </row> - </data> </object> - <object class="GtkListStore" id="liststore_log"> + <object class="GtkListStore" id="liststore_config"> <columns> -  - <column type="gulong"/> -  +  <column type="gchararray"/> -  +  <column type="gchararray"/> -  +  <column type="gchararray"/>  <column type="gchararray"/> +  + <column type="gchararray"/> </columns> </object> <object class="GtkWindow" id="window_main"> @@ -410,6 +386,106 @@ </packing> </child> <child> + <object class="GtkVPaned" id="vpaned_config"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkScrolledWindow" id="scrolledwindow_config_desc"> + <property name="height_request">60</property> + <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="GtkTextView" id="textview_config_desc"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="editable">False</property> + <property name="wrap_mode">word</property> + <property name="cursor_visible">False</property> + <property name="buffer">textbuffer_config_desc</property> + </object> + </child> + </object> + <packing> + <property name="resize">False</property> + <property name="shrink">True</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="scrolledwindow_config"> + <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_config"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="model">liststore_config</property> + <property name="headers_clickable">False</property> + <property name="search_column">0</property> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn_config_option"> + <property name="title">Option</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext_config_option"/> + <attributes> + <attribute name="foreground">3</attribute> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn_config_value"> + <property name="title">Value</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext_config_value"/> + <attributes> + <attribute name="foreground">3</attribute> + <attribute name="text">1</attribute> + </attributes> + </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn_config_summary"> + <property name="title">Description</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext_config_summary"/> + <attributes> + <attribute name="foreground">3</attribute> + <attribute name="text">2</attribute> + </attributes> + </child> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="resize">True</property> + <property name="shrink">True</property> + </packing> + </child> + </object> + <packing> + <property name="position">2</property> + </packing> + </child> + <child type="tab"> + <object class="GtkLabel" id="label_config"> + <property name="visible">True</property> + <property name="label" translatable="yes">Configuration</property> + </object> + <packing> + <property name="position">3</property> + <property name="tab_fill">False</property> + </packing> + </child> + <child> <object class="GtkScrolledWindow" id="scrolledwindow_general"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -451,7 +527,7 @@ </child> </object> <packing> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> <child type="tab"> @@ -460,7 +536,7 @@ <property name="label" translatable="yes">General</property> </object> <packing> - <property name="position">2</property> + <property name="position">3</property> <property name="tab_fill">False</property> </packing> </child> @@ -1264,4 +1340,7 @@ Damian Johnson <atagar1(a)gmail.com></property> <property name="stock_id">gtk-about</property> <signal name="activate" handler="on_action_about_activate"/> </object> + <object class="GtkTextBuffer" id="textbuffer_config_desc"> + <property name="text" translatable="yes">Select a configuration option to see its description.</property> + </object> </interface> diff --git a/src/gui/configPanel.py b/src/gui/configPanel.py new file mode 100644 index 0000000..4001058 --- /dev/null +++ b/src/gui/configPanel.py @@ -0,0 +1,59 @@ +""" +Configuration panel. +""" + +import random +import sys +import time + +import gobject +import gtk + +from cli.configPanel import (ConfigPanel as CliConfigPanel, Field, State) +from util import connections, gtkTools, sysTools, torTools, uiTools +from TorCtl import TorCtl + +class ConfigPanel(CliConfigPanel): + def __init__(self, builder): + CliConfigPanel.__init__(self, None, State.TOR) + + self.builder = builder + + gobject.idle_add(self._fill_entries) + gobject.timeout_add(3000, self._timeout_fill_entries) + + def pack_widgets(self): + treeView = self.builder.get_object('treeview_config') + treeView.connect('cursor-changed', self.on_treeview_config_cursor_changed) + + def _timeout_fill_entries(self): + self._fill_entries() + + return True + + def _fill_entries(self): + self.valsLock.acquire() + + listStore = self.builder.get_object('liststore_config') + listStore.clear() + + for entry in self._getConfigOptions(): + option = entry.get(Field.OPTION) + value = entry.get(Field.VALUE) + summary = entry.get(Field.SUMMARY) + desc = entry.get(Field.DESCRIPTION) + row = (option, value, summary, '#368918', desc) + listStore.append(row) + + self.valsLock.release() + + def on_treeview_config_cursor_changed(self, widget, data=None): + treeSelection = widget.get_selection() + + (model, iter) = treeSelection.get_selected() + desc = model.get_value(iter, 4) + + textBuffer = self.builder.get_object('textbuffer_config_desc') + textBuffer.set_text(desc) + print desc + diff --git a/src/gui/controller.py b/src/gui/controller.py index 19b9513..52bb2c6 100644 --- a/src/gui/controller.py +++ b/src/gui/controller.py @@ -6,7 +6,7 @@ import gtk from connections import connPanel from gui.graphing import bandwidthStats -from gui import generalPanel, logPanel +from gui import configPanel, generalPanel, logPanel from util import log, torTools gobject.threads_init() @@ -29,6 +29,7 @@ class GuiController: panelClasses = (logPanel.LogPanel, bandwidthStats.BandwidthStats, connPanel.ConnectionPanel, + configPanel.ConfigPanel, generalPanel.GeneralPanel) self.panels = {}

1 0

[arm/master] Replace "interval updates" by consistent list->model mapping.
by atagar＠torproject.org 11 Aug '11

11 Aug '11

commit 2526e7160753d5953df392a8c6fde1197f63e4d9 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Fri Jul 22 03:03:25 2011 +0500 Replace "interval updates" by consistent list->model mapping. The CLI config panel stored entries in ConfigPanel.confImportantContents which were regularly polled and exported to GUI treestore. This created problems with selections as the liststore was essentially emptied at each timeout. The new approach is to override ConfigPanel.confImportantContents with a wrapper class which maintains consistency between the Python list and GUI liststore at each append/setitem. --- src/gui/configPanel.py | 72 ++++++++++++++++++++++++++++++++---------------- 1 files changed, 48 insertions(+), 24 deletions(-) diff --git a/src/gui/configPanel.py b/src/gui/configPanel.py index 4001058..ff8ec86 100644 --- a/src/gui/configPanel.py +++ b/src/gui/configPanel.py @@ -13,40 +13,65 @@ from cli.configPanel import (ConfigPanel as CliConfigPanel, Field, State) from util import connections, gtkTools, sysTools, torTools, uiTools from TorCtl import TorCtl +class ConfContents(object): + def __init__(self, container, model): + self.container = [] + self.model = model + + for entry in container: + self.append(entry) + + def append(self, entry): + self.container.append(entry) + gobject.idle_add(self.__model_append, entry) + + def __str__(self): + return str(self.container) + + def __repr__(self): + return str(self.container) + + def __getitem__(self, key): + return self.container[key] + + def __setitem__(self, key, entry): + self.container[key] = entry + + gobject.idle_add(self.__model_set, key, entry) + + def __len__(self): + return len(self.container) + + def __create_row_from_entry(self, entry): + option = entry.get(Field.OPTION) + value = entry.get(Field.VALUE) + summary = entry.get(Field.SUMMARY) + desc = entry.get(Field.DESCRIPTION) + row = (option, value, summary, '#368918', desc) + + return row + + def __model_append(self, entry): + row = self.__create_row_from_entry(entry) + self.model.append(row) + + def __model_set(self, key, entry): + row = self.__create_row_from_entry(entry) + self.model[key] = row + class ConfigPanel(CliConfigPanel): def __init__(self, builder): CliConfigPanel.__init__(self, None, State.TOR) self.builder = builder - gobject.idle_add(self._fill_entries) - gobject.timeout_add(3000, self._timeout_fill_entries) + listStore = self.builder.get_object('liststore_config') + self.confImportantContents = ConfContents(self.confImportantContents, listStore) def pack_widgets(self): treeView = self.builder.get_object('treeview_config') treeView.connect('cursor-changed', self.on_treeview_config_cursor_changed) - def _timeout_fill_entries(self): - self._fill_entries() - - return True - - def _fill_entries(self): - self.valsLock.acquire() - - listStore = self.builder.get_object('liststore_config') - listStore.clear() - - for entry in self._getConfigOptions(): - option = entry.get(Field.OPTION) - value = entry.get(Field.VALUE) - summary = entry.get(Field.SUMMARY) - desc = entry.get(Field.DESCRIPTION) - row = (option, value, summary, '#368918', desc) - listStore.append(row) - - self.valsLock.release() - def on_treeview_config_cursor_changed(self, widget, data=None): treeSelection = widget.get_selection() @@ -55,5 +80,4 @@ class ConfigPanel(CliConfigPanel): textBuffer = self.builder.get_object('textbuffer_config_desc') textBuffer.set_text(desc) - print desc

1 0

[arm/master] Decouple list wrapper class for use by other panels.
by atagar＠torproject.org 11 Aug '11

11 Aug '11

commit 2079780c2c6b90022dda02fac36059476f69eec5 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Fri Jul 22 04:08:31 2011 +0500 Decouple list wrapper class for use by other panels. --- src/gui/configPanel.py | 40 +--------------------------------- src/util/gtkTools.py | 54 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 56 insertions(+), 38 deletions(-) diff --git a/src/gui/configPanel.py b/src/gui/configPanel.py index ff8ec86..46f9aa7 100644 --- a/src/gui/configPanel.py +++ b/src/gui/configPanel.py @@ -13,36 +13,8 @@ from cli.configPanel import (ConfigPanel as CliConfigPanel, Field, State) from util import connections, gtkTools, sysTools, torTools, uiTools from TorCtl import TorCtl -class ConfContents(object): - def __init__(self, container, model): - self.container = [] - self.model = model - - for entry in container: - self.append(entry) - - def append(self, entry): - self.container.append(entry) - gobject.idle_add(self.__model_append, entry) - - def __str__(self): - return str(self.container) - - def __repr__(self): - return str(self.container) - - def __getitem__(self, key): - return self.container[key] - - def __setitem__(self, key, entry): - self.container[key] = entry - - gobject.idle_add(self.__model_set, key, entry) - - def __len__(self): - return len(self.container) - - def __create_row_from_entry(self, entry): +class ConfContents(gtkTools.ListWrapper): + def _create_row_from_entry(self, entry): option = entry.get(Field.OPTION) value = entry.get(Field.VALUE) summary = entry.get(Field.SUMMARY) @@ -51,14 +23,6 @@ class ConfContents(object): return row - def __model_append(self, entry): - row = self.__create_row_from_entry(entry) - self.model.append(row) - - def __model_set(self, key, entry): - row = self.__create_row_from_entry(entry) - self.model[key] = row - class ConfigPanel(CliConfigPanel): def __init__(self, builder): CliConfigPanel.__init__(self, None, State.TOR) diff --git a/src/util/gtkTools.py b/src/util/gtkTools.py index 083fb5d..2d00621 100644 --- a/src/util/gtkTools.py +++ b/src/util/gtkTools.py @@ -2,6 +2,7 @@ Helper module for getting Gtk+ theme colors. """ +import gobject import gtk COLOR_MAP = { @@ -19,3 +20,56 @@ class Theme: for (key, (prop, state)) in COLOR_MAP.items(): self.colors[key] = getattr(widget.style, prop)[state] +class ListWrapper(object): + def __init__(self, container, model): + self.container = [] + self.model = model + + for entry in container: + self.append(entry) + + def append(self, entry): + self.container.append(entry) + gobject.idle_add(self.__model_append, entry) + + def __str__(self): + return str(self.container) + + def __repr__(self): + return str(self.container) + + def __len__(self): + return len(self.container) + + def __iadd__(self, other): + for entry in other: + self.append(entry) + + def __delitem__(self, key): + del self.container[key] + + gobject.idle_add(self.__model_del, key) + + def __getitem__(self, key): + return self.container[key] + + def __setitem__(self, key, entry): + self.container[key] = entry + + gobject.idle_add(self.__model_set, key, entry) + + def __model_append(self, entry): + row = self._create_row_from_entry(entry) + self.model.append(row) + + def __model_del(self, key): + treeIter = self.model.get_iter(key) + self.model.remove(treeIter) + + def __model_set(self, key, entry): + row = self._create_row_from_entry(entry) + self.model[key] = row + + def _create_row_from_entry(self, entry): + raise NotImplementedError("Subclass must implement abstract method") +

1 0

[arm/master] Python black-magic to connect lists with liststores.
by atagar＠torproject.org 11 Aug '11

11 Aug '11

commit df0e5d0ca45f0c304fab0362ce7327cea0b2df5e Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sat Jul 23 06:20:05 2011 +0500 Python black-magic to connect lists with liststores. The ConfigPanel.confImportantContents is patched via Python property() in such a way that assigning lists to it automatically updates the liststore. The setter/getter is really ugly and hard to read, and serves only the purpose that the CLI portion does not need to be changed at all for this to work. Once library/CLI/GUI is decoupled this obscure piece of dark magic shall be gone for good. --- src/gui/configPanel.py | 25 +++++++++++++++++++++++-- src/util/gtkTools.py | 7 +++++++ 2 files changed, 30 insertions(+), 2 deletions(-) diff --git a/src/gui/configPanel.py b/src/gui/configPanel.py index 46f9aa7..e0fb8dc 100644 --- a/src/gui/configPanel.py +++ b/src/gui/configPanel.py @@ -23,14 +23,35 @@ class ConfContents(gtkTools.ListWrapper): return row -class ConfigPanel(CliConfigPanel): +class ConfigPanel(object, CliConfigPanel): def __init__(self, builder): CliConfigPanel.__init__(self, None, State.TOR) self.builder = builder listStore = self.builder.get_object('liststore_config') - self.confImportantContents = ConfContents(self.confImportantContents, listStore) + self._confImportantContents = ConfContents(self.confImportantContents, listStore) + + self.confImportantContents = self.confImportantContents[-5:] + + @property + def confImportantContents(self): + if hasattr(self, '_confImportantContents'): + return self._confImportantContents + else: + return [] + + @confImportantContents.setter + def confImportantContents(self, value): + if hasattr(self, '_confImportantContents'): + try: + self._confImportantContents.empty() + except AttributeError: + pass + for entry in value: + self._confImportantContents.append(entry) + else: + self._confImportantContents = value def pack_widgets(self): treeView = self.builder.get_object('treeview_config') diff --git a/src/util/gtkTools.py b/src/util/gtkTools.py index 2d00621..5ad321e 100644 --- a/src/util/gtkTools.py +++ b/src/util/gtkTools.py @@ -32,6 +32,10 @@ class ListWrapper(object): self.container.append(entry) gobject.idle_add(self.__model_append, entry) + def empty(self): + self.container = [] + gobject.idle_add(self.__model_clear) + def __str__(self): return str(self.container) @@ -62,6 +66,9 @@ class ListWrapper(object): row = self._create_row_from_entry(entry) self.model.append(row) + def __model_clear(self): + self.model.clear() + def __model_del(self, key): treeIter = self.model.get_iter(key) self.model.remove(treeIter)

1 0