diff --git a/extras/package/macosx/VLC.xcodeproj/project.pbxproj b/extras/package/macosx/VLC.xcodeproj/project.pbxproj index e437332b1142a2928b2f18cf06bfd691283e733c..84bb08d28ea62a30ec53ffb60a20a5a0a640990b 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@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "sidebar-local@2x.png"; sourceTree = "<group>"; }; 6B8229CE1E4D2D4700833BE1 /* sidebar-movie.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "sidebar-movie.png"; sourceTree = "<group>"; }; 6B8229CF1E4D2D4700833BE1 /* sidebar-movie@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "sidebar-movie@2x.png"; sourceTree = "<group>"; }; 6B8229D01E4D2D4700833BE1 /* sidebar-music.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "sidebar-music.png"; sourceTree = "<group>"; }; 6B8229D11E4D2D4700833BE1 /* sidebar-music@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "sidebar-music@2x.png"; sourceTree = "<group>"; }; - 6B8229D21E4D2D4700833BE1 /* sidebar-pictures.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "sidebar-pictures.png"; sourceTree = "<group>"; }; - 6B8229D31E4D2D4700833BE1 /* sidebar-pictures@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "sidebar-pictures@2x.png"; sourceTree = "<group>"; }; - 6B8229D41E4D2D4700833BE1 /* sidebar-playlist.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "sidebar-playlist.png"; sourceTree = "<group>"; }; - 6B8229D51E4D2D4700833BE1 /* sidebar-playlist@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "sidebar-playlist@2x.png"; sourceTree = "<group>"; }; - 6B8229D61E4D2D4700833BE1 /* sidebar-podcast.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "sidebar-podcast.png"; sourceTree = "<group>"; }; - 6B8229D71E4D2D4700833BE1 /* sidebar-podcast@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "sidebar-podcast@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@2x.png */, 6B8229CE1E4D2D4700833BE1 /* sidebar-movie.png */, 6B8229CF1E4D2D4700833BE1 /* sidebar-movie@2x.png */, 6B8229D01E4D2D4700833BE1 /* sidebar-music.png */, 6B8229D11E4D2D4700833BE1 /* sidebar-music@2x.png */, - 6B8229D21E4D2D4700833BE1 /* sidebar-pictures.png */, - 6B8229D31E4D2D4700833BE1 /* sidebar-pictures@2x.png */, - 6B8229D41E4D2D4700833BE1 /* sidebar-playlist.png */, - 6B8229D51E4D2D4700833BE1 /* sidebar-playlist@2x.png */, - 6B8229D61E4D2D4700833BE1 /* sidebar-podcast.png */, - 6B8229D71E4D2D4700833BE1 /* sidebar-podcast@2x.png */, ); name = "Sidebar Icons"; path = "sidebar-icons"; diff --git a/modules/gui/macosx/Makefile.am b/modules/gui/macosx/Makefile.am index 665d20ce3df988f0ff51ca9bcd53bd71a56785c0..f4a2692001627dc27c9dbacdc659a53b3bda4200 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@2x.png \ gui/macosx/Resources/sidebar-icons/sidebar-movie.png \ gui/macosx/Resources/sidebar-icons/sidebar-movie@2x.png \ gui/macosx/Resources/sidebar-icons/sidebar-music.png \ gui/macosx/Resources/sidebar-icons/sidebar-music@2x.png \ - gui/macosx/Resources/sidebar-icons/sidebar-pictures.png \ - gui/macosx/Resources/sidebar-icons/sidebar-pictures@2x.png \ - gui/macosx/Resources/sidebar-icons/sidebar-playlist.png \ - gui/macosx/Resources/sidebar-icons/sidebar-playlist@2x.png \ - gui/macosx/Resources/sidebar-icons/sidebar-podcast.png \ - gui/macosx/Resources/sidebar-icons/sidebar-podcast@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 3242ffa6f8df6ba786b0f22fdbab17f066ffdd25..0000000000000000000000000000000000000000 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@2x.png b/modules/gui/macosx/Resources/sidebar-icons/sidebar-local@2x.png deleted file mode 100644 index 4cc1c53e99b6b91145a170d4cc50c2bdca399a29..0000000000000000000000000000000000000000 Binary files a/modules/gui/macosx/Resources/sidebar-icons/sidebar-local@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 61beca21f936efd8252d7d1af67c8af9df198112..0000000000000000000000000000000000000000 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@2x.png b/modules/gui/macosx/Resources/sidebar-icons/sidebar-pictures@2x.png deleted file mode 100644 index 48b8bdb1bbf4fe93f0b08da1b28d6a24fc8de3d8..0000000000000000000000000000000000000000 Binary files a/modules/gui/macosx/Resources/sidebar-icons/sidebar-pictures@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 06abc23cc1b111a9e5fa1ef5c64c4e31d8cfa033..0000000000000000000000000000000000000000 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@2x.png b/modules/gui/macosx/Resources/sidebar-icons/sidebar-playlist@2x.png deleted file mode 100644 index df1b42c24d9212a3938b0faef5c45f7f5e89d24e..0000000000000000000000000000000000000000 Binary files a/modules/gui/macosx/Resources/sidebar-icons/sidebar-playlist@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 9f51cddbe1ff5839c08ebd2e7e641fb0d6ce50ce..0000000000000000000000000000000000000000 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@2x.png b/modules/gui/macosx/Resources/sidebar-icons/sidebar-podcast@2x.png deleted file mode 100644 index 5ed4a94e650588ed4ffb2f98201d77c7a8ca0713..0000000000000000000000000000000000000000 Binary files a/modules/gui/macosx/Resources/sidebar-icons/sidebar-podcast@2x.png and /dev/null differ diff --git a/modules/gui/macosx/menus/VLCStatusBarIcon.h b/modules/gui/macosx/menus/VLCStatusBarIcon.h index a143e4d0350e0728c8311890533db9bc0efd2770..6fa76c5dea12b27aa46c08cdf9fa95d103afa1fb 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 63b61ad430e6261e9fb0aa5fcc057873dd7602ad..6f14233a444b47783524ee40c92fdc491f7e18a4 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 {