aboutsummaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
authorThomas Amland <thomas.amland@gmail.com>2015-12-16 17:19:43 +0100
committerThomas Amland <thomas.amland@gmail.com>2015-12-29 18:01:40 +0100
commit0aa0437b764d39b12a5a4bc7ea4a0e989f5f39f7 (patch)
treed94e1ab5eb52a14cd9e4965fb79eadf9682fd67b /system
parent59a39f40f62d55946fc62433eb9093856e134bce (diff)
[addons] move addon system settings to regular settings window
moves notifications/auto update from side menu moves functionallity from the 'system' directory to settings and merges orphaned/required dependencies
Diffstat (limited to 'system')
-rw-r--r--system/settings/settings.xml50
1 files changed, 34 insertions, 16 deletions
diff --git a/system/settings/settings.xml b/system/settings/settings.xml
index 5cba545208..862b43b521 100644
--- a/system/settings/settings.xml
+++ b/system/settings/settings.xml
@@ -2889,6 +2889,40 @@
</setting>
</group>
</category>
+ <category id="addons" label="24001" help="36610">
+ <group id="1">
+ <setting id="general.addonupdates" type="integer" label="36605" help="36611">
+ <level>0</level>
+ <default>0</default>
+ <constraints>
+ <options>
+ <option label="36606">0</option> <!-- AUTO_UPDATES_ON -->
+ <option label="36607">1</option> <!-- AUTO_UPDATES_NOTIFY -->
+ <option label="36608">2</option> <!-- AUTO_UPDATES_NEVER -->
+ </options>
+ </constraints>
+ <control type="list" format="string" />
+ </setting>
+ <setting id="general.addonnotifications" type="boolean" label="36609" help="36612">
+ <level>0</level>
+ <default>true</default>
+ <control type="toggle" />
+ <dependencies>
+ <dependency type="enable" setting="general.addonupdates">0</dependency>
+ </dependencies>
+ </setting>
+ </group>
+ <group id="2">
+ <setting id="addons.managedependencies" type="action" label="24996" help="36613">
+ <level>2</level>
+ <control type="button" format="action" />
+ </setting>
+ <setting id="addons.showrunning" type="action" label="24994" help="36614">
+ <level>2</level>
+ <control type="button" format="action" />
+ </setting>
+ </group>
+ </category>
<category id="logging" label="14092" help="36391">
<group id="1">
<setting id="eventlog.enabled" type="boolean" label="14112" help="36460">
@@ -3127,22 +3161,6 @@
</category>
<category id="general" label="" help="36412">
<group id="1">
- <setting id="general.addonupdates" type="integer" label="0" help="36413">
- <level>4</level>
- <default>0</default>
- <constraints>
- <options>
- <option label="12396">0</option> <!-- AUTO_UPDATES_ON -->
- <option label="12397">1</option> <!-- AUTO_UPDATES_NOTIFY -->
- <option label="12398">2</option> <!-- AUTO_UPDATES_NEVER -->
- </options>
- </constraints>
- <control type="list" format="string" />
- </setting>
- <setting id="general.addonnotifications" type="boolean" label="0" help="36414">
- <level>4</level>
- <default>true</default>
- </setting>
<setting id="general.addonforeignfilter" type="boolean" label="0" help="36415">
<level>4</level>
<default>false</default>