[vlc-commits] macosx: add yosemite graphics to project file and use them in code
David Fuhrmann
git at videolan.org
Sat Oct 18 13:23:01 CEST 2014
vlc/vlc-2.2 | branch: master | David Fuhrmann <dfuhrmann at videolan.org> | Wed Oct 1 21:52:01 2014 +0200| [ff8d19710854abf91763da5908f7ec87d705f4a8] | committer: David Fuhrmann
macosx: add yosemite graphics to project file and use them in code
This also cleans up the images structure inside the project.
(cherry picked from commit 6616504dfb7658f3b394bef2555f92a390e682ed)
Signed-off-by: David Fuhrmann <dfuhrmann at videolan.org>
Conflicts:
modules/gui/macosx/StringUtility.m
> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=ff8d19710854abf91763da5908f7ec87d705f4a8
---
.../macosx/Resources/English.lproj/MainWindow.xib | 45 +-
.../package/macosx/vlc.xcodeproj/project.pbxproj | 1542 ++++++++++++++++++--
modules/gui/macosx/ControlsBar.m | 244 ++--
modules/gui/macosx/MainWindow.h | 1 +
modules/gui/macosx/MainWindow.m | 15 +-
modules/gui/macosx/MainWindowTitle.m | 2 +-
modules/gui/macosx/SPMediaKeyTap.m | 1 -
modules/gui/macosx/StringUtility.h | 6 +
modules/gui/macosx/StringUtility.m | 21 +-
modules/gui/macosx/fspanel.m | 26 +-
modules/gui/macosx/misc.m | 8 +-
11 files changed, 1601 insertions(+), 310 deletions(-)
Diff: http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commitdiff;h=ff8d19710854abf91763da5908f7ec87d705f4a8
More information about the vlc-commits
mailing list