[vlc-commits] macosx: remove unused resources
Felix Paul Kühne
git at videolan.org
Wed Oct 30 16:17:38 CET 2019
vlc | branch: master | Felix Paul Kühne <felix at feepk.net> | Wed Oct 30 10:03:08 2019 +0100| [6206d1c944f8aa860fa134095910ea2a4682af84] | committer: Felix Paul Kühne
macosx: remove unused resources
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6206d1c944f8aa860fa134095910ea2a4682af84
---
extras/package/macosx/VLC.xcodeproj/project.pbxproj | 16 ----------------
modules/gui/macosx/Makefile.am | 8 --------
.../macosx/Resources/sidebar-icons/sidebar-local.png | Bin 396 -> 0 bytes
.../macosx/Resources/sidebar-icons/sidebar-local at 2x.png | Bin 1142 -> 0 bytes
.../macosx/Resources/sidebar-icons/sidebar-pictures.png | Bin 201 -> 0 bytes
.../Resources/sidebar-icons/sidebar-pictures at 2x.png | Bin 237 -> 0 bytes
.../macosx/Resources/sidebar-icons/sidebar-playlist.png | Bin 233 -> 0 bytes
.../Resources/sidebar-icons/sidebar-playlist at 2x.png | Bin 303 -> 0 bytes
.../macosx/Resources/sidebar-icons/sidebar-podcast.png | Bin 336 -> 0 bytes
.../Resources/sidebar-icons/sidebar-podcast at 2x.png | Bin 734 -> 0 bytes
modules/gui/macosx/menus/VLCStatusBarIcon.h | 1 -
modules/gui/macosx/menus/VLCStatusBarIcon.m | 6 ------
12 files changed, 31 deletions(-)
diff --git a/extras/package/macosx/VLC.xcodeproj/project.pbxproj b/extras/package/macosx/VLC.xcodeproj/project.pbxproj
index e437332b11..84bb08d28e 100644
--- a/extras/package/macosx/VLC.xcodeproj/project.pbxproj
+++ b/extras/package/macosx/VLC.xcodeproj/project.pbxproj
@@ -407,18 +407,10 @@
6B8229C21E4D2CFC00833BE1 /* VLCInterfaceCone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = VLCInterfaceCone.png; sourceTree = "<group>"; };
6B8229C31E4D2CFC00833BE1 /* VLCSubtitleCone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = VLCSubtitleCone.png; sourceTree = "<group>"; };
6B8229C41E4D2CFC00833BE1 /* VLCVideoCone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = VLCVideoCone.png; sourceTree = "<group>"; };
- 6B8229CC1E4D2D4700833BE1 /* sidebar-local.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "sidebar-local.png"; sourceTree = "<group>"; };
- 6B8229CD1E4D2D4700833BE1 /* sidebar-local at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "sidebar-local at 2x.png"; sourceTree = "<group>"; };
6B8229CE1E4D2D4700833BE1 /* sidebar-movie.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "sidebar-movie.png"; sourceTree = "<group>"; };
6B8229CF1E4D2D4700833BE1 /* sidebar-movie at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "sidebar-movie at 2x.png"; sourceTree = "<group>"; };
6B8229D01E4D2D4700833BE1 /* sidebar-music.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "sidebar-music.png"; sourceTree = "<group>"; };
6B8229D11E4D2D4700833BE1 /* sidebar-music at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "sidebar-music at 2x.png"; sourceTree = "<group>"; };
- 6B8229D21E4D2D4700833BE1 /* sidebar-pictures.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "sidebar-pictures.png"; sourceTree = "<group>"; };
- 6B8229D31E4D2D4700833BE1 /* sidebar-pictures at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "sidebar-pictures at 2x.png"; sourceTree = "<group>"; };
- 6B8229D41E4D2D4700833BE1 /* sidebar-playlist.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "sidebar-playlist.png"; sourceTree = "<group>"; };
- 6B8229D51E4D2D4700833BE1 /* sidebar-playlist at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "sidebar-playlist at 2x.png"; sourceTree = "<group>"; };
- 6B8229D61E4D2D4700833BE1 /* sidebar-podcast.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "sidebar-podcast.png"; sourceTree = "<group>"; };
- 6B8229D71E4D2D4700833BE1 /* sidebar-podcast at 2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "sidebar-podcast at 2x.png"; sourceTree = "<group>"; };
6B8229FD1E4D2DB400833BE1 /* noart.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = noart.png; sourceTree = "<group>"; };
6B8229FF1E4D2DD100833BE1 /* vlc.scriptSuite */ = {isa = PBXFileReference; lastKnownFileType = text.plist.scriptSuite; path = vlc.scriptSuite; sourceTree = "<group>"; };
6B822A001E4D2DD100833BE1 /* vlc.scriptTerminology */ = {isa = PBXFileReference; lastKnownFileType = text.plist.scriptTerminology; path = vlc.scriptTerminology; sourceTree = "<group>"; };
@@ -1318,18 +1310,10 @@
6B8229CB1E4D2D2C00833BE1 /* Sidebar Icons */ = {
isa = PBXGroup;
children = (
- 6B8229CC1E4D2D4700833BE1 /* sidebar-local.png */,
- 6B8229CD1E4D2D4700833BE1 /* sidebar-local at 2x.png */,
6B8229CE1E4D2D4700833BE1 /* sidebar-movie.png */,
6B8229CF1E4D2D4700833BE1 /* sidebar-movie at 2x.png */,
6B8229D01E4D2D4700833BE1 /* sidebar-music.png */,
6B8229D11E4D2D4700833BE1 /* sidebar-music at 2x.png */,
- 6B8229D21E4D2D4700833BE1 /* sidebar-pictures.png */,
- 6B8229D31E4D2D4700833BE1 /* sidebar-pictures at 2x.png */,
- 6B8229D41E4D2D4700833BE1 /* sidebar-playlist.png */,
- 6B8229D51E4D2D4700833BE1 /* sidebar-playlist at 2x.png */,
- 6B8229D61E4D2D4700833BE1 /* sidebar-podcast.png */,
- 6B8229D71E4D2D4700833BE1 /* sidebar-podcast at 2x.png */,
);
name = "Sidebar Icons";
path = "sidebar-icons";
diff --git a/modules/gui/macosx/Makefile.am b/modules/gui/macosx/Makefile.am
index 665d20ce3d..f4a2692001 100644
--- a/modules/gui/macosx/Makefile.am
+++ b/modules/gui/macosx/Makefile.am
@@ -439,18 +439,10 @@ libmacosx_plugin_la_RES = \
gui/macosx/Resources/Pref-Icons/VLCInterfaceCone.png \
gui/macosx/Resources/Pref-Icons/VLCSubtitleCone.png \
gui/macosx/Resources/Pref-Icons/VLCVideoCone.png \
- gui/macosx/Resources/sidebar-icons/sidebar-local.png \
- gui/macosx/Resources/sidebar-icons/sidebar-local at 2x.png \
gui/macosx/Resources/sidebar-icons/sidebar-movie.png \
gui/macosx/Resources/sidebar-icons/sidebar-movie at 2x.png \
gui/macosx/Resources/sidebar-icons/sidebar-music.png \
gui/macosx/Resources/sidebar-icons/sidebar-music at 2x.png \
- gui/macosx/Resources/sidebar-icons/sidebar-pictures.png \
- gui/macosx/Resources/sidebar-icons/sidebar-pictures at 2x.png \
- gui/macosx/Resources/sidebar-icons/sidebar-playlist.png \
- gui/macosx/Resources/sidebar-icons/sidebar-playlist at 2x.png \
- gui/macosx/Resources/sidebar-icons/sidebar-podcast.png \
- gui/macosx/Resources/sidebar-icons/sidebar-podcast at 2x.png \
gui/macosx/Resources/Button-Icons/VLCNextTemplate.pdf \
gui/macosx/Resources/Button-Icons/VLCPauseTemplate.pdf \
gui/macosx/Resources/Button-Icons/VLCPlayTemplate.pdf \
diff --git a/modules/gui/macosx/Resources/sidebar-icons/sidebar-local.png b/modules/gui/macosx/Resources/sidebar-icons/sidebar-local.png
deleted file mode 100644
index 3242ffa6f8..0000000000
Binary files a/modules/gui/macosx/Resources/sidebar-icons/sidebar-local.png and /dev/null differ
diff --git a/modules/gui/macosx/Resources/sidebar-icons/sidebar-local at 2x.png b/modules/gui/macosx/Resources/sidebar-icons/sidebar-local at 2x.png
deleted file mode 100644
index 4cc1c53e99..0000000000
Binary files a/modules/gui/macosx/Resources/sidebar-icons/sidebar-local at 2x.png and /dev/null differ
diff --git a/modules/gui/macosx/Resources/sidebar-icons/sidebar-pictures.png b/modules/gui/macosx/Resources/sidebar-icons/sidebar-pictures.png
deleted file mode 100644
index 61beca21f9..0000000000
Binary files a/modules/gui/macosx/Resources/sidebar-icons/sidebar-pictures.png and /dev/null differ
diff --git a/modules/gui/macosx/Resources/sidebar-icons/sidebar-pictures at 2x.png b/modules/gui/macosx/Resources/sidebar-icons/sidebar-pictures at 2x.png
deleted file mode 100644
index 48b8bdb1bb..0000000000
Binary files a/modules/gui/macosx/Resources/sidebar-icons/sidebar-pictures at 2x.png and /dev/null differ
diff --git a/modules/gui/macosx/Resources/sidebar-icons/sidebar-playlist.png b/modules/gui/macosx/Resources/sidebar-icons/sidebar-playlist.png
deleted file mode 100644
index 06abc23cc1..0000000000
Binary files a/modules/gui/macosx/Resources/sidebar-icons/sidebar-playlist.png and /dev/null differ
diff --git a/modules/gui/macosx/Resources/sidebar-icons/sidebar-playlist at 2x.png b/modules/gui/macosx/Resources/sidebar-icons/sidebar-playlist at 2x.png
deleted file mode 100644
index df1b42c24d..0000000000
Binary files a/modules/gui/macosx/Resources/sidebar-icons/sidebar-playlist at 2x.png and /dev/null differ
diff --git a/modules/gui/macosx/Resources/sidebar-icons/sidebar-podcast.png b/modules/gui/macosx/Resources/sidebar-icons/sidebar-podcast.png
deleted file mode 100644
index 9f51cddbe1..0000000000
Binary files a/modules/gui/macosx/Resources/sidebar-icons/sidebar-podcast.png and /dev/null differ
diff --git a/modules/gui/macosx/Resources/sidebar-icons/sidebar-podcast at 2x.png b/modules/gui/macosx/Resources/sidebar-icons/sidebar-podcast at 2x.png
deleted file mode 100644
index 5ed4a94e65..0000000000
Binary files a/modules/gui/macosx/Resources/sidebar-icons/sidebar-podcast at 2x.png and /dev/null differ
diff --git a/modules/gui/macosx/menus/VLCStatusBarIcon.h b/modules/gui/macosx/menus/VLCStatusBarIcon.h
index a143e4d035..6fa76c5dea 100644
--- a/modules/gui/macosx/menus/VLCStatusBarIcon.h
+++ b/modules/gui/macosx/menus/VLCStatusBarIcon.h
@@ -32,7 +32,6 @@
- (IBAction)statusBarIconShowMainWindow:(id)sender;
- (IBAction)statusBarIconTogglePlayPause:(id)sender;
-- (IBAction)statusBarIconStop:(id)sender;
- (IBAction)statusBarIconNext:(id)sender;
- (IBAction)statusBarIconPrevious:(id)sender;
- (IBAction)statusBarIconToggleRandom:(id)sender;
diff --git a/modules/gui/macosx/menus/VLCStatusBarIcon.m b/modules/gui/macosx/menus/VLCStatusBarIcon.m
index 63b61ad430..6f14233a44 100644
--- a/modules/gui/macosx/menus/VLCStatusBarIcon.m
+++ b/modules/gui/macosx/menus/VLCStatusBarIcon.m
@@ -459,12 +459,6 @@
}
}
-// Action: Stop playback
-- (IBAction)statusBarIconStop:(id)sender
-{
- [[[VLCMain sharedInstance] playlistController] stopPlayback];
-}
-
// Action: Go to next track
- (IBAction)statusBarIconNext:(id)sender
{
More information about the vlc-commits
mailing list