Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[add-ons/settings] migrate add-on settings to settings library #12125

Merged
merged 33 commits into from
Jun 3, 2017
Merged

[add-ons/settings] migrate add-on settings to settings library #12125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
ebe6d40
CDateTime: add GetAsDBTime()
Montellese Mar 12, 2017
be75fe1
[settings] CSettingsManager: add IsInitialized() and add IsLoaded()
Montellese May 5, 2017
d9984b9
[settings] CSettingsManager: add SetDefault() and SetDefaults()
Montellese May 5, 2017
b63677c
[settings] CSettingsManager: add FindSetting() and InsertSetting() he…
Montellese Apr 22, 2017
42ef4bd
[settings] CSettingsManager: support arbitrary dot separators in sett…
Montellese Apr 22, 2017
dc772ff
[settings] add abstract CGUIDialogSettingsManagerBase::GetSettingsMan…
Montellese Oct 25, 2016
27d5b4a
[settings] move Save() from CGUIDialogSettingsBase to CGUIDialogSetti…
Montellese Nov 13, 2016
083de25
[settings] CSettingInt/CSettingString: support translatable and fixed…
Montellese Nov 13, 2016
ccfd323
[settings] CSettingList: support modifying the list's setting definition
Montellese Nov 13, 2016
a2b4efe
[settings] split basic functionality of CSettings into CSettingsBase
Montellese Oct 25, 2016
96af5c8
[settings] add versioning support
Montellese Feb 4, 2017
04a55e5
[settings] fix saving of updated settings after loading
Montellese Feb 4, 2017
8ddcbc6
[settings] add support for custom data in CSettingAction
Montellese Feb 7, 2017
0c20054
[settings] support action settings with custom data
Montellese Feb 7, 2017
f379b73
[settings] support masking and hiding extensions in CSettingPath
Montellese Mar 3, 2017
bb40362
[settings] fix FromString/Equals/CheckValidity() for CSettingAddon
Montellese Mar 3, 2017
4359dad
[settings] support resetting a setting to its default value through t…
Montellese Mar 5, 2017
b4d7266
[settings] add CSettingDate and CSettingTime
Montellese Mar 12, 2017
342cc8e
[settings] add lessthan/lt and greaterthan/gt operators for setting d…
Montellese Mar 12, 2017
287fc3c
[settings] support "local" share to not show network shares for path …
Montellese Mar 12, 2017
53f15fa
[settings] CSettingControlButton: support "file" and "image" formats
Montellese Apr 22, 2017
4a5e755
[settings] make OnSettingAction() available on all setting implementa…
Montellese Apr 30, 2017
65fb9b0
[settings] used shared instead of raw pointers
Montellese May 1, 2017
c7d0bf6
[settings] add CSettingReference to reference settings
Montellese Apr 30, 2017
cd3b5cd
[settings] fix label of button controls for CSettingStrings
Montellese May 1, 2017
574b552
[settings] show asterisks instead of nothing for settings with hidden…
Montellese May 31, 2017
4258a2a
[settings] refactor CSettingsManager::SetInitialized()
Montellese Jun 1, 2017
222ded3
[settings] CSettingsManager: support adding a new section after the s…
Montellese Jun 1, 2017
cb1a55a
[settings] CSettingsManager: add necessary locks to AddSection()
Montellese Jun 1, 2017
3e44d1b
[settings] CSettingsManager: support adding single settings
Montellese Jun 1, 2017
5cfbfe0
[add-ons/settings] migrate add-on settings to settings library
Montellese May 19, 2017
631e533
[add-ons/settings] support adding undefined settings on-the-fly
Montellese Jun 1, 2017
17159ce
[add-ons/settings] move GUIDialogAddonSettings.h/cpp from xbmc/addons…
Montellese May 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions addons/resource.language.en_gb/resources/strings.po
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -514,6 +514,7 @@ msgctxt "#127"
msgid "Objects"
msgstr ""

#: xbmc/addons/addonsettings.cpp
#: xbmc/addons/guidialogaddonsettings.cpp
#: system/settings/settings.xml
#: addons/skin.estuary/xml/SkinSettings.xml
Expand Down
152 changes: 71 additions & 81 deletions addons/skin.estuary/xml/DialogAddonSettings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,82 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<window>
<defaultcontrol always="true">9</defaultcontrol>
<defaultcontrol>5</defaultcontrol>
<include>Animation_DialogPopupOpenClose</include>
<controls>
<control type="group">
<centertop>50%</centertop>
<height>800</height>
<top>105</top>
<centerleft>50%</centerleft>
<width>1820</width>
<include>Animation_DialogPopupVisible</include>
<include content="DialogBackgroundCommons">
<param name="width" value="1820" />
<param name="height" value="800" />
<param name="height" value="870" />
<param name="header_label" value="" />
<param name="header_id" value="20" />
<param name="header_id" value="2" />
</include>
<control type="grouplist" id="9">
<description>button area</description>
<left>20</left>
<top>70</top>
<control type="grouplist" id="3">
<description>Categories Area</description>
<left>29</left>
<top>80</top>
<width>400</width>
<height>700</height>
<height>750</height>
<itemgap>-25</itemgap>
<orientation>vertical</orientation>
<onleft>9001</onleft>
<onright>2</onright>
<onup>9</onup>
<ondown>9</ondown>
<onleft>9000</onleft>
<onright>5</onright>
<onup>3</onup>
<ondown>3</ondown>
</control>
<include content="UpDownArrows">
<param name="container_id" value="2" />
<param name="posx" value="830" />
<param name="up_posy" value="-42" />
<param name="down_posy" value="814" />
</include>
<control type="image">
<left>400</left>
<top>70</top>
<width>1100</width>
<height>722</height>
<texture border="40">buttons/dialogbutton-nofo.png</texture>
</control>
<control type="grouplist" id="2">
<description>control area</description>
<left>420</left>
<top>90</top>
<width>1060</width>
<height>680</height>
<onup>2</onup>
<ondown>2</ondown>
<onleft>9</onleft>
<onright>9001</onright>
</control>
<control type="grouplist" id="9001">
<right>20</right>
<top>70</top>
<width>300</width>
<height>700</height>
<itemgap>dialogbuttons_itemgap</itemgap>
<align>left</align>
<orientation>vertical</orientation>
<onup>9001</onup>
<ondown>9001</ondown>
<onleft>2</onleft>
<onright>9</onright>
<include content="DefaultDialogButton">
<param name="id" value="10" />
<param name="label" value="$LOCALIZE[186]" />
</include>
<include content="DefaultDialogButton">
<param name="id" value="11" />
<param name="label" value="$LOCALIZE[222]" />
</include>
<include content="DefaultDialogButton">
<param name="id" value="12" />
<param name="label" value="$LOCALIZE[409]" />
</include>
</control>
<control type="button" id="13">
<control type="button" id="10">
<description>Default Category Button</description>
<height>120</height>
<width>390</width>
Expand All @@ -86,35 +37,74 @@
<font>font25_title</font>
<texturenofocus border="40">buttons/dialogbutton-nofo.png</texturenofocus>
</control>
<control type="button" id="3">
<include>DefaultSettingButton</include>
<control type="image">
<left>410</left>
<top>80</top>
<width>1100</width>
<height>790</height>
<texture border="40">buttons/dialogbutton-nofo.png</texture>
</control>
<control type="grouplist" id="5">
<description>control area</description>
<left>429</left>
<top>100</top>
<width>1060</width>
<height>750</height>
<onleft>3</onleft>
<onright>9000</onright>
<onup>5</onup>
<ondown>5</ondown>
</control>
<control type="radiobutton" id="4">
<control type="button" id="7">
<description>Default Button</description>
<include>DefaultSettingButton</include>
<textwidth>900</textwidth>
</control>
<control type="spincontrolex" id="5">
<control type="radiobutton" id="8">
<description>Default RadioButton</description>
<include>DefaultSettingButton</include>
<textwidth>900</textwidth>
</control>
<control type="label" id="7">
<height>60</height>
<font>font12</font>
<label></label>
<textoffsetx>40</textoffsetx>
<textoffsety>20</textoffsety>
<textcolor>button_focus</textcolor>
<shadowcolor>black</shadowcolor>
<aligny>bottom</aligny>
<control type="spincontrolex" id="9">
<description>Default SpinControlex</description>
<include>DefaultSettingButton</include>
</control>
<control type="image" id="6">
<control type="image" id="11">
<description>separator image</description>
<height>3</height>
<texture colordiffuse="AAAAAAAA" border="3">dialogs/separator-grey.png</texture>
</control>
<control type="sliderex" id="8">
<control type="edit" id="12">
<include>DefaultSettingButton</include>
</control>
<control type="sliderex" id="13">
<description>Default Slider</description>
<include>DefaultSettingButton</include>
</control>
<control type="label" id="14">
<description>Default Label</description>
<include>DefaultSettingLabel</include>
</control>
<control type="grouplist" id="9000">
<left>1510</left>
<top>92</top>
<orientation>vertical</orientation>
<width>300</width>
<height>300</height>
<itemgap>-10</itemgap>
<onleft>5</onleft>
<onright>3</onright>
<include content="DefaultDialogButton">
<param name="id" value="28" />
<param name="label" value="" />
</include>
<include content="DefaultDialogButton">
<param name="id" value="29" />
<param name="label" value="" />
</include>
<include content="DefaultDialogButton">
<param name="id" value="30" />
<param name="label" value="" />
</include>
</control>
</control>
</controls>
</window>
1 change: 1 addition & 0 deletions cmake/treedata/common/subdirs.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ xbmc/addons addons
xbmc/addons/interfaces addonsBinaryInterfaces
xbmc/addons/interfaces/Addon addonCallbacks_Addon
xbmc/addons/interfaces/GUI addonCallbacks_GUI
xbmc/addons/settings addonsSettings
xbmc/commons commons
xbmc/dbwrappers dbwrappers
xbmc/dialogs dialogs
Expand Down
2 changes: 1 addition & 1 deletion system/settings/android.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
<settings>
<settings version="1">
<section id="system">
<category id="display">
<group id="1">
Expand Down
2 changes: 1 addition & 1 deletion system/settings/darwin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
<settings>
<settings version="1">
<section id="system">
<category id="display">
<group id="1">
Expand Down
2 changes: 1 addition & 1 deletion system/settings/darwin_ios.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
<settings>
<settings version="1">
<section id="player" label="14200" help="">
<category id="videoplayer">
<group id="2">
Expand Down
2 changes: 1 addition & 1 deletion system/settings/darwin_osx.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
<settings>
<settings version="1">
<section id="system">
<category id="display">
<group id="1">
Expand Down
2 changes: 1 addition & 1 deletion system/settings/imx6.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
<settings>
<settings version="1">
<section id="player">
<category id="videoplayer">
<group id="3">
Expand Down
2 changes: 1 addition & 1 deletion system/settings/linux.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
<settings>
<settings version="1">
<section id="system">
<category id="display">
<group id="1">
Expand Down
2 changes: 1 addition & 1 deletion system/settings/rbp.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
<settings>
<settings version="1">
<section id="player">
<category id="videoplayer">
<group id="3">
Expand Down
2 changes: 1 addition & 1 deletion system/settings/rbp2.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
<settings>
<settings version="1">
<section id="player">
<category id="videoplayer">
<group id="3">
Expand Down
2 changes: 1 addition & 1 deletion system/settings/settings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
<settings>
<settings version="1">
<section id="player" label="14200" help="38100">
<category id="videoplayer" label="14215" help="38103">
<group id="1" label="14230">
Expand Down
2 changes: 1 addition & 1 deletion system/settings/win32.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
<settings>
<settings version="1">
<section id="services">
<category id="general">
<group id="2">
Expand Down
Loading