Titanium Extended (1 Viewer)

[ge2301]

For testing I removed all skin files from SlimTVClient besides Default, that should have the same effect as your change. Then I copied the default folder in BV themes and renamed it again to "Titanium Extended". I still get the same error message in logfiles, see attachment.

I have built my client just today based on latest branch, so there souldn't be any differences

 

[morpheus_xx]

I can confirm this issue, but already fixed it.

Same explanation as before:
MediaPortal.Utilities.Exceptions.EnvironmentException: Error loading style resource 'C:\Users\Gerrit\Documents\Mediaportal 2\Work_new\MediaPortal\Bin\MP2-Client\bin\x86\Release\Plugins\OnlineVideos\Skin\BlueVision\themes\Titanium Extended\styles\OnlineVideosStyles.xaml' ---> MediaPortal.UI.SkinEngine.Xaml.Exceptions.XamlLoadException: XAML loader: Error parsing file 'C:\Users\Gerrit\Documents\Mediaportal 2\Work_new\MediaPortal\Bin\MP2-Client\bin\x86\Release\Plugins\OnlineVideos\Skin\BlueVision\themes\Titanium Extended\styles\OnlineVideosStyles.xaml' ---> MediaPortal.UI.SkinEngine.Xaml.Exceptions.XamlBindingException: Could not evaluate markup extension 'ThemeResource ResourceKey=DefaultScrollViewerStyle'
--> OnlineVideosStyles needs to depend on "OtherControls"

Next step which was missing are the MediaConsts inside OtherControls

So can I force-push?

 

[ge2301]

So can I force-push?

OK.

Next step which was missing are the MediaConsts inside OtherControls

Yes, I was missing this one in second try... it works now

 

[morpheus_xx]

Done, force-pushed the branch. Please check it out again. Have to leave now...

 

[ge2301]

It seems there were problems with force-push. When I pulled to my local branch it showed a list of conflicts.
A message told me I should commit after resolving the conflicts. Should I? I didn't press ok yet:

 

[morpheus_xx]

I think the easiest way is following:

1. Copy away all your changed files to another folder outside git management
2. Check out remote branch in "reset changes" mode
3. Copy back your modified files

 

[morpheus_xx]

You just have created a "circle" of commits again

FEAT_BlueVision_All_V2 is my one, based linear after dev commits.
origin/FEAT_BlueVision_All_V2 you have pushed now, it merges my one with the old, obsolete branch.

Can I force push my one again, to "cut off" origin to the intended commit?

 

[ge2301]

I'm lost with GitHub. Shall I better completely delete my local branch and pull it after your change into an empty folder?
Otherwise the same will happen again I guess

Edit: I have a backup of my branch of course

 

[morpheus_xx]

No worries, git is not that easy...

Shall I better completely delete my local branch and pull it after your change into an empty folder?

This would be the same effect as if you check out the remote branch and use "reset" option. If you do so, the local branch is overwritten by remote one (which I had pushed)

I will now force-push again, so you can try it in few seconds

 

[ge2301]

I have only Switch/checkout and here the options are different: