[PVR] context menu rewrite & major gui actions refactoring #10870

ksooo · 2016-11-05T22:55:10Z

This all started with the wish to support context menus for the new Estuary PVR home screen widgets and quickly turned big, because i wanted to avoid duplicate code. At the end i was in a rage to eliminate as many duplicate pvr gui actions code as possible.

This is not completely finished, but all runtime tested and working well.

@xhaggi @Jalle19 for review and general comments?
@tamland any comments regarding the new CContextMenuManager related code pieces?

tamland · 2016-11-06T11:15:49Z

wow, all at once. great work!

xbmc/ContextMenuManager.cpp

  ReloadAddonItems();
+
+  std::vector<std::shared_ptr<IContextMenuItem>> pvrItems = m_pvrMgr.GetContextMenuItems();


xbmc/pvr/PVRContextMenus.cpp

+
+    std::string MarkWatched::GetLabel(const CFileItem &item) const
+    {
+      return g_localizeStrings.Get(16103); /* Mark as watched */


ksooo · 2016-11-06T15:24:08Z

@tamland thanks for the review. The changes you suggested are now in.

xbmc/pvr/PVRContextMenus.cpp

+      const CPVRRecordingPtr recording(item.GetPVRRecordingInfoTag());
+      if (recording)
+      {
+        if (!recording->IsDeleted())


xbmc/pvr/PVRContextMenus.cpp

+      if (!recording)
+        recording = item.GetPVRRecordingInfoTag();
+
+      if (recording)


xbmc/pvr/PVRContextMenus.cpp

+        timer = epg->Timer();
+
+      if (!timer)
+        timer = item.GetPVRTimerInfoTag();


xbmc/pvr/PVRContextMenus.h

+    CPVRContextMenuManager();
+    CPVRContextMenuManager(const CPVRContextMenuManager&) = delete;
+    CPVRContextMenuManager const& operator=(CPVRContextMenuManager const&) = delete;
+    virtual ~CPVRContextMenuManager() {}


xbmc/pvr/windows/GUIWindowPVRChannels.cpp

@@ -150,7 +120,6 @@ bool CGUIWindowPVRChannels::OnAction(const CAction &action)
 {
  switch (action.GetID())
  {
-    case REMOTE_0:


da-anda · 2016-11-07T08:54:16Z

I know I'm annoying, but I noticed that you kindly added some file reference comments to the strings.po file and now should also know their context. So I wanted to ask if you're also in the mood to add a small contextual help comment to those strings? At least an indication if a certain string is a settings option or a settings label. Thanks.

ksooo · 2016-11-07T09:17:46Z

@da-anda will do, remember, this is still wip.

ksooo · 2016-11-19T22:32:11Z

@Jalle19 thanks for the review. The changes you suggested are now in.

ksooo · 2016-11-30T19:10:19Z

@ronie mind taking a look at the strings.po cleanup commit? I inserted several "#. @@@ unused?" comments. maybe you can tell for some of those whether they are actually unused?

ronie · 2016-11-30T20:13:26Z

these are used by several skins:
13113
13204
19005
19080
19081
19144
19145
19203
19207
19216
19284

ksooo · 2016-11-30T21:13:17Z

these are used by several skins:

thanks @ronie. will change remarks accordingly.

ksooo · 2016-12-01T12:25:00Z

jenkins build this please

…hook

…play channel, resume recording

…atched

…ivate timer

…erived class from base class)

…ms with static labels.

…ptimizations.

…eader file instead to typedef again and again in several header files.

ksooo · 2016-12-02T06:33:43Z

jenkins build this please

xbmc/pvr/PVRContextMenus.cpp

+#include "pvr/timers/PVRTimers.h"
+#include "utils/URIUtils.h"
+
+#include "PVRContextMenus.h"


ksooo added Type: Feature non-breaking change which adds functionality Type: Cleanup non-breaking change which removes non-working or unmaintained functionality Component: PVR WIP PR that is still being worked on v18 Leia labels Nov 5, 2016

tamland reviewed Nov 6, 2016

View reviewed changes

xbmc/ContextMenuManager.cpp

ReloadAddonItems();

std::vector<std::shared_ptr<IContextMenuItem>> pvrItems = m_pvrMgr.GetContextMenuItems();

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

tamland reviewed Nov 6, 2016

View reviewed changes

xbmc/pvr/PVRContextMenus.cpp

std::string MarkWatched::GetLabel(const CFileItem &item) const

{

return g_localizeStrings.Get(16103); /* Mark as watched */

This comment was marked as spam.

Sign in to view

This comment was marked as spam.

Sign in to view

ksooo force-pushed the pvr-contextmenu-rewrite branch from 69b8586 to 96382da Compare November 6, 2016 15:22

Jalle19 reviewed Nov 6, 2016

View reviewed changes

ksooo force-pushed the pvr-contextmenu-rewrite branch from 96382da to 63c9619 Compare November 10, 2016 21:44

ksooo force-pushed the pvr-contextmenu-rewrite branch from 63c9619 to 7eed678 Compare November 19, 2016 22:30

ksooo force-pushed the pvr-contextmenu-rewrite branch 4 times, most recently from 40220c4 to b64b7b8 Compare November 24, 2016 10:23

ksooo force-pushed the pvr-contextmenu-rewrite branch 2 times, most recently from bb3c868 to 8a8cac6 Compare November 30, 2016 15:31

ksooo force-pushed the pvr-contextmenu-rewrite branch 2 times, most recently from 003c241 to 8b108f4 Compare December 1, 2016 11:06

ksooo removed the WIP PR that is still being worked on label Dec 1, 2016

ksooo force-pushed the pvr-contextmenu-rewrite branch from 8b108f4 to fb8e04c Compare December 1, 2016 12:24

ksooo added 20 commits December 2, 2016 07:29

[PVR] Context menu rewrite, gui actions refactoring: adsp settings

8fceb9d

[PVR] Context menu rewrite, gui actions refactoring: pvr client menu …

7861517

…hook

[PVR] Context menu rewrite, gui actions refactoring: play recording, …

5d6aa49

…play channel, resume recording

[PVR] Context menu rewrite, gui actions refactoring: recording info

b779a29

[PVR] Context menu rewrite: micro opt

cc53676

[PVR] Context menu rewrite, gui actions refactoring: delete recording

51bfabe

[PVR] Context menu rewrite, gui actions refactoring: rename recording

b30413d

[PVR] Context menu rewrite, gui actions refactoring: undelete recording

f91ee37

[PVR] Context menu rewrite, gui actions refactoring: mark watched/unw…

92692f0

…atched

[PVR] Context menu rewrite, gui actions refactoring: rename timer

6c8f2f2

[PVR] Context menu rewrite, gui actions refactoring: activate / deact…

0153822

…ivate timer

[PVR] gui actions refactoring: hide channel

613e28a

[PVR] refactored channels window 'Manage...' context menu item code

7212ece

[PVR] refactored direct channel number input code (removed logic of d…

d098fe0

…erived class from base class)

[PVR] gui actions refactoring: delete all recordings from trash

942390f

[PVR] gui actions refactoring: cleanup strings.po

655b218

[PVR] Context menu rewrite: Use CStaticContextMenuAction for menu ite…

78ad730

…ms with static labels.

[PVR] Context menu rewrite, gui actions refactoring: fileitem usage o…

1db92d4

…ptimizations.

[PVR] refactoring: put all pvr and epg shared_ptr typedefs into one h…

76683ec

…eader file instead to typedef again and again in several header files.

[PVR] C++ basics: const vs non-const, reference vs value. :-/

8c9d4fa

ksooo force-pushed the pvr-contextmenu-rewrite branch from 9d53dbc to 8c9d4fa Compare December 2, 2016 06:33

ksooo merged commit d3f067c into xbmc:master Dec 2, 2016

ksooo deleted the pvr-contextmenu-rewrite branch December 2, 2016 07:44

Montellese reviewed Dec 2, 2016

View reviewed changes

MartijnKaijser modified the milestone: L 18.0-alpha1 Dec 3, 2016

ksooo mentioned this pull request Dec 11, 2016

[PVR][video] Consolidate implementation of "Play", "Mark watched", "Mark unwatched", "Resume from" context menu items #11115

Merged

ksooo mentioned this pull request Feb 15, 2017

[PVR] Refactoring: Remove GUI code from PVR core components, part 2. #11676

Merged

ksooo mentioned this pull request Apr 13, 2017

[PVR] Reintroduce 'Delete' context menu entry for recording folders. #11959

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[PVR] context menu rewrite & major gui actions refactoring #10870

[PVR] context menu rewrite & major gui actions refactoring #10870

ksooo commented Nov 5, 2016 •

edited

tamland commented Nov 6, 2016

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

ksooo commented Nov 6, 2016

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

da-anda commented Nov 7, 2016

ksooo commented Nov 7, 2016

ksooo commented Nov 19, 2016

ksooo commented Nov 30, 2016

ronie commented Nov 30, 2016

ksooo commented Nov 30, 2016

ksooo commented Dec 1, 2016

ksooo commented Dec 2, 2016

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

		ReloadAddonItems();

		std::vector<std::shared_ptr<IContextMenuItem>> pvrItems = m_pvrMgr.GetContextMenuItems();

[PVR] context menu rewrite & major gui actions refactoring #10870

[PVR] context menu rewrite & major gui actions refactoring #10870

Conversation

ksooo commented Nov 5, 2016 • edited

tamland commented Nov 6, 2016

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

ksooo commented Nov 6, 2016

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

da-anda commented Nov 7, 2016

ksooo commented Nov 7, 2016

ksooo commented Nov 19, 2016

ksooo commented Nov 30, 2016

ronie commented Nov 30, 2016

ksooo commented Nov 30, 2016

ksooo commented Dec 1, 2016

ksooo commented Dec 2, 2016

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

This comment was marked as spam.

ksooo commented Nov 5, 2016 •

edited