fit a widget size

[enigma2.git] / data / skin_default.xml

diff --git a/data/skin_default.xml b/data/skin_default.xml
index cc478d128146fbcd75f66046505cdd8de7a55434..38bdd736345159b189532e11dd6dff14c83705f5 100644 (file)
--- a/data/skin_default.xml
+++ b/data/skin_default.xml
@@ -433,19 +433,20 @@ self.instance.move(ePoint((720-wsizex)/2, (576-wsizey)/(count > 7 and 2 or 3)
        <!-- Mediaplayer -->
        <screen name="MediaPlayer" position="70,70" size="580,475" title="MediaPlayer">
                <ePixmap pixmap="skin_default/mediaplayer_bg.png" position="13,9" zPosition="-1" size="554,460" alphatest="on" />
-               <widget name="artisttext" position="20,11" size="60,17" font="Regular;16" valign="top" foregroundColor="#cccccc" transparent="1" />
-               <widget name="artist" position="80,11" size="353,17" font="Regular;16" valign="top" transparent="1" />
-               <widget name="albumtext" position="20,29" size="60,17" font="Regular;16" valign="top" foregroundColor="#cccccc" transparent="1" />
-               <widget name="album" position="80,29" size="353,17" font="Regular;16" valign="top" transparent="1" />
-               <widget name="yeartext" position="20,47" size="60,17" font="Regular;16" valign="top" foregroundColor="#cccccc" transparent="1" />
-               <widget name="year" position="80,47" size="353,17" font="Regular;16" valign="top" transparent="1" />
-               <widget name="genretext" position="20,65" size="60,17" font="Regular;16" valign="top" foregroundColor="#cccccc" transparent="1" />
-               <widget name="genre" position="80,65" size="353,17" font="Regular;16" valign="top" transparent="1" />
+               <widget name="artisttext" position="20,11" size="74,17" font="Regular;16" valign="top" foregroundColor="#cccccc" transparent="1" />
+               <widget name="artist" position="94,11" size="339,17" font="Regular;16" valign="top" transparent="1" />
+               <widget name="albumtext" position="20,29" size="74,17" font="Regular;16" valign="top" foregroundColor="#cccccc" transparent="1" />
+               <widget name="album" position="94,29" size="339,17" font="Regular;16" valign="top" transparent="1" />
+               <widget name="yeartext" position="20,47" size="74,17" font="Regular;16" valign="top" foregroundColor="#cccccc" transparent="1" />
+               <widget name="year" position="94,47" size="339,17" font="Regular;16" valign="top" transparent="1" />
+               <widget name="genretext" position="20,65" size="74,17" font="Regular;16" valign="top" foregroundColor="#cccccc" transparent="1" />
+               <widget name="genre" position="94,65" size="339,17" font="Regular;16" valign="top" transparent="1" />
                <eLabel name="nowPlaying" position="20,92" size="413,16" text="Now Playing" font="Regular;14" foregroundColor="#ffc435" transparent="1" />
                <widget name="title" position="20,108" size="413,18" font="Regular;16" valign="top" transparent="1" />
                <widget name="coverArt" pixmap="skin_default/no_coverArt.png" position="446,11" size="116,116" transparent="1" alphatest="blend" />
                <ePixmap pixmap="skin_default/icons/mp_buttons.png" position="454,136" size="108,13" alphatest="on" />
-               <widget name="PositionGauge" position="15,138" size="418,10" pointer="skin_default/position_pointer.png:540,0" seek_pointer="skin_default/position_pointer.png:540,0" transparent="1" />
+               <widget name="PositionGauge" position="15,138" size="396,10" pointer="skin_default/position_pointer.png:540,0" seek_pointer="skin_default/position_pointer.png:540,0" transparent="1" />
+               <widget name="repeat" pixmaps="skin_default/icons/repeat_off.png,skin_default/icons/repeat_on.png" position="416,135" size="22,15" transparent="1" alphatest="on"/>
                <widget name="filelist" position="15,163" size="550,138" scrollbarMode="showOnDemand" />
                <widget name="playlist" position="15,314" size="550,154" scrollbarMode="showOnDemand" selectionDisabled="1" />
                <widget name="currenttext" position="0,0" size="0,0" />
@@ -616,8 +617,18 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
                <widget name="menu" position="10,10" size="440,310" />
        </screen>
        <!-- Nim selection -->
-       <screen name="NimSelection" position="160,223" size="400,130" title="Choose Tuner">
-               <widget name="nimlist" position="10,10" size="380,105" />
+       <screen name="NimSelection" position="160,123" size="400,330" title="Choose Tuner">
+               <widget source="nimlist" render="Listbox" position="0,0" size="380,300" scrollbarMode="showOnDemand">
+                       <convert type="TemplatedMultiContent">
+                               {"template": [
+                                               MultiContentEntryText(pos = (10, 5), size = (360, 30), flags = RT_HALIGN_LEFT, text = 1), # index 1 is the nim name,
+                                               MultiContentEntryText(pos = (50, 30), size = (320, 30), font = 1, flags = RT_HALIGN_LEFT, text = 2), # index 2 is a description of the nim settings,
+                                       ],
+                                "fonts": [gFont("Regular", 20), gFont("Regular", 15)],
+                                "itemHeight": 70
+                               }
+                       </convert>
+               </widget>
        </screen>
        <!-- Nim setup -->
        <screen name="NimSetup" position="80,95" size="560,412" title="Reception Settings">
@@ -1117,7 +1128,7 @@ self.instance.move(ePoint(orgpos.x() + (orgwidth - newwidth)/2, orgpos.y()))
                <widget source="job_status" render="Label" position="15,246" size="278,62" font="Regular;28" />
                <widget source="job_name" render="Label" position="25,12" size="464,76" font="Regular;28" />
                <widget source="job_task" render="Label" position="19,93" size="475,61" font="Regular;28" />
-               <widget source="job_progress" render="Label" position="18,182" size="106,65" font="Regular;32">
+               <widget source="job_progress" render="Label" position="16,182" size="106,65" font="Regular;28">
                        <convert type="ProgressToText" />
                </widget>
                <widget source="finished" render="Pixmap" pixmap="skin_default/buttons/green.png" position="339,251" size="140,40" alphatest="on" >