Merge pull request xbmc#9848 from ronie/deprecated-controls

[guilib] remove deprecated controls
FernetMenta · May 26, 2016 · c34d9e8 · c34d9e8
2 parents de4c610 + a242f78
commit c34d9e8
Show file tree

Hide file tree

Showing 21 changed files with 9 additions and 1,678 deletions.
diff --git a/Kodi.xcodeproj/project.pbxproj b/Kodi.xcodeproj/project.pbxproj
diff --git a/project/VS2010Express/XBMC.vcxproj b/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" />

diff --git a/project/VS2010Express/XBMC.vcxproj.filters b/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>

diff --git a/xbmc/addons/binary/interfaces/api1/GUI/AddonGUIWindow.cpp b/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
         {

diff --git a/xbmc/addons/kodi-addon-dev-kit/doxygen/Doxyfile b/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 \

diff --git a/xbmc/guilib/CMakeLists.txt b/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

diff --git a/xbmc/guilib/GUICheckMarkControl.cpp b/xbmc/guilib/GUICheckMarkControl.cpp