Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for issue #15 and #17 #16

Merged
merged 2 commits into from
Mar 3, 2015
Merged

Fix for issue #15 and #17 #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8935a7
#15 - Changed favourites path to profile
bluezed Oct 18, 2014
9c8fbf4
#17 - Mouse right click and Touch long press now opening context menu
bluezed Nov 1, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions gui.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ def onActionOSDMode(self, action):
self._showOsd()

def onActionEPGMode(self, action):
if action.getId() in [ACTION_PARENT_DIR, KEY_NAV_BACK, ACTION_PREVIOUS_MENU]:
if action.getId() in [ACTION_PARENT_DIR, KEY_NAV_BACK]:
self.close()
return

Expand Down Expand Up @@ -327,10 +327,12 @@ def onActionEPGMode(self, action):
self.viewStartDate -= datetime.timedelta(minutes=self.viewStartDate.minute % 30,
seconds=self.viewStartDate.second)
self.onRedrawEPG(self.channelIdx, self.viewStartDate)
elif action.getId() in [KEY_CONTEXT_MENU] and controlInFocus is not None:
elif action.getId() in [KEY_CONTEXT_MENU, ACTION_PREVIOUS_MENU] and controlInFocus is not None:
program = self._getProgramFromControl(controlInFocus)
if program is not None:
self._showContextMenu(program)
else:
xbmc.log('[script.tvguide] Unhandled ActionId: ' + str(action.getId()), xbmc.LOGDEBUG)

@buggalo.buggalo_try_except({'method': 'TVGuide.onClick'})
def onClick(self, controlId):
Expand Down
2 changes: 1 addition & 1 deletion streaming.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def __init__(self):

def loadFavourites(self):
entries = list()
path = xbmc.translatePath('special://userdata/favourites.xml')
path = xbmc.translatePath(os.path.join('special://profile', 'favourites.xml'))
if os.path.exists(path):
f = open(path)
xml = f.read()
Expand Down