Index: devel.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/devel/devel.module,v
retrieving revision 1.106.4.39
diff -u -p -r1.106.4.39 devel.module
--- devel.module	8 Mar 2007 06:26:38 -0000	1.106.4.39
+++ devel.module	11 Mar 2007 01:30:22 -0000
@@ -505,7 +505,12 @@ function devel_db_query($query) {
 }
 
 function devel_admin_settings() {
-  $form['queries'] = array('#type' => 'fieldset', '#title' => t('Query log'));
+  $form['queries'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Query log settings'),
+    '#collapsible' => true,
+    '#collapsed' => true,
+  );
   $form['queries']['dev_query'] = array('#type' => 'checkbox',
     '#title' => t('Collect query info'),
     '#default_value' => variable_get('dev_query', 0),
@@ -537,27 +542,40 @@ function devel_admin_settings() {
     '#size' => 4, 
     '#description' => t('If storing query statistics, only store every nth page view. 1 means every page view, 2 every second, and so on.'));
   
-  $form['dev_timer'] = array('#type' => 'checkbox',
+  $form['display'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Display settings'),
+    '#collapsible' => true,
+    '#collapsed' => true,
+  );
+  $form['display']['dev_timer'] = array('#type' => 'checkbox',
     '#title' => t('Display page timer'),
     '#default_value' => variable_get('dev_timer', 0),
     '#description' => t('Display page execution time in the query log box.'),
   );
-  $form['dev_mem'] = array('#type' => 'checkbox',
+  $form['display']['dev_mem'] = array('#type' => 'checkbox',
     '#title' => t('Display memory usage'),
     '#default_value' => variable_get('dev_mem', 0),
     '#description' => t('Display how much memory is used to generate the current page. This will show memory usage when devel_init() is called and when devel_exit() is called. PHP must have been compiled with the <em>--enable-memory-limit</em> configuration option for this feature to work.'),
   );
-  $form['devel_redirect_page'] = array('#type' => 'checkbox',
+  $form['display']['devel_redirect_page'] = array('#type' => 'checkbox',
     '#title' => t('Display redirection page'),
     '#default_value' => variable_get('devel_redirect_page', 0),
     '#description' => t('When a module executes drupal_goto(), the query log and other developer information is lost. Enabling this setting presents an intermediate page to developers so that the log can be examined before continuing to the destination page.'),
   );
-  $form['devel_form_weights'] = array('#type' => 'checkbox',
+  $form['display']['devel_form_weights'] = array('#type' => 'checkbox',
     '#title' => t('Display form element keys and weights'),
     '#default_value' => variable_get('devel_form_weights', 0),
     '#description' => t('Form element names are needed for performing themeing or altering a form. Their weights determine the position of the element. Enabling this setting will show these keys and weights beside each form item.'),
   );
-  $form['devel_error_handler'] = array('#type' => 'radios',
+  
+  $form['error'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Error handler settings'),
+    '#collapsible' => true,
+    '#collapsed' => true,
+  );
+  $form['error']['devel_error_handler'] = array('#type' => 'radios',
     '#title' => t('Error handler'),
     '#default_value' => variable_get('devel_error_handler', DEVEL_ERROR_HANDLER_STANDARD),
     '#options' => array(DEVEL_ERROR_HANDLER_NONE => t('None'), DEVEL_ERROR_HANDLER_STANDARD => t('Standard drupal'), DEVEL_ERROR_HANDLER_BACKTRACE => t('Backtrace')),
@@ -575,7 +593,13 @@ function devel_admin_settings() {
   if (variable_get('devel_old_smtp_library', '') != '') {
     $smtp_options[variable_get('devel_old_smtp_library', '')] = t('Other (%library)', array('%library' => variable_get('devel_old_smtp_library', '')));
   }
-  $form['smtp_library'] = array(
+  $form['mail'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Mail settings'),
+    '#collapsible' => true,
+    '#collapsed' => true,
+  );
+  $form['mail']['smtp_library'] = array(
     '#type' => 'radios',
     '#title' => t('SMTP library'),
     '#options' => $smtp_options,