Bug 1209599 - group general preferences by category

9 files changed, 71 insertions, 17 deletions

diff --git a/extensions/BMO/Extension.pm b/extensions/BMO/Extension.pm
index 6e04c2637..67f7cc160 100644
--- a/extensions/BMO/Extension.pm
+++ b/extensions/BMO/Extension.pm
@@ -1089,13 +1089,21 @@ sub install_before_final_checks {
     my ($self, $args) = @_;
 
     # Add product chooser setting
-    add_setting('product_chooser',
-                ['pretty_product_chooser', 'full_product_chooser'],
-                'pretty_product_chooser');
+    add_setting({
+        name     => 'product_chooser',
+        options  => ['pretty_product_chooser', 'full_product_chooser'],
+        default  => 'pretty_product_chooser',
+        category => 'User Interface'
+    });
 
     # Add option to inject x-bugzilla headers into the message body to work
     # around gmail filtering limitations
-    add_setting('headers_in_body', ['on', 'off'], 'off');
+    add_setting({
+        name     => 'headers_in_body',
+        options  => ['on', 'off'],
+        default  => 'off',
+        category => 'Email Notifications'
+    });
 
     # Migrate from 'gmail_threading' setting to 'bugmail_new_prefix'
     my $dbh = Bugzilla->dbh;
diff --git a/extensions/BugModal/Extension.pm b/extensions/BugModal/Extension.pm
index 2c60ef35a..e929f3fcb 100644
--- a/extensions/BugModal/Extension.pm
+++ b/extensions/BugModal/Extension.pm
@@ -292,8 +292,18 @@ sub webservice {
 
 sub install_before_final_checks {
     my ($self, $args) = @_;
-    add_setting('ui_experiments', ['on', 'off'], 'off');
-    add_setting('ui_remember_collapsed', ['on', 'off'], 'off');
+    add_setting({
+        name     => 'ui_experiments',
+        options  => ['on', 'off'],
+        default  => 'off',
+        category => 'User Interface'
+    });
+    add_setting({
+        name     => 'ui_remember_collapsed',
+        options  => ['on', 'off'],
+        default  => 'off',
+        category => 'User Interface'
+    });
 
     # ensure the correct skin is being used
     my $dbh = Bugzilla->dbh;
diff --git a/extensions/Example/Extension.pm b/extensions/Example/Extension.pm
index 5b76935e3..4fd2d987f 100644
--- a/extensions/Example/Extension.pm
+++ b/extensions/Example/Extension.pm
@@ -543,10 +543,11 @@ sub install_before_final_checks {
     
     # Add a new user setting like this:
     #
-    # add_setting('product_chooser',           # setting name
-    #             ['pretty', 'full', 'small'], # options
-    #             'pretty');                   # default
-    #
+    # add_setting({
+    #     name     => 'product_chooser',           # setting name
+    #     options  => ['pretty', 'full', 'small'], # options
+    #     category => 'pretty'                     # default
+    # });
     # To add descriptions for the setting and choices, add extra values to 
     # the hash defined in global/setting-descs.none.tmpl. Do this in a hook: 
     # hook/global/setting-descs-settings.none.tmpl .
diff --git a/extensions/Gravatar/Extension.pm b/extensions/Gravatar/Extension.pm
index 3338790e7..06e98fb78 100644
--- a/extensions/Gravatar/Extension.pm
+++ b/extensions/Gravatar/Extension.pm
@@ -38,8 +38,18 @@ sub _user_gravatar {
 
 sub install_before_final_checks {
     my ($self, $args) = @_;
-    add_setting('show_gravatars', ['On', 'Off'], 'Off');
-    add_setting('show_my_gravatar', ['On', 'Off'], 'On');
+    add_setting({
+        name     => 'show_gravatars',
+        options  => ['On', 'Off'],
+        default  => 'Off',
+        category => 'Bug Editing'
+    });
+    add_setting({
+        name     => 'show_my_gravatar',
+        options  => ['On', 'Off'],
+        default  => 'On',
+        category => 'Bug Editing'
+    });
 }
 
 __PACKAGE__->NAME;
diff --git a/extensions/InlineHistory/Extension.pm b/extensions/InlineHistory/Extension.pm
index 86536719f..d563bede8 100644
--- a/extensions/InlineHistory/Extension.pm
+++ b/extensions/InlineHistory/Extension.pm
@@ -231,7 +231,12 @@ sub _add_duplicates {
 
 sub install_before_final_checks {
     my ($self, $args) = @_;
-    add_setting('inline_history', ['on', 'off'], 'off');
+    add_setting({
+        name     => 'inline_history',
+        options  => ['on', 'off'],
+        default  => 'off',
+        category => 'Bug Editing'
+    });
 }
 
 __PACKAGE__->NAME;
diff --git a/extensions/Needinfo/Extension.pm b/extensions/Needinfo/Extension.pm
index 7d94fb9a4..c1659a1eb 100644
--- a/extensions/Needinfo/Extension.pm
+++ b/extensions/Needinfo/Extension.pm
@@ -58,7 +58,12 @@ sub install_update_db {
 
 sub install_before_final_checks {
     my ($self, $args) = @_;
-    add_setting('block_needinfo', ['on', 'off'], 'off');
+    add_setting({
+        name     => 'block_needinfo',
+        options  => ['on', 'off'],
+        default  => 'off',
+        category => 'Reviews and Needinfo'
+    });
 }
 
 # Clear the needinfo? flag if comment is being given by
diff --git a/extensions/OrangeFactor/Extension.pm b/extensions/OrangeFactor/Extension.pm
index af629e323..14d500ba0 100644
--- a/extensions/OrangeFactor/Extension.pm
+++ b/extensions/OrangeFactor/Extension.pm
@@ -37,7 +37,12 @@ sub template_before_process {
 
 sub install_before_final_checks {
     my ($self, $args) = @_;
-    add_setting('orange_factor', ['on', 'off'], 'off');
+    add_setting({
+        name     => 'orange_factor',
+        options  => ['on', 'off'],
+        default  => 'off',
+        category => 'User Interface'
+    });
 }
 
 __PACKAGE__->NAME;
diff --git a/extensions/RequestNagger/Extension.pm b/extensions/RequestNagger/Extension.pm
index 169f76b1e..63d79040e 100644
--- a/extensions/RequestNagger/Extension.pm
+++ b/extensions/RequestNagger/Extension.pm
@@ -379,7 +379,12 @@ sub install_filesystem {
 
 sub install_before_final_checks {
     my ($self, $args) = @_;
-    add_setting('request_nagging', ['on', 'off'], 'on');
+    add_setting({
+        name     => 'request_nagging',
+        options  => ['on', 'off'],
+        default  => 'on',
+        category => 'Reviews and Needinfo'
+    });
 }
 
 __PACKAGE__->NAME;
diff --git a/extensions/Review/Extension.pm b/extensions/Review/Extension.pm
index 84ab3e77b..4fd965b4c 100644
--- a/extensions/Review/Extension.pm
+++ b/extensions/Review/Extension.pm
@@ -1041,7 +1041,12 @@ sub install_filesystem {
 
 sub install_before_final_checks {
     my ($self, $args) = @_;
-    add_setting('block_reviews', ['on', 'off'], 'off');
+    add_setting({
+        name     => 'block_reviews',
+        options  => ['on', 'off'],
+        default  => 'off',
+        category => 'Reviews and Needinfo'
+    });
 }
 
 sub config_modify_panels {