Mercurial > mplayer.hg
changeset 33551:5d5f66b52c62
Add a warning message for unavailable or unusable icons.
This is a preparation for differently sized icons to come.
| author | ib |
|---|---|
| date | Fri, 17 Jun 2011 18:59:03 +0000 |
| parents | fea429f90bfd |
| children | ee00679a24c1 |
| files | gui/mplayer/widgets.c help/help_mp-de.h help/help_mp-en.h |
| diffstat | 3 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/gui/mplayer/widgets.c Fri Jun 17 18:31:35 2011 +0000 +++ b/gui/mplayer/widgets.c Fri Jun 17 18:59:03 2011 +0000 @@ -118,7 +118,8 @@ for (i = 2; i < guiIcon.collection_size; data += 4, i++) guiIcon.collection[i] = (data[3] << 24) | AV_RB24(data); // RGBA -> ARGB } - } + } else + mp_msg(MSGT_GPLAYER, MSGL_WARN, MSGTR_ICONERROR, "mplayer"); // start up GTK which realizes the pixmaps gtk_main_iteration_do(FALSE);
--- a/help/help_mp-de.h Fri Jun 17 18:31:35 2011 +0000 +++ b/help/help_mp-de.h Fri Jun 17 18:59:03 2011 +0000 @@ -782,6 +782,7 @@ #define MSGTR_NEMFMR "Sorry, nicht genug Speicher für Menü-Rendering." #define MSGTR_IDFGCVD "Sorry, es wurde kein GUI-kompatibler Ausgabetreiber gefunden.\n" #define MSGTR_NEEDLAVC "Sorry, du versuchst, Nicht-MPEG Dateien ohne erneute Encodierung abzuspielen.\nBitte aktiviere lavc in der DXR3/H+-Konfigurationsbox." +#define MSGTR_ICONERROR "Icon '%s' wurde nicht gefunden oder das Format wird nicht unterstützt.\n" // --- skin loader error messages #define MSGTR_SKIN_ERRORMESSAGE "Fehler in Skin-Konfigurationsdatei in Zeile %d: %s"
--- a/help/help_mp-en.h Fri Jun 17 18:31:35 2011 +0000 +++ b/help/help_mp-en.h Fri Jun 17 18:59:03 2011 +0000 @@ -574,6 +574,7 @@ #define MSGTR_NEMFMR "Sorry, not enough memory for menu rendering." #define MSGTR_IDFGCVD "Sorry, no GUI-compatible video output driver found.\n" #define MSGTR_NEEDLAVC "Sorry, you cannot play non-MPEG files with your DXR3/H+ device without reencoding.\nPlease enable lavc in the DXR3/H+ configuration box." +#define MSGTR_ICONERROR "Icon '%s' not found or unsupported format.\n" // --- skin loader error messages #define MSGTR_SKIN_ERRORMESSAGE "Error in skin config file on line %d: %s"