diff options
| author | da-anda <da-anda@xbmc.org> | 2014-04-29 22:35:12 +0200 |
|---|---|---|
| committer | da-anda <da-anda@xbmc.org> | 2014-05-02 00:52:50 +0200 |
| commit | b7b57f8a624abcd46dcc99fe9fe1d96b399bc02d (patch) | |
| tree | e76e56c559e9db5ed4fe7dd7b710f932a6733663 | |
| parent | 161735ab51146bb051bfdb9007e97f7f6bafaeac (diff) | |
[linux] make use of new icons
| -rw-r--r-- | Makefile.in | 4 | ||||
| -rw-r--r-- | tools/Linux/xbmc-48x48.png | bin | 5880 -> 0 bytes | |||
| -rw-r--r-- | xbmc/windowing/X11/WinSystemX11.cpp | 2 | ||||
| -rw-r--r-- | xbmc/windowing/X11/WinSystemX11GLES.cpp | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index 6f689cfbd1..1db6ee22c2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -648,9 +648,9 @@ endif @install -d $(DESTDIR)$(datarootdir)/applications @install tools/Linux/xbmc.desktop $(DESTDIR)$(datarootdir)/applications/xbmc.desktop @install -d $(DESTDIR)$(datadir)/icons/hicolor/48x48/apps - @install -m 0644 tools/Linux/xbmc-48x48.png $(DESTDIR)$(datadir)/icons/hicolor/48x48/apps/xbmc.png + @install -m 0644 media/icon48x48.png $(DESTDIR)$(datadir)/icons/hicolor/48x48/apps/xbmc.png @install -d $(DESTDIR)$(datadir)/icons/hicolor/256x256/apps - @install -m 0644 media/icon.png $(DESTDIR)$(datadir)/icons/hicolor/256x256/apps/xbmc.png + @install -m 0644 media/icon256x256.png $(DESTDIR)$(datadir)/icons/hicolor/256x256/apps/xbmc.png @test -z "$(DESTDIR)" && gtk-update-icon-cache -f -q -t $(datadir)/icons/hicolor || : @echo "Copying bindings to $(DESTDIR)$(includedir)/xbmc" diff --git a/tools/Linux/xbmc-48x48.png b/tools/Linux/xbmc-48x48.png Binary files differdeleted file mode 100644 index 5b5771cbfb..0000000000 --- a/tools/Linux/xbmc-48x48.png +++ /dev/null diff --git a/xbmc/windowing/X11/WinSystemX11.cpp b/xbmc/windowing/X11/WinSystemX11.cpp index 083d1e9e39..54379eacdc 100644 --- a/xbmc/windowing/X11/WinSystemX11.cpp +++ b/xbmc/windowing/X11/WinSystemX11.cpp @@ -136,7 +136,7 @@ bool CWinSystemX11::CreateNewWindow(const CStdString& name, bool fullScreen, RES if(!SetFullScreen(fullScreen, res, false)) return false; - CBaseTexture* iconTexture = CTexture::LoadFromFile("special://xbmc/media/icon.png"); + CBaseTexture* iconTexture = CTexture::LoadFromFile("special://xbmc/media/icon256x256.png"); if (iconTexture) SDL_WM_SetIcon(SDL_CreateRGBSurfaceFrom(iconTexture->GetPixels(), iconTexture->GetWidth(), iconTexture->GetHeight(), 32, iconTexture->GetPitch(), 0xff0000, 0x00ff00, 0x0000ff, 0xff000000L), NULL); diff --git a/xbmc/windowing/X11/WinSystemX11GLES.cpp b/xbmc/windowing/X11/WinSystemX11GLES.cpp index 3d82fbf345..b2e282e933 100644 --- a/xbmc/windowing/X11/WinSystemX11GLES.cpp +++ b/xbmc/windowing/X11/WinSystemX11GLES.cpp @@ -159,7 +159,7 @@ bool CWinSystemX11GLES::CreateNewWindow(const CStdString& name, bool fullScreen, return false; CTexture iconTexture; - iconTexture.LoadFromFile("special://xbmc/media/icon.png"); + iconTexture.LoadFromFile("special://xbmc/media/icon256x256.png"); SDL_WM_SetIcon(SDL_CreateRGBSurfaceFrom(iconTexture.GetPixels(), iconTexture.GetWidth(), iconTexture.GetHeight(), BPP, iconTexture.GetPitch(), 0xff0000, 0x00ff00, 0x0000ff, 0xff000000L), NULL); SDL_WM_SetCaption("XBMC Media Center", NULL); |
