Skip to content

Commit

Permalink
[video] nuke GUIDialogFileStacking
Browse files Browse the repository at this point in the history
  • Loading branch information
@mkortstiege
mkortstiege committed Aug 23, 2015
1 parent 85f160f commit cbfb11a
Show file tree
Hide file tree
Showing 11 changed files with 1 addition and 290 deletions.
10 changes: 0 additions & 10 deletions Kodi.xcodeproj/project.pbxproj
View file
Expand Up @@ -1809,7 +1809,6 @@
DFF0F3FD17528350002DA3A4 /* XBMCTinyXML.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5ED908615538DCE00842059 /* XBMCTinyXML.cpp */; };
DFF0F3FE17528350002DA3A4 /* XMLUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C9811294385F009E7A26 /* XMLUtils.cpp */; };
DFF0F3FF17528350002DA3A4 /* GUIDialogAudioSubtitleSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C8FE12942761009E7A26 /* GUIDialogAudioSubtitleSettings.cpp */; };
DFF0F40017528350002DA3A4 /* GUIDialogFileStacking.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17AA0D25F9FA00618676 /* GUIDialogFileStacking.cpp */; };
DFF0F40117528350002DA3A4 /* GUIDialogFullScreenInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 886328150E07B37200BB3DAB /* GUIDialogFullScreenInfo.cpp */; };
DFF0F40217528350002DA3A4 /* GUIDialogTeletext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5E55B65107412DE006E788A /* GUIDialogTeletext.cpp */; };
DFF0F40317528350002DA3A4 /* GUIDialogVideoBookmarks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17E00D25F9FA00618676 /* GUIDialogVideoBookmarks.cpp */; };
Expand Down Expand Up @@ -2094,7 +2093,6 @@
E38E207F0D25F9FD00618676 /* GUIDialogContextMenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17A40D25F9FA00618676 /* GUIDialogContextMenu.cpp */; };
E38E20800D25F9FD00618676 /* GUIDialogFavourites.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17A60D25F9FA00618676 /* GUIDialogFavourites.cpp */; };
E38E20810D25F9FD00618676 /* GUIDialogFileBrowser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17A80D25F9FA00618676 /* GUIDialogFileBrowser.cpp */; };
E38E20820D25F9FD00618676 /* GUIDialogFileStacking.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17AA0D25F9FA00618676 /* GUIDialogFileStacking.cpp */; };
E38E20830D25F9FD00618676 /* GUIDialogGamepad.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17AC0D25F9FA00618676 /* GUIDialogGamepad.cpp */; };
E38E20890D25F9FD00618676 /* GUIDialogMediaSource.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17B80D25F9FA00618676 /* GUIDialogMediaSource.cpp */; };
E38E208A0D25F9FD00618676 /* GUIDialogMusicOSD.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17BA0D25F9FA00618676 /* GUIDialogMusicOSD.cpp */; };
Expand Down Expand Up @@ -2979,7 +2977,6 @@
E4991481174E605900741B6D /* XBMCTinyXML.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5ED908615538DCE00842059 /* XBMCTinyXML.cpp */; };
E4991482174E605900741B6D /* XMLUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C9811294385F009E7A26 /* XMLUtils.cpp */; };
E4991483174E606500741B6D /* GUIDialogAudioSubtitleSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 18B7C8FE12942761009E7A26 /* GUIDialogAudioSubtitleSettings.cpp */; };
E4991484174E606500741B6D /* GUIDialogFileStacking.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17AA0D25F9FA00618676 /* GUIDialogFileStacking.cpp */; };
E4991485174E606500741B6D /* GUIDialogFullScreenInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 886328150E07B37200BB3DAB /* GUIDialogFullScreenInfo.cpp */; };
E4991486174E606500741B6D /* GUIDialogTeletext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5E55B65107412DE006E788A /* GUIDialogTeletext.cpp */; };
E4991487174E606500741B6D /* GUIDialogVideoBookmarks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E38E17E00D25F9FA00618676 /* GUIDialogVideoBookmarks.cpp */; };
Expand Down Expand Up @@ -5162,8 +5159,6 @@
E38E17A70D25F9FA00618676 /* GUIDialogFavourites.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogFavourites.h; sourceTree = "<group>"; };
E38E17A80D25F9FA00618676 /* GUIDialogFileBrowser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogFileBrowser.cpp; sourceTree = "<group>"; };
E38E17A90D25F9FA00618676 /* GUIDialogFileBrowser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogFileBrowser.h; sourceTree = "<group>"; };
E38E17AA0D25F9FA00618676 /* GUIDialogFileStacking.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogFileStacking.cpp; sourceTree = "<group>"; };
E38E17AB0D25F9FA00618676 /* GUIDialogFileStacking.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogFileStacking.h; sourceTree = "<group>"; };
E38E17AC0D25F9FA00618676 /* GUIDialogGamepad.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogGamepad.cpp; sourceTree = "<group>"; };
E38E17AD0D25F9FA00618676 /* GUIDialogGamepad.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogGamepad.h; sourceTree = "<group>"; };
E38E17B80D25F9FA00618676 /* GUIDialogMediaSource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogMediaSource.cpp; sourceTree = "<group>"; };
Expand Down Expand Up @@ -6900,8 +6895,6 @@
children = (
18B7C8FE12942761009E7A26 /* GUIDialogAudioSubtitleSettings.cpp */,
18B7C8FF12942761009E7A26 /* GUIDialogAudioSubtitleSettings.h */,
E38E17AA0D25F9FA00618676 /* GUIDialogFileStacking.cpp */,
E38E17AB0D25F9FA00618676 /* GUIDialogFileStacking.h */,
886328150E07B37200BB3DAB /* GUIDialogFullScreenInfo.cpp */,
886328160E07B37200BB3DAB /* GUIDialogFullScreenInfo.h */,
7C4E6F701829AA9700F1068F /* GUIDialogSubtitles.cpp */,
Expand Down Expand Up @@ -10446,7 +10439,6 @@
E38E207F0D25F9FD00618676 /* GUIDialogContextMenu.cpp in Sources */,
E38E20800D25F9FD00618676 /* GUIDialogFavourites.cpp in Sources */,
E38E20810D25F9FD00618676 /* GUIDialogFileBrowser.cpp in Sources */,
E38E20820D25F9FD00618676 /* GUIDialogFileStacking.cpp in Sources */,
E38E20830D25F9FD00618676 /* GUIDialogGamepad.cpp in Sources */,
E38E20890D25F9FD00618676 /* GUIDialogMediaSource.cpp in Sources */,
E38E208A0D25F9FD00618676 /* GUIDialogMusicOSD.cpp in Sources */,
Expand Down Expand Up @@ -12111,7 +12103,6 @@
DFF0F3FD17528350002DA3A4 /* XBMCTinyXML.cpp in Sources */,
DFF0F3FE17528350002DA3A4 /* XMLUtils.cpp in Sources */,
DFF0F3FF17528350002DA3A4 /* GUIDialogAudioSubtitleSettings.cpp in Sources */,
DFF0F40017528350002DA3A4 /* GUIDialogFileStacking.cpp in Sources */,
DFF0F40117528350002DA3A4 /* GUIDialogFullScreenInfo.cpp in Sources */,
DFF0F40217528350002DA3A4 /* GUIDialogTeletext.cpp in Sources */,
DF1D2DF21B6E85EE002BB9DB /* XbtFile.cpp in Sources */,
Expand Down Expand Up @@ -13176,7 +13167,6 @@
395F6DE31A81FACF0088CC74 /* HTTPImageTransformationHandler.cpp in Sources */,
E4991482174E605900741B6D /* XMLUtils.cpp in Sources */,
E4991483174E606500741B6D /* GUIDialogAudioSubtitleSettings.cpp in Sources */,
E4991484174E606500741B6D /* GUIDialogFileStacking.cpp in Sources */,
E4991485174E606500741B6D /* GUIDialogFullScreenInfo.cpp in Sources */,
E4991486174E606500741B6D /* GUIDialogTeletext.cpp in Sources */,
5EE4F9181A9FF36F002E20F8 /* CueInfoLoader.cpp in Sources */,
Expand Down
5 changes: 1 addition & 4 deletions addons/resource.language.en_gb/resources/strings.po
View file
Expand Up @@ -14294,10 +14294,7 @@ msgctxt "#33080"
msgid "Hate"
msgstr ""

#: Unknown
msgctxt "#33081"
msgid "This file is stacked, select the part you want to play from."
msgstr ""
#empty string with id 33081

#: Unknown
msgctxt "#33082"
Expand Down
116 changes: 0 additions & 116 deletions addons/skin.confluence/720p/DialogFileStacking.xml
View file

This file was deleted.

2 changes: 0 additions & 2 deletions project/VS2010Express/XBMC.vcxproj
View file
Expand Up @@ -1530,7 +1530,6 @@
<ClCompile Include="..\..\xbmc\utils\XMLUtils.cpp" />
<ClCompile Include="..\..\xbmc\video\Bookmark.cpp" />
<ClCompile Include="..\..\xbmc\video\dialogs\GUIDialogAudioSubtitleSettings.cpp" />
<ClCompile Include="..\..\xbmc\video\dialogs\GUIDialogFileStacking.cpp" />
<ClCompile Include="..\..\xbmc\video\dialogs\GUIDialogFullScreenInfo.cpp" />
<ClCompile Include="..\..\xbmc\video\dialogs\GUIDialogSubtitles.cpp" />
<ClCompile Include="..\..\xbmc\video\dialogs\GUIDialogTeletext.cpp" />
Expand Down Expand Up @@ -2191,7 +2190,6 @@
<ClInclude Include="..\..\xbmc\utils\XMLUtils.h" />
<ClInclude Include="..\..\xbmc\video\Bookmark.h" />
<ClInclude Include="..\..\xbmc\video\dialogs\GUIDialogAudioSubtitleSettings.h" />
<ClInclude Include="..\..\xbmc\video\dialogs\GUIDialogFileStacking.h" />
<ClInclude Include="..\..\xbmc\video\dialogs\GUIDialogFullScreenInfo.h" />
<ClInclude Include="..\..\xbmc\video\dialogs\GUIDialogSubtitles.h" />
<ClInclude Include="..\..\xbmc\video\dialogs\GUIDialogTeletext.h" />
Expand Down
6 changes: 0 additions & 6 deletions project/VS2010Express/XBMC.vcxproj.filters
View file
Expand Up @@ -1522,9 +1522,6 @@
<ClCompile Include="..\..\xbmc\video\dialogs\GUIDialogAudioSubtitleSettings.cpp">
<Filter>video\dialogs</Filter>
</ClCompile>
<ClCompile Include="..\..\xbmc\video\dialogs\GUIDialogFileStacking.cpp">
<Filter>video\dialogs</Filter>
</ClCompile>
<ClCompile Include="..\..\xbmc\video\dialogs\GUIDialogFullScreenInfo.cpp">
<Filter>video\dialogs</Filter>
</ClCompile>
Expand Down Expand Up @@ -4525,9 +4522,6 @@
<ClInclude Include="..\..\xbmc\video\dialogs\GUIDialogAudioSubtitleSettings.h">
<Filter>video\dialogs</Filter>
</ClInclude>
<ClInclude Include="..\..\xbmc\video\dialogs\GUIDialogFileStacking.h">
<Filter>video\dialogs</Filter>
</ClInclude>
<ClInclude Include="..\..\xbmc\video\dialogs\GUIDialogFullScreenInfo.h">
<Filter>video\dialogs</Filter>
</ClInclude>
Expand Down
3 changes: 0 additions & 3 deletions xbmc/guilib/GUIWindowManager.cpp
View file
Expand Up @@ -97,7 +97,6 @@
#include "dialogs/GUIDialogKaiToast.h"
#include "dialogs/GUIDialogVolumeBar.h"
#include "dialogs/GUIDialogMuteBug.h"
#include "video/dialogs/GUIDialogFileStacking.h"
#include "dialogs/GUIDialogNumeric.h"
#include "dialogs/GUIDialogGamepad.h"
#include "dialogs/GUIDialogSubMenu.h"
Expand Down Expand Up @@ -290,7 +289,6 @@ void CGUIWindowManager::CreateWindows()
Add(new CGUIWindowFullScreen);
Add(new CGUIWindowVisualisation);
Add(new CGUIWindowSlideShow);
Add(new CGUIDialogFileStacking);
#ifdef HAS_KARAOKE
Add(new CGUIWindowKaraokeLyrics);
#endif
Expand Down Expand Up @@ -333,7 +331,6 @@ bool CGUIWindowManager::DestroyWindows()
Delete(WINDOW_DIALOG_VIS_PRESET_LIST);
Delete(WINDOW_DIALOG_SELECT);
Delete(WINDOW_DIALOG_OK);
Delete(WINDOW_DIALOG_FILESTACKING);
Delete(WINDOW_DIALOG_KEYBOARD);
Delete(WINDOW_FULLSCREEN_VIDEO);
Delete(WINDOW_DIALOG_PROFILE_SETTINGS);
Expand Down
1 change: 0 additions & 1 deletion xbmc/guilib/WindowIDs.h
View file
Expand Up @@ -150,7 +150,6 @@
#define WINDOW_FULLSCREEN_VIDEO 12005
#define WINDOW_VISUALISATION 12006
#define WINDOW_SLIDESHOW 12007
#define WINDOW_DIALOG_FILESTACKING 12008
#define WINDOW_KARAOKELYRICS 12009
#define WINDOW_WEATHER 12600
#define WINDOW_SCREENSAVER 12900
Expand Down
1 change: 0 additions & 1 deletion xbmc/input/ButtonTranslator.cpp
View file
Expand Up @@ -382,7 +382,6 @@ static const ActionMapping windows[] =
{ "fullscreenradio" , WINDOW_FULLSCREEN_RADIO }, // virtual window for fullscreen radio, uses WINDOW_VISUALISATION as fallback
{ "visualisation" , WINDOW_VISUALISATION },
{ "slideshow" , WINDOW_SLIDESHOW },
{ "filestackingdialog" , WINDOW_DIALOG_FILESTACKING },
{ "karaoke" , WINDOW_KARAOKELYRICS },
{ "weather" , WINDOW_WEATHER },
{ "screensaver" , WINDOW_SCREENSAVER },
Expand Down
104 changes: 0 additions & 104 deletions xbmc/video/dialogs/GUIDialogFileStacking.cpp
View file

This file was deleted.

0 comments on commit cbfb11a

Please sign in to comment.