From b5743fcfdaca9d4e7c6778e9622b6f18756c9636 Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 27 Mar 2006 11:39:27 +0000 Subject: Rename the default GUI skins directory from 'Skin' to 'skins', keeping backwards compatibility. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17975 b3059339-0415-0410-9bf9-f77b7e298cf2 --- ChangeLog | 1 + DOCS/de/documentation.html | 6 +++--- DOCS/it/documentation.html | 6 +++--- DOCS/it/skin.html | 8 ++++---- DOCS/man/cs/mplayer.1 | 6 +++--- DOCS/man/de/mplayer.1 | 6 +++--- DOCS/man/en/mplayer.1 | 6 +++--- DOCS/man/es/mplayer.1 | 6 +++--- DOCS/man/fr/mplayer.1 | 6 +++--- DOCS/man/hu/mplayer.1 | 2 +- DOCS/man/it/mplayer.1 | 8 ++++---- DOCS/man/pl/mplayer.1 | 8 ++++---- DOCS/man/sv/mplayer.1 | 4 ++-- DOCS/man/zh/mplayer.1 | 2 +- DOCS/tech/TODO | 4 ++++ DOCS/tech/binary-packaging.txt | 2 +- DOCS/xml/cs/install.xml | 6 +++--- DOCS/xml/cs/skin.xml | 10 +++++----- DOCS/xml/en/install.xml | 6 +++--- DOCS/xml/en/skin.xml | 10 +++++----- DOCS/xml/es/install.xml | 6 +++--- DOCS/xml/es/skin.xml | 10 +++++----- DOCS/xml/fr/install.xml | 4 ++-- DOCS/xml/fr/skin.xml | 10 +++++----- DOCS/xml/hu/install.xml | 6 +++--- DOCS/xml/hu/skin.xml | 10 +++++----- DOCS/xml/pl/install.xml | 6 +++--- DOCS/xml/pl/skin.xml | 10 +++++----- DOCS/xml/ru/install.xml | 6 +++--- DOCS/zh/documentation.html | 4 ++-- DOCS/zh/skin.html | 10 +++++----- Gui/app.c | 3 +++ Gui/app.h | 2 ++ Gui/interface.c | 8 ++++++-- Gui/mplayer/gtk/sb.c | 7 +++++++ Gui/mplayer/gtk/sb.h | 2 ++ Gui/mplayer/widgets.c | 5 ++++- Gui/skin/skin.c | 12 ++++++++++-- Makefile | 4 ++-- README | 10 +++++----- etc/example.conf | 2 +- 41 files changed, 142 insertions(+), 108 deletions(-) diff --git a/ChangeLog b/ChangeLog index a41bc8b40a..499ac64920 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 diff --git a/DOCS/de/documentation.html b/DOCS/de/documentation.html index 2247379ad1..4d29cd86fe 100644 --- a/DOCS/de/documentation.html +++ b/DOCS/de/documentation.html @@ -919,12 +919,12 @@ verwenden.

herunterladen, wenn du das GUI verwenden willst. Schau dazu auf die Download-Seite. Diese sollten in das normale, systemweite Verzeichnis -($PREFIX/share/mplayer/Skin) oder nach -$HOME/.mplayer/Skin extrahiert werden. MPlayer sucht +($PREFIX/share/mplayer/skins/) oder nach +$HOME/.mplayer/skins/ extrahiert werden. MPlayer sucht standardmäßig nach einem Verzeichnis namens default, aber du kannst mit der Option -skin (neuer Skin) oder dem Eintrag skin=(neuer Skin) in der Konfigurationsdatei den Skin -*/Skin/(neuer Skin) auswählen.

+*/skins/(neuer Skin) auswählen.

1.4 Untertitel und das OSD

diff --git a/DOCS/it/documentation.html b/DOCS/it/documentation.html index fd4929865b..417cd9e6bc 100644 --- a/DOCS/it/documentation.html +++ b/DOCS/it/documentation.html @@ -790,11 +790,11 @@ Quindi, per usare la modalit

Dato che MPlayer non ha una skin inclusa, devi scaricarle se vuoi usare la GUI. Vedi la pagina dei download. -Dovranno essere estratti nella solita directory valida per tutto il sistema ($PREFIX/share/mplayer/Skin), -o in $HOME/.mplayer/Skin . MPlayer cerca in +Dovranno essere estratti nella solita directory valida per tutto il sistema ($PREFIX/share/mplayer/skins/), +o in $HOME/.mplayer/skins/ . MPlayer cerca in queste una directory di nome default, ma puoi usare l'opzione -skin nuovaskin, o la direttiva skin=nuovaskin del file di configurazione -per usare la skin nella directory */Skin/nuovaskin.

+per usare la skin nella directory */skins/nuovaskin.

1.4. Sottotitoli e OSD

diff --git a/DOCS/it/skin.html b/DOCS/it/skin.html index dc83d3bfbc..9510a8dba4 100644 --- a/DOCS/it/skin.html +++ b/DOCS/it/skin.html @@ -47,9 +47,9 @@ una skin per poter usare la GUI.

Le directory in cui si cerca per le skin sono (in ordine): 

-    $(DATADIR)/Skin/
-    $(PREFIX)/share/mplayer/Skin/
-    ~/.mplayer/Skin/
+    $(DATADIR)/skins/
+    $(PREFIX)/share/mplayer/skins/
+    ~/.mplayer/skins/

Nota che il primo path può variare a seconda di come è stato configurato @@ -59,7 +59,7 @@ una skin per poter usare la GUI.

Ogni skin è installata in una sua propria directory sotto una delle directory elencate sopra, per esempio: 

-    $(PREFIX)/share/mplayer/Skin/default/
+    $(PREFIX)/share/mplayer/skins/default/
diff --git a/DOCS/man/cs/mplayer.1 b/DOCS/man/cs/mplayer.1 index e1371b8a99..93090f7ba1 100644 --- a/DOCS/man/cs/mplayer.1 +++ b/DOCS/man/cs/mplayer.1 @@ -892,14 +892,14 @@ P .TP .B \-skin (pouze GUI) Nahraje skin z adresáøe . 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 . diff --git a/DOCS/man/de/mplayer.1 b/DOCS/man/de/mplayer.1 index b3607b1a2d..df48c2ce1a 100644 --- a/DOCS/man/de/mplayer.1 +++ b/DOCS/man/de/mplayer.1 @@ -943,14 +943,14 @@ Spielt die Dateien in zuf .B \-skin (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 . diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index c0cdec5c2d..b31603b9f7 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -901,14 +901,14 @@ Play files in random order. .TP .B \-skin (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 . diff --git a/DOCS/man/es/mplayer.1 b/DOCS/man/es/mplayer.1 index 64ec6b2817..f565ce17cb 100644 --- a/DOCS/man/es/mplayer.1 +++ b/DOCS/man/es/mplayer.1 @@ -662,14 +662,14 @@ Reproduce archivos en orden aleatorio. .B \-skin (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 . diff --git a/DOCS/man/fr/mplayer.1 b/DOCS/man/fr/mplayer.1 index 935a808c16..44cbdfcdbc 100644 --- a/DOCS/man/fr/mplayer.1 +++ b/DOCS/man/fr/mplayer.1 @@ -934,14 +934,14 @@ Joue les fichiers en ordre al .TP .B \-skin (GUI uniquement) Charge le 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 . diff --git a/DOCS/man/hu/mplayer.1 b/DOCS/man/hu/mplayer.1 index 04f4d274f9..4f14965de2 100644 --- a/DOCS/man/hu/mplayer.1 +++ b/DOCS/man/hu/mplayer.1 @@ -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. diff --git a/DOCS/man/it/mplayer.1 b/DOCS/man/it/mplayer.1 index 66d204c91c..6131e3a25b 100644 --- a/DOCS/man/it/mplayer.1 +++ b/DOCS/man/it/mplayer.1 @@ -925,15 +925,15 @@ Riproduce i file in ordine casuale. .TP .B \-skin (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 . diff --git a/DOCS/man/pl/mplayer.1 b/DOCS/man/pl/mplayer.1 index ce71882fa6..02ff7f0ec7 100644 --- a/DOCS/man/pl/mplayer.1 +++ b/DOCS/man/pl/mplayer.1 @@ -734,15 +734,15 @@ Odtwarza zbiory w losowej kolejno .TP .B \-skin (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 . diff --git a/DOCS/man/sv/mplayer.1 b/DOCS/man/sv/mplayer.1 index 1fc1957fca..2562f5603d 100644 --- a/DOCS/man/sv/mplayer.1 +++ b/DOCS/man/sv/mplayer.1 @@ -647,13 +647,13 @@ Spela filerna i slumpvis ordning. .TP .B \-skin (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 . diff --git a/DOCS/man/zh/mplayer.1 b/DOCS/man/zh/mplayer.1 index 13a0d71ca9..22e2ea61e8 100644 --- a/DOCS/man/zh/mplayer.1 +++ b/DOCS/man/zh/mplayer.1 @@ -290,7 +290,7 @@ gl2, and svga. .PD 0 .RSs .IPs "\-skin fittyfene" -³¢ÊÔSkin/fittyfene. +³¢ÊÔskins/fittyfene. ½«»áÊ×ÏȲ쿴/usr/local/share/mplayer/, È»ºóÊÇ~/.mplayer/. .RE diff --git a/DOCS/tech/TODO b/DOCS/tech/TODO index 7de0a297bb..fdfec6fb9c 100644 --- a/DOCS/tech/TODO +++ b/DOCS/tech/TODO @@ -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: diff --git a/DOCS/tech/binary-packaging.txt b/DOCS/tech/binary-packaging.txt index c579b839f8..9a043636a2 100644 --- a/DOCS/tech/binary-packaging.txt +++ b/DOCS/tech/binary-packaging.txt @@ -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. diff --git a/DOCS/xml/cs/install.xml b/DOCS/xml/cs/install.xml index 7aa24d75e1..a18af263df 100644 --- a/DOCS/xml/cs/install.xml +++ b/DOCS/xml/cs/install.xml @@ -586,13 +586,13 @@ co muset nìjaký stáhnout abyste mohli pou¾ívat GUI. Viz na¹i download stránku. Skiny by mìly být rozbaleny do obvyklého systémového adresáøe - ($PREFIX/share/mplayer/Skin), - nebo do $HOME/.mplayer/Skin. + ($PREFIX/share/mplayer/skins), + nebo do $HOME/.mplayer/skins. MPlayer ve výchozím stavu hledá v tìchto adresáøích podadresáø jménem default, ale mù¾ete pou¾ít volbu nebo direktivu skin=nový_skin konfiguraèního souboru pro - pou¾ití skinu v adresáøi */Skin/nový_skin. + pou¾ití skinu v adresáøi */skins/nový_skin. diff --git a/DOCS/xml/cs/skin.xml b/DOCS/xml/cs/skin.xml index 8bc07f244a..a5b53da38c 100644 --- a/DOCS/xml/cs/skin.xml +++ b/DOCS/xml/cs/skin.xml @@ -34,13 +34,13 @@ nainstalovat, chcete-li pou Adresáøe prohledávané na skiny jsou (v tomto poøadí): -$(DATADIR)/Skin/ +$(DATADIR)/skins/ -$(PREFIX)/share/mplayer/Skin/ +$(PREFIX)/share/mplayer/skins/ -~/.mplayer/Skin/ +~/.mplayer/skins/ @@ -54,7 +54,7 @@ Poznamenejme, Ka¾dý skin je instalován do vlastního adresáøe v nìkterém z vý¹e uvedených. Napøíklad: -$(PREFIX)/share/mplayer/Skin/default/ +$(PREFIX)/share/mplayer/skins/default/ @@ -267,7 +267,7 @@ end Jméno souboru s obrázkem musí být zadáno bez úvodních adresáøù - obrázky jsou -vyhledávány v adresáøi Skin. +vyhledávány v adresáøi skins. Mìli byste (ale nemusíte) zadat pøíponu souboru. Pokud soubor neexistuje, zkou¹í MPlayer naèíst soubor <jméno>.<pøíp>, kdy jsou za diff --git a/DOCS/xml/en/install.xml b/DOCS/xml/en/install.xml index 6890ae25c4..c1aa0f6d3e 100644 --- a/DOCS/xml/en/install.xml +++ b/DOCS/xml/en/install.xml @@ -547,13 +547,13 @@ As MPlayer doesn't have a skin included, you have to download them if you want to use the GUI. See the download page. They should be extracted to the usual system-wide directory ($PREFIX/share/mplayer/Skin), or to $HOME/.mplayer/Skin. +class="directory">$PREFIX/share/mplayer/skins), or to $HOME/.mplayer/skins. MPlayer by default looks in these directories for a directory named default, but you can use the option, or the skin=newskin config file directive to use -the skin in */Skin/newskin +the skin in */skins/newskin directory. diff --git a/DOCS/xml/en/skin.xml b/DOCS/xml/en/skin.xml index 8d37e15def..bf79ce1db3 100644 --- a/DOCS/xml/en/skin.xml +++ b/DOCS/xml/en/skin.xml @@ -18,13 +18,13 @@ in order to be able to use the GUI. The directories searched for skins are (in order): -$(DATADIR)/Skin/ +$(DATADIR)/skins/ -$(PREFIX)/share/mplayer/Skin/ +$(PREFIX)/share/mplayer/skins/ -~/.mplayer/Skin/ +~/.mplayer/skins/ @@ -38,7 +38,7 @@ arguments of the configure script). Every skin is installed into its own directory under one of the directories listed above, for example: -$(PREFIX)/share/mplayer/Skin/default/ +$(PREFIX)/share/mplayer/skins/default/ @@ -253,7 +253,7 @@ end The name of an image file must be given without leading directories - images -are searched for in the Skin directory. +are searched for in the skins directory. You may (but you need not) specify the extension of the file. If the file does not exist, MPlayer tries to load the file <filename>.<ext>, where png diff --git a/DOCS/xml/es/install.xml b/DOCS/xml/es/install.xml index 29f87f23ad..27ebc2ee15 100644 --- a/DOCS/xml/es/install.xml +++ b/DOCS/xml/es/install.xml @@ -542,13 +542,13 @@ Como MPlayer no tiene una piel incluida, debe bajarlas si desea usar la GUI. Vea la página de descargas. Deberían ser extraídas al directorio global de pieles normal ($PREFIX/share/mplayer/Skin), o al directorio -personal $HOME/.mplayer/Skin. +class="directory">$PREFIX/share/mplayer/skins/), o al directorio +personal $HOME/.mplayer/skins/. MPlayer por omisión busca en esos directorios por un directorio llamado default, pero puede usar la opción , o usar la directiva skin=pielnueva en el archivo de configuración -para usar el directorio */Skin/pielnueva. +para usar el directorio */skins//pielnueva. diff --git a/DOCS/xml/es/skin.xml b/DOCS/xml/es/skin.xml index bd7bc89020..a73951a46b 100644 --- a/DOCS/xml/es/skin.xml +++ b/DOCS/xml/es/skin.xml @@ -33,13 +33,13 @@ poder usar el GUI. Los directorios donde se buscan los skins son (en orden): -$(DATADIR)/Skin/ +$(DATADIR)/skins/ -$(PREFIX)/share/mplayer/Skin/ +$(PREFIX)/share/mplayer/skins/ -~/.mplayer/Skin/ +~/.mplayer/skins/ @@ -54,7 +54,7 @@ configurado MPlayer (vea los argumentos Todo skin es instalado en su propio directorio bajo uno de los directorios listados más arriba, por ejemplo: -$(PREFIX)/share/mplayer/Skin/default/ +$(PREFIX)/share/mplayer/skins/default/ @@ -275,7 +275,7 @@ end El nombre de un archivo de imagen se debe dar sin los directorios - las imágenes -se buscan en el directorio Skin. +se buscan en el directorio skins. También puede (pero necesita ser root) especificar la extensión del archivo. Si el archivo no existe, MPlayer intentará cargar el archivo diff --git a/DOCS/xml/fr/install.xml b/DOCS/xml/fr/install.xml index 5e7d5d0a1f..58e1e89c34 100644 --- a/DOCS/xml/fr/install.xml +++ b/DOCS/xml/fr/install.xml @@ -540,11 +540,11 @@ ceci pour des raisons techniques. devrez la télécharger si vous voulez utiliser la GUI. Voir la page des téléchargements. Elles pourront se placer dans le répertoire commun ( -$PREFIX/share/mplayer/Skin), ou dans $HOME/.mplayer/Skin. +$PREFIX/share/mplayer/skins), ou dans $HOME/.mplayer/skins. Par défaut, MPlayer consulte ces répertoires à la recherche d'un répertoire nommé default, mais vous pouvez utiliser l'option , ou placer skin=nouvelleskin -dans votre fichier de configuration pour utiliser la skin dans le répertoire */Skin/newskin. +dans votre fichier de configuration pour utiliser la skin dans le répertoire */skins/newskin. diff --git a/DOCS/xml/fr/skin.xml b/DOCS/xml/fr/skin.xml index 765b7884ed..55ef777675 100644 --- a/DOCS/xml/fr/skin.xml +++ b/DOCS/xml/fr/skin.xml @@ -18,13 +18,13 @@ la GUI. MPlayer cherche des skins dans ces répertoires (dans cet ordre): -$(DATADIR)/Skin/ +$(DATADIR)/skins/ -$(PREFIX)/share/mplayer/Skin/ +$(PREFIX)/share/mplayer/skins/ -~/.mplayer/Skin/ +~/.mplayer/skins/ @@ -38,7 +38,7 @@ du script configure). Chaque skin est installée dans son propre répertoire sous l'un des répertoires listés ci-dessus, par exemple: -$(PREFIX)/share/mplayer/Skin/default/ +$(PREFIX)/share/mplayer/skins/default/ @@ -254,7 +254,7 @@ end Le nom d'un fichier image doit être donné sans distinction de répertoire - les -images seront cherchées dans le répertoire Skin. +images seront cherchées dans le répertoire skins. Vous pouvez (mais ce n'est pas obligatoire) spécifier l'extension du fichier. Si le fichier n'existe pas, MPlayer essaie de charger le fichier <nomfichier>.<ext>, où png diff --git a/DOCS/xml/hu/install.xml b/DOCS/xml/hu/install.xml index 71abd3db8f..de4c0f999f 100644 --- a/DOCS/xml/hu/install.xml +++ b/DOCS/xml/hu/install.xml @@ -538,14 +538,14 @@ Mivel az MPlayer nem rendelkezik be le kell töltened õket, ha a GUI-t használni akarod. Lásd a letöltési oldalt. Ajánlott egy rendszerszinten elérhetõ könyvtárba tenni õket ($PREFIX/share/mplayer/Skin), vagy a $HOME/.mplayer/Skin-be. +class="directory">$PREFIX/share/mplayer/skins), vagy a $HOME/.mplayer/skins-be. Az MPlayer ezekben a könyvtárakban keres egy default nevû alkönyvtárat, amelyben az alapértelmezett skin van. Megadhatsz más könyvtárat is a kapcsolóval vagy a skin=newskin sorral a konfigurációs fájlban, és ekkor a -*/Skin/newskin könyvtárban lévõ skin lesz +*/skins/newskin könyvtárban lévõ skin lesz használatban. diff --git a/DOCS/xml/hu/skin.xml b/DOCS/xml/hu/skin.xml index 6f738d7431..0c2f9f323a 100644 --- a/DOCS/xml/hu/skin.xml +++ b/DOCS/xml/hu/skin.xml @@ -18,13 +18,13 @@ kell lennie, hogy haszn Az alábbi könyvtárak kerülnek átvizsgálásra (sorrendben): -$(DATADIR)/Skin/ +$(DATADIR)/skins/ -$(PREFIX)/share/mplayer/Skin/ +$(PREFIX)/share/mplayer/skins/ -~/.mplayer/Skin/ +~/.mplayer/skins/ @@ -38,7 +38,7 @@ konfigur 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: -$(PREFIX)/share/mplayer/Skin/default/ +$(PREFIX)/share/mplayer/skins/default/ @@ -253,7 +253,7 @@ end Egy kép fájl nevét a hozzá vezetõ útvonal nélkül kell megadni - a képeknek -a Skin könyvtárban kell lenniük. +a skins 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 MPlayer megpróbálja betölteni a <filename>.<ext> fájlt, ahol png diff --git a/DOCS/xml/pl/install.xml b/DOCS/xml/pl/install.xml index d70dcb79c6..9b2476ccaf 100644 --- a/DOCS/xml/pl/install.xml +++ b/DOCS/xml/pl/install.xml @@ -561,14 +561,14 @@ Jako je ¶ci±gn±æ, je¿eli chcesz u¿ywaæ GUI. Sprawd¼ stronê z zasobami do pobrania. Skórki powinny byæ rozpakowane do katalogu dostêpnego dla wszystkich ($PREFIX/share/mplayer/Skin) lub do $HOME/.mplayer/Skin. +class="directory">$PREFIX/share/mplayer/skins) lub do $HOME/.mplayer/skins. MPlayer sprawdza je w poszukiwaniu folderu nazwanego default, ale mo¿esz u¿yæ opcji lub wpisaæ do pliku konfiguracyjnego skin=nowaskórka, aby program korzysta³ ze skórki w katalogu -*/Skin/nowaskórka. +*/skins/nowaskórka. diff --git a/DOCS/xml/pl/skin.xml b/DOCS/xml/pl/skin.xml index 7628900fbd..9a9d6203b4 100644 --- a/DOCS/xml/pl/skin.xml +++ b/DOCS/xml/pl/skin.xml @@ -35,13 +35,13 @@ jedna sk Skórki s± szukane w nastêpuj±cych katalogach (w kolejno¶ci): -$(DATADIR)/Skin/ +$(DATADIR)/skins/ -$(PREFIX)/share/mplayer/Skin/ +$(PREFIX)/share/mplayer/skins/ -~/.mplayer/Skin/ +~/.mplayer/skins/ @@ -56,7 +56,7 @@ w skrypcie configure). Ka¿da skórka jest instalowana w swoim w³asnym katalogu, w jednej z wy¿ej wymienionych lokacji, na przyk³ad: -$(PREFIX)/share/mplayer/Skin/default/ +$(PREFIX)/share/mplayer/skins/default/ @@ -280,7 +280,7 @@ end Nazwa pliku graficznego musi zostaæ podana bez ¿adnych nazw katalogów - obrazki -s± szukane w katalogu Skin. +s± szukane w katalogu skins. Mo¿esz (ale nie musisz) okre¶liæ rozszerzenia tego pliku. Je¶li plik taki nie istnieje, MPlayer spróbuje wczytaæ plik <nazwa pliku>.<rozszerzenie>, diff --git a/DOCS/xml/ru/install.xml b/DOCS/xml/ru/install.xml index 06f6586ddb..1bf4c14515 100644 --- a/DOCS/xml/ru/install.xml +++ b/DOCS/xml/ru/install.xml @@ -540,11 +540,11 @@ make install ÈÏÔÉÔÅ ÉÓÐÏÌØÚÏ×ÁÔØ GUI. óÍ. download page[ÓÔÒÁÎÉÃÕ ÚÁËÁÞÅË]. ïÎÉ ÄÏÌÖÎÙ ÂÙÔØ ÉÚ×ÌÅÞÅÎÙ × ÓÉÓÔÅÍÎÙÊ ËÁÔÁÌÏÇ -($PREFIX/share/mplayer/Skin), ÉÌÉ × -$HOME/.mplayer/Skin. ðÏ ÕÍÏÌÞÁÎÉÀ, MPlayer ÉÝÅÔ ËÁÔÁÌÏÇ default +($PREFIX/share/mplayer/skins), ÉÌÉ × +$HOME/.mplayer/skins. ðÏ ÕÍÏÌÞÁÎÉÀ, MPlayer ÉÝÅÔ ËÁÔÁÌÏÇ default × ÜÔÉÈ ËÁÔÁÌÏÇÁÈ, ÎÏ ×Ù ÍÏÖÅÔÅ ÉÓÐÏÌØÚÏ×ÁÔØ ÏÐÃÉÀ , ÉÌÉ ÄÉÒÅËÔÉ×Õ ËÏÎÆÉÇÕÒÁÃÉÏÎÎÏÇÏ ÆÁÊÌÁ , ÞÔÏÂÙ ÉÓÐÏÌØÚÏ×ÁÔØ -ÛËÕÒÕ ÉÚ ËÁÔÁÌÏÇÁ */Skin/newskin. +ÛËÕÒÕ ÉÚ ËÁÔÁÌÏÇÁ */skins/newskin. diff --git a/DOCS/zh/documentation.html b/DOCS/zh/documentation.html index 1814e00abd..4a9c324d7c 100644 --- a/DOCS/zh/documentation.html +++ b/DOCS/zh/documentation.html @@ -657,9 +657,9 @@ HREF="codecs.html#software_ac3">

Ä¿Ç°ÓÉÓÚ¼¼ÊõÔ­Òò£¬Ä¿Ç°Äã²»ÄÜÔÚÃüÁîÐÐÏÂʹÓÃ-guiÑ¡Ïî¡£

ÒòΪMPlayer²»×Ô´øskin£¬ËùÒÔÈç¹ûÄãÏëҪʹÓÃGUI£¬Äã±ØÐë×Ô¼ºÏÂÔØËüÃÇ¡£²Î¼ûÏÂÔØÒ³¡£ -ËûÃÇÓ¦¸Ã±»½âѹµ½ÏµÍ³Í¨ÓõÄĿ¼($PREFIX/share/mplayer/Skin)£¬»òÕß½âѹµ½$HOME/.mplayer/Skin¡£ +ËûÃÇÓ¦¸Ã±»½âѹµ½ÏµÍ³Í¨ÓõÄĿ¼($PREFIX/share/mplayer/skins/)£¬»òÕß½âѹµ½$HOME/.mplayer/skins/¡£ MPlayerÔÚĬÈÏÇé¿öÏ»áÔÚÕâЩµÄĿ¼ÀïÑ°ÕÒÒ»¸ö½ÐdefaultµÄĿ¼£¬ -µ«ÊÇÄãÄÜʹÓÃ-skin newskinÑ¡Ïî»òÔÚconfigÎļþÖÐÌí¼Óskin=newskinÀ´Ç¿ÖÆʹÓÃ*/Skin/newskinĿ¼ÏµÄskin¡£

+µ«ÊÇÄãÄÜʹÓÃ-skin newskinÑ¡Ïî»òÔÚconfigÎļþÖÐÌí¼Óskin=newskinÀ´Ç¿ÖÆʹÓÃ*/skins/newskinĿ¼ÏµÄskin¡£

1.4 ×ÖÄ»ºÍOSD

diff --git a/DOCS/zh/skin.html b/DOCS/zh/skin.html index 60d80894e4..05e8cf0e8a 100644 --- a/DOCS/zh/skin.html +++ b/DOCS/zh/skin.html @@ -40,9 +40,9 @@

skinµÄËÑË÷Ŀ¼(°´Ë³Ðò)ÊÇ£º

-    $(DATADIR)/Skin/
-    $(PREFIX)/share/mplayer/Skin/
-    ~/.mplayer/Skin/
+    $(DATADIR)/skins/
+    $(PREFIX)/share/mplayer/skins/
+    ~/.mplayer/skins/

×¢Ò⣬µÚÒ»¸ö·¾¶ÒÐÀµÓÚMPlayerµÄ°²×°ÅäÖÃ(¼ûconfigure½Å±¾ @@ -50,7 +50,7 @@

ËùÓеÄskin±»°²×°µ½ÉÏÃæÁгöµÄÒ»¸öĿ¼ÏµÄ×Ô¼ºµÄĿ¼ÖУ¬ÀýÈ磺

-    $(PREFIX)/share/mplayer/Skin/default/
+    $(PREFIX)/share/mplayer/skins/default/
@@ -207,7 +207,7 @@ end -

ͼÏñÎļþµÄÃû³Æ±ØÐë²»´øĿ¼Ãû -- ͼÏñÔÚSkinĿ¼Öб»ËÑË÷¡£ÄãÄÜ(µ«ÊDz¢²»ÐèÒª)¹æ¶¨À©Õ¹Ãû¡£ +

ͼÏñÎļþµÄÃû³Æ±ØÐë²»´øĿ¼Ãû -- ͼÏñÔÚskinsĿ¼Öб»ËÑË÷¡£ÄãÄÜ(µ«ÊDz¢²»ÐèÒª)¹æ¶¨À©Õ¹Ãû¡£ Èç¹ûÎļþ²»´æÔÚ£¬MPlayer½«ÊÔͼװÔØ<filename>.<ext>Îļþ£¬ <ext>¿ÉÒÔÊÇpng»òÕßPNG(°´Õâ¸ö˳Ðò³¢ÊÔ)¡£µÚÒ»¸öÆ¥ÅäÎļþ½«±»Ê¹Óá£

diff --git a/Gui/app.c b/Gui/app.c index 5c3e3ef8e9..58b4a7667c 100644 --- a/Gui/app.c +++ b/Gui/app.c @@ -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 ) diff --git a/Gui/app.h b/Gui/app.h index 5a237d9400..fd5a638e48 100644 --- a/Gui/app.h +++ b/Gui/app.h @@ -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 ); diff --git a/Gui/interface.c b/Gui/interface.c index 3e03e2a1ca..5b785683ab 100644 --- a/Gui/interface.c +++ b/Gui/interface.c @@ -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")) diff --git a/Gui/mplayer/gtk/sb.c b/Gui/mplayer/gtk/sb.c index 3ee89b340c..2293239504 100644 --- a/Gui/mplayer/gtk/sb.c +++ b/Gui/mplayer/gtk/sb.c @@ -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,"/*" ); } diff --git a/Gui/mplayer/gtk/sb.h b/Gui/mplayer/gtk/sb.h index 5831d5450f..74a28ab5a8 100644 --- a/Gui/mplayer/gtk/sb.h +++ b/Gui/mplayer/gtk/sb.h @@ -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 ); diff --git a/Gui/mplayer/widgets.c b/Gui/mplayer/widgets.c index 6fbdeb3a01..464399ef3a 100644 --- a/Gui/mplayer/widgets.c +++ b/Gui/mplayer/widgets.c @@ -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 ) ); diff --git a/Gui/skin/skin.c b/Gui/skin/skin.c index b7b93073dc..2fd61ffad3 100644 --- a/Gui/skin/skin.c +++ b/Gui/skin/skin.c @@ -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; + } + } } } diff --git a/Makefile b/Makefile index 6750780d2f..e8ff7e04c4 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/README b/README index 1ba5b4aebe..cfc988a2fe 100644 --- a/README +++ b/README @@ -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. __________________ diff --git a/etc/example.conf b/etc/example.conf index 6ecba1e81f..a2a04cde90 100644 --- a/etc/example.conf +++ b/etc/example.conf @@ -91,7 +91,7 @@ #framedrop = yes # Specify your preferred skin here (skins are searched for in -# /usr/local/share/mplayer/Skin/ and ~/.mplayer/Skin/). +# /usr/local/share/mplayer/skins/ and ~/.mplayer/skins/). #skin = Abyss # Resample the font alphamap. -- cgit v1.2.3