Author: atagar
Date: 2011-02-16 16:15:27 +0000 (Wed, 16 Feb 2011)
New Revision: 24232
Modified:
arm/trunk/armrc.sample
arm/trunk/src/interface/configPanel.py
Log:
Changing to enums caused configuration catagories to be sorted alphabetcially
rather than by an order matching the man page. This is fine, but not what I'd
intended for the default behavior to be, so explicitly using the man page
ordering as the primary sort field instead.
Modified: arm/trunk/armrc.sample
===================================================================
--- arm/trunk/armrc.sample 2011-02-16 00:39:17 UTC (rev 24231)
+++ arm/trunk/armrc.sample 2011-02-16 16:15:27 UTC (rev 24232)
@@ -86,7 +86,7 @@
# file.maxLinesPerEntry
# max number of lines to display for a single entry in the torrc
-features.config.order 0, 7, 8
+features.config.order 7, 1, 8
features.config.selectionDetails.height 6
features.config.prepopulateEditValues true
features.config.state.colWidth.option 25
Modified: arm/trunk/src/interface/configPanel.py
===================================================================
--- arm/trunk/src/interface/configPanel.py 2011-02-16 00:39:17 UTC (rev
24231)
+++ arm/trunk/src/interface/configPanel.py 2011-02-16 16:15:27 UTC (rev
24232)
@@ -32,7 +32,7 @@
# attributes of a ConfigEntry
Field = enum.Enum("CATEGORY", "OPTION", "VALUE", "TYPE", "ARG_USAGE",
"SUMMARY", "DESCRIPTION", "MAN_ENTRY", "IS_DEFAULT")
-DEFAULT_SORT_ORDER = (Field.CATEGORY, Field.MAN_ENTRY, Field.IS_DEFAULT)
+DEFAULT_SORT_ORDER = (Field.MAN_ENTRY, Field.OPTION, Field.IS_DEFAULT)
FIELD_ATTR = {Field.CATEGORY: ("Category", "red"),
Field.OPTION: ("Option Name", "blue"),
Field.VALUE: ("Value", "cyan"),
