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

Revert " v7.0.3+beta.3.unofficial.1" #577

Merged
merged 1 commit into from
Feb 9, 2024
+1 −289
Merged

Revert " v7.0.3+beta.3.unofficial.1" #577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion resources/lib/youtube_plugin/kodion/abstract_provider.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ def run_wizard(self, context):
settings.set_bool(settings.SETUP_WIZARD, False)

wizard_steps = self.get_wizard_steps(context)
wizard_steps.extend(ui.get_view_manager().get_wizard_steps())

if (wizard_steps and ui.on_yes_no_input(
context.get_name(), context.localize('setup_wizard.execute')
Expand Down
1 change: 0 additions & 1 deletion resources/lib/youtube_plugin/kodion/context/xbmc/xbmc_context.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,6 @@ def set_content(self, content_type, sub_type=None, category_label=None):
type=(sub_type or content_type), path=self.get_path()
))
xbmcplugin.setContent(self._plugin_handle, content_type)
self.get_ui().get_view_manager().set_view_mode(content_type)
if category_label is None:
category_label = self.get_param('category_label')
if category_label:
Expand Down
9 changes: 0 additions & 9 deletions resources/lib/youtube_plugin/kodion/plugin/xbmc/xbmc_runner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,15 +106,6 @@ def run(self, provider, context):
updateListing=options.get(provider.RESULT_UPDATE_LISTING, False),
cacheToDisc=options.get(provider.RESULT_CACHE_TO_DISC, True)
)

# set alternative view mode
view_manager = ui.get_view_manager()
if view_manager.is_override_view_enabled():
view_mode = view_manager.get_view_mode()
if view_mode is not None:
context.log_debug('Override view mode to "%d"' % view_mode)
context.execute('Container.SetViewMode(%d)' % view_mode)

return succeeded

def _set_resolved_url(self, context, base_item, show_fanart):
Expand Down
3 changes: 0 additions & 3 deletions resources/lib/youtube_plugin/kodion/ui/abstract_context_ui.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@ def __init__(self):
def create_progress_dialog(self, heading, text=None, background=False):
raise NotImplementedError()

def get_view_manager(self):
raise NotImplementedError()

def on_keyboard_input(self, title, default='', hidden=False):
raise NotImplementedError()

Expand Down
236 changes: 0 additions & 236 deletions resources/lib/youtube_plugin/kodion/ui/xbmc/view_manager.py
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions resources/lib/youtube_plugin/kodion/ui/xbmc/xbmc_context_ui.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

from __future__ import absolute_import, division, unicode_literals

from .view_manager import ViewManager
from .xbmc_progress_dialog import XbmcProgressDialog, XbmcProgressDialogBG
from ..abstract_context_ui import AbstractContextUI
from ...compatibility import xbmc, xbmcgui
Expand All @@ -25,19 +24,13 @@ def __init__(self, xbmc_addon, context):
self._xbmc_addon = xbmc_addon

self._context = context
self._view_manager = None

def create_progress_dialog(self, heading, text=None, background=False):
if background:
return XbmcProgressDialogBG(heading, text)

return XbmcProgressDialog(heading, text)

def get_view_manager(self):
if self._view_manager is None:
self._view_manager = ViewManager(self._context)

return self._view_manager

def on_keyboard_input(self, title, default='', hidden=False):
# Starting with Gotham (13.X > ...)
Expand Down
33 changes: 1 addition & 32 deletions resources/settings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -703,37 +703,6 @@
</setting>
</group>
<group id="3">
<setting id="kodion.view.override" type="boolean" label="30026" help="">
<level>0</level>
<default>false</default>
<control type="toggle"/>
</setting>
<setting id="kodion.view.default" type="integer" label="30027" help="">
<level>0</level>
<default>55</default>
<dependencies>
<dependency type="enable">
<condition setting="kodion.view.override" operator="is">true</condition>
</dependency>
</dependencies>
<control format="integer" type="edit">
<heading>30027</heading>
</control>
</setting>
<setting id="kodion.view.episodes" type="integer" label="30028" help="">
<level>0</level>
<default>55</default>
<dependencies>
<dependency type="enable">
<condition setting="kodion.view.override" operator="is">true</condition>
</dependency>
</dependencies>
<control format="integer" type="edit">
<heading>30028</heading>
</control>
</setting>
</group>
<group id="4">
<setting id="kodion.cache.size" type="integer" label="30024" help="">
<level>0</level>
<default>20</default>
Expand All @@ -752,7 +721,7 @@
<control type="toggle"/>
</setting>
</group>
<group id="5">
<group id="4">
<setting id="youtube.language" type="string" label="30523" help="">
<level>0</level>
<default>en-US</default>
Expand Down
Loading