- tor-commits - lists.torproject.org

[arm/master] Minor fix for time units.
by atagar＠torproject.org 11 Aug '11

11 Aug '11

commit 4df31a62dbee86919d8834f84b958507e7112e46 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sun Jul 31 01:07:03 2011 +0500 Minor fix for time units. --- src/util/gtkTools.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/util/gtkTools.py b/src/util/gtkTools.py index 56a5718..8e8b985 100644 --- a/src/util/gtkTools.py +++ b/src/util/gtkTools.py @@ -189,7 +189,7 @@ def input_time(prompt, default=None): hBox.pack_end(comboBox, False, False, 0) if default: - if default[:-1] != 's': + if default[-1:] != 's': default = default + 's' value, units = default.split()

1 0

[arm/master] Use CSVs for RouterList values.
by atagar＠torproject.org 11 Aug '11

11 Aug '11

commit eccb84e2494dc2b31aeea8ee33053368d0763d71 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sun Jul 31 15:47:30 2011 +0500 Use CSVs for RouterList values. --- src/gui/configPanel.py | 8 +++++--- src/util/gtkTools.py | 9 +++++---- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/gui/configPanel.py b/src/gui/configPanel.py index 1b57341..adcdcec 100644 --- a/src/gui/configPanel.py +++ b/src/gui/configPanel.py @@ -34,9 +34,9 @@ def input_conf_value_int(option, oldValue): prompt = "Enter value for %s" % option return gtkTools.input_int(prompt, oldValue) -def input_conf_value_list(option, oldValue): +def input_conf_value_list(option, oldValue, csv=False): prompt = "Enter value for %s" % option - return gtkTools.input_list(prompt, oldValue) + return gtkTools.input_list(prompt, oldValue, csv) def input_conf_value_string(option, oldValue): prompt = "Enter value for %s" % option @@ -138,7 +138,9 @@ class ConfigPanel(object, CliConfigPanel): elif configType == 'String': newValue = input_conf_value_string(configOption, oldValue) elif configType == 'LineList': - newValue = input_conf_value_list(configOption, oldValue) + newValue = input_conf_value_list(configOption, oldValue, csv=False) + elif configType == 'RouterList': + newValue = input_conf_value_list(configOption, oldValue, csv=True) elif configType == 'Boolean': newValue = input_conf_value_bool(configOption, oldValue) elif configType == 'Filename': diff --git a/src/util/gtkTools.py b/src/util/gtkTools.py index 8e8b985..2960188 100644 --- a/src/util/gtkTools.py +++ b/src/util/gtkTools.py @@ -214,7 +214,7 @@ def input_time(prompt, default=None): return "%d %s" % (value, units) if response == gtk.RESPONSE_OK else None -def input_int(prompt, default=None): +def input_int(prompt, default=None, csvResponse=False): dialog = gtk.MessageDialog(None, gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, gtk.MESSAGE_QUESTION, @@ -268,7 +268,7 @@ def input_string(prompt, default=None): return text if response == gtk.RESPONSE_OK else None -def input_list(prompt, default): +def input_list(prompt, default, csv=False): def on_add_button_clicked(widget, listStore): newValue = input_string("Enter new value:") @@ -321,8 +321,9 @@ def input_list(prompt, default): addButton.connect('clicked', on_add_button_clicked, listStore) deleteButton.connect('clicked', on_delete_button_clicked, treeView) + separator = "," if csv else " " if default: - for value in default.split(): + for value in default.split(separator): row = (value,) listStore.append(row) @@ -334,7 +335,7 @@ def input_list(prompt, default): if not response == gtk.RESPONSE_OK: return - return None if len(listStore) == 0 else " ".join([row[0] for row in listStore]) + return None if len(listStore) == 0 else separator.join([row[0] for row in listStore]) def input_bool(prompt, default=None): dialog = gtk.MessageDialog(None,

1 0

[arm/master] Merge commit 'krkhan/master'
by atagar＠torproject.org 11 Aug '11

11 Aug '11

commit de4b51a73316a0a4d366a9cab38707ccffa56cf0 Merge: ee6721e 5fff0b1 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Aug 11 08:24:08 2011 -0700 Merge commit 'krkhan/master' src/gui/arm.xml | 169 +++++++++++---- src/gui/configPanel.py | 161 ++++++++++++++ src/gui/connections/circEntry.py | 37 ++-- src/gui/connections/connEntry.py | 48 ++--- src/gui/connections/connPanel.py | 134 +++++------- src/gui/controller.py | 32 ++-- src/gui/generalPanel.py | 25 +-- src/gui/graphing/__init__.py | 2 +- src/gui/graphing/bandwidthStats.py | 12 +- src/gui/graphing/graphPanel.py | 144 +++++++++++++ src/gui/graphing/graphStats.py | 142 ------------- src/gui/logPanel.py | 26 ++-- src/starter.py | 2 +- src/util/gtkTools.py | 405 ++++++++++++++++++++++++++++++++++++ 14 files changed, 979 insertions(+), 360 deletions(-)

1 0

[arm/master] Show all options for testing.
by atagar＠torproject.org 11 Aug '11

11 Aug '11

commit 546ca73259d7863e3efe5e11e09c023c2790a2f6 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Mon Aug 1 05:11:21 2011 +0500 Show all options for testing. --- src/gui/configPanel.py | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/gui/configPanel.py b/src/gui/configPanel.py index adcdcec..e66f670 100644 --- a/src/gui/configPanel.py +++ b/src/gui/configPanel.py @@ -86,23 +86,23 @@ class ConfigPanel(object, CliConfigPanel): self.builder = builder listStore = self.builder.get_object('liststore_config') - self._wrappedConfImportantContents = ConfContents(self.confImportantContents, listStore) + self._wrappedConfContents = ConfContents(self.confContents, listStore) @property - def confImportantContents(self): - if hasattr(self, '_wrappedConfImportantContents'): - return self._wrappedConfImportantContents.container + def confContents(self): + if hasattr(self, '_wrappedConfContents'): + return self._wrappedConfContents.container else: return [] - @confImportantContents.setter - def confImportantContents(self, value): - if hasattr(self, '_wrappedConfImportantContents'): - self._wrappedConfImportantContents.empty() + @confContents.setter + def confContents(self, value): + if hasattr(self, '_wrappedConfContents'): + self._wrappedConfContents.empty() for entry in value: - self._wrappedConfImportantContents.append(entry) + self._wrappedConfContents.append(entry) else: - self._wrappedConfImportantContents = ConfContents(value) + self._wrappedConfContents = ConfContents(value) def pack_widgets(self): treeView = self.builder.get_object('treeview_config') @@ -122,7 +122,7 @@ class ConfigPanel(object, CliConfigPanel): def on_treeview_config_row_activated(self, treeView, path, column): (index,) = path - entry = self._wrappedConfImportantContents[index] + entry = self._wrappedConfContents[index] configOption = entry.get(Field.OPTION) configType = entry.get(Field.TYPE) argUsage = entry.get(Field.ARG_USAGE) @@ -157,5 +157,5 @@ class ConfigPanel(object, CliConfigPanel): except TorCtl.ErrorReply, err: gtkTools.showError(str(err)) - self._wrappedConfImportantContents[index] = entry + self._wrappedConfContents[index] = entry

1 0

[arm/master] Implement config value edits for string values.
by atagar＠torproject.org 11 Aug '11

11 Aug '11

commit e98ab90082947021af9ca4ae7416b35b5e6f1bee Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Wed Jul 27 05:54:16 2011 +0500 Implement config value edits for string values. Catches TorCtl exceptions and shows them in an error dialog. --- src/gui/configPanel.py | 29 +++++++++++++++++++++++++++-- src/util/gtkTools.py | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 2 deletions(-) diff --git a/src/gui/configPanel.py b/src/gui/configPanel.py index 433d612..a1d1daa 100644 --- a/src/gui/configPanel.py +++ b/src/gui/configPanel.py @@ -13,6 +13,10 @@ from cli.configPanel import (ConfigPanel as CliConfigPanel, Field, State) from util import connections, gtkTools, sysTools, torTools, uiTools from TorCtl import TorCtl +def inputConfValueText(option): + prompt = "Enter value for %s" % option + return gtkTools.inputText(prompt) + class ConfContents(gtkTools.ListWrapper): def _create_row_from_value(self, entry): option = entry.get(Field.OPTION) @@ -50,10 +54,12 @@ class ConfigPanel(object, CliConfigPanel): def pack_widgets(self): treeView = self.builder.get_object('treeview_config') + treeView.connect('cursor-changed', self.on_treeview_config_cursor_changed) + treeView.connect('row-activated', self.on_treeview_config_row_activated) - def on_treeview_config_cursor_changed(self, widget, data=None): - treeSelection = widget.get_selection() + def on_treeview_config_cursor_changed(self, treeView, data=None): + treeSelection = treeView.get_selection() (model, iter) = treeSelection.get_selected() desc = model.get_value(iter, 4) @@ -61,3 +67,22 @@ class ConfigPanel(object, CliConfigPanel): textBuffer = self.builder.get_object('textbuffer_config_desc') textBuffer.set_text(desc) + def on_treeview_config_row_activated(self, treeView, path, column): + (index,) = path + + entry = self._wrappedConfImportantContents[index] + configOption = entry.fields[Field.OPTION] + configType = entry.fields[Field.TYPE] + newValue = None + + if configType == 'DataSize': + newValue = inputConfValueText(configOption) + + if newValue: + try: + torTools.getConn().setOption(configOption, newValue) + except TorCtl.ErrorReply, err: + gtkTools.showError(str(err)) + + self._wrappedConfImportantContents[index] = entry + diff --git a/src/util/gtkTools.py b/src/util/gtkTools.py index c1b14dd..5180e82 100644 --- a/src/util/gtkTools.py +++ b/src/util/gtkTools.py @@ -100,3 +100,38 @@ class TreeWrapper(ListWrapper): row = self._create_row_from_value(value) self.model.append(None, row) +def responseToDialog(entry, dialog, response): + dialog.response(response) + +def inputText(prompt): + dialog = gtk.MessageDialog(None, + gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, + gtk.MESSAGE_QUESTION, + gtk.BUTTONS_OK_CANCEL, + None) + + dialog.set_markup(prompt) + + entry = gtk.Entry() + entry.connect("activate", responseToDialog, dialog, gtk.RESPONSE_OK) + + dialog.vbox.pack_end(entry, True, True, 0) + + dialog.show_all() + response = dialog.run() + + text = entry.get_text() + dialog.destroy() + + return text if response == gtk.RESPONSE_OK else None + +def showError(msg): + dialog = gtk.MessageDialog(None, + gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, + gtk.MESSAGE_ERROR, + gtk.BUTTONS_OK, + msg) + + dialog.run() + dialog.destroy() +

1 0

[arm/master] Support += operations for list-model wrapper.
by atagar＠torproject.org 11 Aug '11

11 Aug '11

commit 6b4d1e8ff8d7872bb1cb4bf88bf17f31e61fee1e Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sun Jul 24 03:57:47 2011 +0500 Support += operations for list-model wrapper. --- src/gui/configPanel.py | 11 ++++------- src/util/gtkTools.py | 14 +++++++++++++- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/gui/configPanel.py b/src/gui/configPanel.py index e0fb8dc..a8d7f02 100644 --- a/src/gui/configPanel.py +++ b/src/gui/configPanel.py @@ -32,26 +32,23 @@ class ConfigPanel(object, CliConfigPanel): listStore = self.builder.get_object('liststore_config') self._confImportantContents = ConfContents(self.confImportantContents, listStore) - self.confImportantContents = self.confImportantContents[-5:] + self.confImportantContents += self.confImportantContents[-5:] @property def confImportantContents(self): if hasattr(self, '_confImportantContents'): - return self._confImportantContents + return self._confImportantContents.container else: return [] @confImportantContents.setter def confImportantContents(self, value): if hasattr(self, '_confImportantContents'): - try: - self._confImportantContents.empty() - except AttributeError: - pass + self._confImportantContents.empty() for entry in value: self._confImportantContents.append(entry) else: - self._confImportantContents = value + self._confImportantContents = ConfContents(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 5ad321e..b60a829 100644 --- a/src/util/gtkTools.py +++ b/src/util/gtkTools.py @@ -21,7 +21,7 @@ class Theme: self.colors[key] = getattr(widget.style, prop)[state] class ListWrapper(object): - def __init__(self, container, model): + def __init__(self, container, model=None): self.container = [] self.model = model @@ -63,17 +63,29 @@ class ListWrapper(object): gobject.idle_add(self.__model_set, key, entry) def __model_append(self, entry): + if not self.model: + return + row = self._create_row_from_entry(entry) self.model.append(row) def __model_clear(self): + if not self.model: + return + self.model.clear() def __model_del(self, key): + if not self.model: + return + treeIter = self.model.get_iter(key) self.model.remove(treeIter) def __model_set(self, key, entry): + if not self.model: + return + row = self._create_row_from_entry(entry) self.model[key] = row

1 0

[arm/master] Use spinbutton for value and combobox for units of data size confs.
by atagar＠torproject.org 11 Aug '11

11 Aug '11

commit d640992c3c499ffdcfee9d5002da8f6930e59f14 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Thu Jul 28 16:35:25 2011 +0500 Use spinbutton for value and combobox for units of data size confs. --- src/gui/configPanel.py | 18 ++++++++++----- src/util/gtkTools.py | 54 ++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 62 insertions(+), 10 deletions(-) diff --git a/src/gui/configPanel.py b/src/gui/configPanel.py index 7b1ea42..c5b631a 100644 --- a/src/gui/configPanel.py +++ b/src/gui/configPanel.py @@ -13,13 +13,17 @@ from cli.configPanel import (ConfigPanel as CliConfigPanel, Field, State) from util import connections, gtkTools, sysTools, torTools, uiTools from TorCtl import TorCtl -def inputConfValueText(option): +def input_conf_value_size(option): prompt = "Enter value for %s" % option - return gtkTools.inputText(prompt) + return gtkTools.input_size(prompt) -def inputConfValueBoolean(option): +def input_conf_value_text(option): + prompt = "Enter value for %s" % option + return gtkTools.input_text(prompt) + +def input_conf_value_boolean(option): prompt = "Select value for %s" % option - return "1" if gtkTools.inputBoolean(prompt) else "0" + return "1" if gtkTools.input_boolean(prompt) else "0" class ConfContents(gtkTools.ListWrapper): def _create_row_from_value(self, entry): @@ -80,9 +84,11 @@ class ConfigPanel(object, CliConfigPanel): newValue = None if configType == 'DataSize': - newValue = inputConfValueText(configOption) + newValue = input_conf_value_size(configOption) elif configType == 'Boolean': - newValue = inputConfValueBoolean(configOption) + newValue = input_conf_value_boolean(configOption) + else: + newValue = input_conf_value_text(configOption) if newValue: try: diff --git a/src/util/gtkTools.py b/src/util/gtkTools.py index cc2d361..860a587 100644 --- a/src/util/gtkTools.py +++ b/src/util/gtkTools.py @@ -100,10 +100,56 @@ class TreeWrapper(ListWrapper): row = self._create_row_from_value(value) self.model.append(None, row) -def responseToDialog(entry, dialog, response): +def response_to_dialog(entry, dialog, response): dialog.response(response) -def inputText(prompt): +def input_size(prompt): + dialog = gtk.MessageDialog(None, + gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, + gtk.MESSAGE_QUESTION, + gtk.BUTTONS_OK_CANCEL, + None) + + dialog.set_markup(prompt) + + hBox = gtk.HBox() + + dialog.vbox.pack_end(hBox, True, True, 0) + + spinButton = gtk.SpinButton(None) + spinButton.connect("activate", response_to_dialog, dialog, gtk.RESPONSE_OK) + + spinButton.set_increments(1, 10) + spinButton.set_range(0, 1024) + + hBox.pack_start(spinButton, True, True, 0) + + comboBox = gtk.combo_box_new_text() + + comboBox.append_text("B") + comboBox.append_text("KB") + comboBox.append_text("MB") + comboBox.append_text("GB") + comboBox.append_text("TB") + comboBox.append_text("PB") + comboBox.set_active(0) + + hBox.pack_end(comboBox, False, False, 0) + + dialog.show_all() + response = dialog.run() + + value = spinButton.get_value_as_int() + + model = comboBox.get_model() + active = comboBox.get_active() + (units,) = model[active] + + dialog.destroy() + + return "%d %s" % (value, units) if response == gtk.RESPONSE_OK else None + +def input_text(prompt): dialog = gtk.MessageDialog(None, gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, gtk.MESSAGE_QUESTION, @@ -113,7 +159,7 @@ def inputText(prompt): dialog.set_markup(prompt) entry = gtk.Entry() - entry.connect("activate", responseToDialog, dialog, gtk.RESPONSE_OK) + entry.connect("activate", response_to_dialog, dialog, gtk.RESPONSE_OK) dialog.vbox.pack_end(entry, True, True, 0) @@ -125,7 +171,7 @@ def inputText(prompt): return text if response == gtk.RESPONSE_OK else None -def inputBoolean(prompt): +def input_boolean(prompt): dialog = gtk.MessageDialog(None, gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, gtk.MESSAGE_QUESTION,

1 0

[arm/master] Replace list->treestore caching from conn panel with wrappers.
by atagar＠torproject.org 11 Aug '11

11 Aug '11

commit 5d05a442373b252ed21f2cad237d1ed37786390c Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sun Jul 24 05:25:10 2011 +0500 Replace list->treestore caching from conn panel with wrappers. The old method of refreshing treestore entries every three seconds via the CLI counterpart is replaced by the list wrapper (developed for config panel, part of gtkTools). The list wrapper patches the conn panel so that each time the CLI panel updates entryLines, the relevant treestore structures are updated automatically. This way, the treestores are only updated when arm backend is updated. --- src/gui/configPanel.py | 18 ++--- src/gui/connections/connPanel.py | 145 ++++++++++++------------------------- src/util/gtkTools.py | 46 +++++++----- 3 files changed, 82 insertions(+), 127 deletions(-) diff --git a/src/gui/configPanel.py b/src/gui/configPanel.py index a8d7f02..433d612 100644 --- a/src/gui/configPanel.py +++ b/src/gui/configPanel.py @@ -14,7 +14,7 @@ from util import connections, gtkTools, sysTools, torTools, uiTools from TorCtl import TorCtl class ConfContents(gtkTools.ListWrapper): - def _create_row_from_entry(self, entry): + def _create_row_from_value(self, entry): option = entry.get(Field.OPTION) value = entry.get(Field.VALUE) summary = entry.get(Field.SUMMARY) @@ -30,25 +30,23 @@ class ConfigPanel(object, CliConfigPanel): self.builder = builder listStore = self.builder.get_object('liststore_config') - self._confImportantContents = ConfContents(self.confImportantContents, listStore) - - self.confImportantContents += self.confImportantContents[-5:] + self._wrappedConfImportantContents = ConfContents(self.confImportantContents, listStore) @property def confImportantContents(self): - if hasattr(self, '_confImportantContents'): - return self._confImportantContents.container + if hasattr(self, '_wrappedConfImportantContents'): + return self._wrappedConfImportantContents.container else: return [] @confImportantContents.setter def confImportantContents(self, value): - if hasattr(self, '_confImportantContents'): - self._confImportantContents.empty() + if hasattr(self, '_wrappedConfImportantContents'): + self._wrappedConfImportantContents.empty() for entry in value: - self._confImportantContents.append(entry) + self._wrappedConfImportantContents.append(entry) else: - self._confImportantContents = ConfContents(value) + self._wrappedConfImportantContents = ConfContents(value) def pack_widgets(self): treeView = self.builder.get_object('treeview_config') diff --git a/src/gui/connections/connPanel.py b/src/gui/connections/connPanel.py index 55669f9..9476059 100644 --- a/src/gui/connections/connPanel.py +++ b/src/gui/connections/connPanel.py @@ -11,43 +11,51 @@ from collections import deque import gobject import gtk -from cli.connections import (circEntry as cliCircEntry, connEntry as cliConnEntry) +from cli.connections import (circEntry as cliCircEntry, connEntry as cliConnEntry, entries) from cli.connections.connPanel import ConnectionPanel as CliConnectionPanel from gui.connections import circEntry, connEntry -from util import connections, sysTools, uiTools, torTools +from util import connections, gtkTools, sysTools, uiTools, torTools from TorCtl import TorCtl -class GuiConverter: +def convert_to_gui(cliInstance): cliToGuiMap = [ (cliCircEntry.CircHeaderLine, circEntry.CircHeaderLine), (cliCircEntry.CircLine, circEntry.CircLine), (cliConnEntry.ConnectionLine, connEntry.ConnectionLine)] - def __init__(self): - self._cache = {} + line = None - def __call__(self, cliInstance): - cacheKey = self._calculate_cache_key(cliInstance) + for (cliClass, guiClass) in cliToGuiMap: + if isinstance(cliInstance, cliClass): + line = guiClass(cliInstance) + break - if self._cache.has_key(cacheKey): - return self._cache[cacheKey] + return line - line = None +class EntryLines(gtkTools.TreeWrapper): + def __init__(self, container, model=None, listingType=None): + gtkTools.TreeWrapper.__init__(self, container, model) - for (cliClass, guiClass) in GuiConverter.cliToGuiMap: - if isinstance(cliInstance, cliClass): - line = guiClass(cliInstance) - self._cache[cacheKey] = line - break + self._listingType = listingType if listingType else entries.ListingType.IP_ADDRESS - return line + def _model_append(self, cliLine): + if not self.model: + return - def _calculate_cache_key(self, entryLine): - local = (entryLine.local.ipAddr, entryLine.local.port) - foreign = (entryLine.foreign.ipAddr, entryLine.foreign.port) + row = self._create_row_from_value(cliLine) + line = convert_to_gui(cliLine) - return (entryLine.__class__, local, foreign) + if isinstance(line, circEntry.CircHeaderLine): + self.headerIter = self.model.append(None, row) + elif isinstance(line, circEntry.CircLine): + self.model.append(self.headerIter, row) + else: + self.model.append(None, row) -convert_to_gui = GuiConverter() + def _create_row_from_value(self, cliLine): + line = convert_to_gui(cliLine) + row = line.get_listing_row(self._listingType) + + return row class ConnectionPanel(CliConnectionPanel): def __init__(self, builder): @@ -60,84 +68,25 @@ class ConnectionPanel(CliConnectionPanel): torCmdName = sysTools.getProcessName(torPid, 'tor') connections.getResolver(torCmdName, torPid, 'tor') - gobject.idle_add(self._fill_entries) - gobject.timeout_add(3000, self._timeout_fill_entries) + treeStore = self.builder.get_object('treestore_conn') + self._wrappedEntryLines = EntryLines(self._entryLines, treeStore) + + @property + def _entryLines(self): + if hasattr(self, '_wrappedEntryLines'): + return self._wrappedEntryLines.container + else: + return [] + + @_entryLines.setter + def _entryLines(self, value): + if hasattr(self, '_wrappedEntryLines'): + self._wrappedEntryLines.empty() + for entry in value: + self._wrappedEntryLines.append(entry) + else: + self._wrappedEntryLines = EntryLines(value) def pack_widgets(self): self.start() - def _timeout_fill_entries(self): - self._fill_entries() - - return True - - def _fill_entries(self): - self.valsLock.acquire() - - label = self.builder.get_object('label_conn_top') - label.set_text(self._title) - - treeStore = self.builder.get_object('treestore_conn') - - # first pass checks whether we have enough entries cached to not update the treeview - index = 0 - for cliLine in self._entryLines: - line = convert_to_gui(cliLine) - - treeIter = self._treestore_get_iter(line) - - if treeIter: - if not isinstance(line, circEntry.CircLine): - timeLabel = "%d s" % (time.time() - line.cliLine.startTime) - treeStore.set_value(treeIter, 2, timeLabel) - else: - break - - index = index + 1 - - if index == len(self._entryLines): - self.valsLock.release() - return True - - # one of the entries was not found in cache, clear and repopulate the treeStore - treeStore.clear() - headerIter = None - - for cliLine in self._entryLines: - line = convert_to_gui(cliLine) - - if isinstance(line, connEntry.ConnectionLine) and line.cliLine.isUnresolvedApp(): - self._resolveApps() - - row = line.get_listing_row(self._listingType) - - if isinstance(line, circEntry.CircHeaderLine): - currentIter = treeStore.append(None, row) - headerIter = currentIter - elif isinstance(line, circEntry.CircLine): - currentIter = treeStore.append(headerIter, row) - else: - currentIter = treeStore.append(None, row) - - 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 - diff --git a/src/util/gtkTools.py b/src/util/gtkTools.py index b60a829..c1b14dd 100644 --- a/src/util/gtkTools.py +++ b/src/util/gtkTools.py @@ -25,16 +25,16 @@ class ListWrapper(object): self.container = [] self.model = model - for entry in container: - self.append(entry) + for value in container: + self.append(value) - def append(self, entry): - self.container.append(entry) - gobject.idle_add(self.__model_append, entry) + def append(self, value): + self.container.append(value) + gobject.idle_add(self._model_append, value) def empty(self): self.container = [] - gobject.idle_add(self.__model_clear) + gobject.idle_add(self._model_clear) def __str__(self): return str(self.container) @@ -46,49 +46,57 @@ class ListWrapper(object): return len(self.container) def __iadd__(self, other): - for entry in other: - self.append(entry) + for value in other: + self.append(value) def __delitem__(self, key): del self.container[key] - gobject.idle_add(self.__model_del, 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 + def __setitem__(self, key, value): + self.container[key] = value - gobject.idle_add(self.__model_set, key, entry) + gobject.idle_add(self._model_set, key, value) - def __model_append(self, entry): + def _model_append(self, value): if not self.model: return - row = self._create_row_from_entry(entry) + row = self._create_row_from_value(value) self.model.append(row) - def __model_clear(self): + def _model_clear(self): if not self.model: return self.model.clear() - def __model_del(self, key): + def _model_del(self, key): if not self.model: return treeIter = self.model.get_iter(key) self.model.remove(treeIter) - def __model_set(self, key, entry): + def _model_set(self, key, value): if not self.model: return - row = self._create_row_from_entry(entry) + row = self._create_row_from_value(value) self.model[key] = row - def _create_row_from_entry(self, entry): + def _create_row_from_value(self, value): raise NotImplementedError("Subclass must implement abstract method") +class TreeWrapper(ListWrapper): + def _model_append(self, value): + if not self.model: + return + + row = self._create_row_from_value(value) + self.model.append(None, row) +

1 0

[arm/master] Support integer confs.
by atagar＠torproject.org 11 Aug '11

11 Aug '11

commit e72dad26709f7260af4567a53c4b334681eb3072 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sat Jul 30 14:25:07 2011 +0500 Support integer confs. --- src/gui/configPanel.py | 8 ++++++++ src/util/gtkTools.py | 26 ++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 0 deletions(-) diff --git a/src/gui/configPanel.py b/src/gui/configPanel.py index b87c1b3..582034a 100644 --- a/src/gui/configPanel.py +++ b/src/gui/configPanel.py @@ -17,6 +17,10 @@ def input_conf_value_size(option): prompt = "Enter value for %s" % option return gtkTools.input_size(prompt) +def input_conf_value_int(option): + prompt = "Enter value for %s" % option + return gtkTools.input_int(prompt) + def input_conf_value_list(option): prompt = "Enter value for %s" % option return gtkTools.input_list(prompt) @@ -31,6 +35,8 @@ def input_conf_value_boolean(option): class ConfContents(gtkTools.ListWrapper): def _create_row_from_value(self, entry): + print entry.get(Field.OPTION), ":", entry.get(Field.TYPE) + option = entry.get(Field.OPTION) value = entry.get(Field.VALUE) summary = entry.get(Field.SUMMARY) @@ -89,6 +95,8 @@ class ConfigPanel(object, CliConfigPanel): if configType == 'DataSize': newValue = input_conf_value_size(configOption) + elif configType == 'Integer': + newValue = input_conf_value_int(configOption) elif configType == 'LineList': newValue = input_conf_value_list(configOption) elif configType == 'Boolean': diff --git a/src/util/gtkTools.py b/src/util/gtkTools.py index 37e818e..afd4fef 100644 --- a/src/util/gtkTools.py +++ b/src/util/gtkTools.py @@ -149,6 +149,32 @@ def input_size(prompt): return "%d %s" % (value, units) if response == gtk.RESPONSE_OK else None +def input_int(prompt): + dialog = gtk.MessageDialog(None, + gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, + gtk.MESSAGE_QUESTION, + gtk.BUTTONS_OK_CANCEL, + None) + + dialog.set_markup(prompt) + + spinButton = gtk.SpinButton(None) + spinButton.connect("activate", response_to_dialog, dialog, gtk.RESPONSE_OK) + + spinButton.set_increments(1, 10) + spinButton.set_range(0, 65535) + + dialog.vbox.pack_end(spinButton, True, True, 0) + + dialog.show_all() + response = dialog.run() + + value = spinButton.get_value_as_int() + + dialog.destroy() + + return "%d" % (value) if response == gtk.RESPONSE_OK else None + def input_text(prompt): dialog = gtk.MessageDialog(None, gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,

1 0

[arm/master] Support boolean conf options.
by atagar＠torproject.org 11 Aug '11

11 Aug '11

commit ac0278521e4d71348ec68776112a9fb55497d02d Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Wed Jul 27 07:15:23 2011 +0500 Support boolean conf options. --- src/gui/configPanel.py | 6 ++++++ src/util/gtkTools.py | 31 +++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 0 deletions(-) diff --git a/src/gui/configPanel.py b/src/gui/configPanel.py index a1d1daa..7b1ea42 100644 --- a/src/gui/configPanel.py +++ b/src/gui/configPanel.py @@ -17,6 +17,10 @@ def inputConfValueText(option): prompt = "Enter value for %s" % option return gtkTools.inputText(prompt) +def inputConfValueBoolean(option): + prompt = "Select value for %s" % option + return "1" if gtkTools.inputBoolean(prompt) else "0" + class ConfContents(gtkTools.ListWrapper): def _create_row_from_value(self, entry): option = entry.get(Field.OPTION) @@ -77,6 +81,8 @@ class ConfigPanel(object, CliConfigPanel): if configType == 'DataSize': newValue = inputConfValueText(configOption) + elif configType == 'Boolean': + newValue = inputConfValueBoolean(configOption) if newValue: try: diff --git a/src/util/gtkTools.py b/src/util/gtkTools.py index 5180e82..cc2d361 100644 --- a/src/util/gtkTools.py +++ b/src/util/gtkTools.py @@ -125,6 +125,37 @@ def inputText(prompt): return text if response == gtk.RESPONSE_OK else None +def inputBoolean(prompt): + dialog = gtk.MessageDialog(None, + gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, + gtk.MESSAGE_QUESTION, + gtk.BUTTONS_OK_CANCEL, + None) + + dialog.set_markup(prompt) + + hbox = gtk.HBox() + buttonTrue = gtk.RadioButton(None, "True") + buttonFalse = gtk.RadioButton(buttonTrue, "False") + hbox.pack_start(buttonTrue, True, True, 0) + hbox.pack_start(buttonFalse, True, True, 0) + + dialog.vbox.pack_end(hbox, True, True, 0) + + dialog.show_all() + response = dialog.run() + + choice = None + + if buttonTrue.get_active(): + choice = True + elif buttonFalse.get_active(): + choice = False + + dialog.destroy() + + return choice if response == gtk.RESPONSE_OK else None + def showError(msg): dialog = gtk.MessageDialog(None, gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,

1 0