--- squeezeplay/squeezeplay/share/applets/SetupWallpaper/SetupWallpaperApplet.lua.orig 2013-02-01 20:12:42.000000000 +0100 +++ squeezeplay/squeezeplay/share/applets/SetupWallpaper/SetupWallpaperApplet.lua 2010-07-19 03:24:18.000000000 +0200 @@ -159,7 +159,7 @@ local screen = screenWidth .. "x" .. screenHeight - if screen ~= "480x272" and screen ~= "240x320" and screen ~= "320x240" then + if screen ~= "480x272" and screen ~= "240x320" and screen ~= "320x240" and screen ~= "1024x600" then screen = nil end @@ -225,6 +225,8 @@ pattern = 'JIVE_' elseif screenWidth == 480 and screenHeight == 272 then pattern = 'FAB4_' + elseif screenWidth == 1024 and screenHeight == 600 then + pattern = 'JCD_' end if not self.wallpapers[name] and ( not pattern or ( pattern and string.match(patternMatch, pattern) ) ) then --- squeezeplay/squeezeplay/share/applets/WSVGAsmallSkin/WSVGAsmallSkinMeta.lua.orig 2013-02-01 20:11:53.000000000 +0100 +++ squeezeplay/squeezeplay/share/applets/WSVGAsmallSkin/WSVGAsmallSkinMeta.lua 2013-03-27 14:17:48.685926344 +0100 @@ -2,11 +2,11 @@ --[[ =head1 NAME -applets.WQVGAsmallSkin.WQVGAsmallSkinMeta +applets.WSVGAsmallSkin.WSVGAsmallSkinMeta =head1 DESCRIPTION -See L. +See L. =head1 FUNCTIONS @@ -37,7 +37,7 @@ end function registerApplet(self) - jiveMain:registerSkin(self:string("WQVGA_SMALL_SKIN"), "WQVGAsmallSkin", "skin") + jiveMain:registerSkin(self:string("WSVGA_SMALL_SKIN"), "WSVGAsmallSkin", "skin") end --- squeezeplay/squeezeplay/share/applets/WSVGAsmallSkin/strings.txt.orig 2013-02-01 20:11:53.000000000 +0100 +++ squeezeplay/squeezeplay/share/applets/WSVGAsmallSkin/strings.txt 2013-03-27 14:18:28.109922629 +0100 @@ -2,23 +2,23 @@ # The two letter codes are defined by ISO 639-1 # http://en.wikipedia.org/wiki/List_of_ISO_639_codes -WQVGA_SMALL_SKIN -# SLT: WQVGA refers to the "wide quarter VGA" resolution of the display - CS WQVGA skin malého písma - DA WQVGA-tema med små bogstaver - DE WQVGA-Skin – Kleine Schrift - EN WQVGA Small Print Skin - ES Máscara con letra pequeña WQVGA - FI Pieni WQVGA-tulostuspinta - FR Habillage à petits caractères WQVGA - IT Skin WQVGA a caratteri piccoli - NL WQVGA Small Print-skin - NO WQVGA-skall med liten skrift - PL Karnacja WQVGA (mały format) - RU Мелкая обложка, WQVGA - SV WQVGA-skal med liten text +WSVGA_SMALL_SKIN +# SLT: WSVGA refers to the "wide quarter VGA" resolution of the display + CS WSVGA skin malého písma + DA WSVGA-tema med små bogstaver + DE WSVGA-Skin – Kleine Schrift + EN WSVGA Small Print Skin + ES Máscara con letra pequeña WSVGA + FI Pieni WSVGA-tulostuspinta + FR Habillage à petits caractères WSVGA + IT Skin WSVGA a caratteri piccoli + NL WSVGA Small Print-skin + NO WSVGA-skall med liten skrift + PL Karnacja WSVGA (mały format) + RU Мелкая обложка, WSVGA + SV WSVGA-skal med liten text -WQVGA_SMALL_SKIN_FAB4 +WSVGA_SMALL_SKIN_FAB4 CS Skin s malým textem DA Tema med lille tekst DE Skin: kleine Schrift --- squeezeplay/squeezeplay/share/applets/WSVGAsmallSkin/WSVGAsmallSkinApplet.lua.orig 2013-03-28 03:59:14.926688240 +0100 +++ squeezeplay/squeezeplay/share/applets/WSVGAsmallSkin/WSVGAsmallSkinApplet.lua 2013-03-29 17:38:46.728797091 +0100 @@ -1,11 +1,11 @@ --[[ =head1 NAME -applets.WQVGAsmallSkin.WQVGAsmallSkinApplet +applets.WSVGAsmallSkin.WSVGAsmallSkinApplet =head1 DESCRIPTION -This applet implements a small print skin for 480x272 resolution +This applet implements a small print skin for 1024x600 resolution =head1 FUNCTIONS @@ -39,7 +39,7 @@ local debug = require("jive.utils.debug") local autotable = require("jive.utils.autotable") -local log = require("jive.utils.log").logger("applet.WQVGAsmallSkin") +local log = require("jive.utils.log").logger("applet.WSVGAsmallSkin") local EVENT_ACTION = jive.ui.EVENT_ACTION local EVENT_CONSUME = jive.ui.EVENT_CONSUME @@ -66,10 +66,10 @@ -- Define useful variables for this skin -local imgpath = "applets/WQVGAsmallSkin/images/" +local imgpath = "applets/WSVGAsmallSkin/images/" local fontpath = "fonts/" local FONT_NAME = "FreeSans" -local BOLD_PREFIX = "Bold" +local BOLD_PREFIX = "" function init(self) @@ -90,16 +90,16 @@ -- 3 is for a three line track, artist, and album (e.g., SBtouch) -- 2 is for a two line track, artist+album (e.g., SBradio, SBcontroller) NOWPLAYING_TRACKINFO_LINES = 3, - POPUP_THUMB_SIZE = 120, + POPUP_THUMB_SIZE = 300, radialClock = { - hourTickPath = 'applets/WQVGAsmallSkin/images/Clocks/Radial/radial_ticks_hr_on.png', - minuteTickPath = 'applets/WQVGAsmallSkin/images/Clocks/Radial/radial_ticks_min_on.png', + hourTickPath = 'applets/WSVGAsmallSkin/images/Clocks/Radial/radial_ticks_hr_on.png', + minuteTickPath = 'applets/WSVGAsmallSkin/images/Clocks/Radial/radial_ticks_min_on.png', }, nowPlayingScreenStyles = { -- every skin needs to start off with a nowplaying style { style = 'nowplaying', - artworkSize = '180x180', + artworkSize = '300x300', text = self:string("ART_AND_TEXT"), }, { @@ -110,18 +110,18 @@ }, { style = 'nowplaying_text_only', - artworkSize = '180x180', + artworkSize = '300x300', text = self:string("TEXT_ONLY"), }, { style = 'nowplaying_spectrum_text', - artworkSize = '180x180', + artworkSize = '300x300', localPlayerOnly = 1, text = self:string("SPECTRUM_ANALYZER"), }, { style = 'nowplaying_vuanalog_text', - artworkSize = '180x180', + artworkSize = '300x300', localPlayerOnly = 1, text = self:string("ANALOG_VU_METER"), }, @@ -244,7 +244,7 @@ -- skin -- The meta arranges for this to be called to skin the interface. function skin(self, s) - Framework:setVideoMode(480, 272, 0, false) + Framework:setVideoMode(1024, 600, 0, true) local screenWidth, screenHeight = Framework:getScreenSize() @@ -658,11 +658,11 @@ local SELECT_COLOR = { 0xE7, 0xE7, 0xE7 } local SELECT_SH_COLOR = { } - local TITLE_HEIGHT = 47 - local TITLE_FONT_SIZE = 20 - local ALBUMMENU_FONT_SIZE = 18 - local ALBUMMENU_SMALL_FONT_SIZE = 14 - local TEXTMENU_FONT_SIZE = 20 + local TITLE_HEIGHT = 65 + local TITLE_FONT_SIZE = 30 + local ALBUMMENU_FONT_SIZE = 25 + local ALBUMMENU_SMALL_FONT_SIZE = 18 + local TEXTMENU_FONT_SIZE = 25 local POPUP_TEXT_SIZE_1 = 34 local POPUP_TEXT_SIZE_2 = 26 local TRACK_FONT_SIZE = 18 @@ -1482,8 +1482,8 @@ text = { line = { { - font = _boldfont(18), - height = 18, + font = _boldfont(30), + height = 32, }, { font = _font(14), @@ -1503,7 +1503,7 @@ padding = { 4, 15, 4, 15 }, }) - -- choose player window is exactly the same as text_list on all windows except WQVGAlarge + -- choose player window is exactly the same as text_list on all windows except WSVGAlarge s.choose_player = s.text_list s.multiline_text_list = _uses(s.text_list) @@ -1671,7 +1671,7 @@ line = { { font = _boldfont(ALBUMMENU_FONT_SIZE), - height = 22, + height = 25, }, { font = _font(ALBUMMENU_SMALL_FONT_SIZE), @@ -2063,11 +2063,11 @@ }, menu = { - h = CM_MENU_HEIGHT * 4, + h = CM_MENU_HEIGHT * 8, border = { 7, 0, 7, 0 }, padding = { 0, 0, 0, 100 }, scrollbar = { - h = CM_MENU_HEIGHT * 4, + h = CM_MENU_HEIGHT * 8, }, item = { h = CM_MENU_HEIGHT, @@ -2806,12 +2806,12 @@ -- BEGIN NowPlaying skin code - local NP_ARTISTALBUM_FONT_SIZE = 20 - local NP_TRACK_FONT_SIZE = 24 + local NP_ARTISTALBUM_FONT_SIZE = 26 + local NP_TRACK_FONT_SIZE = 28 - local controlHeight = 38 - local controlWidth = 45 - local volumeBarWidth = 163 -- screenWidth - (transport controls + volume controls + dividers + border around volume bar) + local controlHeight = 76 + local controlWidth = 90 + local volumeBarWidth = 440 -- screenWidth - (transport controls + volume controls + dividers + border around volume bar) local buttonPadding = 0 local _transportControlButton = { @@ -2838,7 +2838,7 @@ align = "left", lineHeight = NP_TRACK_FONT_SIZE, fg = TEXT_COLOR, - x = 198, + x = 318, } s.nowplaying = _uses(s.window, { @@ -2865,7 +2865,7 @@ position = _tracklayout.position, border = _tracklayout.border, x = _tracklayout.x, - y = TITLE_HEIGHT + 32, + y = TITLE_HEIGHT + 32 + 100, h = 32, nptrack = { w = screenWidth - _tracklayout.x - 10, @@ -2882,7 +2882,7 @@ position = _tracklayout.position, border = _tracklayout.border, x = _tracklayout.x, - y = TITLE_HEIGHT + 32 + 32, + y = TITLE_HEIGHT + 32 + 32 + 100 , h = 32, npartist = { padding = { 0, 6, 0, 0 }, @@ -2899,7 +2899,7 @@ position = _tracklayout.position, border = _tracklayout.border, x = _tracklayout.x, - y = TITLE_HEIGHT + 32 + 32 + 32, + y = TITLE_HEIGHT + 32 + 32 + 32 + 100, h = 32, npalbum = { w = screenWidth - _tracklayout.x - 10, @@ -2917,15 +2917,15 @@ -- cover art npartwork = { - w = 180, + w = 300, position = LAYOUT_NONE, x = 8, - y = TITLE_HEIGHT + 4, + y = TITLE_HEIGHT + 25, align = "center", - h = 180, + h = 300, artwork = { - w = 180, + w = 300, align = "center", padding = 0, img = false, @@ -3030,46 +3030,46 @@ -- Progress bar npprogress = { position = LAYOUT_NONE, - x = 202, - y = TITLE_HEIGHT + 29 + 26 + 32 + 32 + 23, + x = 322, + y = TITLE_HEIGHT + 29 + 26 + 32 + 32 + 23 + 100, padding = { 0, 10, 0, 0 }, order = { "elapsed", "slider", "remain" }, elapsed = { - w = 45, + w = 70, align = 'left', - padding = { 0, 0, 4, 10 }, - font = _boldfont(12), + padding = { 0, 0, 4, 20 }, + font = _boldfont(18), fg = { 0xe7,0xe7, 0xe7 }, sh = { 0x37, 0x37, 0x37 }, }, remain = { - w = 45, + w = 70, align = 'right', - padding = { 4, 0, 0, 10 }, - font = _boldfont(12), + padding = { 4, 0, 0, 20 }, + font = _boldfont(18), fg = { 0xe7,0xe7, 0xe7 }, sh = { 0x37, 0x37, 0x37 }, }, elapsedSmall = { - w = 45, + w = 70, align = 'left', - padding = { 0, 0, 4, 10 }, - font = _boldfont(9), + padding = { 0, 0, 4, 20 }, + font = _boldfont(18), fg = { 0xe7,0xe7, 0xe7 }, sh = { 0x37, 0x37, 0x37 }, }, remainSmall = { - w = 45, + w = 70, align = 'right', - padding = { 4, 0, 0, 10 }, - font = _boldfont(9), + padding = { 4, 0, 0, 20 }, + font = _boldfont(18), fg = { 0xe7,0xe7, 0xe7 }, sh = { 0x37, 0x37, 0x37 }, }, npprogressB = { - w = 180, - h = 25, - padding = { 0, 0, 0, 18 }, + w = 280, + h = 50, + padding = { 0, 0, 0, 0 }, position = LAYOUT_SOUTH, horizontal = 1, bgImg = _songProgressBackground, @@ -3081,12 +3081,12 @@ npprogressNB = { order = { "elapsed" }, position = LAYOUT_NONE, - x = 202, - y = TITLE_HEIGHT + 29 + 26 + 32 + 32 + 23, + x = 322, + y = TITLE_HEIGHT + 29 + 26 + 32 + 32 + 23 + 100, elapsed = { w = WH_FILL, align = "left", - font = _boldfont(12), + font = _boldfont(18), fg = { 0xe7, 0xe7, 0xe7 }, sh = { 0x37, 0x37, 0x37 }, }, @@ -3102,7 +3102,7 @@ s.npvolumeB = { w = volumeBarWidth, - border = { 5, 3, 5, 0 }, + border = { 5, 20, 5, 0 }, padding = { 6, 0, 6, 0 }, position = LAYOUT_SOUTH, horizontal = 1, @@ -3219,7 +3219,7 @@ npprogress = { x = 10, y = 200, - w = screenWidth - 20, + w = screenWidth - 150, elapsed = { w = 50, },