- tor-commits - lists.torproject.org

[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

[arm/master] Use separate file choosers for dir selection and file selection.
by atagar＠torproject.org 11 Aug '11

11 Aug '11

commit f6178103cceb94e65c911f17e014e5691228e95c Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sat Jul 30 14:57:50 2011 +0500 Use separate file choosers for dir selection and file selection. --- src/gui/configPanel.py | 9 ++++++++- src/util/gtkTools.py | 28 +++++++++++++++++++++++++--- 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/src/gui/configPanel.py b/src/gui/configPanel.py index a6f5c07..8c3a5e0 100644 --- a/src/gui/configPanel.py +++ b/src/gui/configPanel.py @@ -33,6 +33,10 @@ 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_dir(option): + prompt = "Select value for %s" % option + return gtkTools.input_dir(prompt) + def input_conf_value_filename(option): prompt = "Select value for %s" % option return gtkTools.input_filename(prompt) @@ -106,7 +110,10 @@ class ConfigPanel(object, CliConfigPanel): elif configType == 'Boolean': newValue = input_conf_value_boolean(configOption) elif configType == 'Filename': - newValue = input_conf_value_filename(configOption) + if 'Directory' in configOption: + newValue = input_conf_value_dir(configOption) + else: + 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 1d3468f..87b3981 100644 --- a/src/util/gtkTools.py +++ b/src/util/gtkTools.py @@ -288,17 +288,39 @@ def input_boolean(prompt): return choice if response == gtk.RESPONSE_OK else None +def input_dir(prompt): + dialog = gtk.FileChooserDialog(prompt, + None, + gtk.FILE_CHOOSER_ACTION_SELECT_FOLDER, + (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, + gtk.STOCK_OPEN, gtk.RESPONSE_OK)) + dialog.set_default_response(gtk.RESPONSE_OK) + + dialog.show_all() + response = dialog.run() + + filename = dialog.get_filename() + + dialog.destroy() + + return filename if response == gtk.RESPONSE_OK else None + def input_filename(prompt): - dialog = gtk.FileSelection(prompt) + dialog = gtk.FileChooserDialog(prompt, + None, + gtk.FILE_CHOOSER_ACTION_SAVE, + (gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL, + gtk.STOCK_OPEN, gtk.RESPONSE_OK)) + dialog.set_default_response(gtk.RESPONSE_OK) dialog.show_all() response = dialog.run() - choice = dialog.get_filename() + filename = dialog.get_filename() dialog.destroy() - return choice if response == gtk.RESPONSE_OK else None + return filename if response == gtk.RESPONSE_OK else None def showError(msg): dialog = gtk.MessageDialog(None,

1 0

[arm/master] Use colors for conf rows, treat "<none>" as None.
by atagar＠torproject.org 11 Aug '11

11 Aug '11

commit 5d3eee00a1387fed7c4f9237f414f98e9c1cfa32 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sun Jul 31 00:24:07 2011 +0500 Use colors for conf rows, treat "<none>" as None. --- src/gui/configPanel.py | 22 ++++++++++++++++++---- 1 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/gui/configPanel.py b/src/gui/configPanel.py index b5ea6ab..a82a03f 100644 --- a/src/gui/configPanel.py +++ b/src/gui/configPanel.py @@ -10,9 +10,18 @@ import gobject import gtk from cli.configPanel import (ConfigPanel as CliConfigPanel, Field, State) -from util import connections, gtkTools, sysTools, torTools, uiTools +from util import connections, gtkTools, sysTools, torConfig, torTools, uiTools from TorCtl import TorCtl +CATEGORY_COLOR = {torConfig.Category.GENERAL: "#307809", + torConfig.Category.CLIENT: "#2F305C", + torConfig.Category.RELAY: "#848144", + torConfig.Category.DIRECTORY: "#9F2254", + torConfig.Category.AUTHORITY: "#B3141B", + torConfig.Category.HIDDEN_SERVICE: "#3A8427", + torConfig.Category.TESTING: "#222222", + torConfig.Category.UNKNOWN: "#111111"} + def input_conf_value_size(option, oldValue): prompt = "Enter value for %s" % option return gtkTools.input_size(prompt, oldValue) @@ -53,7 +62,12 @@ class ConfContents(gtkTools.ListWrapper): value = entry.get(Field.VALUE) summary = entry.get(Field.SUMMARY) desc = entry.get(Field.DESCRIPTION) - row = (option, value, summary, '#368918', desc) + category = entry.get(Field.CATEGORY) + + # fix multiple spaces + desc = " ".join(desc.split()) + + row = (option, value, summary, CATEGORY_COLOR[category], desc) return row @@ -103,7 +117,7 @@ class ConfigPanel(object, CliConfigPanel): entry = self._wrappedConfImportantContents[index] configOption = entry.get(Field.OPTION) configType = entry.get(Field.TYPE) - oldValue = entry.get(Field.VALUE) + oldValue = entry.get(Field.VALUE) if entry.get(Field.VALUE) != '<none>' else None newValue = None if configType == 'DataSize': @@ -124,7 +138,7 @@ class ConfigPanel(object, CliConfigPanel): else: newValue = input_conf_value_string(configOption, oldValue) - if newValue: + if newValue and newValue != oldValue: try: torTools.getConn().setOption(configOption, newValue) except TorCtl.ErrorReply, err:

1 0

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

11 Aug '11

commit 610420ea46ad2c03052c3656f0616b5224330e74 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sat Jul 30 16:11:21 2011 +0500 Prepopulate linelist confs. --- src/gui/configPanel.py | 6 +++--- src/util/gtkTools.py | 10 +++++++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/gui/configPanel.py b/src/gui/configPanel.py index 110c67f..efa9b71 100644 --- a/src/gui/configPanel.py +++ b/src/gui/configPanel.py @@ -21,9 +21,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): +def input_conf_value_list(option, oldValue): prompt = "Enter value for %s" % option - return gtkTools.input_list(prompt) + return gtkTools.input_list(prompt, oldValue) def input_conf_value_string(option, oldValue): prompt = "Enter value for %s" % option @@ -113,7 +113,7 @@ class ConfigPanel(object, CliConfigPanel): elif configType == 'String': newValue = input_conf_value_string(configOption, oldValue) elif configType == 'LineList': - newValue = input_conf_value_list(configOption) + newValue = input_conf_value_list(configOption, oldValue) 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 44296f5..435f694 100644 --- a/src/util/gtkTools.py +++ b/src/util/gtkTools.py @@ -213,7 +213,7 @@ def input_string(prompt, default=None): return text if response == gtk.RESPONSE_OK else None -def input_list(prompt): +def input_list(prompt, default): def on_add_button_clicked(widget, listStore): newValue = input_string("Enter new value:") @@ -266,11 +266,19 @@ def input_list(prompt): addButton.connect('clicked', on_add_button_clicked, listStore) deleteButton.connect('clicked', on_delete_button_clicked, treeView) + if default: + for value in default.split(): + row = (value,) + listStore.append(row) + dialog.show_all() response = dialog.run() dialog.destroy() + if not response == gtk.RESPONSE_OK: + return + return None if len(listStore) == 0 else " ".join([row[0] for row in listStore]) def input_bool(prompt, default=None):

1 0