Skip to content

Commit

Permalink
Update to 2.0.15
Browse files Browse the repository at this point in the history
include most pull requests from original (hippojay,arctelix,rogerbramon)
  • Loading branch information
jester-xbmc committed May 5, 2015
1 parent 65e279f commit 6bf0829
Show file tree
Hide file tree
Showing 13 changed files with 85 additions and 38 deletions.
8 changes: 4 additions & 4 deletions 1080i/DialogPictureInfo.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@
<scrolltime tween="sine" easing="inout">280</scrolltime>
<itemlayout height="60">
<control type="label">
<posx>1100</posx>
<posx>300</posx>
<height>70</height>
<width>800</width>
<align>right</align>
<align>left</align>
<scroll>false</scroll>
<font>ListDetails</font>
<info>ListItem.Label2</info>
Expand All @@ -60,10 +60,10 @@
<texture border="2">buttons/ButtonFO.png</texture>
</control>
<control type="label">
<posx>1100</posx>
<posx>300</posx>
<height>70</height>
<width>800</width>
<align>right</align>
<align>left</align>
<font>ListDetails</font>
<info>ListItem.Label2</info>
</control>
Expand Down
5 changes: 3 additions & 2 deletions 1080i/DialogSeekBar.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,9 @@
<height>18</height>
<texturebg border="15,0,15,0">VideoOSD/ProgressBG.png</texturebg>
<midtexture border="15,0,15,0">VideoOSD/ProgressBar.png</midtexture>
<info>Player.CacheLevel</info>
<visible>Player.Caching</visible>
<colordiffuse>Diffuse2</colordiffuse>
<info>Player.ProgressCache</info>
<visible>true</visible>
</control>
<control type="progress" id="23" description="Progress Bar">
<posx>600</posx>
Expand Down
23 changes: 23 additions & 0 deletions 1080i/Home.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,29 @@
<animation effect="fade" start="0" end="100" time="200" condition="!Window.Previous(Startup.xml)">Conditional</animation>
<include condition="Skin.HasSetting(VerticalHome)">Vertical_Home_Layout</include>
<include condition="!Skin.HasSetting(VerticalHome)">Horizontal_Home_Layout</include>
<control type="group" description="Plexhome user">
<control type="label"> <!-- username -->
<visible>Skin.HasSetting(plexbmc) + substring(Window(Home).Property(plexbmc.plexhome_enabled),true)</visible>
<posx>1800</posx>
<posy>1020</posy>
<width>460</width>
<height>80</height>
<aligny>bottom</aligny>
<align>right</align>
<textcolor>Grey3</textcolor>
<shadowcolor>ShadowDark</shadowcolor>
<label>$INFO[Window(Home).Property(plexbmc.plexhome_user)]</label>
<font>Volume</font>
</control>
<control type="image"> <!-- avatar -->
<visible>Skin.HasSetting(plexbmc) + substring(Window(Home).Property(plexbmc.plexhome_enabled),true)</visible>
<posx>1810</posx>
<posy>995</posy>
<width>74</width>
<height>68</height>
<texture diffuse="plexbmc/circle.png" >$INFO[Window(Home).Property(plexbmc.plexhome_avatar)]</texture>
</control>
</control>
<control type="group" description="RSS">
<visible>system.getbool(lookandfeel.enablerssfeeds)</visible>
<control type="image">
Expand Down
4 changes: 2 additions & 2 deletions 1080i/MyPVRGuide.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
<control type="group" id="50">
<include>OpenClose</include>
<include>EPGTimelineView</include>
<include>LiveTVGuideNowView</include>
<include>LiveTVGuideNextView</include>
<include>LiveTVGuideNowNextView</include>
<include>LiveTVGuideChannelView</include>
</control>
<control type="group" description="EPG Timeline Info">
<visible>Control.IsVisible(10)</visible>
Expand Down
13 changes: 12 additions & 1 deletion 1080i/VideoFullScreen.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,25 @@
<include>OSDFade</include>
<visible>[Player.ShowInfo | Window.IsActive(VideoOSD)] + ![Window.IsVisible(OSDVideoSettings) | Window.IsVisible(OSDAudioSettings) | Window.IsVisible(VideoBookmarks) | Window.IsVisible(PVROSDChannels) | Window.IsVisible(PVROSDGuide) | Window.IsVisible(SliderDialog)] + [VideoPlayer.Content(LiveTV)]</visible>
<animation effect="fade" time="200">VisibleChange</animation>
<!-- Background ist scaled depending of the visability of the Video OSD, so no overlapping of Backgrounds -->
<control type="image" id="1">
<visible>!Window.IsActive(VideoOSD)</visible>
<posx>0</posx>
<posy>0</posy>
<width>1920</width>
<height>261</height>
<texture border="0,30,0,30">OSD/OSDBackground.png</texture>
<colordiffuse>FFE2E2E2</colordiffuse>
</control>
<control type="image" id="1">
<visible>Window.IsActive(VideoOSD)</visible>
<posx>0</posx>
<posy>0</posy>
<width>1920</width>
<height>361</height>
<texture border="0,30,0,30">OSD/OSDBackground.png</texture>
<colordiffuse>FFE2E2E2</colordiffuse>
</control>
<control type="image" id="1">
<posx>200</posx>
<posy>20</posy>
Expand Down Expand Up @@ -378,4 +389,4 @@
</control>
</control>
</controls>
</window>
</window>
2 changes: 2 additions & 0 deletions 1080i/VideoOSD.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
<posx>0</posx>
<posy>0</posy>
<control type="group">
<!-- Hide Background of Video Controls when in Live TV as Background from VideoFullscreen.xml is used -->
<visible>!VideoPlayer.Content(LiveTV)</visible>
<control type="group" description="Dialog Background">
<control type="image" description="Background">
<posx>0</posx>
Expand Down
3 changes: 2 additions & 1 deletion 1080i/View_PVR.xml
Original file line number Diff line number Diff line change
Expand Up @@ -646,7 +646,8 @@
<onright>101</onright>
<onup>10</onup>
<ondown>10</ondown>
<onback>101</onback>
<!-- commented out the next line below so it is possible to exit Timeline with backspace -->
<!-- <onback>101</onback> -->
<rulerlayout height="80" width="60">
<control type="image" id="1" description="Header row">
<width>60</width>
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
skin.amber
==========

Amber skin for Kodi/Helix
Amber skin for Kodi/XBMC
4 changes: 2 additions & 2 deletions addon.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<addon id="skin.amber" version="2.0.12" name="Amber" provider-name="Pecinko">
<addon id="skin.amber" version="2.0.15" name="Amber" provider-name="Pecinko">
<requires>
<import addon="xbmc.gui" version="5.3.0"/>
<import addon="script.favourites" version="3.2.0"/>
Expand Down Expand Up @@ -38,4 +38,4 @@
<source>https://github.com/pecinko/skin.amber</source>
<forum>http://forum.kodi.tv/showthread.php?tid=203708</forum>
</extension>
</addon>
</addon>
Binary file modified backgrounds/TVShows.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 13 additions & 4 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
2.0.15
Update german translation, exit Timeline with "Back-Key", no overlapping of Backgrounds for Video Controls from VideoOSD.xml,
Hide Background of Video Controls when in Live TV as Background from VideoFullScreen.xml is used, Added Plex User Display

2.0.14
Undefined Includes fix, fixed EPG Guide view (now, next, channel), Picture dialog alignment error fixed

2.0.13
Add seekbar buffer amount, Plexbmc fixes, add license/forum/source to addon.xml

2.0.12
Add Live-TV OSD and add "Launch" button to DialogAddonInfo

Expand Down Expand Up @@ -36,15 +46,14 @@ Re-wamp media covers
Add videoplaylist link to side menu
Fix settings descriptions


1.5.8
Fix add ons settings
Add option to hide library sections - plexbmc profiles support
Fix add ons settings
Add option to hide library sections - plexbmc profiles support
Increase plexbmc episode items
Finally fix busy dialog
Plexbmc add-on support improvements
Add holiday snowfall effect
Fix size and scrolling of titles in panel view

Ver 1.5.0
Initial release to Gotham repository
Initial release to Gotham repository
42 changes: 21 additions & 21 deletions language/German/strings.po
Original file line number Diff line number Diff line change
Expand Up @@ -46,23 +46,23 @@ msgstr "Geteilt"

msgctxt "#31007"
msgid "PleKodi settings"
msgstr "PleKodi-Einstellungen"
msgstr "Plex AddOn Einstellungen"

msgctxt "#31008"
msgid "Go Plex"
msgstr "Plex"
msgstr "Zeige Plex-Bibliothek"

msgctxt "#31009"
msgid "Go Kodi"
msgstr "Kodi"
msgstr "Zeige Kodi-Bibliothek"

msgctxt "#31010"
msgid "Queue"
msgstr "Abspielliste"

msgctxt "#31011"
msgid "Recently Viewed"
msgstr "Zuletzt angeschaut"
msgstr "Zuletzt gesehen"

msgctxt "#31012"
msgid "Recently Released"
Expand All @@ -74,7 +74,7 @@ msgstr "Zuletzt ausgestrahlt"

msgctxt "#31014"
msgid "On Deck"
msgstr "Im Deck"
msgstr "Aktuell"

msgctxt "#31020"
msgid "Recently Added"
Expand All @@ -98,7 +98,7 @@ msgstr "Einstellungslevel"

msgctxt "#31110"
msgid "Edit Background for Media Type"
msgstr "Hintergrund für Menüpunkt ändern"
msgstr "Hintergrund für den Menüpunkt ändern"

msgctxt "#31113"
msgid "Single Image"
Expand All @@ -114,7 +114,7 @@ msgstr "Musik-Wiedergabeliste starten, wenn Kodi gestartet wird"

msgctxt "#31116"
msgid "Startup playlist"
msgstr "Einschalt-Wiedergabeliste"
msgstr "Autostart-Wiedergabeliste"

msgctxt "#31132"
msgid "Lyrics Add-on"
Expand Down Expand Up @@ -226,31 +226,31 @@ msgstr "Verfügbare[CR]Gruppen"

msgctxt "#31507"
msgid "Movies homescreen button opens:"
msgstr "Home-Screen-Knopf für Filme öffnet:"
msgstr "\"Filme\" im Hauptmenü öffnet:"

msgctxt "#31508"
msgid "TV Shows homescreen button opens:"
msgstr "TV Serien Hauptmenüknopf öffnet:"
msgstr "\"Serien\" im Hauptmenü öffnet:"

msgctxt "#31510"
msgid "Timer Set"
msgstr "Timer gesetzt"

msgctxt "#31901"
msgid "36 Hour Forecast"
msgstr "36 Stunden-Prognose"
msgstr "36 Stunden Vorhersage"

msgctxt "#31902"
msgid "Hourly Forecast"
msgstr "Stündliche Prognose"
msgstr "Stündliche Vorhersage"

msgctxt "#31903"
msgid "Weekend Forecast"
msgstr "Wochenendprognose"
msgstr "Wöchentliche Vorhersage"

msgctxt "#31904"
msgid "10 Day Forecast"
msgstr "10 Tage-Prognose"
msgstr "10 Tage Vorhersage"

msgctxt "#31954"
msgid "S"
Expand All @@ -266,7 +266,7 @@ msgstr "Lade Theme"

msgctxt "#31957"
msgid "Hide Update library button from home submenu"
msgstr "Bibliothek aktualisieren-Schaltfläche im Hauptuntermenü verbergen"
msgstr "\"Bibliothek aktualisieren\" im Hauptuntermenü verbergen"

msgctxt "#31958"
msgid "Big Panel"
Expand All @@ -282,27 +282,27 @@ msgstr "Musik öffnet Künstler"

msgctxt "#31961"
msgid "Recently added"
msgstr "Zuletzt hinzugefügte Konzerte"
msgstr "Zuletzt hinzugefügt"

msgctxt "#31962"
msgid "Low List"
msgstr "Empfohlene Konzerte"
msgstr "Liste (niedrig)"

msgctxt "#31963"
msgid "Panel"
msgstr "Empfohlene Alben"
msgstr "Panel"

msgctxt "#31964"
msgid "Configure shelf items"
msgstr "Shelf-Inhalt konfigurieren"

msgctxt "#31965"
msgid "Banner List"
msgstr "Empfohlene Folge"
msgstr "Banner Liste"

msgctxt "#31966"
msgid "Recommended"
msgstr "Empfohlene Filme"
msgstr "Empfohlen"

msgctxt "#31967"
msgid "Enable Home shelf"
Expand Down Expand Up @@ -354,7 +354,7 @@ msgstr "Statistik im Homebildschirm anzeigen"

msgctxt "#31979"
msgid "Loading..."
msgstr "Arbeitet..."
msgstr "Bitte warten..."

msgctxt "#31980"
msgid "Hide unwatched and partialy watched marks"
Expand Down Expand Up @@ -422,7 +422,7 @@ msgstr "Home-Layout"

msgctxt "#31996"
msgid "Holiday snowfall theme"
msgstr "Winterlicher Schneefall"
msgstr "\"Winter / Schnefall\" Animation"

msgctxt "#31997"
msgid "Hide channel logos in PVR List/Timeline"
Expand Down
Binary file added media/plexbmc/circle.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 6bf0829

Please sign in to comment.