RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-12-26 09:02:38 +00:00
Code Issues Releases Wiki Activity

Rename the default GUI skins directory from 'Skin' to 'skins', keeping

Browse Source 
backwards compatibility.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17975 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2006-03-27 11:39:27 +00:00
parent 171de9cf5f
commit b5743fcfda
41 changed files with 142 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -122,6 +122,7 @@ MPlayer (1.0)
* bitexact decoding
GUI:
* skins now reside in a directory named 'skins', not 'Skin'
* ported to GTK2
* long standing up side down vpotmeter bug fixed
* don't hang on unreadable skin files

6
DOCS/de/documentation.html
View File

@ -919,12 +919,12 @@ verwenden.</P>
herunterladen, wenn du das GUI verwenden willst. Schau dazu auf die <A
HREF="http://www.mplayerhq.hu/dload.html">Download-Seite</A>. Diese
sollten in das normale, systemweite Verzeichnis
(<CODE>$PREFIX/share/mplayer/Skin</CODE>) oder nach
<CODE>$HOME/.mplayer/Skin</CODE> extrahiert werden. MPlayer sucht
(<CODE>$PREFIX/share/mplayer/skins/</CODE>) oder nach
<CODE>$HOME/.mplayer/skins/</CODE> extrahiert werden. MPlayer sucht
standardm&auml;&szlig;ig nach einem Verzeichnis namens <CODE>default</CODE>,
aber du kannst mit der Option <CODE>-skin (neuer Skin)</CODE> oder dem Eintrag
<CODE>skin=(neuer Skin)</CODE> in der Konfigurationsdatei den Skin
<CODE>*/Skin/(neuer Skin)</CODE> ausw&auml;hlen.</P>
<CODE>*/skins/(neuer Skin)</CODE> ausw&auml;hlen.</P>
<H2><A NAME="subtitles_osd">1.4 Untertitel und das OSD</H2>

6
DOCS/it/documentation.html
View File

@ -790,11 +790,11 @@ Quindi, per usare la modalit
<P>Dato che MPlayer non ha una skin inclusa, devi scaricarle
se vuoi usare la GUI. Vedi la <A HREF="http://www.mplayerhq.hu/dload.html">pagina dei download</A>.
Dovranno essere estratti nella solita directory valida per tutto il sistema (<CODE>$PREFIX/share/mplayer/Skin</CODE>),
o in <CODE>$HOME/.mplayer/Skin</CODE> . MPlayer cerca in
Dovranno essere estratti nella solita directory valida per tutto il sistema (<CODE>$PREFIX/share/mplayer/skins/</CODE>),
o in <CODE>$HOME/.mplayer/skins/</CODE> . MPlayer cerca in
queste una directory di nome <I>default</I>, ma puoi usare l'opzione
<I>-skin nuovaskin</I>, o la direttiva <I>skin=nuovaskin</I> del file di configurazione
per usare la skin nella directory <CODE>*/Skin/nuovaskin</CODE>.</P>
per usare la skin nella directory <CODE>*/skins/nuovaskin</CODE>.</P>
<H2><A NAME="subtitles_osd">1.4. Sottotitoli e OSD</A></H2>

8
DOCS/it/skin.html
View File

@ -47,9 +47,9 @@ una skin per poter usare la GUI.</b></p>
<p>Le directory in cui si cerca per le skin sono (in ordine):
<pre>
$(DATADIR)/Skin/
$(PREFIX)/share/mplayer/Skin/
~/.mplayer/Skin/
$(DATADIR)/skins/
$(PREFIX)/share/mplayer/skins/
~/.mplayer/skins/
</pre>
<p>Nota che il primo path può variare a seconda di come è stato configurato
@ -59,7 +59,7 @@ una skin per poter usare la GUI.</b></p>
<p>Ogni skin è installata in una sua propria directory sotto una delle directory
elencate sopra, per esempio:
<pre>
$(PREFIX)/share/mplayer/Skin/default/
$(PREFIX)/share/mplayer/skins/default/
</pre>

6
DOCS/man/cs/mplayer.1
View File

@ -892,14 +892,14 @@ P
.TP
.B \-skin <jméno> (pouze GUI)
Nahraje skin z adresáře <jméno>. Zde jsou výchozí
adresáøe se skiny:\& /usr/\:local/\:share/\:mplayer/\:Skin/\: a ~/.mplayer/\:Skin/.
adresáøe se skiny:\& /usr/\:local/\:share/\:mplayer/\:skins/\: a ~/.mplayer/\:skins/.
.sp 1
.I PŘÍKLAD:
.PD 0
.RSs
.IPs "\-skin fittyfene"
Zkou¹í /usr/\:local/\:share/\:mplayer/\:Skin/\:fittyfene
a poté ~/.mplayer/\:Skin/\:fittyfene.
Zkou¹í /usr/\:local/\:share/\:mplayer/\:skins/\:fittyfene
a poté ~/.mplayer/\:skins/\:fittyfene.
.RE
.PD 1
.

6
DOCS/man/de/mplayer.1
View File

@ -943,14 +943,14 @@ Spielt die Dateien in zuf
.B \-skin <Name> (nur mit GUI)
Lädt eine Oberfläche (skin) aus dem angegebenen Verzeichnis, das sich in einem
der beiden Standardoberflächenverzeichnisse
/usr/\:local/\:share/\:mplayer/\:Skin/\: und ~/.mplayer/\:Skin/ befindet.
/usr/\:local/\:share/\:mplayer/\:skins/\: und ~/.mplayer/\:skins/ befindet.
.sp 1
.I BEISPIEL:
.PD 0
.RSs
.IPs "\-skin fittyfene"
Probiert zuerst /usr/\:local/\:share/\:mplayer/\:Skin/\:fittyfene und
anschließend ~/.mplayer/\:Skin/\:fittyfene.
Probiert zuerst /usr/\:local/\:share/\:mplayer/\:skins/\:fittyfene und
anschließend ~/.mplayer/\:skins/\:fittyfene.
.RE
.PD 1
.

6
DOCS/man/en/mplayer.1
View File

@ -901,14 +901,14 @@ Play files in random order.
.TP
.B \-skin <name> (GUI only)
Loads a skin from the directory given as parameter below the default skin
directories, /usr/\:local/\:share/\:mplayer/\:Skin/\: and ~/.mplayer/\:Skin/.
directories, /usr/\:local/\:share/\:mplayer/\:skins/\: and ~/.mplayer/\:skins/.
.sp 1
.I EXAMPLE:
.PD 0
.RSs
.IPs "\-skin fittyfene"
Tries /usr/\:local/\:share/\:mplayer/\:Skin/\:fittyfene
and afterwards ~/.mplayer/\:Skin/\:fittyfene.
Tries /usr/\:local/\:share/\:mplayer/\:skins/\:fittyfene
and afterwards ~/.mplayer/\:skins/\:fittyfene.
.RE
.PD 1
.

6
DOCS/man/es/mplayer.1
View File

@ -662,14 +662,14 @@ Reproduce archivos en orden aleatorio.
.B \-skin <nombre> (sólo GUI)
Carga un skin del directorio dado como parámetro bajo el directorio
por defecto para los skins, /usr/\:local/\:share/\:mplayer/ y
~/.mplayer/\:Skin/.
~/.mplayer/\:skins/.
.sp 1
.I EJEMPLO:
.PD 0
.RSs
.IPs "\-skin fittyfene"
Intenta usar /usr/\:local/\:share/\:mplayer/\:Skin/\:fittyfene y
después ~/.mplayer/\:Skin/\:fittyfene.
Intenta usar /usr/\:local/\:share/\:mplayer/\:skins/\:fittyfene y
después ~/.mplayer/\:skins/\:fittyfene.
.RE
.PD 1
.

6
DOCS/man/fr/mplayer.1
View File

@ -934,14 +934,14 @@ Joue les fichiers en ordre al
.TP
.B \-skin <nom_skin> (GUI uniquement)
Charge le skin <nom_skin> (revêtement décoratif) depuis les répertoires
par défaut /usr/\:local/\:share/\:mplayer/\:Skin/\: et ~/.mplayer/\:Skin/.
par défaut /usr/\:local/\:share/\:mplayer/\:skins/\: et ~/.mplayer/\:skins/.
.sp 1
.I EXEMPLE:
.PD 0
.RSs
.IPs "\-skin fittyfene"
Essaie /usr/\:local/\:share/\:mplayer/\:Skin/\:fittyfene en premier, puis
~/.mplayer/\:Skin/\:fittyfene en cas d'échec.
Essaie /usr/\:local/\:share/\:mplayer/\:skins/\:fittyfene en premier, puis
~/.mplayer/\:skins/\:fittyfene en cas d'échec.
.RE
.PD 1
.

2
DOCS/man/hu/mplayer.1
View File

@ -533,7 +533,7 @@ Skin bet
.PD 0
.RSs
.IPs "\-skin fittyfene"
megpróbálja a Skin/fittyfenét.
megpróbálja a skins/fittyfenét.
Először az
/usr/local/share/mplayer/
könyvtárban, majd a ~/.mplayer/ könyvtárban.

8
DOCS/man/it/mplayer.1
View File

@ -925,15 +925,15 @@ Riproduce i file in ordine casuale.
.TP
.B \-skin <nome> (solo GUI)
Carica la skin dalla directory specificata come parametro sotto le directory
di default delle skin, /usr/\:local/\:share/\:mplayer/\:Skin/ e
~/.mplayer/\:Skin/.
di default delle skin, /usr/\:local/\:share/\:mplayer/\:skins/ e
~/.mplayer/\:skins/.
.sp 1
.I ESEMPIO:
.PD 0
.RSs
.IPs "\-skin fittyfene"
Prova prima in /usr/\:local/\:share/\:mplayer/\:Skin/\:fittyfene
e poi in ~/.mplayer/\:Skin/\:fittyfene.
Prova prima in /usr/\:local/\:share/\:mplayer/\:skins/\:fittyfene
e poi in ~/.mplayer/\:skins/\:fittyfene.
.RE
.PD 1
.

8
DOCS/man/pl/mplayer.1
View File

@ -734,15 +734,15 @@ Odtwarza zbiory w losowej kolejno
.TP
.B \-skin <nazwa> (tylko z GUI)
Załaduje skórkę z podanego jako parametr katalogu znajdującego się pod
domy¶lnymi katalogami skórek, /usr/\:local/\:share/\:mplayer/\:Skin/
i ~/.mplayer/Skin.
domy¶lnymi katalogami skórek, /usr/\:local/\:share/\:mplayer/\:skins/
i ~/.mplayer/skins/.
.sp 1
.I PRZYKŁAD:
.PD 0
.RSs
.IPs "\-skin fittyfene"
Próbuje za³adowaæ /usr/\:local/\:share/\:mplayer/\:Skin/\:fittyfene,
pó¼niej ~/.mplayer/\:Skin/\:fittyfene.
Próbuje za³adowaæ /usr/\:local/\:share/\:mplayer/\:skins/\:fittyfene,
pó¼niej ~/.mplayer/\:skins/\:fittyfene.
.RE
.PD 1
.

4
DOCS/man/sv/mplayer.1
View File

@ -647,13 +647,13 @@ Spela filerna i slumpvis ordning.
.TP
.B \-skin <namn> (Endast GUI)
Ladda angivet skin från en katalog vilke som standard är:
/usr/\:local/\:share/\:mplayer/\:Skin/\: samt ~/.mplayer/\:Skin/.
/usr/\:local/\:share/\:mplayer/\:skins/\: samt ~/.mplayer/\:skins/.
.sp 1
.I EXEMPEL:
.PD 0
.RSs
.IPs "\-skin fittyfene"
Försöker /usr/\:local/\:share/\:mplayer/\:Skin/\:fittyfene och efteråt ~/.mplayer/\:Skin/\:fittyfene.
Försöker /usr/\:local/\:share/\:mplayer/\:skins/\:fittyfene och efteråt ~/.mplayer/\:skins/\:fittyfene.
.RE
.PD 1
.

2
DOCS/man/zh/mplayer.1
View File

@ -290,7 +290,7 @@ gl2, and svga.
.PD 0
.RSs
.IPs "\-skin fittyfene"
³¢ÊÔSkin/fittyfene.
³¢ÊÔskins/fittyfene.
将会首先察看/usr/local/share/mplayer/,
然后是~/.mplayer/.
.RE

4
DOCS/tech/TODO
View File

@ -42,6 +42,10 @@ FOR THE NEXT RELEASE:
FOR THE v1.00 RELEASE:
~~~~~~~~~~~~~~~~~~~~~~
cruft removal:
- remove support for skins directories using the obsolete name 'Skin'
DVB:
- display OSD and subtitles using DVB card's OSD
mpg demuxer:

2
DOCS/tech/binary-packaging.txt
View File

@ -101,7 +101,7 @@ for Red Hat and Fedora RPMs I am using FHS-compliant paths:
/usr/share/man/man1/ man page
/usr/share/man/XX/man1/ translated man page
/usr/share/mplayer/font/ fonts
/usr/share/mplayer/Skin/ GUI skins
/usr/share/mplayer/skins/ GUI skins
You MUSTN'T include the codecs.conf file in your package. It is useful
only for development purposes and often causes obscure problems for users.

6
DOCS/xml/cs/install.xml
View File

@ -586,13 +586,13 @@ co
muset nějaký stáhnout abyste mohli používat GUI. Viz naši <ulink
url="http://www.mplayerhq.hu/dload.html">download stránku</ulink>.
Skiny by měly být rozbaleny do obvyklého systémového adresáře
(<filename class="directory">$PREFIX/share/mplayer/Skin</filename>),
nebo do <filename class="directory">$HOME/.mplayer/Skin</filename>.
(<filename class="directory">$PREFIX/share/mplayer/skins</filename>),
nebo do <filename class="directory">$HOME/.mplayer/skins</filename>.
<application>MPlayer</application> ve výchozím stavu hledá v těchto adresářích
podadresář jménem <filename class="directory">default</filename>, ale
můžete použít volbu <option>-skin <replaceable>nový_skin</replaceable></option>
nebo direktivu <literal>skin=nový_skin</literal> konfiguračního souboru pro
pou¾ití skinu v adresáøi <filename class="directory">*/Skin/nový_skin</filename>.
pou¾ití skinu v adresáøi <filename class="directory">*/skins/nový_skin</filename>.
</para>
</sect1>

10
DOCS/xml/cs/skin.xml
View File

@ -34,13 +34,13 @@ nainstalovat, chcete-li pou
Adresáře prohledávané na skiny jsou (v tomto pořadí):
<orderedlist>
<listitem><para>
<filename class="directory">$(DATADIR)/Skin/</filename>
<filename class="directory">$(DATADIR)/skins/</filename>
</para></listitem>
<listitem><para>
<filename class="directory">$(PREFIX)/share/mplayer/Skin/</filename>
<filename class="directory">$(PREFIX)/share/mplayer/skins/</filename>
</para></listitem>
<listitem><para>
<filename class="directory">~/.mplayer/Skin/</filename>
<filename class="directory">~/.mplayer/skins/</filename>
</para></listitem>
</orderedlist>
</para>
@ -54,7 +54,7 @@ Poznamenejme,
<para>
Každý skin je instalován do vlastního adresáře v některém z výše uvedených.
Například:
<screen>$(PREFIX)/share/mplayer/Skin/default/</screen>
<screen>$(PREFIX)/share/mplayer/skins/default/</screen>
</para>
</sect2>
@ -267,7 +267,7 @@ end
<para>
Jméno souboru s obrázkem musí být zadáno bez úvodních adresářů - obrázky jsou
vyhledávány v adresáøi <filename class="directory">Skin</filename>.
vyhledávány v adresáøi <filename class="directory">skins</filename>.
Měli byste (ale nemusíte) zadat příponu souboru. Pokud soubor neexistuje,
zkouší <application>MPlayer</application> načíst soubor
<filename>&lt;jméno&gt;.&lt;příp&gt;</filename>, kdy jsou za

6
DOCS/xml/en/install.xml
View File

@ -547,13 +547,13 @@ As <application>MPlayer</application> doesn't have a skin included, you
have to download them if you want to use the GUI. See the <ulink
url="http://www.mplayerhq.hu/dload.html">download page</ulink>.
They should be extracted to the usual system-wide directory (<filename
class="directory">$PREFIX/share/mplayer/Skin</filename>), or to <filename
class="directory">$HOME/.mplayer/Skin</filename>.
class="directory">$PREFIX/share/mplayer/skins</filename>), or to <filename
class="directory">$HOME/.mplayer/skins</filename>.
<application>MPlayer</application> by default looks in these directories
for a directory named <filename class="directory">default</filename>, but
you can use the <option>-skin <replaceable>newskin</replaceable></option>
option, or the <literal>skin=newskin</literal> config file directive to use
the skin in <filename class="directory">*/Skin/newskin</filename>
the skin in <filename class="directory">*/skins/newskin</filename>
directory.
</para>
</sect1>

10
DOCS/xml/en/skin.xml
View File

@ -18,13 +18,13 @@ in order to be able to use the GUI.</emphasis>
The directories searched for skins are (in order):
<orderedlist>
<listitem><para>
<filename class="directory">$(DATADIR)/Skin/</filename>
<filename class="directory">$(DATADIR)/skins/</filename>
</para></listitem>
<listitem><para>
<filename class="directory">$(PREFIX)/share/mplayer/Skin/</filename>
<filename class="directory">$(PREFIX)/share/mplayer/skins/</filename>
</para></listitem>
<listitem><para>
<filename class="directory">~/.mplayer/Skin/</filename>
<filename class="directory">~/.mplayer/skins/</filename>
</para></listitem>
</orderedlist>
</para>
@ -38,7 +38,7 @@ arguments of the <command>configure</command> script).
<para>
Every skin is installed into its own directory under one of the directories
listed above, for example:
<screen>$(PREFIX)/share/mplayer/Skin/default/</screen>
<screen>$(PREFIX)/share/mplayer/skins/default/</screen>
</para>
</sect2>
@ -253,7 +253,7 @@ end
<para>
The name of an image file must be given without leading directories - images
are searched for in the <filename class="directory">Skin</filename> directory.
are searched for in the <filename class="directory">skins</filename> directory.
You may (but you need not) specify the extension of the file. If the file does
not exist, <application>MPlayer</application> tries to load the file
<filename>&lt;filename&gt;.&lt;ext&gt;</filename>, where <literal>png</literal>

6
DOCS/xml/es/install.xml
View File

@ -542,13 +542,13 @@ Como <application>MPlayer</application> no tiene una piel incluida, debe
bajarlas si desea usar la GUI. Vea la <ulink
url="http://www.mplayerhq.hu/dload.html">página de descargas</ulink>.
Deberían ser extraídas al directorio global de pieles normal (<filename
class="directory">$PREFIX/share/mplayer/Skin</filename>), o al directorio
personal <filename class="directory">$HOME/.mplayer/Skin</filename>.
class="directory">$PREFIX/share/mplayer/skins/</filename>), o al directorio
personal <filename class="directory">$HOME/.mplayer/skins/</filename>.
<application>MPlayer</application> por omisión busca en esos directorios
por un directorio llamado <filename class="directory">default</filename>, pero
puede usar la opción <option>-skin <replaceable>pielnueva</replaceable></option>,
o usar la directiva <literal>skin=pielnueva</literal> en el archivo de configuración
para usar el directorio <filename class="directory">*/Skin/pielnueva</filename>.
para usar el directorio <filename class="directory">*/skins//pielnueva</filename>.
</para>
</sect1>

10
DOCS/xml/es/skin.xml
View File

@ -33,13 +33,13 @@ poder usar el GUI.</emphasis>
Los directorios donde se buscan los skins son (en orden):
<orderedlist>
<listitem><para>
<filename class="directory">$(DATADIR)/Skin/</filename>
<filename class="directory">$(DATADIR)/skins/</filename>
</para></listitem>
<listitem><para>
<filename class="directory">$(PREFIX)/share/mplayer/Skin/</filename>
<filename class="directory">$(PREFIX)/share/mplayer/skins/</filename>
</para></listitem>
<listitem><para>
<filename class="directory">~/.mplayer/Skin/</filename>
<filename class="directory">~/.mplayer/skins/</filename>
</para></listitem>
</orderedlist>
</para>
@ -54,7 +54,7 @@ configurado <application>MPlayer</application> (vea los argumentos
<para>
Todo skin es instalado en su propio directorio bajo uno de los directorios
listados más arriba, por ejemplo:
<screen>$(PREFIX)/share/mplayer/Skin/default/</screen>
<screen>$(PREFIX)/share/mplayer/skins/default/</screen>
</para>
</sect2>
@ -275,7 +275,7 @@ end
<para>
El nombre de un archivo de imagen se debe dar sin los directorios - las imágenes
se buscan en el directorio <filename class="directory">Skin</filename>.
se buscan en el directorio <filename class="directory">skins</filename>.
También puede (pero necesita ser root) especificar la extensión del archivo. Si
el archivo no existe, <application>MPlayer</application> intentará cargar el
archivo

4
DOCS/xml/fr/install.xml
View File

@ -540,11 +540,11 @@ ceci pour des raisons techniques.
devrez la télécharger si vous voulez utiliser la GUI. Voir la <ulink
url="http://www.mplayerhq.hu/dload.html">page des téléchargements</ulink>.
Elles pourront se placer dans le répertoire commun (<filename class="directory">
$PREFIX/share/mplayer/Skin</filename>), ou dans <filename class="directory">$HOME/.mplayer/Skin</filename>.
$PREFIX/share/mplayer/skins</filename>), ou dans <filename class="directory">$HOME/.mplayer/skins</filename>.
Par défaut, <application>MPlayer</application> consulte ces répertoires à la recherche
d'un répertoire nommé <filename class="directory">default</filename>, mais vous pouvez utiliser l'option
<option>-skin <replaceable>nouvelleskin</replaceable></option>, ou placer <literal>skin=nouvelleskin</literal>
dans votre fichier de configuration pour utiliser la skin dans le répertoire <filename class="directory">*/Skin/newskin</filename>.
dans votre fichier de configuration pour utiliser la skin dans le répertoire <filename class="directory">*/skins/newskin</filename>.
</para>
</sect1>

10
DOCS/xml/fr/skin.xml
View File

@ -18,13 +18,13 @@ la GUI.</emphasis>
<application>MPlayer</application> cherche des skins dans ces répertoires (dans cet ordre):
<orderedlist>
<listitem><para>
<filename class="directory">$(DATADIR)/Skin/</filename>
<filename class="directory">$(DATADIR)/skins/</filename>
</para></listitem>
<listitem><para>
<filename class="directory">$(PREFIX)/share/mplayer/Skin/</filename>
<filename class="directory">$(PREFIX)/share/mplayer/skins/</filename>
</para></listitem>
<listitem><para>
<filename class="directory">~/.mplayer/Skin/</filename>
<filename class="directory">~/.mplayer/skins/</filename>
</para></listitem>
</orderedlist>
</para>
@ -38,7 +38,7 @@ du script <command>configure</command>).
<para>
Chaque skin est installée dans son propre répertoire sous l'un des répertoires
listés ci-dessus, par exemple:
<screen>$(PREFIX)/share/mplayer/Skin/default/</screen>
<screen>$(PREFIX)/share/mplayer/skins/default/</screen>
</para>
</sect2>
@ -254,7 +254,7 @@ end
<para>
Le nom d'un fichier image doit être donné sans distinction de répertoire - les
images seront cherchées dans le répertoire <filename class="directory">Skin</filename>.
images seront cherchées dans le répertoire <filename class="directory">skins</filename>.
Vous pouvez (mais ce n'est pas obligatoire) spécifier l'extension du fichier. Si
le fichier n'existe pas, <application>MPlayer</application> essaie de charger le fichier
<filename>&lt;nomfichier&gt;.&lt;ext&gt;</filename>, où <literal>png</literal>

6
DOCS/xml/hu/install.xml
View File

@ -538,14 +538,14 @@ Mivel az <application>MPlayer</application> nem rendelkezik be
le kell töltened őket, ha a GUI-t használni akarod. Lásd a <ulink
url="http://www.mplayerhq.hu/dload.html">letöltési oldalt</ulink>.
Ajánlott egy rendszerszinten elérhető könyvtárba tenni őket (<filename
class="directory">$PREFIX/share/mplayer/Skin</filename>), vagy a <filename
class="directory">$HOME/.mplayer/Skin</filename>-be.
class="directory">$PREFIX/share/mplayer/skins</filename>), vagy a <filename
class="directory">$HOME/.mplayer/skins</filename>-be.
Az <application>MPlayer</application> ezekben a könyvtárakban
keres egy <filename class="directory">default</filename> nevű alkönyvtárat, amelyben
az alapértelmezett skin van. Megadhatsz más könyvtárat is a
<option>-skin <replaceable>newskin</replaceable></option> kapcsolóval vagy a
<literal>skin=newskin</literal> sorral a konfigurációs fájlban, és ekkor a
<filename class="directory">*/Skin/newskin</filename> könyvtárban lévõ skin lesz
<filename class="directory">*/skins/newskin</filename> könyvtárban lévõ skin lesz
használatban.
</para>
</sect1>

10
DOCS/xml/hu/skin.xml
View File

@ -18,13 +18,13 @@ kell lennie, hogy haszn
Az alábbi könyvtárak kerülnek átvizsgálásra (sorrendben):
<orderedlist>
<listitem><para>
<filename class="directory">$(DATADIR)/Skin/</filename>
<filename class="directory">$(DATADIR)/skins/</filename>
</para></listitem>
<listitem><para>
<filename class="directory">$(PREFIX)/share/mplayer/Skin/</filename>
<filename class="directory">$(PREFIX)/share/mplayer/skins/</filename>
</para></listitem>
<listitem><para>
<filename class="directory">~/.mplayer/Skin/</filename>
<filename class="directory">~/.mplayer/skins/</filename>
</para></listitem>
</orderedlist>
</para>
@ -38,7 +38,7 @@ konfigur
<para>
Minden skin a saját könyvtárába kerül telepítésre a fent felsorolt könyvtárakon
belül, például:
<screen>$(PREFIX)/share/mplayer/Skin/default/</screen>
<screen>$(PREFIX)/share/mplayer/skins/default/</screen>
</para>
</sect2>
@ -253,7 +253,7 @@ end
<para>
Egy kép fájl nevét a hozzá vezető útvonal nélkül kell megadni - a képeknek
a <filename class="directory">Skin</filename> könyvtárban kell lenniük.
a <filename class="directory">skins</filename> könyvtárban kell lenniük.
A fájl kiterjesztését megadhatod (de nem kötelező). Ha a fájl nem létezik,
az <application>MPlayer</application> megpróbálja betölteni a
<filename>&lt;filename&gt;.&lt;ext&gt;</filename> fájlt, ahol <literal>png</literal>

6
DOCS/xml/pl/install.xml
View File

@ -561,14 +561,14 @@ Jako
je ściągnąć, jeżeli chcesz używać GUI. Sprawdź <ulink
url="http://www.mplayerhq.hu/dload.html">stronę z zasobami do pobrania</ulink>.
Skórki powinny być rozpakowane do katalogu dostępnego dla wszystkich (<filename
class="directory">$PREFIX/share/mplayer/Skin</filename>) lub do <filename
class="directory">$HOME/.mplayer/Skin</filename>.
class="directory">$PREFIX/share/mplayer/skins</filename>) lub do <filename
class="directory">$HOME/.mplayer/skins</filename>.
<application>MPlayer</application> sprawdza je w poszukiwaniu
folderu nazwanego <filename class="directory">default</filename>, ale
możesz użyć opcji <option>-skin <replaceable>nowaskórka</replaceable></option>
lub wpisać do pliku konfiguracyjnego <literal>skin=nowaskórka</literal>, aby
program korzystał ze skórki w katalogu
<filename class="directory">*/Skin/nowaskórka</filename>.
<filename class="directory">*/skins/nowaskórka</filename>.
</para>
</sect1>

10
DOCS/xml/pl/skin.xml
View File

@ -35,13 +35,13 @@ jedna sk
Skórki są szukane w następujących katalogach (w kolejności):
<orderedlist>
<listitem><para>
<filename class="directory">$(DATADIR)/Skin/</filename>
<filename class="directory">$(DATADIR)/skins/</filename>
</para></listitem>
<listitem><para>
<filename class="directory">$(PREFIX)/share/mplayer/Skin/</filename>
<filename class="directory">$(PREFIX)/share/mplayer/skins/</filename>
</para></listitem>
<listitem><para>
<filename class="directory">~/.mplayer/Skin/</filename>
<filename class="directory">~/.mplayer/skins/</filename>
</para></listitem>
</orderedlist>
</para>
@ -56,7 +56,7 @@ w skrypcie <command>configure</command>).
<para>
Każda skórka jest instalowana w swoim własnym katalogu, w jednej z wyżej
wymienionych lokacji, na przykład:
<screen>$(PREFIX)/share/mplayer/Skin/default/</screen>
<screen>$(PREFIX)/share/mplayer/skins/default/</screen>
</para>
</sect2>
@ -280,7 +280,7 @@ end
<para>
Nazwa pliku graficznego musi zostać podana bez żadnych nazw katalogów - obrazki
s± szukane w katalogu <filename class="directory">Skin</filename>.
s± szukane w katalogu <filename class="directory">skins</filename>.
Możesz (ale nie musisz) określić rozszerzenia tego pliku. Jeśli plik taki nie
istnieje, <application>MPlayer</application>
spróbuje wczytać plik <filename>&lt;nazwa pliku&gt;.&lt;rozszerzenie&gt;</filename>,

6
DOCS/xml/ru/install.xml
View File

@ -540,11 +540,11 @@ make install</screen>
хотите использовать GUI. См.
<ulink url="http://www.mplayerhq.hu/dload.html">download page[страницу
закачек]</ulink>. Они должны быть извлечены в системный каталог
(<filename class="directory">$PREFIX/share/mplayer/Skin</filename>), ÉÌÉ ×
<filename class="directory">$HOME/.mplayer/Skin</filename>. ðÏ ÕÍÏÌÞÁÎÉÀ, MPlayer ÉÝÅÔ ËÁÔÁÌÏÇ <filename class="directory">default</filename>
(<filename class="directory">$PREFIX/share/mplayer/skins</filename>), ÉÌÉ ×
<filename class="directory">$HOME/.mplayer/skins</filename>. ðÏ ÕÍÏÌÞÁÎÉÀ, MPlayer ÉÝÅÔ ËÁÔÁÌÏÇ <filename class="directory">default</filename>
в этих каталогах, но вы можете использовать опцию <option>-skin <replaceable>newskin</replaceable></option>,
или директиву конфигурационного файла <option>skin=newskin</option>, чтобы использовать
ÛËÕÒÕ ÉÚ ËÁÔÁÌÏÇÁ <filename class="directory">*/Skin/newskin</filename>.
ÛËÕÒÕ ÉÚ ËÁÔÁÌÏÇÁ <filename class="directory">*/skins/newskin</filename>.
</para>
</sect1>

4
DOCS/zh/documentation.html
View File

@ -657,9 +657,9 @@ HREF="codecs.html#software_ac3">
<P>目前由于技术原因，目前你不能在命令行下使用<CODE>-gui</CODE>选项。</P>
<P>因为MPlayer不自带skin，所以如果你想要使用GUI，你必须自己下载它们。参见<A HREF="http://www.mplayerhq.hu/dload.html">下载页</A>。
他们应该被解压到系统通用的目录(<CODE>$PREFIX/share/mplayer/Skin</CODE>)，或者解压到<CODE>$HOME/.mplayer/Skin</CODE>。
他们应该被解压到系统通用的目录(<CODE>$PREFIX/share/mplayer/skins/</CODE>)，或者解压到<CODE>$HOME/.mplayer/skins/</CODE>。
MPlayer在默认情况下会在这些的目录里寻找一个叫<I>default</I>的目录，
但是你能使用<CODE>-skin newskin</CODE>选项或在config文件中添加<CODE>skin=newskin</CODE>来强制使用<CODE>*/Skin/newskin</CODE>目录下的skin。</P>
但是你能使用<CODE>-skin newskin</CODE>选项或在config文件中添加<CODE>skin=newskin</CODE>来强制使用<CODE>*/skins/newskin</CODE>目录下的skin。</P>
<H2><A NAME="subtitles_osd">1.4 字幕和OSD</A></H2>

10
DOCS/zh/skin.html
View File

@ -40,9 +40,9 @@
<p>skin的搜索目录(按顺序)是：</p>
<pre>
$(DATADIR)/Skin/
$(PREFIX)/share/mplayer/Skin/
~/.mplayer/Skin/
$(DATADIR)/skins/
$(PREFIX)/share/mplayer/skins/
~/.mplayer/skins/
</pre>
<p>注意，第一个路径倚赖于MPlayer的安装配置(见<code>configure</code>脚本
@ -50,7 +50,7 @@
<p>所有的skin被安装到上面列出的一个目录下的自己的目录中，例如：</p>
<pre>
$(PREFIX)/share/mplayer/Skin/default/
$(PREFIX)/share/mplayer/skins/default/
</pre>
@ -207,7 +207,7 @@ end
</tr>
</table>
<p>图像文件的名称必须不带目录名 -- 图像在<code>Skin</code>目录中被搜索。你能(但是并不需要)规定扩展名。
<p>图像文件的名称必须不带目录名 -- 图像在<code>skins</code>目录中被搜索。你能(但是并不需要)规定扩展名。
如果文件不存在，MPlayer将试图装载<code>&lt;filename&gt;.&lt;ext&gt;</code>文件，
<code>&lt;ext&gt;</code>可以是<code>png</code>或者<code>PNG</code>(按这个顺序尝试)。第一个匹配文件将被使用。</p>

3
Gui/app.c
View File

@ -74,8 +74,11 @@ extern char *get_path(char *);
listItems appMPlayer;
/* FIXME: Eventually remove the obsolete directory names. */
char * skinDirInHome=NULL;
char * skinDirInHome_obsolete=NULL;
char * skinMPlayerDir=NULL;
char * skinMPlayerDir_obsolete=NULL;
char * skinName = NULL;
void appClearItem( wItem * item )

2
Gui/app.h
View File

@ -171,7 +171,9 @@ typedef struct
extern listItems appMPlayer;
extern char * skinDirInHome;
extern char * skinDirInHome_obsolete;
extern char * skinMPlayerDir;
extern char * skinMPlayerDir_obsolete;
extern char * skinName;
extern void appInitStruct( listItems * item );

8
Gui/interface.c
View File

@ -215,10 +215,14 @@ void guiInit( void )
// --- initialize X
wsXInit( (void *)mDisplay );
// --- load skin
skinDirInHome=get_path("Skin");
skinMPlayerDir=MPLAYER_DATADIR "/Skin";
skinDirInHome=get_path("skins");
skinDirInHome_obsolete=get_path("Skin");
skinMPlayerDir=MPLAYER_DATADIR "/skins";
skinMPlayerDir_obsolete=MPLAYER_DATADIR "/Skin";
mp_msg( MSGT_GPLAYER,MSGL_V,"SKIN dir 1: '%s'\n",skinDirInHome);
mp_msg( MSGT_GPLAYER,MSGL_V,"SKIN dir 1 (obsolete): '%s'\n",skinDirInHome_obsolete);
mp_msg( MSGT_GPLAYER,MSGL_V,"SKIN dir 2: '%s'\n",skinMPlayerDir);
mp_msg( MSGT_GPLAYER,MSGL_V,"SKIN dir 2 (obsolete): '%s'\n",skinMPlayerDir_obsolete);
if ( !skinName ) skinName=strdup( "default" );
i = skinRead( skinName );
if ((i == -1) && strcmp(skinName,"default"))

7
Gui/mplayer/gtk/sb.c
View File

@ -18,8 +18,11 @@
GtkWidget * SkinList = NULL;
char * sbSelectedSkin=NULL;
/* FIXME: Eventually remove the obsolete directory names. */
char * sbMPlayerDirInHome=NULL;
char * sbMPlayerDirInHome_obsolete=NULL;
char * sbMPlayerPrefixDir=NULL;
char * sbMPlayerPrefixDir_obsolete=NULL;
char * gtkOldSkin;
static char * prev;
@ -173,8 +176,12 @@ GtkWidget * create_SkinBrowser( void )
gtk_signal_connect( GTK_OBJECT( Ok ),"clicked",GTK_SIGNAL_FUNC( prButton ),(void *)1 );
gtk_signal_connect( GTK_OBJECT( Cancel ),"clicked",GTK_SIGNAL_FUNC( prButton ),(void *)0 );
if ( ( sbMPlayerDirInHome_obsolete=(char *)calloc( 1,strlen( skinDirInHome_obsolete ) + 4 ) ) != NULL )
{ strcpy( sbMPlayerDirInHome_obsolete,skinDirInHome_obsolete ); strcat( sbMPlayerDirInHome_obsolete,"/*" ); }
if ( ( sbMPlayerDirInHome=(char *)calloc( 1,strlen( skinDirInHome ) + 4 ) ) != NULL )
{ strcpy( sbMPlayerDirInHome,skinDirInHome ); strcat( sbMPlayerDirInHome,"/*" ); }
if ( ( sbMPlayerPrefixDir_obsolete=(char *)calloc( 1,strlen( skinMPlayerDir ) + 4 ) ) != NULL )
{ strcpy( sbMPlayerPrefixDir_obsolete,skinMPlayerDir ); strcat( sbMPlayerPrefixDir_obsolete,"/*" ); }
if ( ( sbMPlayerPrefixDir=(char *)calloc( 1,strlen( skinMPlayerDir ) + 4 ) ) != NULL )
{ strcpy( sbMPlayerPrefixDir,skinMPlayerDir ); strcat( sbMPlayerPrefixDir,"/*" ); }

2
Gui/mplayer/gtk/sb.h
View File

@ -6,7 +6,9 @@
extern GtkWidget * SkinList;
extern char * sbSelectedSkin;
extern char * sbMPlayerDirInHome;
extern char * sbMPlayerDirInHome_obsolete;
extern char * sbMPlayerPrefixDir;
extern char * sbMPlayerPrefixDir_obsolete;
extern GtkWidget * SkinBrowser;
extern void ShowSkinBrowser( void );

5
Gui/mplayer/widgets.c
View File

@ -167,7 +167,10 @@ void gtkShow( int type,char * param )
case evSkinBrowser:
ShowSkinBrowser();
// gtkClearList( SkinList );
if ( gtkFillSkinList( sbMPlayerPrefixDir ) && gtkFillSkinList( sbMPlayerDirInHome ) )
if ( gtkFillSkinList( sbMPlayerPrefixDir ) &&
gtkFillSkinList( sbMPlayerPrefixDir_obsolete ) &&
gtkFillSkinList( sbMPlayerDirInHome ) &&
gtkFillSkinList( sbMPlayerDirInHome_obsolete ) )
{
gtkSetDefaultToCList( SkinList,param );
gtk_clist_sort( GTK_CLIST( SkinList ) );

12
Gui/skin/skin.c
View File

@ -676,8 +676,16 @@ int skinRead( char * dname )
setname( skinMPlayerDir,dname );
if ( ( skinFile = fopen( fn,"rt" ) ) == NULL )
{
mp_msg( MSGT_GPLAYER,MSGL_STATUS,MSGTR_SKIN_SkinFileNotFound,fn );
return -1;
setname( skinDirInHome_obsolete,dname );
if ( ( skinFile = fopen( fn,"rt" ) ) == NULL )
{
setname( skinMPlayerDir_obsolete,dname );
if ( ( skinFile = fopen( fn,"rt" ) ) == NULL )
{
mp_msg( MSGT_GPLAYER,MSGL_STATUS,MSGTR_SKIN_SkinFileNotFound,fn );
return -1;
}
}
}
}

4
Makefile
View File

@ -494,9 +494,9 @@ endif
echo "*** for OSD/Subtitles support and extract to $(DATADIR)/font/" ; \
fi
ifeq ($(GUI),yes)
@$(INSTALL) -d $(DATADIR)/Skin
@$(INSTALL) -d $(DATADIR)/skins
@echo "*** Download skin(s) at http://www.mplayerhq.hu/dload.html"
@echo "*** for GUI, and extract to $(DATADIR)/Skin/"
@echo "*** for GUI, and extract to $(DATADIR)/skins/"
@$(INSTALL) -d $(prefix)/share/pixmaps
$(INSTALL) -m 644 Gui/mplayer/pixmaps/mplayer-desktop.xpm $(prefix)/share/pixmaps/mplayer-desktop.xpm
@$(INSTALL) -d $(prefix)/share/applications

10
README
View File

@ -210,11 +210,11 @@ ____________________________
STEP6: Installing a GUI skin
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Unpack the archive and put the contents in /usr/local/share/mplayer/Skin/ or
~/.mplayer/Skin/. MPlayer will use the skin in the subdirectory named default
of /usr/local/share/mplayer/Skin/ or ~/.mplayer/Skin/ unless told otherwise via
the '-skin' switch. You should therefore rename your skin subdirectory or make
a suitable symbolic link.
Unpack the archive and put the contents in /usr/local/share/mplayer/skins/ or
~/.mplayer/skins/. MPlayer will use the skin in the subdirectory named default
of /usr/local/share/mplayer/skins/ or ~/.mplayer/skins/ unless told otherwise
via the '-skin' switch. You should therefore rename your skin subdirectory or
make a suitable symbolic link.
__________________

2
etc/example.conf
View File

@ -91,7 +91,7 @@
#framedrop = yes
# Specify your preferred skin here (skins are searched for in
# /usr/local/share/mplayer/Skin/<name> and ~/.mplayer/Skin/<name>).
# /usr/local/share/mplayer/skins/<name> and ~/.mplayer/skins/<name>).
#skin = Abyss
# Resample the font alphamap.