X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=include%2Foptions%2Faccessibility.php;h=adef93c61d557ae9a2ce10a36b7707af8def4667;hp=b84f71ef7920b3d200de34b6e21a5b1a115d6e2d;hb=c69bc63529c64510bdccbfb74bfcecc1d9d0d07b;hpb=8949acd68dc6459372ef79823c88c0fbf2ae4e23

diff --git a/include/options/accessibility.php b/include/options/accessibility.php
index b84f71ef..adef93c6 100644
--- a/include/options/accessibility.php
+++ b/include/options/accessibility.php
@@ -12,8 +12,12 @@
  */
 
 /** Define the group constants for this options page. */
-define('SMOPT_GRP_ACCESSKEYS_READ_MESSAGE', 0);
-define('SMOPT_GRP_ACCESSKEYS_COMPOSE', 1);
+define('SMOPT_GRP_ACCESSKEYS_MENUBAR', 0);
+define('SMOPT_GRP_ACCESSKEYS_MAILBOX', 1);
+define('SMOPT_GRP_ACCESSKEYS_READ_MESSAGE', 2);
+define('SMOPT_GRP_ACCESSKEYS_COMPOSE', 3);
+define('SMOPT_GRP_ACCESSKEYS_FOLDER_LIST', 4);
+define('SMOPT_GRP_ACCESSKEYS_OPTIONS', 5);
 
 /**
  * This function builds an array with all the information about
@@ -41,6 +45,208 @@ function load_optpage_data_accessibility() {
     /* LOAD EACH GROUP OF OPTIONS INTO THE OPTIONS ARRAY. */
     /******************************************************/
 
+    /*** Load the Access Key Options for the Menubar into the array ***/
+    $optgrps[SMOPT_GRP_ACCESSKEYS_MENUBAR] = _("Access Keys For Top Menu (All Screens)");
+    $optvals[SMOPT_GRP_ACCESSKEYS_MENUBAR] = array();
+
+    $optvals[SMOPT_GRP_ACCESSKEYS_MENUBAR][] = array(
+        'name'    => 'accesskey_menubar_compose',
+        'caption' => _("Compose"),
+        'type'    => SMOPT_TYPE_STRLIST,
+        'refresh' => SMOPT_REFRESH_NONE,
+        'posvals' => $my_a_to_z,
+    );
+
+    $optvals[SMOPT_GRP_ACCESSKEYS_MENUBAR][] = array(
+        'name'    => 'accesskey_menubar_addresses',
+        'caption' => _("Addresses"),
+        'type'    => SMOPT_TYPE_STRLIST,
+        'refresh' => SMOPT_REFRESH_NONE,
+        'posvals' => $my_a_to_z,
+    );
+
+    $optvals[SMOPT_GRP_ACCESSKEYS_MENUBAR][] = array(
+        'name'    => 'accesskey_menubar_folders',
+        'caption' => _("Folders"),
+        'type'    => SMOPT_TYPE_STRLIST,
+        'refresh' => SMOPT_REFRESH_NONE,
+        'posvals' => $my_a_to_z,
+    );
+
+    $optvals[SMOPT_GRP_ACCESSKEYS_MENUBAR][] = array(
+        'name'    => 'accesskey_menubar_options',
+        'caption' => _("Options"),
+        'type'    => SMOPT_TYPE_STRLIST,
+        'refresh' => SMOPT_REFRESH_NONE,
+        'posvals' => $my_a_to_z,
+    );
+
+    $optvals[SMOPT_GRP_ACCESSKEYS_MENUBAR][] = array(
+        'name'    => 'accesskey_menubar_search',
+        'caption' => _("Search"),
+        'type'    => SMOPT_TYPE_STRLIST,
+        'refresh' => SMOPT_REFRESH_NONE,
+        'posvals' => $my_a_to_z,
+    );
+
+    $optvals[SMOPT_GRP_ACCESSKEYS_MENUBAR][] = array(
+        'name'    => 'accesskey_menubar_help',
+        'caption' => _("Help"),
+        'type'    => SMOPT_TYPE_STRLIST,
+        'refresh' => SMOPT_REFRESH_NONE,
+        'posvals' => $my_a_to_z,
+    );
+
+    $optvals[SMOPT_GRP_ACCESSKEYS_MENUBAR][] = array(
+        'name'    => 'accesskey_menubar_signout',
+        'caption' => _("Sign Out"),
+        'type'    => SMOPT_TYPE_STRLIST,
+        'refresh' => SMOPT_REFRESH_NONE,
+        'posvals' => $my_a_to_z,
+    );
+
+
+    /*** Load the Access Key Options for the Mailbox page into the array ***/
+    $optgrps[SMOPT_GRP_ACCESSKEYS_MAILBOX] = _("Access Keys For Message List Screen");
+    $optvals[SMOPT_GRP_ACCESSKEYS_MAILBOX] = array();
+
+    $optvals[SMOPT_GRP_ACCESSKEYS_MAILBOX][] = array(
+        'name'    => 'accesskey_mailbox_previous',
+        'caption' => _("Previous"),
+        'type'    => SMOPT_TYPE_STRLIST,
+        'refresh' => SMOPT_REFRESH_NONE,
+        'posvals' => $my_a_to_z,
+    );
+
+    $optvals[SMOPT_GRP_ACCESSKEYS_MAILBOX][] = array(
+        'name'    => 'accesskey_mailbox_next',
+        'caption' => _("Next"),
+        'type'    => SMOPT_TYPE_STRLIST,
+        'refresh' => SMOPT_REFRESH_NONE,
+        'posvals' => $my_a_to_z,
+    );
+
+    $optvals[SMOPT_GRP_ACCESSKEYS_MAILBOX][] = array(
+        'name'    => 'accesskey_mailbox_all_paginate',
+        'caption' => _("Show All/Paginate"),
+        'type'    => SMOPT_TYPE_STRLIST,
+        'refresh' => SMOPT_REFRESH_NONE,
+        'posvals' => $my_a_to_z,
+    );
+
+    $optvals[SMOPT_GRP_ACCESSKEYS_MAILBOX][] = array(
+        'name'    => 'accesskey_mailbox_thread',
+        'caption' => _("Thread View/Unthreaded View"),
+        'type'    => SMOPT_TYPE_STRLIST,
+        'refresh' => SMOPT_REFRESH_NONE,
+        'posvals' => $my_a_to_z,
+    );
+
+    $optvals[SMOPT_GRP_ACCESSKEYS_MAILBOX][] = array(
+        'name'    => 'accesskey_mailbox_flag',
+        'caption' => _("Flag"),
+        'type'    => SMOPT_TYPE_STRLIST,
+        'refresh' => SMOPT_REFRESH_NONE,
+        'posvals' => $my_a_to_z,
+    );
+
+    $optvals[SMOPT_GRP_ACCESSKEYS_MAILBOX][] = array(
+        'name'    => 'accesskey_mailbox_unflag',
+        'caption' => _("Unflag"),
+        'type'    => SMOPT_TYPE_STRLIST,
+        'refresh' => SMOPT_REFRESH_NONE,
+        'posvals' => $my_a_to_z,
+    );
+
+    $optvals[SMOPT_GRP_ACCESSKEYS_MAILBOX][] = array(
+        'name'    => 'accesskey_mailbox_read',
+        'caption' => _("Read"),
+        'type'    => SMOPT_TYPE_STRLIST,
+        'refresh' => SMOPT_REFRESH_NONE,
+        'posvals' => $my_a_to_z,
+    );
+
+    $optvals[SMOPT_GRP_ACCESSKEYS_MAILBOX][] = array(
+        'name'    => 'accesskey_mailbox_unread',
+        'caption' => _("Unread"),
+        'type'    => SMOPT_TYPE_STRLIST,
+        'refresh' => SMOPT_REFRESH_NONE,
+        'posvals' => $my_a_to_z,
+    );
+
+    $optvals[SMOPT_GRP_ACCESSKEYS_MAILBOX][] = array(
+        'name'    => 'accesskey_mailbox_forward',
+        'caption' => _("Forward"),
+        'type'    => SMOPT_TYPE_STRLIST,
+        'refresh' => SMOPT_REFRESH_NONE,
+        'posvals' => $my_a_to_z,
+    );
+
+    $optvals[SMOPT_GRP_ACCESSKEYS_MAILBOX][] = array(
+        'name'    => 'accesskey_mailbox_delete',
+        'caption' => _("Delete"),
+        'type'    => SMOPT_TYPE_STRLIST,
+        'refresh' => SMOPT_REFRESH_NONE,
+        'posvals' => $my_a_to_z,
+    );
+
+    $optvals[SMOPT_GRP_ACCESSKEYS_MAILBOX][] = array(
+        'name'    => 'accesskey_mailbox_expunge',
+        'caption' => _("Expunge"),
+        'type'    => SMOPT_TYPE_STRLIST,
+        'refresh' => SMOPT_REFRESH_NONE,
+        'posvals' => $my_a_to_z,
+    );
+
+    $optvals[SMOPT_GRP_ACCESSKEYS_MAILBOX][] = array(
+        'name'    => 'accesskey_mailbox_undelete',
+        'caption' => _("Undelete"),
+        'type'    => SMOPT_TYPE_STRLIST,
+        'refresh' => SMOPT_REFRESH_NONE,
+        'posvals' => $my_a_to_z,
+    );
+
+    $optvals[SMOPT_GRP_ACCESSKEYS_MAILBOX][] = array(
+        'name'    => 'accesskey_mailbox_bypass_trash',
+        'caption' => _("Bypass Trash"),
+        'type'    => SMOPT_TYPE_STRLIST,
+        'refresh' => SMOPT_REFRESH_NONE,
+        'posvals' => $my_a_to_z,
+    );
+
+    $optvals[SMOPT_GRP_ACCESSKEYS_MAILBOX][] = array(
+        'name'    => 'accesskey_mailbox_move_to',
+        'caption' => _("Move To"),
+        'type'    => SMOPT_TYPE_STRLIST,
+        'refresh' => SMOPT_REFRESH_NONE,
+        'posvals' => $my_a_to_z,
+    );
+
+    $optvals[SMOPT_GRP_ACCESSKEYS_MAILBOX][] = array(
+        'name'    => 'accesskey_mailbox_move',
+        'caption' => _("Move"),
+        'type'    => SMOPT_TYPE_STRLIST,
+        'refresh' => SMOPT_REFRESH_NONE,
+        'posvals' => $my_a_to_z,
+    );
+
+    $optvals[SMOPT_GRP_ACCESSKEYS_MAILBOX][] = array(
+        'name'    => 'accesskey_mailbox_copy',
+        'caption' => _("Copy"),
+        'type'    => SMOPT_TYPE_STRLIST,
+        'refresh' => SMOPT_REFRESH_NONE,
+        'posvals' => $my_a_to_z,
+    );
+
+    $optvals[SMOPT_GRP_ACCESSKEYS_MAILBOX][] = array(
+        'name'    => 'accesskey_mailbox_toggle_selected',
+        'caption' => _("Toggle Selected"),
+        'type'    => SMOPT_TYPE_STRLIST,
+        'refresh' => SMOPT_REFRESH_NONE,
+        'posvals' => $my_a_to_z,
+    );
+
+
     /*** Load the Access Key Options for the Read Message page into the array ***/
     $optgrps[SMOPT_GRP_ACCESSKEYS_READ_MESSAGE] = _("Access Keys For Read Message Screen");
     $optvals[SMOPT_GRP_ACCESSKEYS_READ_MESSAGE] = array();
@@ -50,7 +256,6 @@ function load_optpage_data_accessibility() {
         'caption' => _("Reply"),
         'type'    => SMOPT_TYPE_STRLIST,
         'refresh' => SMOPT_REFRESH_NONE,
-        'size'    => SMOPT_SIZE_TINY,
         'posvals' => $my_a_to_z,
     );
 
@@ -59,7 +264,6 @@ function load_optpage_data_accessibility() {
         'caption' => _("Reply All"),
         'type'    => SMOPT_TYPE_STRLIST,
         'refresh' => SMOPT_REFRESH_NONE,
-        'size'    => SMOPT_SIZE_TINY,
         'posvals' => $my_a_to_z,
     );
 
@@ -68,7 +272,6 @@ function load_optpage_data_accessibility() {
         'caption' => _("Forward"),
         'type'    => SMOPT_TYPE_STRLIST,
         'refresh' => SMOPT_REFRESH_NONE,
-        'size'    => SMOPT_SIZE_TINY,
         'posvals' => $my_a_to_z,
     );
 
@@ -77,7 +280,6 @@ function load_optpage_data_accessibility() {
         'caption' => _("As Attachment"),
         'type'    => SMOPT_TYPE_STRLIST,
         'refresh' => SMOPT_REFRESH_NONE,
-        'size'    => SMOPT_SIZE_TINY,
         'posvals' => $my_a_to_z,
     );
 
@@ -86,7 +288,6 @@ function load_optpage_data_accessibility() {
         'caption' => _("Delete"),
         'type'    => SMOPT_TYPE_STRLIST,
         'refresh' => SMOPT_REFRESH_NONE,
-        'size'    => SMOPT_SIZE_TINY,
         'posvals' => $my_a_to_z,
     );
 
@@ -95,7 +296,6 @@ function load_optpage_data_accessibility() {
         'caption' => _("Bypass Trash"),
         'type'    => SMOPT_TYPE_STRLIST,
         'refresh' => SMOPT_REFRESH_NONE,
-        'size'    => SMOPT_SIZE_TINY,
         'posvals' => $my_a_to_z,
     );
 
@@ -104,7 +304,6 @@ function load_optpage_data_accessibility() {
         'caption' => _("Move To"),
         'type'    => SMOPT_TYPE_STRLIST,
         'refresh' => SMOPT_REFRESH_NONE,
-        'size'    => SMOPT_SIZE_TINY,
         'posvals' => $my_a_to_z,
     );
 
@@ -113,7 +312,6 @@ function load_optpage_data_accessibility() {
         'caption' => _("Move"),
         'type'    => SMOPT_TYPE_STRLIST,
         'refresh' => SMOPT_REFRESH_NONE,
-        'size'    => SMOPT_SIZE_TINY,
         'posvals' => $my_a_to_z,
     );
 
@@ -122,7 +320,6 @@ function load_optpage_data_accessibility() {
         'caption' => _("Copy"),
         'type'    => SMOPT_TYPE_STRLIST,
         'refresh' => SMOPT_REFRESH_NONE,
-        'size'    => SMOPT_SIZE_TINY,
         'posvals' => $my_a_to_z,
     );
 
@@ -131,12 +328,19 @@ function load_optpage_data_accessibility() {
     $optgrps[SMOPT_GRP_ACCESSKEYS_COMPOSE] = _("Access Keys For Compose Screen");
     $optvals[SMOPT_GRP_ACCESSKEYS_COMPOSE] = array();
 
+    $optvals[SMOPT_GRP_ACCESSKEYS_COMPOSE][] = array(
+        'name'    => 'accesskey_compose_identity',
+        'caption' => _("From"),
+        'type'    => SMOPT_TYPE_STRLIST,
+        'refresh' => SMOPT_REFRESH_NONE,
+        'posvals' => $my_a_to_z,
+    );
+
     $optvals[SMOPT_GRP_ACCESSKEYS_COMPOSE][] = array(
         'name'    => 'accesskey_compose_to',
         'caption' => _("To"),
         'type'    => SMOPT_TYPE_STRLIST,
         'refresh' => SMOPT_REFRESH_NONE,
-        'size'    => SMOPT_SIZE_TINY,
         'posvals' => $my_a_to_z,
     );
 
@@ -145,7 +349,6 @@ function load_optpage_data_accessibility() {
         'caption' => _("Cc"),
         'type'    => SMOPT_TYPE_STRLIST,
         'refresh' => SMOPT_REFRESH_NONE,
-        'size'    => SMOPT_SIZE_TINY,
         'posvals' => $my_a_to_z,
     );
 
@@ -154,7 +357,6 @@ function load_optpage_data_accessibility() {
         'caption' => _("Bcc"),
         'type'    => SMOPT_TYPE_STRLIST,
         'refresh' => SMOPT_REFRESH_NONE,
-        'size'    => SMOPT_SIZE_TINY,
         'posvals' => $my_a_to_z,
     );
 
@@ -163,7 +365,6 @@ function load_optpage_data_accessibility() {
         'caption' => _("Subject"),
         'type'    => SMOPT_TYPE_STRLIST,
         'refresh' => SMOPT_REFRESH_NONE,
-        'size'    => SMOPT_SIZE_TINY,
         'posvals' => $my_a_to_z,
     );
 
@@ -172,7 +373,6 @@ function load_optpage_data_accessibility() {
         'caption' => _("Priority"),
         'type'    => SMOPT_TYPE_STRLIST,
         'refresh' => SMOPT_REFRESH_NONE,
-        'size'    => SMOPT_SIZE_TINY,
         'posvals' => $my_a_to_z,
     );
 
@@ -181,7 +381,6 @@ function load_optpage_data_accessibility() {
         'caption' => _("On Read"),
         'type'    => SMOPT_TYPE_STRLIST,
         'refresh' => SMOPT_REFRESH_NONE,
-        'size'    => SMOPT_SIZE_TINY,
         'posvals' => $my_a_to_z,
     );
 
@@ -190,7 +389,6 @@ function load_optpage_data_accessibility() {
         'caption' => _("On Delivery"),
         'type'    => SMOPT_TYPE_STRLIST,
         'refresh' => SMOPT_REFRESH_NONE,
-        'size'    => SMOPT_SIZE_TINY,
         'posvals' => $my_a_to_z,
     );
 
@@ -199,7 +397,6 @@ function load_optpage_data_accessibility() {
         'caption' => _("Signature"),
         'type'    => SMOPT_TYPE_STRLIST,
         'refresh' => SMOPT_REFRESH_NONE,
-        'size'    => SMOPT_SIZE_TINY,
         'posvals' => $my_a_to_z,
     );
 
@@ -208,7 +405,6 @@ function load_optpage_data_accessibility() {
         'caption' => _("Addresses"),
         'type'    => SMOPT_TYPE_STRLIST,
         'refresh' => SMOPT_REFRESH_NONE,
-        'size'    => SMOPT_SIZE_TINY,
         'posvals' => $my_a_to_z,
     );
 
@@ -217,7 +413,6 @@ function load_optpage_data_accessibility() {
         'caption' => _("Save Draft"),
         'type'    => SMOPT_TYPE_STRLIST,
         'refresh' => SMOPT_REFRESH_NONE,
-        'size'    => SMOPT_SIZE_TINY,
         'posvals' => $my_a_to_z,
     );
 
@@ -226,7 +421,6 @@ function load_optpage_data_accessibility() {
         'caption' => _("Send"),
         'type'    => SMOPT_TYPE_STRLIST,
         'refresh' => SMOPT_REFRESH_NONE,
-        'size'    => SMOPT_SIZE_TINY,
         'posvals' => $my_a_to_z,
     );
 
@@ -235,7 +429,6 @@ function load_optpage_data_accessibility() {
         'caption' => _("Body"),
         'type'    => SMOPT_TYPE_STRLIST,
         'refresh' => SMOPT_REFRESH_NONE,
-        'size'    => SMOPT_SIZE_TINY,
         'posvals' => $my_a_to_z,
     );
 
@@ -244,7 +437,6 @@ function load_optpage_data_accessibility() {
         'caption' => _("Browse"),
         'type'    => SMOPT_TYPE_STRLIST,
         'refresh' => SMOPT_REFRESH_NONE,
-        'size'    => SMOPT_SIZE_TINY,
         'posvals' => $my_a_to_z,
     );
 
@@ -253,7 +445,6 @@ function load_optpage_data_accessibility() {
         'caption' => _("Attach"),
         'type'    => SMOPT_TYPE_STRLIST,
         'refresh' => SMOPT_REFRESH_NONE,
-        'size'    => SMOPT_SIZE_TINY,
         'posvals' => $my_a_to_z,
     );
 
@@ -262,7 +453,96 @@ function load_optpage_data_accessibility() {
         'caption' => _("Delete Selected Attachments"),
         'type'    => SMOPT_TYPE_STRLIST,
         'refresh' => SMOPT_REFRESH_NONE,
-        'size'    => SMOPT_SIZE_TINY,
+        'posvals' => $my_a_to_z,
+    );
+
+
+    /*** Load the Access Key Options for the Folder List page into the array ***/
+    $optgrps[SMOPT_GRP_ACCESSKEYS_FOLDER_LIST] = _("Access Keys For Folder List Screen");
+    $optvals[SMOPT_GRP_ACCESSKEYS_FOLDER_LIST] = array();
+
+    $optvals[SMOPT_GRP_ACCESSKEYS_FOLDER_LIST][] = array(
+        'name'    => 'accesskey_folders_refresh',
+        'caption' => _("Refresh/Check Mail"),
+        'type'    => SMOPT_TYPE_STRLIST,
+        'refresh' => SMOPT_REFRESH_NONE,
+        'posvals' => $my_a_to_z,
+    );
+
+    $optvals[SMOPT_GRP_ACCESSKEYS_FOLDER_LIST][] = array(
+        'name'    => 'accesskey_folders_purge_trash',
+        'caption' => _("Purge Trash"),
+        'type'    => SMOPT_TYPE_STRLIST,
+        'refresh' => SMOPT_REFRESH_NONE,
+        'posvals' => $my_a_to_z,
+    );
+
+    $optvals[SMOPT_GRP_ACCESSKEYS_FOLDER_LIST][] = array(
+        'name'    => 'accesskey_folders_inbox',
+        'caption' => _("INBOX"),
+        'type'    => SMOPT_TYPE_STRLIST,
+        'refresh' => SMOPT_REFRESH_NONE,
+        'posvals' => $my_a_to_z,
+    );
+
+
+    /*** Load the Access Key Options for the main Options page into the array ***/
+    $optgrps[SMOPT_GRP_ACCESSKEYS_OPTIONS] = _("Access Keys For Options Screen");
+    $optvals[SMOPT_GRP_ACCESSKEYS_OPTIONS] = array();
+
+    $optvals[SMOPT_GRP_ACCESSKEYS_OPTIONS][] = array(
+        'name'    => 'accesskey_options_personal',
+        'caption' => _("Personal Information"),
+        'type'    => SMOPT_TYPE_STRLIST,
+        'refresh' => SMOPT_REFRESH_NONE,
+        'posvals' => $my_a_to_z,
+    );
+
+    $optvals[SMOPT_GRP_ACCESSKEYS_OPTIONS][] = array(
+        'name'    => 'accesskey_options_display',
+        'caption' => _("Display Preferences"),
+        'type'    => SMOPT_TYPE_STRLIST,
+        'refresh' => SMOPT_REFRESH_NONE,
+        'posvals' => $my_a_to_z,
+    );
+
+    $optvals[SMOPT_GRP_ACCESSKEYS_OPTIONS][] = array(
+        'name'    => 'accesskey_options_highlighting',
+        'caption' => _("Message Highlighting"),
+        'type'    => SMOPT_TYPE_STRLIST,
+        'refresh' => SMOPT_REFRESH_NONE,
+        'posvals' => $my_a_to_z,
+    );
+
+    $optvals[SMOPT_GRP_ACCESSKEYS_OPTIONS][] = array(
+        'name'    => 'accesskey_options_folders',
+        'caption' => _("Folder Preferences"),
+        'type'    => SMOPT_TYPE_STRLIST,
+        'refresh' => SMOPT_REFRESH_NONE,
+        'posvals' => $my_a_to_z,
+    );
+
+    $optvals[SMOPT_GRP_ACCESSKEYS_OPTIONS][] = array(
+        'name'    => 'accesskey_options_index_order',
+        'caption' => _("Index Order"),
+        'type'    => SMOPT_TYPE_STRLIST,
+        'refresh' => SMOPT_REFRESH_NONE,
+        'posvals' => $my_a_to_z,
+    );
+
+    $optvals[SMOPT_GRP_ACCESSKEYS_OPTIONS][] = array(
+        'name'    => 'accesskey_options_compose',
+        'caption' => _("Compose Preferences"),
+        'type'    => SMOPT_TYPE_STRLIST,
+        'refresh' => SMOPT_REFRESH_NONE,
+        'posvals' => $my_a_to_z,
+    );
+
+    $optvals[SMOPT_GRP_ACCESSKEYS_OPTIONS][] = array(
+        'name'    => 'accesskey_options_accessibility',
+        'caption' => _("Accessibility Preferences"),
+        'type'    => SMOPT_TYPE_STRLIST,
+        'refresh' => SMOPT_REFRESH_NONE,
         'posvals' => $my_a_to_z,
     );