Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Čihař <michal@cihar.com>2017-11-28 15:08:41 +0300
committerMichal Čihař <michal@cihar.com>2017-11-28 15:08:49 +0300
commita2fd98d9f18a61f97fb4bd2f8efd27743b3bbee8 (patch)
treeae4b73988a1f31bea9a2c32f32f5373b13f3f29c /libraries/classes/Config
parent4f2709fe01453ec6fc9100b01cab73f81d68e94e (diff)
Add console preferences
This will allow to use console preferences using normal userconfig framework. Issue #13466 Signed-off-by: Michal Čihař <michal@cihar.com>
Diffstat (limited to 'libraries/classes/Config')
-rw-r--r--libraries/classes/Config/Descriptions.php16
-rw-r--r--libraries/classes/Config/Forms/User/FeaturesForm.php9
2 files changed, 25 insertions, 0 deletions
diff --git a/libraries/classes/Config/Descriptions.php b/libraries/classes/Config/Descriptions.php
index 30fd23031a..51076fcda2 100644
--- a/libraries/classes/Config/Descriptions.php
+++ b/libraries/classes/Config/Descriptions.php
@@ -599,6 +599,8 @@ class Descriptions
return __('Warnings');
case 'Form_Warnings_desc':
return __('Disable some of the warnings shown by phpMyAdmin.');
+ case 'Form_Console_name':
+ return __('Console');
case 'GZipDump_desc':
return __(
'Enable gzip compression for import '
@@ -1456,6 +1458,20 @@ class Descriptions
);
case 'ZeroConf_name':
return __('Enable Zero Configuration mode');
+ case 'Console_StartHistory_name':
+ return __('Show query history at start');
+ case 'Console_AlwaysExpand_name':
+ return __('Always expand query messages');
+ case 'Console_CurrentQuery_name':
+ return __('Show current browsing query');
+ case 'Console_EnterExecutes_name':
+ return __('Execute queries on Enter and insert new line with Shift + Enter');
+ case 'Console_DarkTheme_name':
+ return __('Switch to dark theme');
+ case 'Console_Height_name':
+ return __('Console height');
+ case 'Console_Mode_name':
+ return __('Console mode');
}
return null;
}
diff --git a/libraries/classes/Config/Forms/User/FeaturesForm.php b/libraries/classes/Config/Forms/User/FeaturesForm.php
index cac7dd5088..7b17aa86ea 100644
--- a/libraries/classes/Config/Forms/User/FeaturesForm.php
+++ b/libraries/classes/Config/Forms/User/FeaturesForm.php
@@ -53,6 +53,15 @@ class FeaturesForm extends BaseForm
'LoginCookieValidityDisableWarning',
'ReservedWordDisableWarning'
),
+ 'Console' => array(
+ 'Console/Mode',
+ 'Console/StartHistory',
+ 'Console/AlwaysExpand',
+ 'Console/CurrentQuery',
+ 'Console/EnterExecutes',
+ 'Console/DarkTheme',
+ 'Console/Height',
+ ),
);
// skip Developer form if no setting is available
if ($GLOBALS['cfg']['UserprefsDeveloperTab']) {