Skip to content
Browse files

Merge pull request #9848 from ronie/deprecated-controls

[guilib] remove deprecated controls
2 parents de4c610 + a242f78 commit c34d9e805e4da7dd0e213fe7e84f081fefd9ca44 @ronie ronie committed May 26, 2016
View
25 Kodi.xcodeproj/project.pbxproj
@@ -35,7 +35,6 @@
18B7C7B11294222E009E7A26 /* GUIBaseContainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C75C1294222E009E7A26 /* GUIBaseContainer.cpp */; };
18B7C7B21294222E009E7A26 /* GUIBorderedImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C75D1294222E009E7A26 /* GUIBorderedImage.cpp */; };
18B7C7B31294222E009E7A26 /* GUIButtonControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C75E1294222E009E7A26 /* GUIButtonControl.cpp */; };
- 18B7C7B51294222E009E7A26 /* GUICheckMarkControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C7601294222E009E7A26 /* GUICheckMarkControl.cpp */; };
18B7C7B61294222E009E7A26 /* GUIColorManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C7611294222E009E7A26 /* GUIColorManager.cpp */; };
18B7C7B71294222E009E7A26 /* GUIControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C7621294222E009E7A26 /* GUIControl.cpp */; };
18B7C7B81294222E009E7A26 /* GUIControlFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C7631294222E009E7A26 /* GUIControlFactory.cpp */; };
@@ -64,15 +63,13 @@
18B7C7CF1294222E009E7A26 /* GUIMessage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C77A1294222E009E7A26 /* GUIMessage.cpp */; };
18B7C7D01294222E009E7A26 /* GUIMoverControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C77B1294222E009E7A26 /* GUIMoverControl.cpp */; };
18B7C7D11294222E009E7A26 /* GUIMultiImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C77C1294222E009E7A26 /* GUIMultiImage.cpp */; };
- 18B7C7D21294222E009E7A26 /* GUIMultiSelectText.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C77D1294222E009E7A26 /* GUIMultiSelectText.cpp */; };
18B7C7D31294222E009E7A26 /* GUIPanelContainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C77E1294222E009E7A26 /* GUIPanelContainer.cpp */; };
18B7C7D41294222E009E7A26 /* GUIProgressControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C77F1294222E009E7A26 /* GUIProgressControl.cpp */; };
18B7C7D51294222E009E7A26 /* GUIRadioButtonControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C7801294222E009E7A26 /* GUIRadioButtonControl.cpp */; };
18B7C7D61294222E009E7A26 /* GUIRenderingControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C7811294222E009E7A26 /* GUIRenderingControl.cpp */; };
18B7C7D71294222E009E7A26 /* GUIResizeControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C7821294222E009E7A26 /* GUIResizeControl.cpp */; };
18B7C7D81294222E009E7A26 /* GUIRSSControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C7831294222E009E7A26 /* GUIRSSControl.cpp */; };
18B7C7D91294222E009E7A26 /* GUIScrollBarControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C7841294222E009E7A26 /* GUIScrollBarControl.cpp */; };
- 18B7C7DA1294222E009E7A26 /* GUISelectButtonControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C7851294222E009E7A26 /* GUISelectButtonControl.cpp */; };
18B7C7DB1294222E009E7A26 /* GUISettingsSliderControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C7861294222E009E7A26 /* GUISettingsSliderControl.cpp */; };
18B7C7DC1294222E009E7A26 /* GUIShader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C7871294222E009E7A26 /* GUIShader.cpp */; };
18B7C7DD1294222E009E7A26 /* GUISliderControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C7881294222E009E7A26 /* GUISliderControl.cpp */; };
@@ -1717,7 +1714,6 @@
E49912E5174E5DAD00741B6D /* GUIBaseContainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C75C1294222E009E7A26 /* GUIBaseContainer.cpp */; };
E49912E6174E5DAD00741B6D /* GUIBorderedImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C75D1294222E009E7A26 /* GUIBorderedImage.cpp */; };
E49912E7174E5DAD00741B6D /* GUIButtonControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C75E1294222E009E7A26 /* GUIButtonControl.cpp */; };
- E49912E8174E5DAD00741B6D /* GUICheckMarkControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C7601294222E009E7A26 /* GUICheckMarkControl.cpp */; };
E49912E9174E5DAD00741B6D /* GUIColorManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C7611294222E009E7A26 /* GUIColorManager.cpp */; };
E49912EA174E5DAD00741B6D /* GUIControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C7621294222E009E7A26 /* GUIControl.cpp */; };
E49912EB174E5DAD00741B6D /* GUIControlFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C7631294222E009E7A26 /* GUIControlFactory.cpp */; };
@@ -1747,15 +1743,13 @@
E4991303174E5DAD00741B6D /* GUIMessage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C77A1294222E009E7A26 /* GUIMessage.cpp */; };
E4991304174E5DAD00741B6D /* GUIMoverControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C77B1294222E009E7A26 /* GUIMoverControl.cpp */; };
E4991305174E5DAD00741B6D /* GUIMultiImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C77C1294222E009E7A26 /* GUIMultiImage.cpp */; };
- E4991306174E5DAD00741B6D /* GUIMultiSelectText.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C77D1294222E009E7A26 /* GUIMultiSelectText.cpp */; };
E4991307174E5DAD00741B6D /* GUIPanelContainer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C77E1294222E009E7A26 /* GUIPanelContainer.cpp */; };
E4991308174E5DAD00741B6D /* GUIProgressControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C77F1294222E009E7A26 /* GUIProgressControl.cpp */; };
E4991309174E5DAD00741B6D /* GUIRadioButtonControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C7801294222E009E7A26 /* GUIRadioButtonControl.cpp */; };
E499130A174E5DAD00741B6D /* GUIRenderingControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C7811294222E009E7A26 /* GUIRenderingControl.cpp */; };
E499130B174E5DAD00741B6D /* GUIResizeControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C7821294222E009E7A26 /* GUIResizeControl.cpp */; };
E499130C174E5DAD00741B6D /* GUIRSSControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C7831294222E009E7A26 /* GUIRSSControl.cpp */; };
E499130D174E5DAD00741B6D /* GUIScrollBarControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C7841294222E009E7A26 /* GUIScrollBarControl.cpp */; };
- E499130E174E5DAD00741B6D /* GUISelectButtonControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C7851294222E009E7A26 /* GUISelectButtonControl.cpp */; };
E499130F174E5DAD00741B6D /* GUISettingsSliderControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C7861294222E009E7A26 /* GUISettingsSliderControl.cpp */; };
E4991310174E5DAD00741B6D /* GUIShader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C7871294222E009E7A26 /* GUIShader.cpp */; };
E4991311174E5DAD00741B6D /* GUISliderControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C7881294222E009E7A26 /* GUISliderControl.cpp */; };
@@ -2360,7 +2354,6 @@
18B7C7021294222D009E7A26 /* GUIBorderedImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIBorderedImage.h; sourceTree = "<group>"; };
18B7C7031294222D009E7A26 /* GUIButtonControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIButtonControl.h; sourceTree = "<group>"; };
18B7C7051294222D009E7A26 /* GUICallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUICallback.h; sourceTree = "<group>"; };
- 18B7C7061294222D009E7A26 /* GUICheckMarkControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUICheckMarkControl.h; sourceTree = "<group>"; };
18B7C7071294222D009E7A26 /* GUIColorManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIColorManager.h; sourceTree = "<group>"; };
18B7C7081294222D009E7A26 /* GUIControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIControl.h; sourceTree = "<group>"; };
18B7C7091294222D009E7A26 /* GUIControlFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIControlFactory.h; sourceTree = "<group>"; };
@@ -2389,15 +2382,13 @@
18B7C7201294222D009E7A26 /* GUIMessage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIMessage.h; sourceTree = "<group>"; };
18B7C7211294222D009E7A26 /* GUIMoverControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIMoverControl.h; sourceTree = "<group>"; };
18B7C7221294222D009E7A26 /* GUIMultiImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIMultiImage.h; sourceTree = "<group>"; };
- 18B7C7231294222D009E7A26 /* GUIMultiSelectText.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIMultiSelectText.h; sourceTree = "<group>"; };
18B7C7241294222D009E7A26 /* GUIPanelContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIPanelContainer.h; sourceTree = "<group>"; };
18B7C7251294222D009E7A26 /* GUIProgressControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIProgressControl.h; sourceTree = "<group>"; };
18B7C7261294222D009E7A26 /* GUIRadioButtonControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIRadioButtonControl.h; sourceTree = "<group>"; };
18B7C7271294222D009E7A26 /* GUIRenderingControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIRenderingControl.h; sourceTree = "<group>"; };
18B7C7281294222D009E7A26 /* GUIResizeControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIResizeControl.h; sourceTree = "<group>"; };
18B7C7291294222D009E7A26 /* GUIRSSControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIRSSControl.h; sourceTree = "<group>"; };
18B7C72A1294222D009E7A26 /* GUIScrollBarControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIScrollBarControl.h; sourceTree = "<group>"; };
- 18B7C72B1294222D009E7A26 /* GUISelectButtonControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUISelectButtonControl.h; sourceTree = "<group>"; };
18B7C72C1294222D009E7A26 /* GUISettingsSliderControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUISettingsSliderControl.h; sourceTree = "<group>"; };
18B7C72D1294222D009E7A26 /* GUIShader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIShader.h; sourceTree = "<group>"; };
18B7C72E1294222D009E7A26 /* GUISliderControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUISliderControl.h; sourceTree = "<group>"; };
@@ -2442,7 +2433,6 @@
18B7C75C1294222E009E7A26 /* GUIBaseContainer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIBaseContainer.cpp; sourceTree = "<group>"; };
18B7C75D1294222E009E7A26 /* GUIBorderedImage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIBorderedImage.cpp; sourceTree = "<group>"; };
18B7C75E1294222E009E7A26 /* GUIButtonControl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIButtonControl.cpp; sourceTree = "<group>"; };
- 18B7C7601294222E009E7A26 /* GUICheckMarkControl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUICheckMarkControl.cpp; sourceTree = "<group>"; };
18B7C7611294222E009E7A26 /* GUIColorManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIColorManager.cpp; sourceTree = "<group>"; };
18B7C7621294222E009E7A26 /* GUIControl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIControl.cpp; sourceTree = "<group>"; };
18B7C7631294222E009E7A26 /* GUIControlFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIControlFactory.cpp; sourceTree = "<group>"; };
@@ -2471,15 +2461,13 @@
18B7C77A1294222E009E7A26 /* GUIMessage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIMessage.cpp; sourceTree = "<group>"; };
18B7C77B1294222E009E7A26 /* GUIMoverControl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIMoverControl.cpp; sourceTree = "<group>"; };
18B7C77C1294222E009E7A26 /* GUIMultiImage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIMultiImage.cpp; sourceTree = "<group>"; };
- 18B7C77D1294222E009E7A26 /* GUIMultiSelectText.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIMultiSelectText.cpp; sourceTree = "<group>"; };
18B7C77E1294222E009E7A26 /* GUIPanelContainer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIPanelContainer.cpp; sourceTree = "<group>"; };
18B7C77F1294222E009E7A26 /* GUIProgressControl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIProgressControl.cpp; sourceTree = "<group>"; };
18B7C7801294222E009E7A26 /* GUIRadioButtonControl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIRadioButtonControl.cpp; sourceTree = "<group>"; };
18B7C7811294222E009E7A26 /* GUIRenderingControl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIRenderingControl.cpp; sourceTree = "<group>"; };
18B7C7821294222E009E7A26 /* GUIResizeControl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIResizeControl.cpp; sourceTree = "<group>"; };
18B7C7831294222E009E7A26 /* GUIRSSControl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIRSSControl.cpp; sourceTree = "<group>"; };
18B7C7841294222E009E7A26 /* GUIScrollBarControl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIScrollBarControl.cpp; sourceTree = "<group>"; };
- 18B7C7851294222E009E7A26 /* GUISelectButtonControl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUISelectButtonControl.cpp; sourceTree = "<group>"; };
18B7C7861294222E009E7A26 /* GUISettingsSliderControl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUISettingsSliderControl.cpp; sourceTree = "<group>"; };
18B7C7871294222E009E7A26 /* GUIShader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIShader.cpp; sourceTree = "<group>"; };
18B7C7881294222E009E7A26 /* GUISliderControl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUISliderControl.cpp; sourceTree = "<group>"; };
@@ -5215,8 +5203,6 @@
18B7C75E1294222E009E7A26 /* GUIButtonControl.cpp */,
18B7C7031294222D009E7A26 /* GUIButtonControl.h */,
18B7C7051294222D009E7A26 /* GUICallback.h */,
- 18B7C7601294222E009E7A26 /* GUICheckMarkControl.cpp */,
- 18B7C7061294222D009E7A26 /* GUICheckMarkControl.h */,
18B7C7611294222E009E7A26 /* GUIColorManager.cpp */,
18B7C7071294222D009E7A26 /* GUIColorManager.h */,
18B7C7621294222E009E7A26 /* GUIControl.cpp */,
@@ -5278,8 +5264,6 @@
18B7C7211294222D009E7A26 /* GUIMoverControl.h */,
18B7C77C1294222E009E7A26 /* GUIMultiImage.cpp */,
18B7C7221294222D009E7A26 /* GUIMultiImage.h */,
- 18B7C77D1294222E009E7A26 /* GUIMultiSelectText.cpp */,
- 18B7C7231294222D009E7A26 /* GUIMultiSelectText.h */,
18B7C77E1294222E009E7A26 /* GUIPanelContainer.cpp */,
18B7C7241294222D009E7A26 /* GUIPanelContainer.h */,
18B7C77F1294222E009E7A26 /* GUIProgressControl.cpp */,
@@ -5294,8 +5278,6 @@
18B7C7291294222D009E7A26 /* GUIRSSControl.h */,
18B7C7841294222E009E7A26 /* GUIScrollBarControl.cpp */,
18B7C72A1294222D009E7A26 /* GUIScrollBarControl.h */,
- 18B7C7851294222E009E7A26 /* GUISelectButtonControl.cpp */,
- 18B7C72B1294222D009E7A26 /* GUISelectButtonControl.h */,
18B7C7861294222E009E7A26 /* GUISettingsSliderControl.cpp */,
18B7C72C1294222D009E7A26 /* GUISettingsSliderControl.h */,
18B7C7871294222E009E7A26 /* GUIShader.cpp */,
@@ -10134,7 +10116,6 @@
18B7C7B11294222E009E7A26 /* GUIBaseContainer.cpp in Sources */,
18B7C7B21294222E009E7A26 /* GUIBorderedImage.cpp in Sources */,
18B7C7B31294222E009E7A26 /* GUIButtonControl.cpp in Sources */,
- 18B7C7B51294222E009E7A26 /* GUICheckMarkControl.cpp in Sources */,
18B7C7B61294222E009E7A26 /* GUIColorManager.cpp in Sources */,
DFD717391C09FEC60025D964 /* DarwinUtils.mm in Sources */,
18B7C7B71294222E009E7A26 /* GUIControl.cpp in Sources */,
@@ -10169,7 +10150,7 @@
2AB491701CDDF1920004C263 /* HTTPRequestHandlerUtils.cpp in Sources */,
18B7C7D01294222E009E7A26 /* GUIMoverControl.cpp in Sources */,
18B7C7D11294222E009E7A26 /* GUIMultiImage.cpp in Sources */,
- 18B7C7D21294222E009E7A26 /* GUIMultiSelectText.cpp in Sources */,
+ 764697C61CA72E8D00AB1347 /* Addon_GUIControlSpin.cpp in Sources */,
18B7C7D31294222E009E7A26 /* GUIPanelContainer.cpp in Sources */,
18B7C7D41294222E009E7A26 /* GUIProgressControl.cpp in Sources */,
DF1D2DF01B6E85EE002BB9DB /* XbtFile.cpp in Sources */,
@@ -10178,7 +10159,6 @@
18B7C7D71294222E009E7A26 /* GUIResizeControl.cpp in Sources */,
18B7C7D81294222E009E7A26 /* GUIRSSControl.cpp in Sources */,
18B7C7D91294222E009E7A26 /* GUIScrollBarControl.cpp in Sources */,
- 18B7C7DA1294222E009E7A26 /* GUISelectButtonControl.cpp in Sources */,
18B7C7DB1294222E009E7A26 /* GUISettingsSliderControl.cpp in Sources */,
18B7C7DC1294222E009E7A26 /* GUIShader.cpp in Sources */,
18B7C7DD1294222E009E7A26 /* GUISliderControl.cpp in Sources */,
@@ -11135,7 +11115,6 @@
E49912E5174E5DAD00741B6D /* GUIBaseContainer.cpp in Sources */,
E49912E6174E5DAD00741B6D /* GUIBorderedImage.cpp in Sources */,
E49912E7174E5DAD00741B6D /* GUIButtonControl.cpp in Sources */,
- E49912E8174E5DAD00741B6D /* GUICheckMarkControl.cpp in Sources */,
E49912E9174E5DAD00741B6D /* GUIColorManager.cpp in Sources */,
76AEFB3F1C8F79DC00EF2EC0 /* AddonCallbacksPVR.cpp in Sources */,
E49912EA174E5DAD00741B6D /* GUIControl.cpp in Sources */,
@@ -11171,7 +11150,6 @@
E4991304174E5DAD00741B6D /* GUIMoverControl.cpp in Sources */,
399442751A8DD920006C39E9 /* VideoLibraryMarkWatchedJob.cpp in Sources */,
E4991305174E5DAD00741B6D /* GUIMultiImage.cpp in Sources */,
- E4991306174E5DAD00741B6D /* GUIMultiSelectText.cpp in Sources */,
3994427B1A8DD920006C39E9 /* VideoLibraryScanningJob.cpp in Sources */,
E4991307174E5DAD00741B6D /* GUIPanelContainer.cpp in Sources */,
E4991308174E5DAD00741B6D /* GUIProgressControl.cpp in Sources */,
@@ -11182,7 +11160,6 @@
395C2A251AA4C32100EBC7AD /* AudioDecoder.cpp in Sources */,
E499130C174E5DAD00741B6D /* GUIRSSControl.cpp in Sources */,
E499130D174E5DAD00741B6D /* GUIScrollBarControl.cpp in Sources */,
- E499130E174E5DAD00741B6D /* GUISelectButtonControl.cpp in Sources */,
E499130F174E5DAD00741B6D /* GUISettingsSliderControl.cpp in Sources */,
E4991310174E5DAD00741B6D /* GUIShader.cpp in Sources */,
E4991311174E5DAD00741B6D /* GUISliderControl.cpp in Sources */,
View
6 project/VS2010Express/XBMC.vcxproj
@@ -515,7 +515,6 @@ copy "..\Win32BuildSetup\dependencies\python27.dll" "$(TargetDir)"</Command>
<ClCompile Include="..\..\xbmc\guilib\GUIBaseContainer.cpp" />
<ClCompile Include="..\..\xbmc\guilib\GUIBorderedImage.cpp" />
<ClCompile Include="..\..\xbmc\guilib\GUIButtonControl.cpp" />
- <ClCompile Include="..\..\xbmc\guilib\GUICheckMarkControl.cpp" />
<ClCompile Include="..\..\xbmc\guilib\GUIColorManager.cpp" />
<ClCompile Include="..\..\xbmc\guilib\GUIControl.cpp" />
<ClCompile Include="..\..\xbmc\guilib\GUIControlFactory.cpp" />
@@ -545,15 +544,13 @@ copy "..\Win32BuildSetup\dependencies\python27.dll" "$(TargetDir)"</Command>
<ClCompile Include="..\..\xbmc\guilib\GUIMessage.cpp" />
<ClCompile Include="..\..\xbmc\guilib\GUIMoverControl.cpp" />
<ClCompile Include="..\..\xbmc\guilib\GUIMultiImage.cpp" />
- <ClCompile Include="..\..\xbmc\guilib\GUIMultiSelectText.cpp" />
<ClCompile Include="..\..\xbmc\guilib\GUIPanelContainer.cpp" />
<ClCompile Include="..\..\xbmc\guilib\GUIProgressControl.cpp" />
<ClCompile Include="..\..\xbmc\guilib\GUIRadioButtonControl.cpp" />
<ClCompile Include="..\..\xbmc\guilib\GUIRenderingControl.cpp" />
<ClCompile Include="..\..\xbmc\guilib\GUIResizeControl.cpp" />
<ClCompile Include="..\..\xbmc\guilib\GUIRSSControl.cpp" />
<ClCompile Include="..\..\xbmc\guilib\GUIScrollBarControl.cpp" />
- <ClCompile Include="..\..\xbmc\guilib\GUISelectButtonControl.cpp" />
<ClCompile Include="..\..\xbmc\guilib\GUISettingsSliderControl.cpp" />
<ClCompile Include="..\..\xbmc\guilib\GUIShader.cpp" />
<ClCompile Include="..\..\xbmc\guilib\GUIShaderDX.cpp" />
@@ -2051,7 +2048,6 @@ copy "..\Win32BuildSetup\dependencies\python27.dll" "$(TargetDir)"</Command>
<ClInclude Include="..\..\xbmc\guilib\GUIBorderedImage.h" />
<ClInclude Include="..\..\xbmc\guilib\GUIButtonControl.h" />
<ClInclude Include="..\..\xbmc\guilib\GUICallback.h" />
- <ClInclude Include="..\..\xbmc\guilib\GUICheckMarkControl.h" />
<ClInclude Include="..\..\xbmc\guilib\GUIColorManager.h" />
<ClInclude Include="..\..\xbmc\guilib\GUIControl.h" />
<ClInclude Include="..\..\xbmc\guilib\GUIControlFactory.h" />
@@ -2080,15 +2076,13 @@ copy "..\Win32BuildSetup\dependencies\python27.dll" "$(TargetDir)"</Command>
<ClInclude Include="..\..\xbmc\guilib\GUIMessage.h" />
<ClInclude Include="..\..\xbmc\guilib\GUIMoverControl.h" />
<ClInclude Include="..\..\xbmc\guilib\GUIMultiImage.h" />
- <ClInclude Include="..\..\xbmc\guilib\GUIMultiSelectText.h" />
<ClInclude Include="..\..\xbmc\guilib\GUIPanelContainer.h" />
<ClInclude Include="..\..\xbmc\guilib\GUIProgressControl.h" />
<ClInclude Include="..\..\xbmc\guilib\GUIRadioButtonControl.h" />
<ClInclude Include="..\..\xbmc\guilib\GUIRenderingControl.h" />
<ClInclude Include="..\..\xbmc\guilib\GUIResizeControl.h" />
<ClInclude Include="..\..\xbmc\guilib\GUIRSSControl.h" />
<ClInclude Include="..\..\xbmc\guilib\GUIScrollBarControl.h" />
- <ClInclude Include="..\..\xbmc\guilib\GUISelectButtonControl.h" />
<ClInclude Include="..\..\xbmc\guilib\GUISettingsSliderControl.h" />
<ClInclude Include="..\..\xbmc\guilib\GUIShader.h" />
<ClInclude Include="..\..\xbmc\guilib\GUISliderControl.h" />
View
18 project/VS2010Express/XBMC.vcxproj.filters
@@ -966,9 +966,6 @@
<ClCompile Include="..\..\xbmc\guilib\GUIButtonControl.cpp">
<Filter>guilib</Filter>
</ClCompile>
- <ClCompile Include="..\..\xbmc\guilib\GUICheckMarkControl.cpp">
- <Filter>guilib</Filter>
- </ClCompile>
<ClCompile Include="..\..\xbmc\guilib\GUIColorManager.cpp">
<Filter>guilib</Filter>
</ClCompile>
@@ -1044,9 +1041,6 @@
<ClCompile Include="..\..\xbmc\guilib\GUIMultiImage.cpp">
<Filter>guilib</Filter>
</ClCompile>
- <ClCompile Include="..\..\xbmc\guilib\GUIMultiSelectText.cpp">
- <Filter>guilib</Filter>
- </ClCompile>
<ClCompile Include="..\..\xbmc\guilib\GUIPanelContainer.cpp">
<Filter>guilib</Filter>
</ClCompile>
@@ -1068,9 +1062,6 @@
<ClCompile Include="..\..\xbmc\guilib\GUIScrollBarControl.cpp">
<Filter>guilib</Filter>
</ClCompile>
- <ClCompile Include="..\..\xbmc\guilib\GUISelectButtonControl.cpp">
- <Filter>guilib</Filter>
- </ClCompile>
<ClCompile Include="..\..\xbmc\guilib\GUISettingsSliderControl.cpp">
<Filter>guilib</Filter>
</ClCompile>
@@ -4077,9 +4068,6 @@
<ClInclude Include="..\..\xbmc\guilib\GUICallback.h">
<Filter>guilib</Filter>
</ClInclude>
- <ClInclude Include="..\..\xbmc\guilib\GUICheckMarkControl.h">
- <Filter>guilib</Filter>
- </ClInclude>
<ClInclude Include="..\..\xbmc\guilib\GUIColorManager.h">
<Filter>guilib</Filter>
</ClInclude>
@@ -4155,9 +4143,6 @@
<ClInclude Include="..\..\xbmc\guilib\GUIMultiImage.h">
<Filter>guilib</Filter>
</ClInclude>
- <ClInclude Include="..\..\xbmc\guilib\GUIMultiSelectText.h">
- <Filter>guilib</Filter>
- </ClInclude>
<ClInclude Include="..\..\xbmc\guilib\GUIPanelContainer.h">
<Filter>guilib</Filter>
</ClInclude>
@@ -4179,9 +4164,6 @@
<ClInclude Include="..\..\xbmc\guilib\GUIScrollBarControl.h">
<Filter>guilib</Filter>
</ClInclude>
- <ClInclude Include="..\..\xbmc\guilib\GUISelectButtonControl.h">
- <Filter>guilib</Filter>
- </ClInclude>
<ClInclude Include="..\..\xbmc\guilib\GUISettingsSliderControl.h">
<Filter>guilib</Filter>
</ClInclude>
View
2 xbmc/addons/binary/interfaces/api1/GUI/AddonGUIWindow.cpp
@@ -148,7 +148,7 @@ bool CGUIAddonWindow::OnMessage(CGUIMessage& message)
{
CGUIControl* controlClicked = (CGUIControl*)this->GetControl(iControl);
- // The old python way used to check list AND SELECITEM method or if its a button, checkmark.
+ // The old python way used to check list AND SELECITEM method or if its a button, radiobutton.
// Its done this way for now to allow other controls without a python version like togglebutton to still raise a onAction event
if (controlClicked) // Will get problems if we the id is not on the window and we try to do GetControlType on it. So check to make sure it exists
{
View
1 xbmc/addons/kodi-addon-dev-kit/doxygen/Doxyfile
@@ -803,7 +803,6 @@ INPUT = main.txt \
../../../guilib/GUIResizeControl.dox \
../../../guilib/GUIRSSControl.dox \
../../../guilib/GUIScrollBarControl.dox \
- ../../../guilib/GUISelectButtonControl.dox \
../../../guilib/GUISettingsSliderControl.dox \
../../../guilib/GUISpinControlEx.dox \
../../../guilib/GUISliderControl.dox \
View
6 xbmc/guilib/CMakeLists.txt
@@ -9,7 +9,6 @@ set(SOURCES DDSImage.cpp
GUIBaseContainer.cpp
GUIBorderedImage.cpp
GUIButtonControl.cpp
- GUICheckMarkControl.cpp
GUIColorManager.cpp
GUIControl.cpp
GUIControlFactory.cpp
@@ -38,15 +37,13 @@ set(SOURCES DDSImage.cpp
GUIMessage.cpp
GUIMoverControl.cpp
GUIMultiImage.cpp
- GUIMultiSelectText.cpp
GUIPanelContainer.cpp
GUIProgressControl.cpp
GUIRadioButtonControl.cpp
GUIRenderingControl.cpp
GUIResizeControl.cpp
GUIRSSControl.cpp
GUIScrollBarControl.cpp
- GUISelectButtonControl.cpp
GUISettingsSliderControl.cpp
GUISliderControl.cpp
GUISpinControl.cpp
@@ -91,7 +88,6 @@ set(HEADERS DDSImage.h
GUIBorderedImage.h
GUIButtonControl.h
GUICallback.h
- GUICheckMarkControl.h
GUIColorManager.h
GUIControl.h
GUIControlFactory.h
@@ -121,15 +117,13 @@ set(HEADERS DDSImage.h
GUIMessage.h
GUIMoverControl.h
GUIMultiImage.h
- GUIMultiSelectText.h
GUIPanelContainer.h
GUIProgressControl.h
GUIRadioButtonControl.h
GUIRenderingControl.h
GUIResizeControl.h
GUIRSSControl.h
GUIScrollBarControl.h
- GUISelectButtonControl.h
GUISettingsSliderControl.h
GUISliderControl.h
GUISpinControl.h
View
202 xbmc/guilib/GUICheckMarkControl.cpp
@@ -1,202 +0,0 @@
-/*
- * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
- *
- * This Program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This Program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with XBMC; see the file COPYING. If not, see
- * <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "GUICheckMarkControl.h"
-#include "GUIFontManager.h"
-#include "input/Key.h"
-
-CGUICheckMarkControl::CGUICheckMarkControl(int parentID, int controlID, float posX, float posY, float width, float height, const CTextureInfo& textureCheckMark, const CTextureInfo& textureCheckMarkNF, float checkWidth, float checkHeight, const CLabelInfo &labelInfo)
- : CGUIControl(parentID, controlID, posX, posY, width, height)
- , m_imgCheckMark(posX, posY, checkWidth, checkHeight, textureCheckMark)
- , m_imgCheckMarkNoFocus(posX, posY, checkWidth, checkHeight, textureCheckMarkNF)
- , m_label(posX, posY, width, height, labelInfo)
- , m_strLabel("")
-{
- m_bSelected = false;
- m_label.GetLabelInfo().align |= XBFONT_CENTER_Y;
- ControlType = GUICONTROL_CHECKMARK;
-}
-
-CGUICheckMarkControl::~CGUICheckMarkControl(void)
-{}
-
-void CGUICheckMarkControl::Process(unsigned int currentTime, CDirtyRegionList &dirtyregions)
-{
- bool changed = false;
-
- changed |= m_imgCheckMark.Process(currentTime);
- changed |= m_imgCheckMarkNoFocus.Process(currentTime);
- changed |= m_label.Process(currentTime);
-
- if (changed)
- MarkDirtyRegion();
-
- CGUIControl::Process(currentTime, dirtyregions);
-}
-
-void CGUICheckMarkControl::Render()
-{
- m_label.SetText(m_strLabel);
-
- float textWidth = m_label.GetTextWidth();
- m_width = textWidth + 5 + m_imgCheckMark.GetWidth();
- m_height = m_imgCheckMark.GetHeight();
-
- float textPosX = m_posX;
- float checkMarkPosX = m_posX;
-
- if (m_label.GetLabelInfo().align & (XBFONT_RIGHT | XBFONT_CENTER_X))
- textPosX += m_imgCheckMark.GetWidth() + 5;
- else
- checkMarkPosX += textWidth + 5;
-
- m_label.SetMaxRect(textPosX, m_posY, textWidth, m_height);
- m_label.SetColor(GetTextColor());
- m_label.Render();
-
- if (m_bSelected)
- {
- m_imgCheckMark.SetPosition(checkMarkPosX, m_posY);
- m_imgCheckMark.Render();
- }
- else
- {
- m_imgCheckMarkNoFocus.SetPosition(checkMarkPosX, m_posY);
- m_imgCheckMarkNoFocus.Render();
- }
- CGUIControl::Render();
-}
-
-CGUILabel::COLOR CGUICheckMarkControl::GetTextColor() const
-{
- if (IsDisabled())
- return CGUILabel::COLOR_DISABLED;
- else if (HasFocus())
- return CGUILabel::COLOR_FOCUSED;
- return CGUILabel::COLOR_TEXT;
-}
-
-bool CGUICheckMarkControl::OnAction(const CAction &action)
-{
- if (action.GetID() == ACTION_SELECT_ITEM)
- {
- m_bSelected = !m_bSelected;
- CGUIMessage msg(GUI_MSG_CLICKED, GetID(), GetParentID(), action.GetID());
- SendWindowMessage(msg);
- return true;
- }
- return CGUIControl::OnAction(action);
-}
-
-bool CGUICheckMarkControl::OnMessage(CGUIMessage& message)
-{
- if ( message.GetControlId() == GetID() )
- {
- if (message.GetMessage() == GUI_MSG_LABEL_SET)
- {
- m_strLabel = message.GetLabel();
- return true;
- }
- }
- if (CGUIControl::OnMessage(message)) return true;
- return false;
-}
-
-void CGUICheckMarkControl::AllocResources()
-{
- CGUIControl::AllocResources();
- m_imgCheckMark.AllocResources();
- m_imgCheckMarkNoFocus.AllocResources();
-}
-
-void CGUICheckMarkControl::FreeResources(bool immediately)
-{
- CGUIControl::FreeResources(immediately);
- m_imgCheckMark.FreeResources(immediately);
- m_imgCheckMarkNoFocus.FreeResources(immediately);
-}
-
-void CGUICheckMarkControl::DynamicResourceAlloc(bool bOnOff)
-{
- CGUIControl::DynamicResourceAlloc(bOnOff);
- m_imgCheckMark.DynamicResourceAlloc(bOnOff);
- m_imgCheckMarkNoFocus.DynamicResourceAlloc(bOnOff);
-}
-
-void CGUICheckMarkControl::SetInvalid()
-{
- CGUIControl::SetInvalid();
- m_label.SetInvalid();
- m_imgCheckMark.SetInvalid();
- m_imgCheckMarkNoFocus.SetInvalid();
-}
-
-void CGUICheckMarkControl::SetSelected(bool bOnOff)
-{
- m_bSelected = bOnOff;
-}
-
-bool CGUICheckMarkControl::GetSelected() const
-{
- return m_bSelected;
-}
-
-EVENT_RESULT CGUICheckMarkControl::OnMouseEvent(const CPoint &point, const CMouseEvent &event)
-{
- if (event.m_id == ACTION_MOUSE_LEFT_CLICK)
- {
- OnAction(CAction(ACTION_SELECT_ITEM));
- return EVENT_RESULT_HANDLED;
- }
- return EVENT_RESULT_UNHANDLED;
-}
-
-void CGUICheckMarkControl::SetLabel(const std::string &label)
-{
- if (m_strLabel != label)
- {
- m_strLabel = label;
- SetInvalid();
- }
-}
-
-void CGUICheckMarkControl::PythonSetLabel(const std::string &strFont, const std::string &strText, color_t textColor)
-{
- m_label.GetLabelInfo().font = g_fontManager.GetFont(strFont);
- m_label.GetLabelInfo().textColor = textColor;
- m_label.GetLabelInfo().focusedColor = textColor;
- m_strLabel = strText;
- SetInvalid();
-}
-
-void CGUICheckMarkControl::PythonSetDisabledColor(color_t disabledColor)
-{
- m_label.GetLabelInfo().disabledColor = disabledColor;
-}
-
-bool CGUICheckMarkControl::UpdateColors()
-{
- bool changed = CGUIControl::UpdateColors();
- changed |= m_label.UpdateColors();
- changed |= m_imgCheckMark.SetDiffuseColor(m_diffuseColor);
- changed |= m_imgCheckMarkNoFocus.SetDiffuseColor(m_diffuseColor);
-
- return changed;
-}
View
76 xbmc/guilib/GUICheckMarkControl.h
@@ -1,76 +0,0 @@
-/*!
-\file GUICheckMarkControl.h
-\brief
-*/
-
-#ifndef CGUILIB_GUICHECKMARK_CONTROL_H
-#define CGUILIB_GUICHECKMARK_CONTROL_H
-
-#pragma once
-
-/*
- * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
- *
- * This Program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This Program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with XBMC; see the file COPYING. If not, see
- * <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "GUITexture.h"
-#include "GUILabel.h"
-#include "GUIControl.h"
-
-/*!
- \ingroup controls
- \brief
- */
-class CGUICheckMarkControl: public CGUIControl
-{
-public:
- CGUICheckMarkControl(int parentID, int controlID, float posX, float posY, float width, float height, const CTextureInfo& textureCheckMark, const CTextureInfo& textureCheckMarkNF, float checkWidth, float checkHeight, const CLabelInfo &labelInfo);
- virtual ~CGUICheckMarkControl(void);
- virtual CGUICheckMarkControl *Clone() const { return new CGUICheckMarkControl(*this); };
-
- virtual void Process(unsigned int currentTime, CDirtyRegionList &dirtyregions);
- virtual void Render();
- virtual bool OnAction(const CAction &action) ;
- virtual bool OnMessage(CGUIMessage& message);
- virtual void AllocResources();
- virtual void FreeResources(bool immediately = false);
- virtual void DynamicResourceAlloc(bool bOnOff);
- virtual void SetInvalid();
-
- void SetLabel(const std::string& strLabel);
- const std::string GetLabel() const { return m_strLabel; };
- const CLabelInfo& GetLabelInfo() const { return m_label.GetLabelInfo(); };
- void SetSelected(bool bOnOff);
- bool GetSelected() const;
-
- void PythonSetLabel(const std::string &strFont, const std::string &strText, color_t textColor);
- void PythonSetDisabledColor(color_t disabledColor);
-
-protected:
- virtual EVENT_RESULT OnMouseEvent(const CPoint &point, const CMouseEvent &event);
- virtual bool UpdateColors();
- CGUILabel::COLOR GetTextColor() const;
-
- CGUITexture m_imgCheckMark;
- CGUITexture m_imgCheckMarkNoFocus;
-
- CGUILabel m_label;
- std::string m_strLabel;
- bool m_bSelected;
-};
-#endif
View
4 xbmc/guilib/GUIControl.h
@@ -248,17 +248,14 @@ class CGUIControl
enum GUICONTROLTYPES {
GUICONTROL_UNKNOWN,
GUICONTROL_BUTTON,
- GUICONTROL_CHECKMARK,
GUICONTROL_FADELABEL,
GUICONTROL_IMAGE,
GUICONTROL_BORDEREDIMAGE,
- GUICONTROL_LARGE_IMAGE,
GUICONTROL_LABEL,
GUICONTROL_LISTGROUP,
GUICONTROL_PROGRESS,
GUICONTROL_RADIO,
GUICONTROL_RSS,
- GUICONTROL_SELECTBUTTON,
GUICONTROL_SLIDER,
GUICONTROL_SETTINGS_SLIDER,
GUICONTROL_SPIN,
@@ -276,7 +273,6 @@ class CGUIControl
GUICONTROL_GROUPLIST,
GUICONTROL_SCROLLBAR,
GUICONTROL_LISTLABEL,
- GUICONTROL_MULTISELECT,
GUICONTROL_GAMECONTROLLER,
GUICONTAINER_LIST,
GUICONTAINER_WRAPLIST,
View
50 xbmc/guilib/GUIControlFactory.cpp
@@ -30,13 +30,11 @@
#include "GUILabelControl.h"
#include "GUIEditControl.h"
#include "GUIFadeLabelControl.h"
-#include "GUICheckMarkControl.h"
#include "GUIToggleButtonControl.h"
#include "GUITextBox.h"
#include "GUIVideoControl.h"
#include "GUIProgressControl.h"
#include "GUISliderControl.h"
-#include "GUISelectButtonControl.h"
#include "GUIMoverControl.h"
#include "GUIResizeControl.h"
#include "GUISpinControlEx.h"
@@ -51,7 +49,6 @@
#include "GUIWrappingListContainer.h"
#include "epg/GUIEPGGridContainer.h"
#include "GUIPanelContainer.h"
-#include "GUIMultiSelectText.h"
#include "GUIListLabel.h"
#include "GUIListGroup.h"
#include "GUIInfoManager.h"
@@ -77,10 +74,8 @@ typedef struct
static const ControlMapping controls[] =
{{"button", CGUIControl::GUICONTROL_BUTTON},
- {"checkmark", CGUIControl::GUICONTROL_CHECKMARK},
{"fadelabel", CGUIControl::GUICONTROL_FADELABEL},
{"image", CGUIControl::GUICONTROL_IMAGE},
- {"largeimage", CGUIControl::GUICONTROL_IMAGE},
{"image", CGUIControl::GUICONTROL_BORDEREDIMAGE},
{"label", CGUIControl::GUICONTROL_LABEL},
{"label", CGUIControl::GUICONTROL_LISTLABEL},
@@ -89,7 +84,6 @@ static const ControlMapping controls[] =
{"progress", CGUIControl::GUICONTROL_PROGRESS},
{"radiobutton", CGUIControl::GUICONTROL_RADIO},
{"rss", CGUIControl::GUICONTROL_RSS},
- {"selectbutton", CGUIControl::GUICONTROL_SELECTBUTTON},
{"slider", CGUIControl::GUICONTROL_SLIDER},
{"sliderex", CGUIControl::GUICONTROL_SETTINGS_SLIDER},
{"spincontrol", CGUIControl::GUICONTROL_SPIN},
@@ -105,7 +99,6 @@ static const ControlMapping controls[] =
{"multiimage", CGUIControl::GUICONTROL_MULTI_IMAGE},
{"grouplist", CGUIControl::GUICONTROL_GROUPLIST},
{"scrollbar", CGUIControl::GUICONTROL_SCROLLBAR},
- {"multiselect", CGUIControl::GUICONTROL_MULTISELECT},
{"gamecontroller", CGUIControl::GUICONTROL_GAMECONTROLLER},
{"list", CGUIControl::GUICONTAINER_LIST},
{"wraplist", CGUIControl::GUICONTAINER_WRAPLIST},
@@ -702,13 +695,11 @@ CGUIControl* CGUIControlFactory::Create(int parentID, const CRect &rect, TiXmlEl
bool bReveal = false;
CTextureInfo textureBackground, textureLeft, textureRight, textureMid, textureOverlay;
CTextureInfo textureNib, textureNibFocus, textureBar, textureBarFocus;
- CTextureInfo textureLeftFocus, textureRightFocus;
CTextureInfo textureUp, textureDown;
CTextureInfo textureUpFocus, textureDownFocus;
CTextureInfo textureUpDisabled, textureDownDisabled;
CTextureInfo texture, borderTexture;
CGUIInfoLabel textureFile;
- CTextureInfo textureCheckMark, textureCheckMarkNF;
CTextureInfo textureFocus, textureNoFocus;
CTextureInfo textureAltFocus, textureAltNoFocus;
CTextureInfo textureRadioOnFocus, textureRadioOnNoFocus;
@@ -890,11 +881,6 @@ CGUIControl* CGUIControlFactory::Create(int parentID, const CRect &rect, TiXmlEl
GetTexture(pControlNode, "textureupdisabled", textureUpDisabled);
GetTexture(pControlNode, "texturedowndisabled", textureDownDisabled);
- GetTexture(pControlNode, "textureleft", textureLeft);
- GetTexture(pControlNode, "textureright", textureRight);
- GetTexture(pControlNode, "textureleftfocus", textureLeftFocus);
- GetTexture(pControlNode, "texturerightfocus", textureRightFocus);
-
XMLUtils::GetFloat(pControlNode, "spinwidth", spinWidth);
XMLUtils::GetFloat(pControlNode, "spinheight", spinHeight);
XMLUtils::GetFloat(pControlNode, "spinposx", spinPosX);
@@ -904,8 +890,6 @@ CGUIControl* CGUIControlFactory::Create(int parentID, const CRect &rect, TiXmlEl
XMLUtils::GetFloat(pControlNode, "markheight", checkHeight);
XMLUtils::GetFloat(pControlNode, "sliderwidth", sliderWidth);
XMLUtils::GetFloat(pControlNode, "sliderheight", sliderHeight);
- GetTexture(pControlNode, "texturecheckmark", textureCheckMark);
- GetTexture(pControlNode, "texturecheckmarknofocus", textureCheckMarkNF);
if (!GetTexture(pControlNode, "textureradioonfocus", textureRadioOnFocus) || !GetTexture(pControlNode, "textureradioonnofocus", textureRadioOnNoFocus))
{
GetTexture(pControlNode, "textureradiofocus", textureRadioOnFocus); // backward compatibility
@@ -1214,16 +1198,6 @@ CGUIControl* CGUIControlFactory::Create(int parentID, const CRect &rect, TiXmlEl
((CGUIToggleButtonControl *)control)->SetToggleSelect(toggleSelect);
}
break;
- case CGUIControl::GUICONTROL_CHECKMARK:
- {
- control = new CGUICheckMarkControl(
- parentID, id, posX, posY, width, height,
- textureCheckMark, textureCheckMarkNF,
- checkWidth, checkHeight, labelInfo);
-
- ((CGUICheckMarkControl *)control)->SetLabel(strLabel);
- }
- break;
case CGUIControl::GUICONTROL_RADIO:
{
control = new CGUIRadioButtonControl(
@@ -1241,16 +1215,6 @@ CGUIControl* CGUIControlFactory::Create(int parentID, const CRect &rect, TiXmlEl
((CGUIRadioButtonControl *)control)->SetUnFocusActions(unfocusActions);
}
break;
- case CGUIControl::GUICONTROL_MULTISELECT:
- {
- CGUIInfoLabel label;
- if (infoLabels.size())
- label = infoLabels[0];
- control = new CGUIMultiSelectTextControl(
- parentID, id, posX, posY, width, height,
- textureFocus, textureNoFocus, labelInfo, label);
- }
- break;
case CGUIControl::GUICONTROL_SPIN:
{
control = new CGUISpinControl(
@@ -1318,9 +1282,6 @@ CGUIControl* CGUIControlFactory::Create(int parentID, const CRect &rect, TiXmlEl
break;
case CGUIControl::GUICONTROL_IMAGE:
{
- if (strType == "largeimage")
- texture.useLarge = true;
-
// use a bordered texture if we have <bordersize> or <bordertexture> specified.
if (borderTexture.filename.empty() && borderStr.empty())
control = new CGUIImage(
@@ -1430,17 +1391,6 @@ CGUIControl* CGUIControlFactory::Create(int parentID, const CRect &rect, TiXmlEl
((CGUITextBox *)control)->SetMinHeight(minHeight);
}
break;
- case CGUIControl::GUICONTROL_SELECTBUTTON:
- {
- control = new CGUISelectButtonControl(
- parentID, id, posX, posY,
- width, height, textureFocus, textureNoFocus,
- labelInfo,
- textureBackground, textureLeft, textureLeftFocus, textureRight, textureRightFocus);
-
- ((CGUISelectButtonControl *)control)->SetLabel(strLabel);
- }
- break;
case CGUIControl::GUICONTROL_MOVER:
{
control = new CGUIMoverControl(
View
8 xbmc/guilib/GUIControlProfiler.cpp
@@ -92,15 +92,11 @@ void CGUIControlProfilerItem::SaveToXML(TiXmlElement *parent)
{
case CGUIControl::GUICONTROL_BUTTON:
lpszType = "button"; break;
- case CGUIControl::GUICONTROL_CHECKMARK:
- lpszType = "checkmark"; break;
case CGUIControl::GUICONTROL_FADELABEL:
lpszType = "fadelabel"; break;
case CGUIControl::GUICONTROL_IMAGE:
case CGUIControl::GUICONTROL_BORDEREDIMAGE:
lpszType = "image"; break;
- case CGUIControl::GUICONTROL_LARGE_IMAGE:
- lpszType = "largeimage"; break;
case CGUIControl::GUICONTROL_LABEL:
lpszType = "label"; break;
case CGUIControl::GUICONTROL_LISTGROUP:
@@ -111,8 +107,6 @@ void CGUIControlProfilerItem::SaveToXML(TiXmlElement *parent)
lpszType = "radiobutton"; break;
case CGUIControl::GUICONTROL_RSS:
lpszType = "rss"; break;
- case CGUIControl::GUICONTROL_SELECTBUTTON:
- lpszType = "selectbutton"; break;
case CGUIControl::GUICONTROL_SLIDER:
lpszType = "slider"; break;
case CGUIControl::GUICONTROL_SETTINGS_SLIDER:
@@ -145,8 +139,6 @@ void CGUIControlProfilerItem::SaveToXML(TiXmlElement *parent)
lpszType = "scrollbar"; break;
case CGUIControl::GUICONTROL_LISTLABEL:
lpszType = "label"; break;
- case CGUIControl::GUICONTROL_MULTISELECT:
- lpszType = "multiselect"; break;
case CGUIControl::GUICONTAINER_LIST:
lpszType = "list"; break;
case CGUIControl::GUICONTAINER_WRAPLIST:
View
22 xbmc/guilib/GUIListGroup.cpp
@@ -20,7 +20,6 @@
#include "GUIListGroup.h"
#include "GUIListLabel.h"
-#include "GUIMultiSelectText.h"
#include "utils/log.h"
CGUIListGroup::CGUIListGroup(int parentID, int controlID, float posX, float posY, float width, float height)
@@ -51,7 +50,6 @@ void CGUIListGroup::AddControl(CGUIControl *control, int position /*= -1*/)
control->GetControlType() == CGUIControl::GUICONTROL_IMAGE ||
control->GetControlType() == CGUIControl::GUICONTROL_BORDEREDIMAGE ||
control->GetControlType() == CGUIControl::GUICONTROL_MULTI_IMAGE ||
- control->GetControlType() == CGUIControl::GUICONTROL_MULTISELECT ||
control->GetControlType() == CGUIControl::GUICONTROL_TEXTBOX ||
control->GetControlType() == CGUIControl::GUICONTROL_PROGRESS))
CLog::Log(LOGWARNING, "Trying to add unsupported control type %d", control->GetControlType());
@@ -172,9 +170,7 @@ void CGUIListGroup::SetFocusedItem(unsigned int focus)
{
for (iControls it = m_children.begin(); it != m_children.end(); it++)
{
- if ((*it)->GetControlType() == CGUIControl::GUICONTROL_MULTISELECT)
- ((CGUIMultiSelectTextControl *)(*it))->SetFocusedItem(focus);
- else if ((*it)->GetControlType() == CGUIControl::GUICONTROL_LISTGROUP)
+ if ((*it)->GetControlType() == CGUIControl::GUICONTROL_LISTGROUP)
((CGUIListGroup *)(*it))->SetFocusedItem(focus);
else
(*it)->SetFocus(focus > 0);
@@ -186,9 +182,7 @@ unsigned int CGUIListGroup::GetFocusedItem() const
{
for (ciControls it = m_children.begin(); it != m_children.end(); it++)
{
- if ((*it)->GetControlType() == CGUIControl::GUICONTROL_MULTISELECT && ((CGUIMultiSelectTextControl *)(*it))->GetFocusedItem())
- return ((CGUIMultiSelectTextControl *)(*it))->GetFocusedItem();
- else if ((*it)->GetControlType() == CGUIControl::GUICONTROL_LISTGROUP && ((CGUIListGroup *)(*it))->GetFocusedItem())
+ if ((*it)->GetControlType() == CGUIControl::GUICONTROL_LISTGROUP && ((CGUIListGroup *)(*it))->GetFocusedItem())
return ((CGUIListGroup *)(*it))->GetFocusedItem();
}
return 0;
@@ -198,9 +192,7 @@ bool CGUIListGroup::MoveLeft()
{
for (iControls it = m_children.begin(); it != m_children.end(); it++)
{
- if ((*it)->GetControlType() == CGUIControl::GUICONTROL_MULTISELECT && ((CGUIMultiSelectTextControl *)(*it))->MoveLeft())
- return true;
- else if ((*it)->GetControlType() == CGUIControl::GUICONTROL_LISTGROUP && ((CGUIListGroup *)(*it))->MoveLeft())
+ if ((*it)->GetControlType() == CGUIControl::GUICONTROL_LISTGROUP && ((CGUIListGroup *)(*it))->MoveLeft())
return true;
}
return false;
@@ -210,9 +202,7 @@ bool CGUIListGroup::MoveRight()
{
for (iControls it = m_children.begin(); it != m_children.end(); it++)
{
- if ((*it)->GetControlType() == CGUIControl::GUICONTROL_MULTISELECT && ((CGUIMultiSelectTextControl *)(*it))->MoveRight())
- return true;
- else if ((*it)->GetControlType() == CGUIControl::GUICONTROL_LISTGROUP && ((CGUIListGroup *)(*it))->MoveRight())
+ if ((*it)->GetControlType() == CGUIControl::GUICONTROL_LISTGROUP && ((CGUIListGroup *)(*it))->MoveRight())
return true;
}
return false;
@@ -240,9 +230,7 @@ void CGUIListGroup::SelectItemFromPoint(const CPoint &point)
for (iControls it = m_children.begin(); it != m_children.end(); ++it)
{
CGUIControl *child = *it;
- if (child->GetControlType() == CGUIControl::GUICONTROL_MULTISELECT)
- ((CGUIMultiSelectTextControl *)child)->SelectItemFromPoint(point);
- else if (child->GetControlType() == CGUIControl::GUICONTROL_LISTGROUP)
+ if (child->GetControlType() == CGUIControl::GUICONTROL_LISTGROUP)
((CGUIListGroup *)child)->SelectItemFromPoint(point);
}
}
View
447 xbmc/guilib/GUIMultiSelectText.cpp
@@ -1,447 +0,0 @@
-/*
- * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
- *
- * This Program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This Program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with XBMC; see the file COPYING. If not, see
- * <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "GUIMultiSelectText.h"
-#include "GUIWindowManager.h"
-#include "input/Key.h"
-#include "utils/log.h"
-#include "utils/StringUtils.h"
-
-CGUIMultiSelectTextControl::CSelectableString::CSelectableString(CGUIFont *font, const std::string &text, bool selectable, const std::string &clickAction)
- : m_text(font, false)
- , m_clickAction(clickAction)
-{
- m_selectable = selectable;
- StringUtils::TrimLeft(m_clickAction, " =");
- StringUtils::TrimRight(m_clickAction);
- m_text.Update(text);
- float height;
- m_text.GetTextExtent(m_length, height);
-}
-
-CGUIMultiSelectTextControl::CGUIMultiSelectTextControl(int parentID, int controlID, float posX, float posY, float width, float height, const CTextureInfo& textureFocus, const CTextureInfo& textureNoFocus, const CLabelInfo& labelInfo, const CGUIInfoLabel &content)
- : CGUIControl(parentID, controlID, posX, posY, width, height)
- , m_label(labelInfo)
- , m_info(content)
- , m_button(parentID, controlID, posX, posY, width, height, textureFocus, textureNoFocus, labelInfo)
-{
- m_selectedItem = 0;
- m_offset = 0;
- m_totalWidth = 0;
- m_scrollOffset = 0;
- m_scrollSpeed = 0;
- m_scrollLastTime = 0;
- m_renderTime = 0;
- m_label.align &= ~3; // we currently ignore all x alignment
-}
-
-CGUIMultiSelectTextControl::~CGUIMultiSelectTextControl(void)
-{
-}
-
-bool CGUIMultiSelectTextControl::UpdateColors()
-{
- bool changed = CGUIControl::UpdateColors();
- changed |= m_label.UpdateColors();
-
- return changed;
-}
-
-void CGUIMultiSelectTextControl::Process(unsigned int currentTime, CDirtyRegionList &dirtyregions)
-{
- m_renderTime = currentTime;
-
- // check our selected item is in range
- unsigned int numSelectable = GetNumSelectable();
- if (!numSelectable)
- SetFocus(false);
- else if (m_selectedItem >= numSelectable)
- m_selectedItem = numSelectable - 1;
-
- // and validate our offset
- if (m_offset + m_width > m_totalWidth)
- m_offset = m_totalWidth - m_width;
- if (m_offset < 0) m_offset = 0;
-
- // handle scrolling
- m_scrollOffset += m_scrollSpeed * (m_renderTime - m_scrollLastTime);
- if ((m_scrollSpeed < 0 && m_scrollOffset < m_offset) ||
- (m_scrollSpeed > 0 && m_scrollOffset > m_offset))
- {
- m_scrollOffset = m_offset;
- m_scrollSpeed = 0;
- }
- m_scrollLastTime = m_renderTime;
-
- g_graphicsContext.SetOrigin(-m_scrollOffset, 0);
-
- // process the buttons
- for (unsigned int i = 0; i < m_buttons.size(); i++)
- {
- m_buttons[i].SetFocus(HasFocus() && i == m_selectedItem);
- m_buttons[i].DoProcess(currentTime, dirtyregions);
- }
-
- g_graphicsContext.RestoreOrigin();
-
- CGUIControl::Process(currentTime, dirtyregions);
-}
-
-void CGUIMultiSelectTextControl::Render()
-{
- // clip and set our scrolling origin
- bool clip(m_width < m_totalWidth);
- if (clip)
- { // need to crop
- if (!g_graphicsContext.SetClipRegion(m_posX, m_posY, m_width, m_height))
- return; // nothing to render??
- }
- g_graphicsContext.SetOrigin(-m_scrollOffset, 0);
-
- // render the buttons
- for (unsigned int i = 0; i < m_buttons.size(); i++)
- m_buttons[i].DoRender();
-
- // position the text - we center vertically if applicable, and use the offsets.
- // all x-alignment is ignored for now (see constructor)
- float posX = m_posX;
- float posY = m_posY + m_label.offsetY;
- if (m_label.align & XBFONT_CENTER_Y)
- posY = m_posY + m_height * 0.5f;
-
- if (m_items.size() && m_items[0].m_selectable)
- posX += m_label.offsetX;
-
- // render the text
- unsigned int num_selectable = 0;
- for (unsigned int i = 0; i < m_items.size(); i++)
- {
- CSelectableString &string = m_items[i];
- if (IsDisabled()) // all text is rendered with disabled color
- string.m_text.Render(posX, posY, 0, m_label.disabledColor, m_label.shadowColor, m_label.align, 0, true);
- else if (HasFocus() && string.m_selectable && num_selectable == m_selectedItem) // text is rendered with focusedcolor
- string.m_text.Render(posX, posY, 0, m_label.focusedColor, m_label.shadowColor, m_label.align, 0);
- else // text is rendered with textcolor
- string.m_text.Render(posX, posY, 0, m_label.textColor, m_label.shadowColor, m_label.align, 0);
- posX += string.m_length;
- if (string.m_selectable)
- num_selectable++;
- }
-
- g_graphicsContext.RestoreOrigin();
- if (clip)
- g_graphicsContext.RestoreClipRegion();
-
- CGUIControl::Render();
-}
-
-void CGUIMultiSelectTextControl::UpdateInfo(const CGUIListItem *item)
-{
- if (m_info.IsEmpty())
- return; // nothing to do
-
- if (item)
- UpdateText(m_info.GetItemLabel(item));
- else
- UpdateText(m_info.GetLabel(m_parentID));
-}
-
-bool CGUIMultiSelectTextControl::OnAction(const CAction &action)
-{
- if (action.GetID() == ACTION_SELECT_ITEM)
- {
- // item is clicked - see if we have a clickaction
- std::string clickAction;
- unsigned int selected = 0;
- for (unsigned int i = 0; i < m_items.size(); i++)
- {
- if (m_items[i].m_selectable)
- {
- if (m_selectedItem == selected)
- clickAction = m_items[i].m_clickAction;
- selected++;
- }
- }
- if (!clickAction.empty())
- { // have a click action -> perform it
- CGUIMessage message(GUI_MSG_EXECUTE, m_controlID, m_parentID);
- message.SetStringParam(clickAction);
- g_windowManager.SendMessage(message);
- }
- else
- { // no click action, just send a message to the window
- CGUIMessage msg(GUI_MSG_CLICKED, m_controlID, m_parentID, m_selectedItem);
- SendWindowMessage(msg);
- }
- return true;
- }
- return CGUIControl::OnAction(action);
-}
-
-void CGUIMultiSelectTextControl::OnLeft()
-{
- if (MoveLeft())
- return;
- CGUIControl::OnLeft();
-}
-
-void CGUIMultiSelectTextControl::OnRight()
-{
- if (MoveRight())
- return;
- CGUIControl::OnRight();
-}
-
-// movement functions (callable from lists)
-bool CGUIMultiSelectTextControl::MoveLeft()
-{
- CGUIAction action = GetAction(ACTION_MOVE_LEFT);
- if (m_selectedItem > 0)
- ScrollToItem(m_selectedItem - 1);
- else if (GetNumSelectable() && action.GetNavigation() && action.GetNavigation() == m_controlID)
- ScrollToItem(GetNumSelectable() - 1);
- else
- return false;
- return true;
-}
-
-bool CGUIMultiSelectTextControl::MoveRight()
-{
- CGUIAction action = GetAction(ACTION_MOVE_RIGHT);
- if (GetNumSelectable() && m_selectedItem < GetNumSelectable() - 1)
- ScrollToItem(m_selectedItem + 1);
- else if (action.GetNavigation() && action.GetNavigation() == m_controlID)
- ScrollToItem(0);
- else
- return false;
- return true;
-}
-
-void CGUIMultiSelectTextControl::SelectItemFromPoint(const CPoint &point)
-{
- int item = GetItemFromPoint(point);
- if (item != -1)
- {
- ScrollToItem(item);
- SetFocus(true);
- }
- else
- SetFocus(false);
-}
-
-bool CGUIMultiSelectTextControl::HitTest(const CPoint &point) const
-{
- return (GetItemFromPoint(point) != -1);
-}
-
-bool CGUIMultiSelectTextControl::OnMouseOver(const CPoint &point)
-{
- ScrollToItem(GetItemFromPoint(point));
- return CGUIControl::OnMouseOver(point);
-}
-
-EVENT_RESULT CGUIMultiSelectTextControl::OnMouseEvent(const CPoint &point, const CMouseEvent &event)
-{
- if (event.m_id == ACTION_MOUSE_LEFT_CLICK)
- {
- m_selectedItem = GetItemFromPoint(point);
- OnAction(CAction(ACTION_SELECT_ITEM));
- return EVENT_RESULT_HANDLED;
- }
- return EVENT_RESULT_UNHANDLED;
-}
-
-int CGUIMultiSelectTextControl::GetItemFromPoint(const CPoint &point) const
-{
- if (!m_label.font) return -1;
- float posX = m_posX;
- unsigned int selectable = 0;
- for (unsigned int i = 0; i < m_items.size(); i++)
- {
- const CSelectableString &string = m_items[i];
- if (string.m_selectable)
- {
- CRect rect(posX, m_posY, posX + string.m_length, m_posY + m_height);
- if (rect.PtInRect(point))
- return selectable;
- selectable++;
- }
- posX += string.m_length;
- }
- return -1;
-}
-
-void CGUIMultiSelectTextControl::UpdateText(const std::string &text)
-{
- if (text == m_oldText)
- return;
-
- m_items.clear();
-
- // parse our text into clickable blocks
- // format is [ONCLICK <action>] [/ONCLICK]
- size_t startClickable = text.find("[ONCLICK");
- size_t startUnclickable = 0;
-
- // add the first unclickable block
- if (startClickable != std::string::npos)
- AddString(text.substr(startUnclickable, startClickable - startUnclickable), false);
- else
- AddString(text.substr(startUnclickable), false);
- while (startClickable != std::string::npos)
- {
- // grep out the action and the end of the string
- size_t endAction = text.find(']', startClickable + 8);
- size_t endClickable = text.find("[/ONCLICK]", startClickable + 8);
- if (endAction != std::string::npos && endClickable != std::string::npos)
- { // success - add the string, and move the start of our next unclickable portion along
- AddString(text.substr(endAction + 1, endClickable - endAction - 1), true, text.substr(startClickable + 8, endAction - startClickable - 8));
- startUnclickable = endClickable + 10;
- }
- else
- {
- CLog::Log(LOGERROR, "Invalid multiselect string %s", text.c_str());
- break;
- }
- startClickable = text.find("[ONCLICK", startUnclickable);
- // add the unclickable portion
- if (startClickable != std::string::npos)
- AddString(text.substr(startUnclickable, startClickable - startUnclickable), false);
- else
- AddString(text.substr(startUnclickable), false);
- }
-
- m_oldText = text;
-
- // finally, position our buttons
- PositionButtons();
-}
-
-void CGUIMultiSelectTextControl::AddString(const std::string &text, bool selectable, const std::string &clickAction)
-{
- if (!text.empty())
- m_items.push_back(CSelectableString(m_label.font, text, selectable, clickAction));
-}
-
-void CGUIMultiSelectTextControl::PositionButtons()
-{
- m_buttons.clear();
-
- // add new buttons
- m_totalWidth = 0;
- if (m_items.size() && m_items.front().m_selectable)
- m_totalWidth += m_label.offsetX;
-
- for (unsigned int i = 0; i < m_items.size(); i++)
- {
- const CSelectableString &text = m_items[i];
- if (text.m_selectable)
- {
- CGUIButtonControl button(m_button);
- button.SetPosition(m_posX + m_totalWidth - m_label.offsetX, m_posY);
- button.SetWidth(text.m_length + 2 * m_label.offsetX);
- m_buttons.push_back(button);
- }
- m_totalWidth += text.m_length;
- }
-
- if (m_items.size() && m_items.back().m_selectable)
- m_totalWidth += m_label.offsetX;
-}
-
-std::string CGUIMultiSelectTextControl::GetDescription() const
-{
- // We currently just return the entire string - should we bother returning the
- // particular subitems of this?
- std::string strLabel(m_info.GetLabel(m_parentID));
- return strLabel;
-}
-
-unsigned int CGUIMultiSelectTextControl::GetNumSelectable() const
-{
- unsigned int selectable = 0;
- for (unsigned int i = 0; i < m_items.size(); i++)
- if (m_items[i].m_selectable)
- selectable++;
- return selectable;
-}
-
-unsigned int CGUIMultiSelectTextControl::GetFocusedItem() const
-{
- if (GetNumSelectable())
- return m_selectedItem + 1;
- return 0;
-}
-
-void CGUIMultiSelectTextControl::SetFocusedItem(unsigned int item)
-{
- SetFocus(item > 0);
- if (item > 0)
- ScrollToItem(item - 1);
-}
-
-bool CGUIMultiSelectTextControl::CanFocus() const
-{
- if (!GetNumSelectable()) return false;
- return CGUIControl::CanFocus();
-}
-
-void CGUIMultiSelectTextControl::SetFocus(bool focus)
-{
- for (unsigned int i = 0; i < m_buttons.size(); i++)
- m_buttons[i].SetFocus(focus);
- CGUIControl::SetFocus(focus);
-}
-
-// overrides to allow anims to translate down to the focus image
-void CGUIMultiSelectTextControl::SetAnimations(const std::vector<CAnimation> &animations)
-{
- // send any focus animations down to the focus image only
- m_animations.clear();
- std::vector<CAnimation> focusAnims;
- for (unsigned int i = 0; i < animations.size(); i++)
- {
- const CAnimation &anim = animations[i];
- if (anim.GetType() == ANIM_TYPE_FOCUS)
- focusAnims.push_back(anim);
- else
- m_animations.push_back(anim);
- }
- m_button.SetAnimations(focusAnims);
-}
-
-void CGUIMultiSelectTextControl::ScrollToItem(unsigned int item)
-{
- static const unsigned int time_to_scroll = 200;
- if (item >= m_buttons.size()) return;
- // grab our button
- const CGUIButtonControl &button = m_buttons[item];
- float left = button.GetXPosition();
- float right = left + button.GetWidth();
- // make sure that we scroll so that this item is on screen
- m_scrollOffset = m_offset;
- if (left < m_posX + m_offset)
- m_offset = left - m_posX;
- else if (right > m_posX + m_offset + m_width)
- m_offset = right - m_width - m_posX;
- m_scrollSpeed = (m_offset - m_scrollOffset) / time_to_scroll;
- m_selectedItem = item;
-}
-
View
100 xbmc/guilib/GUIMultiSelectText.h
@@ -1,100 +0,0 @@
-#pragma once
-
-/*
- * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
- *
- * This Program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This Program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with XBMC; see the file COPYING. If not, see
- * <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "GUIButtonControl.h"
-
-/*!
- \ingroup controls
- \brief
- */
-class CGUIMultiSelectTextControl : public CGUIControl
-{
-public:
- CGUIMultiSelectTextControl(int parentID, int controlID,
- float posX, float posY, float width, float height,
- const CTextureInfo& textureFocus, const CTextureInfo& textureNoFocus, const CLabelInfo &label, const CGUIInfoLabel &content);
-
- virtual ~CGUIMultiSelectTextControl(void);
- virtual CGUIMultiSelectTextControl *Clone() const { return new CGUIMultiSelectTextControl(*this); };
-
- virtual void Process(unsigned int currentTime, CDirtyRegionList &dirtyregions);
- virtual void Render();
-
- virtual bool OnAction(const CAction &action);
- virtual void OnLeft();
- virtual void OnRight();
- virtual bool HitTest(const CPoint &point) const;
- virtual bool OnMouseOver(const CPoint &point);
- virtual void UpdateInfo(const CGUIListItem *item = NULL);
-
- virtual std::string GetDescription() const;
- virtual bool CanFocus() const;
-
- void UpdateText(const std::string &text);
- bool MoveLeft();
- bool MoveRight();
- void SelectItemFromPoint(const CPoint &point);
- unsigned int GetFocusedItem() const;
- void SetFocusedItem(unsigned int item);
-
- // overrides to allow all focus anims to translate down to the focus image
- virtual void SetAnimations(const std::vector<CAnimation> &animations);
- virtual void SetFocus(bool focus);
-protected:
- virtual EVENT_RESULT OnMouseEvent(const CPoint &point, const CMouseEvent &event);
- virtual bool UpdateColors();
- void AddString(const std::string &text, bool selectable, const std::string &clickAction = "");
- void PositionButtons();
- unsigned int GetNumSelectable() const;
- int GetItemFromPoint(const CPoint &point) const;
- void ScrollToItem(unsigned int item);
-
- // the static strings and buttons strings
- class CSelectableString
- {
- public:
- CSelectableString(CGUIFont *font, const std::string &text, bool selectable, const std::string &clickAction);
- CGUITextLayout m_text;
- float m_length;
- bool m_selectable;
- std::string m_clickAction;
- };
- std::vector<CSelectableString> m_items;
-
- CLabelInfo m_label;
- CGUIInfoLabel m_info;
- std::string m_oldText;
- unsigned int m_renderTime;
-
- // scrolling
- float m_totalWidth;
- float m_offset;
- float m_scrollOffset;
- float m_scrollSpeed;
- unsigned int m_scrollLastTime;
-
- // buttons
- CGUIButtonControl m_button;
- unsigned int m_selectedItem;
- std::vector<CGUIButtonControl> m_buttons;
-};
-
View
454 xbmc/guilib/GUISelectButtonControl.cpp
@@ -1,454 +0,0 @@
-/*
- * Copyright (C) 2005-2015 Team Kodi
- * http://kodi.tv
- *
- * This Program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This Program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Kodi; see the file COPYING. If not, see
- * <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "GUISelectButtonControl.h"
-#include "GUIWindowManager.h"
-#include "utils/TimeUtils.h"
-#include "input/Key.h"
-
-CGUISelectButtonControl::CGUISelectButtonControl(int parentID, int controlID,
- float posX, float posY,
- float width, float height,
- const CTextureInfo& buttonFocus,
- const CTextureInfo& button,
- const CLabelInfo& labelInfo,
- const CTextureInfo& selectBackground,
- const CTextureInfo& selectArrowLeft,
- const CTextureInfo& selectArrowLeftFocus,
- const CTextureInfo& selectArrowRight,
- const CTextureInfo& selectArrowRightFocus
- )
- : CGUIButtonControl(parentID, controlID, posX, posY, width, height, buttonFocus, button, labelInfo)
- , m_imgBackground(posX, posY, width, height, selectBackground)
- , m_imgLeft(posX, posY, 16, 16, selectArrowLeft)
- , m_imgLeftFocus(posX, posY, 16, 16, selectArrowLeftFocus)
- , m_imgRight(posX, posY, 16, 16, selectArrowRight)
- , m_imgRightFocus(posX, posY, 16, 16, selectArrowRightFocus)
-{
- m_bShowSelect = false;
- m_iCurrentItem = -1;
- m_iDefaultItem = -1;
- m_iStartFrame = 0;
- m_bLeftSelected = false;
- m_bRightSelected = false;
- m_bMovedLeft = false;
- m_bMovedRight = false;
- m_ticks = 0;
- m_label.SetAlign(m_label.GetLabelInfo().align | XBFONT_CENTER_X);
- ControlType = GUICONTROL_SELECTBUTTON;
-}
-
-CGUISelectButtonControl::~CGUISelectButtonControl(void)
-{}
-
-void CGUISelectButtonControl::Process(unsigned int currentTime, CDirtyRegionList &dirtyregions)
-{
- if (m_bInvalidated)
- {
- m_imgBackground.SetWidth(m_width);
- m_imgBackground.SetHeight(m_height);
- }
- // Are we in selection mode
- if (m_bShowSelect)
- {
- // render background, left and right arrow
- if (m_imgBackground.Process(currentTime))
- MarkDirtyRegion();
-
- CGUILabel::COLOR color = CGUILabel::COLOR_TEXT;
-
- // User has moved left...
- if (m_bMovedLeft)
- {
- m_iStartFrame++;
- if (m_iStartFrame >= 10)
- {
- m_iStartFrame = 0;
- m_bMovedLeft = false;
- MarkDirtyRegion();
- }
- // If we are moving left
- // render item text as disabled
- color = CGUILabel::COLOR_DISABLED;
- }
-
- // Update arrow
- m_imgLeftFocus.Process(currentTime);
- m_imgLeft.Process(currentTime);
-
- // User has moved right...
- if (m_bMovedRight)
- {
- m_iStartFrame++;
- if (m_iStartFrame >= 10)
- {
- m_iStartFrame = 0;
- m_bMovedRight = false;
- MarkDirtyRegion();
- }
- // If we are moving right
- // render item text as disabled
- color = CGUILabel::COLOR_DISABLED;
- }
-
- // Update arrow
- m_imgRightFocus.Process(currentTime);
- m_imgRight.Process(currentTime);
-
- // Render text if a current item is available
- if (m_iCurrentItem >= 0 && (unsigned)m_iCurrentItem < m_vecItems.size())
- {
- bool changed = m_label.SetMaxRect(m_posX, m_posY, m_width, m_height);
- changed |= m_label.SetText(m_vecItems[m_iCurrentItem]);
- changed |= m_label.SetColor(color);
- changed |= m_label.Process(currentTime);
- if (changed)
- MarkDirtyRegion();
- }
-
- // Select current item, if user doesn't
- // move left or right for 1.5 sec.
- unsigned int ticksSpan = currentTime - m_ticks;
- if (ticksSpan > 1500)
- {
- // User hasn't moved disable selection mode...
- m_bShowSelect = false;
- MarkDirtyRegion();
-
- // ...and send a thread message.
- // (Sending a message with SendMessage
- // can result in a GPF.)
- CGUIMessage message(GUI_MSG_CLICKED, GetID(), GetParentID() );
- g_windowManager.SendThreadMessage(message);
- }
- CGUIControl::Process(currentTime, dirtyregions);
- } // if (m_bShowSelect)
- else
- CGUIButtonControl::Process(currentTime, dirtyregions);
-}
-
-void CGUISelectButtonControl::Render()
-{
- if (m_bShowSelect)
- {
- // render background, left and right arrow
- m_imgBackground.Render();
-
- // Render arrows
- if (m_bLeftSelected || m_bMovedLeft)
- m_imgLeftFocus.Render();
- else
- m_imgLeft.Render();
-
- if (m_bRightSelected || m_bMovedRight)
- m_imgRightFocus.Render();
- else
- m_imgRight.Render();
-
- // Render text if a current item is available
- if (m_iCurrentItem >= 0 && (unsigned)m_iCurrentItem < m_vecItems.size())
- m_label.Render();
-
- CGUIControl::Render();
- } // if (m_bShowSelect)
- else
- {
- // No, render a normal button
- CGUIButtonControl::Render();
- }
-}
-
-bool CGUISelectButtonControl::OnMessage(CGUIMessage& message)
-{
- if ( message.GetControlId() == GetID() )
- {
- if (message.GetMessage() == GUI_MSG_LABEL_ADD)
- {
- if (m_vecItems.size() <= 0)
- {
- m_iCurrentItem = 0;
- m_iDefaultItem = 0;
- }
- m_vecItems.push_back(message.GetLabel());
- return true;
- }
- else if (message.GetMessage() == GUI_MSG_LABEL_RESET)
- {
- m_vecItems.erase(m_vecItems.begin(), m_vecItems.end());
- m_iCurrentItem = -1;
- m_iDefaultItem = -1;
- return true;
- }
- else if (message.GetMessage() == GUI_MSG_ITEM_SELECTED)
- {
- message.SetParam1(m_iCurrentItem);
- if (m_iCurrentItem >= 0 && m_iCurrentItem < (int)m_vecItems.size())
- message.SetLabel(m_vecItems[m_iCurrentItem]);
- return true;
- }
- else if (message.GetMessage() == GUI_MSG_ITEM_SELECT)
- {
- m_iDefaultItem = m_iCurrentItem = message.GetParam1();
- return true;
- }
- else if (message.GetMessage() == GUI_MSG_SET_LABELS && message.GetPointer())
- {
- const std::vector< std::pair<std::string, int> > *labels = (const std::vector< std::pair<std::string, int> > *)message.GetPointer();
- m_vecItems.clear();
- for (std::vector< std::pair<std::string, int> >::const_iterator i = labels->begin(); i != labels->end(); ++i)
- m_vecItems.push_back(i->first);
- m_iDefaultItem = m_iCurrentItem = message.GetParam1();
- }
- }
-
- return CGUIButtonControl::OnMessage(message);
-}
-
-bool CGUISelectButtonControl::OnAction(const CAction &action)
-{
- if (!m_bShowSelect)
- {
- if (action.GetID() == ACTION_SELECT_ITEM)
- {
- // Enter selection mode
- m_bShowSelect = true;
- SetInvalid();
-
- // Start timer, if user doesn't select an item
- // or moves left/right. The control will
- // automatically select the current item.
- m_ticks = CTimeUtils::GetFrameTime();
- return true;
- }
- else
- return CGUIButtonControl::OnAction(action);
- }
- else
- {
- if (action.GetID() == ACTION_SELECT_ITEM)
- {
- // User has selected an item, disable selection mode...
- m_bShowSelect = false;
- SetInvalid();
-
- // ...and send a message.
- CGUIMessage message(GUI_MSG_CLICKED, GetID(), GetParentID() );
- SendWindowMessage(message);
- return true;
- }
- if (action.GetID() == ACTION_MOVE_UP || action.GetID() == ACTION_MOVE_DOWN )
- {
- // Disable selection mode when moving up or down
- m_bShowSelect = false;
- m_iCurrentItem = m_iDefaultItem;
- SetInvalid();
- }
- // call the base class
- return CGUIButtonControl::OnAction(action);
- }
-}
-
-void CGUISelectButtonControl::FreeResources(bool immediately)
-{
- CGUIButtonControl::FreeResources(immediately);
-
- m_imgBackground.FreeResources(immediately);
-
- m_imgLeft.FreeResources(immediately);
- m_imgLeftFocus.FreeResources(immediately);
-
- m_imgRight.FreeResources(immediately);
- m_imgRightFocus.FreeResources(immediately);
-
- m_bShowSelect = false;
-}
-
-void CGUISelectButtonControl::DynamicResourceAlloc(bool bOnOff)
-{
- CGUIControl::DynamicResourceAlloc(bOnOff);
-
- m_imgBackground.DynamicResourceAlloc(bOnOff);
-
- m_imgLeft.DynamicResourceAlloc(bOnOff);
- m_imgLeftFocus.DynamicResourceAlloc(bOnOff);
-
- m_imgRight.DynamicResourceAlloc(bOnOff);
- m_imgRightFocus.DynamicResourceAlloc(bOnOff);
-}
-
-void CGUISelectButtonControl::AllocResources()
-{
- CGUIButtonControl::AllocResources();
-
- m_imgBackground.AllocResources();
-
- m_imgLeft.AllocResources();
- m_imgLeftFocus.AllocResources();
-
- m_imgRight.AllocResources();
- m_imgRightFocus.AllocResources();
-
- // Position right arrow
- float posX = (m_posX + m_width - 8) - 16;
- float posY = m_posY + (m_height - 16) / 2;
- m_imgRight.SetPosition(posX, posY);
- m_imgRightFocus.SetPosition(posX, posY);
-
- // Position left arrow
- posX = m_posX + 8;
- m_imgLeft.SetPosition(posX, posY);
- m_imgLeftFocus.SetPosition(posX, posY);
-}
-
-void CGUISelectButtonControl::SetInvalid()
-{
- CGUIButtonControl::SetInvalid();
- m_imgBackground.SetInvalid();
- m_imgLeft.SetInvalid();
- m_imgLeftFocus.SetInvalid();
- m_imgRight.SetInvalid();
- m_imgRightFocus.SetInvalid();
-}
-
-void CGUISelectButtonControl::OnLeft()
-{
- if (m_bShowSelect)
- {
- // Set for visual feedback
- m_bMovedLeft = true;
- m_iStartFrame = 0;
- SetInvalid();
-
- // Reset timer for automatically selecting
- // the current item.
- m_ticks = CTimeUtils::GetFrameTime();
-
- // Switch to previous item
- if (!m_vecItems.empty())
- {
- m_iCurrentItem--;
- if (m_iCurrentItem < 0)
- m_iCurrentItem = (int)m_vecItems.size() - 1;
- }
- }
- else
- { // use the base class
- CGUIButtonControl::OnLeft();
- }
-}
-
-void CGUISelectButtonControl::OnRight()
-{
- if (m_bShowSelect)
- {
- // Set for visual feedback
- m_bMovedRight = true;
- m_iStartFrame = 0;
- SetInvalid();
-
- // Reset timer for automatically selecting
- // the current item.
- m_ticks = CTimeUtils::GetFrameTime();
-
- // Switch to next item
- if (!m_vecItems.empty())
- {
- m_iCurrentItem++;
- if (m_iCurrentItem >= (int)m_vecItems.size())
- m_iCurrentItem = 0;
- }
- }
- else
- { // use the base class
- CGUIButtonControl::OnRight();
- }
-}
-
-bool CGUISelectButtonControl::OnMouseOver(const CPoint &point)
-{
- bool ret = CGUIControl::OnMouseOver(point);
- m_bLeftSelected = false;
- m_bRightSelected = false;
- if (m_imgLeft.HitTest(point))
- { // highlight the left control, but don't start moving until we have clicked
- m_bLeftSelected = true;
- }
- if (m_imgRight.HitTest(point))
- { // highlight the right control, but don't start moving until we have clicked
- m_bRightSelected = true;
- }
- // reset ticks
- m_ticks = CTimeUtils::GetFrameTime();
- return ret;
-}
-
-EVENT_RESULT CGUISelectButtonControl::OnMouseEvent(const CPoint &point, const CMouseEvent &event)
-{
- if (event.m_id == ACTION_MOUSE_LEFT_CLICK)
- {
- if (m_bShowSelect && m_imgLeft.HitTest(point))
- OnLeft();
- else if (m_bShowSelect && m_imgRight.HitTest(point))
- OnRight();
- else // normal select
- CGUIButtonControl::OnMouseEvent(point, event);
- return EVENT_RESULT_HANDLED;
- }
- else if (event.m_id == ACTION_MOUSE_WHEEL_UP)
- {
- OnLeft();
- return EVENT_RESULT_HANDLED;
- }
- else if (event.m_id == ACTION_MOUSE_WHEEL_DOWN)
- {
- OnRight();
- return EVENT_RESULT_HANDLED;
- }
- return EVENT_RESULT_UNHANDLED;
-}
-
-void CGUISelectButtonControl::SetPosition(float posX, float posY)
-{
- float leftOffX = m_imgLeft.GetXPosition() - m_posX;
- float leftOffY = m_imgLeft.GetYPosition() - m_posY;
- float rightOffX = m_imgRight.GetXPosition() - m_posX;
- float rightOffY = m_imgRight.GetYPosition() - m_posY;
- float backOffX = m_imgBackground.GetXPosition() - m_posX;
- float backOffY = m_imgBackground.GetYPosition() - m_posY;
- CGUIButtonControl::SetPosition(posX, posY);
- m_imgLeft.SetPosition(posX + leftOffX, posY + leftOffY);
- m_imgLeftFocus.SetPosition(posX + leftOffX, posY + leftOffY);
- m_imgRight.SetPosition(posX + rightOffX, posY + rightOffY);
- m_imgRightFocus.SetPosition(posX + rightOffX, posY + rightOffY);
- m_imgBackground.SetPosition(posX + backOffX, posY + backOffY);
-}
-
-bool CGUISelectButtonControl::UpdateColors()
-{
- bool changed = CGUIButtonControl::UpdateColors();
- changed |= m_imgLeft.SetDiffuseColor(m_diffuseColor);
- changed |= m_imgLeftFocus.SetDiffuseColor(m_diffuseColor);
- changed |= m_imgRight.SetDiffuseColor(m_diffuseColor);
- changed |= m_imgRightFocus.SetDiffuseColor(m_diffuseColor);
- changed |= m_imgBackground.SetDiffuseColor(m_diffuseColor);
-
- return changed;
-}
-
View
96 xbmc/guilib/GUISelectButtonControl.dox
@@ -1,96 +0,0 @@
-/*!
-
-\page Select_Button_Control Select Button Control
-\brief **Button with multi selection choice.**
-
-\tableofcontents
-
-Behaves like a normal button control, but when pressing, it can show multiple
-strings. The user can choose one by moving left or right.
-
-Messages the button reactes on:
-
-- GUI_MSG_LABEL_ADD \n
- Add a label to the control.
-- GUI_MSG_LABEL_RESET \n
- Remove all labels from the control.
-- GUI_MSG_ITEM_SELECTED \n
- After sending this message Kodi contains the selected label as an integer.
- \note The order of the items depends on the order they have been added to
- the control using GUI_MSG_LABEL_ADD.
-- GUI_MSG_ITEM_SELECT \n
- Send this message to set the label to be selected.
-
-
---------------------------------------------------------------------------------
-\section Select_Button_Control_sect1 Example
-
-Example entry to define a select button in a window or as reference control:
-
-~~~~~~~~~~~~~
- <control>
- <description>default select button</description
- <type>selectbutton</type>
- <id>6</id>
- <posX>60</posX>
- <posY>192</posY>
- <width>130</width>
- <height>32</height>
- <label>132</label>
- <font>font13</font>
- <textureFocus>button-focus.png</textureFocus>
- <textureNoFocus>button-nofocus.jpg</textureNoFocus>
- <texturebg>button-focus.png</texturebg>
- <textureLeft>scroll-left.png</textureLeft>
- <textureRight>scroll-right.png</textureRight>
- <font>font13</font>
- <textcolor>ffffffff</textcolor>
- <colordiffuse>ffffffff</colordiffuse>
- <disabledcolor>60ffffff</disabledcolor>
- <onleft>50</onleft>
- <onright>50</onright>
- <onup>3</onup>
- <ondown>7</ondown>
- </control>
-~~~~~~~~~~~~~
-
-
---------------------------------------------------------------------------------
-\section Select_Button_Control_sect2 Available tags
-
-In addition to the [Default Control Tags](http://kodi.wiki/view/Default_Control_Tags)
-the following tags are available. Note that each tag is lower case only. This is
-important, as xml tags are case-sensitive.
-
-| Tag | Description |
-|--------------:|:--------------------------------------------------------------|
-| texturefocus | Specifies the image file which should be displayed when the button has focus. [See here for additional information about textures](http://kodi.wiki/view/Texture_Attributes).
-| texturenofocus| Specifies the image file which should be displayed when the button does not have focus.
-| label | The label used on the button. It can be a link into <b>`strings.xml`</b>, or an actual text label.
-| font | Font used for the button label. From fonts.xml.
-| textcolor | Color used for displaying the button label. In **AARRGGBB** hex format, or a name from the [colour theme](http://kodi.wiki/view/Colour_Themes).
-| focusedcolor | Color used for the button label when the button has in focus. In **AARRGGBB** hex format or a name from the [colour theme](http://kodi.wiki/view/Colour_Themes).
-| disabledcolor | Color used for the button label if the button is disabled. In **AARRGGBB** hex format or a name from the [colour theme](http://kodi.wiki/view/Colour_Themes).
-| invalidcolor | Color used for the button if the user entered some invalid value. In **AARRGGBB** hex format or a name from the [colour theme](http://kodi.wiki/view/Colour_Themes).
-| shadowcolor | Specifies the color of the drop shadow on the text, in **AARRGGBB** format, or a name from the [colour theme](http://kodi.wiki/view/Colour_Themes).
-| angle | The angle the text should be rendered at, in degrees. A value of 0 is horizontal.
-| align | Label horizontal alignment on the button. Defaults to left, can also be center or right.
-| aligny | Label vertical alignment on the button. Defaults to top, can also be center.
-| textoffsetx | Amount to offset the label from the left (or right) edge of the button when using left or right alignment.
-| textoffsety | Amount to offset the label from the top edge of the button when using top alignment.
-| textwidth | Will truncate any text that's too long.
-| onclick | Specifies the action to perform when the button is pressed. Should be a built in function. [See here for more information](http://kodi.wiki/view/Built-in_functions_available_to_FTP,_Webserver,_skins,_keymap_and_to_python). You may have more than one <b>`<onclick>`</b> tag, and they'll be executed in sequence.
-| onfocus | Specifies the action to perform when the button is focused. Should be a built in function. The action is performed after any focus animations have completed. [See here for more information](http://kodi.wiki/view/Built-in_functions_available_to_FTP,_Webserver,_skins,_keymap_and_to_python).
-| onunfocus | Specifies the action to perform when the button loses focus. Should be a built in function.
-| wrapmultiline | Will wrap the label across multiple lines if the label exceeds the control width.
-
-
---------------------------------------------------------------------------------
-\section Select_Button_Control_sect3 See also
-
-#### Development:
-
-- [Add-on development](http://kodi.wiki/view/Add-on_development)
-- [Skinning](http://kodi.wiki/view/Skinning)
-
- */
View
134 xbmc/guilib/GUISelectButtonControl.h
@@ -1,134 +0,0 @@
-/*!
-\file GUISelectButtonControl.h
-\brief
-*/
-
-#ifndef GUILIB_GUIWINDOWSELECTCONTROL_H
-#define GUILIB_GUIWINDOWSELECTCONTROL_H
-
-#pragma once
-
-/*
- * Copyright (C) 2005-2013 Team XBMC
- * http://xbmc.org
- *
- * This Program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2, or (at your option)
- * any later version.
- *
- * This Program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with XBMC; see the file COPYING. If not, see
- * <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "GUIButtonControl.h"
-
-/*!
- \ingroup controls
- \brief Button with multi selection choice.
-
- Behaves like a normal button control, but when pressing,
- it can show multiple strings. The user can choose one by
- moving left or right. \n
- \n
- Messages the button reactes on: \n
-
- - GUI_MSG_LABEL_ADD \n
- Add a label to the control. Use CGUIMessage::SetLabel
- to set the label text.
- - GUI_MSG_LABEL_RESET \n
- Remove all labels from the control.
- - GUI_MSG_ITEM_SELECTED \n
- After sending this message the CGUIMessage::GetParam1
- contains the selected label as an integer.
- \note The order of the items depends on the order they have been added to
- the control using GUI_MSG_LABEL_ADD.
- - GUI_MSG_ITEM_SELECT \n
- Send this message with CGUIMessage::SetParam1() set to the label
- to be selected. \n
- \n
- Example entry to define a select button in a window or as reference control: \n
- \verbatim
- <control>
- <description>default select button</description
- <type>selectbutton</type>
- <id>6</id>
- <posX>60</posX>
- <posY>192</posY>
- <width>130</width>
- <height>32</height>
- <label>132</label>
- <font>font13</font>
- <textureFocus>button-focus.png</textureFocus>
- <textureNoFocus>button-nofocus.jpg</textureNoFocus>
- <texturebg>button-focus.png</texturebg>
- <textureLeft>scroll-left.png</textureLeft>
- <textureRight>scroll-right.png</textureRight>
- <font>font13</font>
- <textcolor>ffffffff</textcolor>
- <colordiffuse>ffffffff</colordiffuse>
- <disabledcolor>60ffffff</disabledcolor>
- <onleft>50</onleft>
- <onright>50</onright>
- <onup>3</onup>
- <ondown>7</ondown>
- </control>
- \endverbatim
-
- \sa CGUIMessage
- */
-class CGUISelectButtonControl : public CGUIButtonControl
-{
-public:
- CGUISelectButtonControl(int parentID, int controlID,
- float posX, float posY,
- float width, float height,
- const CTextureInfo& buttonFocus, const CTextureInfo& button,
- const CLabelInfo& labelInfo,
- const CTextureInfo& selectBackground,
- const CTextureInfo& selectArrowLeft, const CTextureInfo& selectArrowLeftFocus,
- const CTextureInfo& selectArrowRight, const CTextureInfo& selectArrowRightFocus);
- virtual ~CGUISelectButtonControl(void);
- virtual CGUISelectButtonControl *Clone() const { return new CGUISelectButtonControl(*this); };
-
- virtual void Process(unsigned int currentTime, CDirtyRegionList &dirtyregions);
- virtual void Render();
- virtual bool OnAction(const CAction &action) ;
- virtual void OnLeft();
- virtual void OnRight();
- virtual bool OnMessage(CGUIMessage& message);
- virtual bool OnMouseOver(const CPoint &point);
-
- virtual void AllocResources();
- virtual void FreeResources(bool immediately = false);
- virtual void DynamicResourceAlloc(bool bOnOff);
- virtual void SetInvalid();
- virtual void SetPosition(float posX, float posY);
-
-protected:
- virtual EVENT_RESULT OnMouseEvent(const CPoint &point, const CMouseEvent &event);
- virtual bool UpdateColors();
- bool m_bShowSelect;
- CGUITexture m_imgBackground;
- CGUITexture m_imgLeft;
- CGUITexture m_imgLeftFocus;
- CGUITexture m_imgRight;
- CGUITexture m_imgRightFocus;
- std::vector<std::string> m_vecItems;
- int m_iCurrentItem;
- int m_iDefaultItem;
- int m_iStartFrame;
- bool m_bLeftSelected;
- bool m_bRightSelected;
- bool m_bMovedLeft;
- bool m_bMovedRight;
- unsigned int m_ticks;
-};
-#endif
View
3 xbmc/guilib/Makefile.in
@@ -9,7 +9,6 @@ SRCS += GUIAudioManager.cpp
SRCS += GUIBaseContainer.cpp
SRCS += GUIBorderedImage.cpp
SRCS += GUIButtonControl.cpp
-SRCS += GUICheckMarkControl.cpp
SRCS += GUIColorManager.cpp
SRCS += GUIControl.cpp
SRCS += GUIControlFactory.cpp
@@ -38,15 +37,13 @@ SRCS += GUIListLabel.cpp
SRCS += GUIMessage.cpp
SRCS += GUIMoverControl.cpp
SRCS += GUIMultiImage.cpp
-SRCS += GUIMultiSelectText.cpp
SRCS += GUIPanelContainer.cpp
SRCS += GUIProgressControl.cpp
SRCS += GUIRadioButtonControl.cpp
SRCS += GUIResizeControl.cpp
SRCS += GUIRenderingControl.cpp
SRCS += GUIRSSControl.cpp
SRCS += GUIScrollBarControl.cpp
-SRCS += GUISelectButtonControl.cpp
SRCS += GUISettingsSliderControl.cpp
SRCS += GUISliderControl.cpp
SRCS += GUISpinControl.cpp
View
29 xbmc/interfaces/builtins/SkinBuiltins.cpp
@@ -310,25 +310,6 @@ static int SetImage(const std::vector<std::string>& params)
return 0;
}
-/*! \brief Set a skin large image setting.
- * \param params The parameters.
- * \details params[0] = Name of skin setting.
- */
-static int SetLargeImage(const std::vector<std::string>& params)
-{
- int string = CSkinSettings::GetInstance().TranslateString(params[0]);
- std::string value = CSkinSettings::GetInstance().GetString(string);
- VECSOURCES localShares;
- g_mediaManager.GetLocalDrives(localShares);
- VECSOURCES *shares = CMediaSourceSettings::GetInstance().GetSources("pictures");
- if (!shares)
- shares = &localShares;
- if (CGUIDialogFileBrowser::ShowAndGetImage(*shares, g_localizeStrings.Get(1030), value))
- CSkinSettings::GetInstance().SetString(string, value);
-
- return 0;
-}
-
/*! \brief Set a string skin setting.
* \param params The parameters.
* \details params[0] = Name of skin setting.
@@ -520,15 +501,6 @@ static int SkinDebug(const std::vector<std::string>& params)
/// @param[in] url Extra URL to allow selection from (optional).
/// }
/// \table_row2_l{
-/// <b>`Skin.SetLargeImage(string)`</b>
-/// ,
-/// Pops up a file browser and allows the user to select an large image file
-/// to be used in an image control else where in the skin via the info tag