diff options
author | ksooo <3226626+ksooo@users.noreply.github.com> | 2024-06-25 00:07:01 +0200 |
---|---|---|
committer | ksooo <3226626+ksooo@users.noreply.github.com> | 2024-06-25 22:47:20 +0200 |
commit | 5ed5e7d5f3af714952e93b0434edeca7b79b9e63 (patch) | |
tree | 0f3df7b6327c428986b71b17905d613056d1b9de | |
parent | 5506f4fccb00bc3bb87f84d4657d4e22056c52c6 (diff) |
[PVR] Cleanup: clang-format GUIDialogPVRChannelManager.(cpp|h).
-rw-r--r-- | xbmc/pvr/dialogs/GUIDialogPVRChannelManager.cpp | 179 | ||||
-rw-r--r-- | xbmc/pvr/dialogs/GUIDialogPVRChannelManager.h | 146 |
2 files changed, 178 insertions, 147 deletions
diff --git a/xbmc/pvr/dialogs/GUIDialogPVRChannelManager.cpp b/xbmc/pvr/dialogs/GUIDialogPVRChannelManager.cpp index 8bc352d0ff..f60ac12f23 100644 --- a/xbmc/pvr/dialogs/GUIDialogPVRChannelManager.cpp +++ b/xbmc/pvr/dialogs/GUIDialogPVRChannelManager.cpp @@ -48,20 +48,20 @@ #include <utility> #include <vector> -#define BUTTON_OK 4 -#define BUTTON_APPLY 5 -#define BUTTON_CANCEL 6 -#define RADIOBUTTON_ACTIVE 7 -#define EDIT_NAME 8 -#define BUTTON_CHANNEL_LOGO 9 -#define IMAGE_CHANNEL_LOGO 10 -#define RADIOBUTTON_USEEPG 12 -#define SPIN_EPGSOURCE_SELECTION 13 +#define BUTTON_OK 4 +#define BUTTON_APPLY 5 +#define BUTTON_CANCEL 6 +#define RADIOBUTTON_ACTIVE 7 +#define EDIT_NAME 8 +#define BUTTON_CHANNEL_LOGO 9 +#define IMAGE_CHANNEL_LOGO 10 +#define RADIOBUTTON_USEEPG 12 +#define SPIN_EPGSOURCE_SELECTION 13 #define RADIOBUTTON_PARENTAL_LOCK 14 -#define CONTROL_LIST_CHANNELS 20 -#define BUTTON_GROUP_MANAGER 30 -#define BUTTON_NEW_CHANNEL 31 -#define BUTTON_RADIO_TV 34 +#define CONTROL_LIST_CHANNELS 20 +#define BUTTON_GROUP_MANAGER 30 +#define BUTTON_NEW_CHANNEL 31 +#define BUTTON_RADIO_TV 34 #define BUTTON_REFRESH_LOGOS 35 namespace @@ -88,8 +88,8 @@ constexpr const char* PROPERTY_ITEM_CHANGED = "Changed"; using namespace PVR; using namespace KODI::MESSAGING; -CGUIDialogPVRChannelManager::CGUIDialogPVRChannelManager() : - CGUIDialog(WINDOW_DIALOG_PVR_CHANNEL_MANAGER, "DialogPVRChannelManager.xml"), +CGUIDialogPVRChannelManager::CGUIDialogPVRChannelManager() + : CGUIDialog(WINDOW_DIALOG_PVR_CHANNEL_MANAGER, "DialogPVRChannelManager.xml"), m_channelItems(new CFileItemList) { SetRadio(false); @@ -142,9 +142,10 @@ bool CGUIDialogPVRChannelManager::OnActionMove(const CAction& action) } else { - bool bMoveUp = iActionId == ACTION_PAGE_UP || iActionId == ACTION_MOVE_UP || iActionId == ACTION_FIRST_PAGE; + bool bMoveUp = iActionId == ACTION_PAGE_UP || iActionId == ACTION_MOVE_UP || + iActionId == ACTION_FIRST_PAGE; unsigned int iLines = bMoveUp ? abs(m_iSelected - iSelected) : 1; - bool bOutOfBounds = bMoveUp ? m_iSelected <= 0 : m_iSelected >= m_channelItems->Size() - 1; + bool bOutOfBounds = bMoveUp ? m_iSelected <= 0 : m_iSelected >= m_channelItems->Size() - 1; if (bOutOfBounds) { bMoveUp = !bMoveUp; @@ -183,8 +184,7 @@ bool CGUIDialogPVRChannelManager::OnActionMove(const CAction& action) bool CGUIDialogPVRChannelManager::OnAction(const CAction& action) { - return OnActionMove(action) || - CGUIDialog::OnAction(action); + return OnActionMove(action) || CGUIDialog::OnAction(action); } void CGUIDialogPVRChannelManager::OnInitWindow() @@ -251,10 +251,12 @@ bool CGUIDialogPVRChannelManager::OnClickListChannels(const CGUIMessage& message int iItem = m_viewControl.GetSelectedItem(); /* Check file item is in list range and get his pointer */ - if (iItem < 0 || iItem >= m_channelItems->Size()) return true; + if (iItem < 0 || iItem >= m_channelItems->Size()) + return true; /* Process actions */ - if (iAction == ACTION_SELECT_ITEM || iAction == ACTION_CONTEXT_MENU || iAction == ACTION_MOUSE_RIGHT_CLICK) + if (iAction == ACTION_SELECT_ITEM || iAction == ACTION_CONTEXT_MENU || + iAction == ACTION_MOUSE_RIGHT_CLICK) { /* Show Contextmenu */ OnPopupMenu(iItem); @@ -391,9 +393,11 @@ bool CGUIDialogPVRChannelManager::OnClickButtonChannelLogo() if (!pItem) return false; - const std::shared_ptr<CProfileManager> profileManager = CServiceBroker::GetSettingsComponent()->GetProfileManager(); + const std::shared_ptr<CProfileManager> profileManager = + CServiceBroker::GetSettingsComponent()->GetProfileManager(); - if (profileManager->GetCurrentProfile().canWriteSources() && !g_passwordManager.IsProfileLockUnlocked()) + if (profileManager->GetCurrentProfile().canWriteSources() && + !g_passwordManager.IsProfileLockUnlocked()) return false; // setup our thumb list @@ -432,7 +436,8 @@ bool CGUIDialogPVRChannelManager::OnClickButtonChannelLogo() shares.push_back(share1); } CServiceBroker::GetMediaManager().GetLocalDrives(shares); - if (!CGUIDialogFileBrowser::ShowAndGetImage(items, shares, g_localizeStrings.Get(19285), strThumb, NULL, 19285)) + if (!CGUIDialogFileBrowser::ShowAndGetImage(items, shares, g_localizeStrings.Get(19285), strThumb, + NULL, 19285)) return false; if (strThumb == "thumb://Current") @@ -497,7 +502,9 @@ bool CGUIDialogPVRChannelManager::OnClickButtonGroupManager() PromptAndSaveList(); /* Load group manager dialog */ - CGUIDialogPVRGroupManager* pDlgInfo = CServiceBroker::GetGUI()->GetWindowManager().GetWindow<CGUIDialogPVRGroupManager>(WINDOW_DIALOG_PVR_GROUP_MANAGER); + CGUIDialogPVRGroupManager* pDlgInfo = + CServiceBroker::GetGUI()->GetWindowManager().GetWindow<CGUIDialogPVRGroupManager>( + WINDOW_DIALOG_PVR_GROUP_MANAGER); if (!pDlgInfo) return false; @@ -517,7 +524,9 @@ bool CGUIDialogPVRChannelManager::OnClickButtonNewChannel() int iSelection = 0; if (m_clientsWithSettingsList.size() > 1) { - CGUIDialogSelect* pDlgSelect = CServiceBroker::GetGUI()->GetWindowManager().GetWindow<CGUIDialogSelect>(WINDOW_DIALOG_SELECT); + CGUIDialogSelect* pDlgSelect = + CServiceBroker::GetGUI()->GetWindowManager().GetWindow<CGUIDialogSelect>( + WINDOW_DIALOG_SELECT); if (!pDlgSelect) return false; @@ -565,9 +574,13 @@ bool CGUIDialogPVRChannelManager::OnClickButtonNewChannel() } } else if (ret == PVR_ERROR_NOT_IMPLEMENTED) - HELPERS::ShowOKDialogText(CVariant{19033}, CVariant{19038}); // "Information", "Not supported by the PVR backend." + HELPERS::ShowOKDialogText( + CVariant{19033}, CVariant{19038}); // "Information", "Not supported by the PVR backend." else - HELPERS::ShowOKDialogText(CVariant{2103}, CVariant{16029}); // "Add-on error", "Check the log for more information about this message." + HELPERS::ShowOKDialogText( + CVariant{2103}, + CVariant{ + 16029}); // "Add-on error", "Check the log for more information about this message." } return true; } @@ -597,38 +610,38 @@ bool CGUIDialogPVRChannelManager::OnClickButtonRefreshChannelLogos() bool CGUIDialogPVRChannelManager::OnMessageClick(const CGUIMessage& message) { int iControl = message.GetSenderId(); - switch(iControl) + switch (iControl) { - case CONTROL_LIST_CHANNELS: - return OnClickListChannels(message); - case BUTTON_OK: - return OnClickButtonOK(); - case BUTTON_APPLY: - return OnClickButtonApply(); - case BUTTON_CANCEL: - return OnClickButtonCancel(); - case BUTTON_RADIO_TV: - return OnClickButtonRadioTV(); - case RADIOBUTTON_ACTIVE: - return OnClickButtonRadioActive(); - case RADIOBUTTON_PARENTAL_LOCK: - return OnClickButtonRadioParentalLocked(); - case EDIT_NAME: - return OnClickButtonEditName(); - case BUTTON_CHANNEL_LOGO: - return OnClickButtonChannelLogo(); - case RADIOBUTTON_USEEPG: - return OnClickButtonUseEPG(); - case SPIN_EPGSOURCE_SELECTION: - return OnClickEPGSourceSpin(); - case BUTTON_GROUP_MANAGER: - return OnClickButtonGroupManager(); - case BUTTON_NEW_CHANNEL: - return OnClickButtonNewChannel(); - case BUTTON_REFRESH_LOGOS: - return OnClickButtonRefreshChannelLogos(); - default: - return false; + case CONTROL_LIST_CHANNELS: + return OnClickListChannels(message); + case BUTTON_OK: + return OnClickButtonOK(); + case BUTTON_APPLY: + return OnClickButtonApply(); + case BUTTON_CANCEL: + return OnClickButtonCancel(); + case BUTTON_RADIO_TV: + return OnClickButtonRadioTV(); + case RADIOBUTTON_ACTIVE: + return OnClickButtonRadioActive(); + case RADIOBUTTON_PARENTAL_LOCK: + return OnClickButtonRadioParentalLocked(); + case EDIT_NAME: + return OnClickButtonEditName(); + case BUTTON_CHANNEL_LOGO: + return OnClickButtonChannelLogo(); + case RADIOBUTTON_USEEPG: + return OnClickButtonUseEPG(); + case SPIN_EPGSOURCE_SELECTION: + return OnClickEPGSourceSpin(); + case BUTTON_GROUP_MANAGER: + return OnClickButtonGroupManager(); + case BUTTON_NEW_CHANNEL: + return OnClickButtonNewChannel(); + case BUTTON_REFRESH_LOGOS: + return OnClickButtonRefreshChannelLogos(); + default: + return false; } } @@ -706,7 +719,8 @@ bool CGUIDialogPVRChannelManager::OnPopupMenu(int iItem) bool CGUIDialogPVRChannelManager::OnContextButton(int itemNumber, CONTEXT_BUTTON button) { /* Check file item is in list range and get his pointer */ - if (itemNumber < 0 || itemNumber >= m_channelItems->Size()) return false; + if (itemNumber < 0 || itemNumber >= m_channelItems->Size()) + return false; CFileItemPtr pItem = m_channelItems->Get(itemNumber); if (!pItem) @@ -732,13 +746,19 @@ bool CGUIDialogPVRChannelManager::OnContextButton(int itemNumber, CONTEXT_BUTTON SetData(m_iSelected); } else if (ret == PVR_ERROR_NOT_IMPLEMENTED) - HELPERS::ShowOKDialogText(CVariant{19033}, CVariant{19038}); // "Information", "Not supported by the PVR backend." + HELPERS::ShowOKDialogText( + CVariant{19033}, CVariant{19038}); // "Information", "Not supported by the PVR backend." else - HELPERS::ShowOKDialogText(CVariant{2103}, CVariant{16029}); // "Add-on error", "Check the log for more information about this message." + HELPERS::ShowOKDialogText( + CVariant{2103}, + CVariant{ + 16029}); // "Add-on error", "Check the log for more information about this message." } else if (button == CONTEXT_BUTTON_DELETE) { - CGUIDialogYesNo* pDialog = CServiceBroker::GetGUI()->GetWindowManager().GetWindow<CGUIDialogYesNo>(WINDOW_DIALOG_YES_NO); + CGUIDialogYesNo* pDialog = + CServiceBroker::GetGUI()->GetWindowManager().GetWindow<CGUIDialogYesNo>( + WINDOW_DIALOG_YES_NO); if (!pDialog) return true; @@ -764,9 +784,14 @@ bool CGUIDialogPVRChannelManager::OnContextButton(int itemNumber, CONTEXT_BUTTON } } else if (ret == PVR_ERROR_NOT_IMPLEMENTED) - HELPERS::ShowOKDialogText(CVariant{19033}, CVariant{19038}); // "Information", "Not supported by the PVR backend." + HELPERS::ShowOKDialogText( + CVariant{19033}, + CVariant{19038}); // "Information", "Not supported by the PVR backend." else - HELPERS::ShowOKDialogText(CVariant{2103}, CVariant{16029}); // "Add-on error", "Check the log for more information about this message." + HELPERS::ShowOKDialogText( + CVariant{2103}, + CVariant{ + 16029}); // "Add-on error", "Check the log for more information about this message." } } } @@ -807,7 +832,8 @@ void CGUIDialogPVRChannelManager::Update() // empty the lists ready for population Clear(); - std::shared_ptr<CPVRChannelGroup> channels = CServiceBroker::GetPVRManager().ChannelGroups()->GetGroupAll(m_bIsRadio); + std::shared_ptr<CPVRChannelGroup> channels = + CServiceBroker::GetPVRManager().ChannelGroups()->GetGroupAll(m_bIsRadio); // No channels available, nothing to do. if (!channels) @@ -849,13 +875,14 @@ void CGUIDialogPVRChannelManager::Update() } { - std::vector< std::pair<std::string, int> > labels; + std::vector<std::pair<std::string, int>> labels; labels.emplace_back(g_localizeStrings.Get(19210), 0); //! @todo Add Labels for EPG scrapers here SET_CONTROL_LABELS(SPIN_EPGSOURCE_SELECTION, 0, &labels); } - m_clientsWithSettingsList = CServiceBroker::GetPVRManager().Clients()->GetClientsSupportingChannelSettings(m_bIsRadio); + m_clientsWithSettingsList = + CServiceBroker::GetPVRManager().Clients()->GetClientsSupportingChannelSettings(m_bIsRadio); if (!m_clientsWithSettingsList.empty()) m_bAllowNewChannel = true; @@ -930,7 +957,8 @@ void CGUIDialogPVRChannelManager::RenameChannel(const CFileItemPtr& pItem) const std::shared_ptr<CPVRClient> client = CServiceBroker::GetPVRManager().GetClient(*pItem); if (!client || (client->RenameChannel(channel) != PVR_ERROR_NO_ERROR)) - HELPERS::ShowOKDialogText(CVariant{2103}, CVariant{16029}); // Add-on error;Check the log file for details. + HELPERS::ShowOKDialogText(CVariant{2103}, + CVariant{16029}); // Add-on error;Check the log file for details. } } @@ -1006,7 +1034,9 @@ void CGUIDialogPVRChannelManager::SaveList() return; /* display the progress dialog */ - CGUIDialogProgress* pDlgProgress = CServiceBroker::GetGUI()->GetWindowManager().GetWindow<CGUIDialogProgress>(WINDOW_DIALOG_PROGRESS); + CGUIDialogProgress* pDlgProgress = + CServiceBroker::GetGUI()->GetWindowManager().GetWindow<CGUIDialogProgress>( + WINDOW_DIALOG_PROGRESS); pDlgProgress->SetHeading(CVariant{190}); pDlgProgress->SetLine(0, CVariant{""}); pDlgProgress->SetLine(1, CVariant{328}); @@ -1016,7 +1046,8 @@ void CGUIDialogPVRChannelManager::SaveList() pDlgProgress->SetPercentage(0); /* persist all channels */ - std::shared_ptr<CPVRChannelGroup> group = CServiceBroker::GetPVRManager().ChannelGroups()->GetGroupAll(m_bIsRadio); + std::shared_ptr<CPVRChannelGroup> group = + CServiceBroker::GetPVRManager().ChannelGroups()->GetGroupAll(m_bIsRadio); if (!group) return; @@ -1060,9 +1091,9 @@ void CGUIDialogPVRChannelManager::SaveList() bool CGUIDialogPVRChannelManager::HasChangedItems() const { - return std::any_of(m_channelItems->cbegin(), m_channelItems->cend(), [](const auto& item) { - return item && item->GetProperty(PROPERTY_ITEM_CHANGED).asBoolean(); - }); + return std::any_of(m_channelItems->cbegin(), m_channelItems->cend(), + [](const auto& item) + { return item && item->GetProperty(PROPERTY_ITEM_CHANGED).asBoolean(); }); } namespace diff --git a/xbmc/pvr/dialogs/GUIDialogPVRChannelManager.h b/xbmc/pvr/dialogs/GUIDialogPVRChannelManager.h index 7dfc88a236..c1fd416a6d 100644 --- a/xbmc/pvr/dialogs/GUIDialogPVRChannelManager.h +++ b/xbmc/pvr/dialogs/GUIDialogPVRChannelManager.h @@ -21,76 +21,76 @@ class CGUIMessage; namespace PVR { - class CPVRChannelGroup; - class CPVRClient; - - class CGUIDialogPVRChannelManager : public CGUIDialog - { - public: - CGUIDialogPVRChannelManager(); - ~CGUIDialogPVRChannelManager() override; - bool OnMessage(CGUIMessage& message) override; - bool OnAction(const CAction& action) override; - void OnWindowLoaded() override; - void OnWindowUnload() override; - bool HasListItems() const override{ return true; } - CFileItemPtr GetCurrentListItem(int offset = 0) override; - - void Open(const std::shared_ptr<CFileItem>& initialSelection); - void SetRadio(bool bIsRadio); - - protected: - void OnInitWindow() override; - void OnDeinitWindow(int nextWindowID) override; - - private: - void Clear(); - void Update(); - void PromptAndSaveList(); - void SaveList(); - void Renumber(); - void SetData(int iItem); - void RenameChannel(const CFileItemPtr& pItem); - - void ClearChannelOptions(); - void EnableChannelOptions(bool bEnable); - - bool OnPopupMenu(int iItem); - bool OnContextButton(int itemNumber, CONTEXT_BUTTON button); - bool OnActionMove(const CAction& action); - bool OnMessageClick(const CGUIMessage& message); - bool OnClickListChannels(const CGUIMessage& message); - bool OnClickButtonOK(); - bool OnClickButtonApply(); - bool OnClickButtonCancel(); - bool OnClickButtonRadioTV(); - bool OnClickButtonRadioActive(); - bool OnClickButtonRadioParentalLocked(); - bool OnClickButtonEditName(); - bool OnClickButtonChannelLogo(); - bool OnClickButtonUseEPG(); - bool OnClickEPGSourceSpin(); - bool OnClickButtonGroupManager(); - bool OnClickButtonNewChannel(); - bool OnClickButtonRefreshChannelLogos(); - - bool UpdateChannelData(const std::shared_ptr<CFileItem>& pItem, - const std::shared_ptr<CPVRChannelGroup>& group); - - bool HasChangedItems() const; - void SetItemChanged(const CFileItemPtr& pItem); - - bool m_bIsRadio = false; - bool m_bMovingMode = false; - bool m_bAllowNewChannel = false; - bool m_bAllowRenumber = false; - bool m_bAllowReorder = false; - - std::shared_ptr<CFileItem> m_initialSelection; - int m_iSelected = 0; - CFileItemList* m_channelItems; - CGUIViewControl m_viewControl; - - std::vector<std::shared_ptr<CPVRClient>> m_clientsWithSettingsList; - }; -} +class CPVRChannelGroup; +class CPVRClient; + +class CGUIDialogPVRChannelManager : public CGUIDialog +{ +public: + CGUIDialogPVRChannelManager(); + ~CGUIDialogPVRChannelManager() override; + bool OnMessage(CGUIMessage& message) override; + bool OnAction(const CAction& action) override; + void OnWindowLoaded() override; + void OnWindowUnload() override; + bool HasListItems() const override { return true; } + CFileItemPtr GetCurrentListItem(int offset = 0) override; + + void Open(const std::shared_ptr<CFileItem>& initialSelection); + void SetRadio(bool bIsRadio); + +protected: + void OnInitWindow() override; + void OnDeinitWindow(int nextWindowID) override; + +private: + void Clear(); + void Update(); + void PromptAndSaveList(); + void SaveList(); + void Renumber(); + void SetData(int iItem); + void RenameChannel(const CFileItemPtr& pItem); + + void ClearChannelOptions(); + void EnableChannelOptions(bool bEnable); + + bool OnPopupMenu(int iItem); + bool OnContextButton(int itemNumber, CONTEXT_BUTTON button); + bool OnActionMove(const CAction& action); + bool OnMessageClick(const CGUIMessage& message); + bool OnClickListChannels(const CGUIMessage& message); + bool OnClickButtonOK(); + bool OnClickButtonApply(); + bool OnClickButtonCancel(); + bool OnClickButtonRadioTV(); + bool OnClickButtonRadioActive(); + bool OnClickButtonRadioParentalLocked(); + bool OnClickButtonEditName(); + bool OnClickButtonChannelLogo(); + bool OnClickButtonUseEPG(); + bool OnClickEPGSourceSpin(); + bool OnClickButtonGroupManager(); + bool OnClickButtonNewChannel(); + bool OnClickButtonRefreshChannelLogos(); + + bool UpdateChannelData(const std::shared_ptr<CFileItem>& pItem, + const std::shared_ptr<CPVRChannelGroup>& group); + + bool HasChangedItems() const; + void SetItemChanged(const CFileItemPtr& pItem); + + bool m_bIsRadio = false; + bool m_bMovingMode = false; + bool m_bAllowNewChannel = false; + bool m_bAllowRenumber = false; + bool m_bAllowReorder = false; + + std::shared_ptr<CFileItem> m_initialSelection; + int m_iSelected = 0; + CFileItemList* m_channelItems; + CGUIViewControl m_viewControl; + + std::vector<std::shared_ptr<CPVRClient>> m_clientsWithSettingsList; +}; +} // namespace PVR |