- tor-commits - lists.torproject.org

[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

[arm/master] Provide a list with add and delete options for LineList confs.
by atagar＠torproject.org 11 Aug '11

11 Aug '11

commit df60a8383458a05a66bc94d1b94941e2863a5ae6 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Fri Jul 29 17:09:18 2011 +0500 Provide a list with add and delete options for LineList confs. --- src/gui/configPanel.py | 6 ++++ src/util/gtkTools.py | 60 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 0 deletions(-) diff --git a/src/gui/configPanel.py b/src/gui/configPanel.py index c5b631a..b87c1b3 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_list(option): + prompt = "Enter value for %s" % option + return gtkTools.input_list(prompt) + def input_conf_value_text(option): prompt = "Enter value for %s" % option return gtkTools.input_text(prompt) @@ -85,6 +89,8 @@ class ConfigPanel(object, CliConfigPanel): if configType == 'DataSize': newValue = input_conf_value_size(configOption) + elif configType == 'LineList': + newValue = input_conf_value_list(configOption) elif configType == 'Boolean': newValue = input_conf_value_boolean(configOption) else: diff --git a/src/util/gtkTools.py b/src/util/gtkTools.py index 860a587..37e818e 100644 --- a/src/util/gtkTools.py +++ b/src/util/gtkTools.py @@ -171,6 +171,66 @@ def input_text(prompt): return text if response == gtk.RESPONSE_OK else None +def input_list(prompt): + def on_add_button_clicked(widget, listStore): + newValue = input_text("Enter new value:") + + if newValue: + row = (newValue,) + listStore.append(row) + + def on_delete_button_clicked(widget, treeView): + selection = treeView.get_selection() + model, selectionIter = selection.get_selected() + + if (selectionIter): + model.remove(selectionIter) + + 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_start(hBox, False, False, 0) + + addButton = gtk.Button(stock=gtk.STOCK_ADD) + + hBox.pack_start(addButton, False, False, 0) + + deleteButton = gtk.Button(stock=gtk.STOCK_DELETE) + + hBox.pack_start(deleteButton, False, False, 0) + + scrolledWindow = gtk.ScrolledWindow() + + dialog.vbox.pack_end(scrolledWindow, True, True, 0) + + listStore = gtk.ListStore(str) + treeView = gtk.TreeView(listStore) + treeViewColumn = gtk.TreeViewColumn("Value") + cellRenderer = gtk.CellRendererText() + + treeViewColumn.pack_start(cellRenderer, True) + treeViewColumn.add_attribute(cellRenderer, 'text', 0) + treeView.append_column(treeViewColumn) + + scrolledWindow.add(treeView) + + addButton.connect('clicked', on_add_button_clicked, listStore) + deleteButton.connect('clicked', on_delete_button_clicked, treeView) + + dialog.show_all() + response = dialog.run() + + dialog.destroy() + + return None if len(listStore) == 0 else " ".join([row[0] for row in listStore]) + def input_boolean(prompt): dialog = gtk.MessageDialog(None, gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT,

1 0

[arm/master] Prepopulate string confs.
by atagar＠torproject.org 11 Aug '11

11 Aug '11

commit eb9f21e88de70774ec990e8256ffa2b4e35c9c4b Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sat Jul 30 15:57:26 2011 +0500 Prepopulate string confs. --- src/gui/configPanel.py | 6 +++--- src/util/gtkTools.py | 7 +++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/gui/configPanel.py b/src/gui/configPanel.py index cf36e23..d3b3a9c 100644 --- a/src/gui/configPanel.py +++ b/src/gui/configPanel.py @@ -25,9 +25,9 @@ def input_conf_value_list(option): prompt = "Enter value for %s" % option return gtkTools.input_list(prompt) -def input_conf_value_text(option): +def input_conf_value_string(option, oldValue): prompt = "Enter value for %s" % option - return gtkTools.input_text(prompt) + return gtkTools.input_string(prompt, oldValue) def input_conf_value_boolean(option): prompt = "Select value for %s" % option @@ -105,7 +105,7 @@ class ConfigPanel(object, CliConfigPanel): elif configType == 'Integer': newValue = input_conf_value_int(configOption, oldValue) elif configType == 'String': - newValue = input_conf_value_text(configOption) + newValue = input_conf_value_string(configOption, oldValue) 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 6526701..68946de 100644 --- a/src/util/gtkTools.py +++ b/src/util/gtkTools.py @@ -188,7 +188,7 @@ def input_int(prompt, default=None): return "%d" % (value) if response == gtk.RESPONSE_OK else None -def input_text(prompt): +def input_string(prompt, default=None): dialog = gtk.MessageDialog(None, gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, gtk.MESSAGE_QUESTION, @@ -202,6 +202,9 @@ def input_text(prompt): dialog.vbox.pack_end(entry, True, True, 0) + if default: + entry.set_text(default) + dialog.show_all() response = dialog.run() @@ -212,7 +215,7 @@ def input_text(prompt): def input_list(prompt): def on_add_button_clicked(widget, listStore): - newValue = input_text("Enter new value:") + newValue = input_string("Enter new value:") if newValue: row = (newValue,)

1 0

[arm/master] Use usage args for better option descriptions.
by atagar＠torproject.org 11 Aug '11

11 Aug '11

commit 4373a40c6d71b57a21b93ce28f7f9b91d8d911f8 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sun Jul 31 00:49:40 2011 +0500 Use usage args for better option descriptions. --- src/gui/configPanel.py | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/gui/configPanel.py b/src/gui/configPanel.py index a82a03f..8f09f40 100644 --- a/src/gui/configPanel.py +++ b/src/gui/configPanel.py @@ -59,15 +59,19 @@ def input_conf_value_filename(option, oldValue): class ConfContents(gtkTools.ListWrapper): def _create_row_from_value(self, entry): option = entry.get(Field.OPTION) + isDefault = entry.get(Field.IS_DEFAULT) value = entry.get(Field.VALUE) + configType = entry.get(Field.TYPE) summary = entry.get(Field.SUMMARY) - desc = entry.get(Field.DESCRIPTION) + desc = " ".join(entry.get(Field.DESCRIPTION).split()) + argUsage = entry.get(Field.ARG_USAGE) category = entry.get(Field.CATEGORY) - # fix multiple spaces - desc = " ".join(desc.split()) + descText = "%s (%s Option)" % (option, category) + descText += "\nValue: %s (%s%s, usage: %s)" % (value, "default, " if isDefault else "", configType, argUsage) + descText += "\nDescription: %s" % (desc) - row = (option, value, summary, CATEGORY_COLOR[category], desc) + row = (option, value, summary, CATEGORY_COLOR[category], descText) return row @@ -117,6 +121,7 @@ class ConfigPanel(object, CliConfigPanel): entry = self._wrappedConfImportantContents[index] configOption = entry.get(Field.OPTION) configType = entry.get(Field.TYPE) + argUsage = entry.get(Field.ARG_USAGE) oldValue = entry.get(Field.VALUE) if entry.get(Field.VALUE) != '<none>' else None newValue = None @@ -131,7 +136,7 @@ class ConfigPanel(object, CliConfigPanel): elif configType == 'Boolean': newValue = input_conf_value_bool(configOption, oldValue) elif configType == 'Filename': - if 'Directory' in configOption: + if 'DIR' in argUsage: newValue = input_conf_value_dir(configOption, oldValue) else: newValue = input_conf_value_filename(configOption, oldValue)

1 0

[arm/master] Prepopulate data size configs.
by atagar＠torproject.org 11 Aug '11

11 Aug '11

commit 93acdc1831cecb23760cbc1b8a195058c7a23739 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sat Jul 30 15:53:41 2011 +0500 Prepopulate data size configs. --- src/gui/configPanel.py | 11 ++++++----- src/util/gtkTools.py | 18 ++++++++++++++---- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/src/gui/configPanel.py b/src/gui/configPanel.py index 8c3a5e0..8be7020 100644 --- a/src/gui/configPanel.py +++ b/src/gui/configPanel.py @@ -13,9 +13,9 @@ from cli.configPanel import (ConfigPanel as CliConfigPanel, Field, State) from util import connections, gtkTools, sysTools, torTools, uiTools from TorCtl import TorCtl -def input_conf_value_size(option): +def input_conf_value_size(option, oldValue): prompt = "Enter value for %s" % option - return gtkTools.input_size(prompt) + return gtkTools.input_size(prompt, oldValue) def input_conf_value_int(option): prompt = "Enter value for %s" % option @@ -95,12 +95,13 @@ class ConfigPanel(object, CliConfigPanel): (index,) = path entry = self._wrappedConfImportantContents[index] - configOption = entry.fields[Field.OPTION] - configType = entry.fields[Field.TYPE] + configOption = entry.get(Field.OPTION) + configType = entry.get(Field.TYPE) + oldValue = entry.get(Field.VALUE) newValue = None if configType == 'DataSize': - newValue = input_conf_value_size(configOption) + newValue = input_conf_value_size(configOption, oldValue) elif configType == 'Integer': newValue = input_conf_value_int(configOption) elif configType == 'String': diff --git a/src/util/gtkTools.py b/src/util/gtkTools.py index 87b3981..8a628e2 100644 --- a/src/util/gtkTools.py +++ b/src/util/gtkTools.py @@ -103,7 +103,7 @@ class TreeWrapper(ListWrapper): def response_to_dialog(entry, dialog, response): dialog.response(response) -def input_size(prompt): +def input_size(prompt, default=None): dialog = gtk.MessageDialog(None, gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, gtk.MESSAGE_QUESTION, @@ -117,7 +117,7 @@ def input_size(prompt): dialog.vbox.pack_end(hBox, True, True, 0) spinButton = gtk.SpinButton(None) - spinButton.connect("activate", response_to_dialog, dialog, gtk.RESPONSE_OK) + spinButton.connect('activate', response_to_dialog, dialog, gtk.RESPONSE_OK) spinButton.set_increments(1, 10) spinButton.set_range(0, 1024) @@ -136,6 +136,16 @@ def input_size(prompt): hBox.pack_end(comboBox, False, False, 0) + if default: + value, units = default.split() + + spinButton.set_value(float(value)) + + model = comboBox.get_model() + modelUnits = [row[0] for row in model] + index = modelUnits.index(units) + comboBox.set_active(index) + dialog.show_all() response = dialog.run() @@ -159,7 +169,7 @@ def input_int(prompt): dialog.set_markup(prompt) spinButton = gtk.SpinButton(None) - spinButton.connect("activate", response_to_dialog, dialog, gtk.RESPONSE_OK) + spinButton.connect('activate', response_to_dialog, dialog, gtk.RESPONSE_OK) spinButton.set_increments(1, 10) spinButton.set_range(0, 65535) @@ -185,7 +195,7 @@ def input_text(prompt): dialog.set_markup(prompt) entry = gtk.Entry() - entry.connect("activate", response_to_dialog, dialog, gtk.RESPONSE_OK) + entry.connect('activate', response_to_dialog, dialog, gtk.RESPONSE_OK) dialog.vbox.pack_end(entry, True, True, 0)

1 0

[arm/master] Prepopulate bool confs.
by atagar＠torproject.org 11 Aug '11

11 Aug '11

commit e088d225dc023c5d7c81002de0bc30cb674e6aab Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sat Jul 30 16:06:31 2011 +0500 Prepopulate bool confs. --- src/gui/configPanel.py | 12 +++++++++--- src/util/gtkTools.py | 8 +++++++- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/gui/configPanel.py b/src/gui/configPanel.py index d3b3a9c..110c67f 100644 --- a/src/gui/configPanel.py +++ b/src/gui/configPanel.py @@ -29,9 +29,15 @@ def input_conf_value_string(option, oldValue): prompt = "Enter value for %s" % option return gtkTools.input_string(prompt, oldValue) -def input_conf_value_boolean(option): +def input_conf_value_bool(option, oldValue): prompt = "Select value for %s" % option - return "1" if gtkTools.input_boolean(prompt) else "0" + + newValue = gtkTools.input_bool(prompt, oldValue) + + if newValue == None: + return + + return "1" if newValue else "0" def input_conf_value_dir(option): prompt = "Select value for %s" % option @@ -109,7 +115,7 @@ class ConfigPanel(object, CliConfigPanel): elif configType == 'LineList': newValue = input_conf_value_list(configOption) elif configType == 'Boolean': - newValue = input_conf_value_boolean(configOption) + newValue = input_conf_value_bool(configOption, oldValue) elif configType == 'Filename': if 'Directory' in configOption: newValue = input_conf_value_dir(configOption) diff --git a/src/util/gtkTools.py b/src/util/gtkTools.py index 68946de..44296f5 100644 --- a/src/util/gtkTools.py +++ b/src/util/gtkTools.py @@ -273,7 +273,7 @@ def input_list(prompt): return None if len(listStore) == 0 else " ".join([row[0] for row in listStore]) -def input_boolean(prompt): +def input_bool(prompt, default=None): dialog = gtk.MessageDialog(None, gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT, gtk.MESSAGE_QUESTION, @@ -290,6 +290,12 @@ def input_boolean(prompt): dialog.vbox.pack_end(hbox, True, True, 0) + if not default == None: + if default == 'True': + buttonTrue.set_active(True) + elif default == 'False': + buttonFalse.set_active(True) + dialog.show_all() response = dialog.run()

1 0

[arm/master] Use file selection dialogs for filename confs.
by atagar＠torproject.org 11 Aug '11

11 Aug '11

commit 8f793419458866575f08d69dc1d8e15d0107f2b3 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sat Jul 30 14:34:09 2011 +0500 Use file selection dialogs for filename confs. --- src/gui/configPanel.py | 10 ++++++++-- src/util/gtkTools.py | 12 ++++++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/gui/configPanel.py b/src/gui/configPanel.py index 582034a..a6f5c07 100644 --- a/src/gui/configPanel.py +++ b/src/gui/configPanel.py @@ -33,10 +33,12 @@ def input_conf_value_boolean(option): prompt = "Select value for %s" % option return "1" if gtkTools.input_boolean(prompt) else "0" +def input_conf_value_filename(option): + prompt = "Select value for %s" % option + return gtkTools.input_filename(prompt) + 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) @@ -97,10 +99,14 @@ class ConfigPanel(object, CliConfigPanel): newValue = input_conf_value_size(configOption) elif configType == 'Integer': newValue = input_conf_value_int(configOption) + elif configType == 'String': + newValue = input_conf_value_text(configOption) elif configType == 'LineList': newValue = input_conf_value_list(configOption) elif configType == 'Boolean': newValue = input_conf_value_boolean(configOption) + elif configType == 'Filename': + newValue = input_conf_value_filename(configOption) else: newValue = input_conf_value_text(configOption) diff --git a/src/util/gtkTools.py b/src/util/gtkTools.py index afd4fef..1d3468f 100644 --- a/src/util/gtkTools.py +++ b/src/util/gtkTools.py @@ -288,6 +288,18 @@ def input_boolean(prompt): return choice if response == gtk.RESPONSE_OK else None +def input_filename(prompt): + dialog = gtk.FileSelection(prompt) + + dialog.show_all() + response = dialog.run() + + choice = dialog.get_filename() + + 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