From cbfb11ae5d0c5b7beed021b7ea1388cca58ba802 Mon Sep 17 00:00:00 2001 From: Matthias Kortstiege Date: Sun, 23 Aug 2015 19:52:46 +0200 Subject: [PATCH] [video] nuke GUIDialogFileStacking --- Kodi.xcodeproj/project.pbxproj | 10 -- .../resources/strings.po | 5 +- .../720p/DialogFileStacking.xml | 116 ------------------ project/VS2010Express/XBMC.vcxproj | 2 - project/VS2010Express/XBMC.vcxproj.filters | 6 - xbmc/guilib/GUIWindowManager.cpp | 3 - xbmc/guilib/WindowIDs.h | 1 - xbmc/input/ButtonTranslator.cpp | 1 - xbmc/video/dialogs/GUIDialogFileStacking.cpp | 104 ---------------- xbmc/video/dialogs/GUIDialogFileStacking.h | 42 ------- xbmc/video/dialogs/Makefile | 1 - 11 files changed, 1 insertion(+), 290 deletions(-) delete mode 100644 addons/skin.confluence/720p/DialogFileStacking.xml delete mode 100644 xbmc/video/dialogs/GUIDialogFileStacking.cpp delete mode 100644 xbmc/video/dialogs/GUIDialogFileStacking.h diff --git a/Kodi.xcodeproj/project.pbxproj b/Kodi.xcodeproj/project.pbxproj index 21091fab02502..c44c230fe1c53 100644 --- a/Kodi.xcodeproj/project.pbxproj +++ b/Kodi.xcodeproj/project.pbxproj @@ -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 */; }; @@ -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 */; }; @@ -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 */; }; @@ -5162,8 +5159,6 @@ E38E17A70D25F9FA00618676 /* GUIDialogFavourites.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogFavourites.h; sourceTree = ""; }; E38E17A80D25F9FA00618676 /* GUIDialogFileBrowser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogFileBrowser.cpp; sourceTree = ""; }; E38E17A90D25F9FA00618676 /* GUIDialogFileBrowser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogFileBrowser.h; sourceTree = ""; }; - E38E17AA0D25F9FA00618676 /* GUIDialogFileStacking.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogFileStacking.cpp; sourceTree = ""; }; - E38E17AB0D25F9FA00618676 /* GUIDialogFileStacking.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogFileStacking.h; sourceTree = ""; }; E38E17AC0D25F9FA00618676 /* GUIDialogGamepad.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogGamepad.cpp; sourceTree = ""; }; E38E17AD0D25F9FA00618676 /* GUIDialogGamepad.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GUIDialogGamepad.h; sourceTree = ""; }; E38E17B80D25F9FA00618676 /* GUIDialogMediaSource.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GUIDialogMediaSource.cpp; sourceTree = ""; }; @@ -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 */, @@ -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 */, @@ -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 */, @@ -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 */, diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po index 356a558ccfd79..05110b1f1f9cd 100644 --- a/addons/resource.language.en_gb/resources/strings.po +++ b/addons/resource.language.en_gb/resources/strings.po @@ -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" diff --git a/addons/skin.confluence/720p/DialogFileStacking.xml b/addons/skin.confluence/720p/DialogFileStacking.xml deleted file mode 100644 index cb983c269cb26..0000000000000 --- a/addons/skin.confluence/720p/DialogFileStacking.xml +++ /dev/null @@ -1,116 +0,0 @@ - - - 450 - dialogeffect - - 315 - 260 - - - - 0 - 0 - 650 - 200 - OverlayDialogBackground.png - - - Close Window button - 560 - 5 - 64 - 32 - - - - PreviousMenu - DialogCloseButton-focus.png - DialogCloseButton.png - 13 - 13 - 13 - 13 - system.getbool(input.enablemouse) - - - heading label - 40 - 18 - 570 - 30 - center - center - font13 - - white - - - 40 - 60 - 570 - 30 - center - center - font12 - - grey2 - - - 50 - 110 - 20 - 25 - scroll-left-focus.png - Container(450).HasPrevious - - - 575 - 110 - 20 - 25 - scroll-right-focus.png - Container(450).HasNext - - - 85 - 105 - 480 - 100 - 450 - 450 - 450 - 450 - horizontal - list - 200 - - - 0 - 0 - 38 - 32 - stretch - StackNF.png - - - - - 0 - 0 - 38 - 32 - stretch - StackFO.png - - - - - 40 - 155 - 570 - 22 - font13_title - center - Container(450).ListItem.Label - - - diff --git a/project/VS2010Express/XBMC.vcxproj b/project/VS2010Express/XBMC.vcxproj index 199bd8dd20ed2..94aedee3805d4 100644 --- a/project/VS2010Express/XBMC.vcxproj +++ b/project/VS2010Express/XBMC.vcxproj @@ -1530,7 +1530,6 @@ - @@ -2191,7 +2190,6 @@ - diff --git a/project/VS2010Express/XBMC.vcxproj.filters b/project/VS2010Express/XBMC.vcxproj.filters index 4a8cab1925a25..8d17ebaeb4959 100644 --- a/project/VS2010Express/XBMC.vcxproj.filters +++ b/project/VS2010Express/XBMC.vcxproj.filters @@ -1522,9 +1522,6 @@ video\dialogs - - video\dialogs - video\dialogs @@ -4525,9 +4522,6 @@ video\dialogs - - video\dialogs - video\dialogs diff --git a/xbmc/guilib/GUIWindowManager.cpp b/xbmc/guilib/GUIWindowManager.cpp index 05a2e49aaaea2..12bcf9f879e55 100644 --- a/xbmc/guilib/GUIWindowManager.cpp +++ b/xbmc/guilib/GUIWindowManager.cpp @@ -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" @@ -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 @@ -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); diff --git a/xbmc/guilib/WindowIDs.h b/xbmc/guilib/WindowIDs.h index 2707949398526..42eef441c9d84 100644 --- a/xbmc/guilib/WindowIDs.h +++ b/xbmc/guilib/WindowIDs.h @@ -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 diff --git a/xbmc/input/ButtonTranslator.cpp b/xbmc/input/ButtonTranslator.cpp index 96712873835af..e64d112c9ee15 100644 --- a/xbmc/input/ButtonTranslator.cpp +++ b/xbmc/input/ButtonTranslator.cpp @@ -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 }, diff --git a/xbmc/video/dialogs/GUIDialogFileStacking.cpp b/xbmc/video/dialogs/GUIDialogFileStacking.cpp deleted file mode 100644 index 4ddedde9c3c80..0000000000000 --- a/xbmc/video/dialogs/GUIDialogFileStacking.cpp +++ /dev/null @@ -1,104 +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 - * . - * - */ - -#include "GUIDialogFileStacking.h" -#include "input/Key.h" -#include "guilib/LocalizeStrings.h" -#include "FileItem.h" -#include "utils/StringUtils.h" -#include - -#define STACK_LIST 450 - -CGUIDialogFileStacking::CGUIDialogFileStacking(void) - : CGUIDialog(WINDOW_DIALOG_FILESTACKING, "DialogFileStacking.xml") -{ - m_iSelectedFile = -1; - m_iNumberOfFiles = 0; - m_stackItems = new CFileItemList; -} - -CGUIDialogFileStacking::~CGUIDialogFileStacking(void) -{ - delete m_stackItems; -} - -bool CGUIDialogFileStacking::OnMessage(CGUIMessage& message) -{ - switch ( message.GetMessage() ) - { - case GUI_MSG_WINDOW_DEINIT: - CGUIDialog::OnMessage(message); - if (m_stackItems) - m_stackItems->Clear(); - return true; - case GUI_MSG_WINDOW_INIT: - { - CGUIDialog::OnMessage(message); - m_iSelectedFile = -1; - return true; - } - break; - - case GUI_MSG_CLICKED: - { - if (message.GetSenderId() == STACK_LIST && (message.GetParam1() == ACTION_SELECT_ITEM || - message.GetParam1() == ACTION_MOUSE_LEFT_CLICK)) - { - // grab the selected item - CGUIMessage msg(GUI_MSG_ITEM_SELECTED, GetID(), STACK_LIST); - OnMessage(msg); - m_iSelectedFile = msg.GetParam1() + 1; - } - Close(); - return true; - } - break; - } - return CGUIDialog::OnMessage(message); -} - -int CGUIDialogFileStacking::GetSelectedFile() const -{ - return m_iSelectedFile; -} - -void CGUIDialogFileStacking::SetNumberOfFiles(int iFiles) -{ - m_iNumberOfFiles = iFiles; -} - -void CGUIDialogFileStacking::OnInitWindow() -{ - if (GetControl(STACK_LIST)) - { - // have the new stack list instead - fill it up - SendMessage(GUI_MSG_LABEL_RESET, GetID(), STACK_LIST); - for (int i = 0; i < m_iNumberOfFiles; i++) - { - std::string label = StringUtils::Format(g_localizeStrings.Get(23051).c_str(), i+1); - CFileItemPtr item(new CFileItem(label)); - m_stackItems->Add(item); - } - CGUIMessage msg(GUI_MSG_LABEL_BIND, GetID(), STACK_LIST, 0, 0, m_stackItems); - OnMessage(msg); - } - CGUIDialog::OnInitWindow(); -} diff --git a/xbmc/video/dialogs/GUIDialogFileStacking.h b/xbmc/video/dialogs/GUIDialogFileStacking.h deleted file mode 100644 index 78e189d5583f2..0000000000000 --- a/xbmc/video/dialogs/GUIDialogFileStacking.h +++ /dev/null @@ -1,42 +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 - * . - * - */ - -#include "guilib/GUIDialog.h" - -class CFileItemList; - -class CGUIDialogFileStacking : - public CGUIDialog -{ -public: - CGUIDialogFileStacking(void); - virtual ~CGUIDialogFileStacking(void); - virtual bool OnMessage(CGUIMessage& message); - - int GetSelectedFile() const; - void SetNumberOfFiles(int iFiles); -protected: - virtual void OnInitWindow(); - int m_iSelectedFile; - int m_iNumberOfFiles; - CFileItemList* m_stackItems; -}; diff --git a/xbmc/video/dialogs/Makefile b/xbmc/video/dialogs/Makefile index a714f3d1c7841..0480a6d859ca0 100644 --- a/xbmc/video/dialogs/Makefile +++ b/xbmc/video/dialogs/Makefile @@ -1,5 +1,4 @@ SRCS=GUIDialogAudioSubtitleSettings.cpp \ - GUIDialogFileStacking.cpp \ GUIDialogFullScreenInfo.cpp \ GUIDialogSubtitles.cpp \ GUIDialogTeletext.cpp \