[vlc-commits] macosx: New directory structure for the macOS UI

David Fuhrmann git at videolan.org
Sun Feb 3 14:13:57 CET 2019


vlc | branch: master | David Fuhrmann <dfuhrmann at videolan.org> | Fri Feb  1 17:54:34 2019 +0100| [ba6ad45fbd4f8130139c32901c46cbab875d0871] | committer: David Fuhrmann

macosx: New directory structure for the macOS UI

This orders existing files into a new directory structure, to
group related elements together. The Xcode project is adapted
as well and reflects the same structure under macosx.

All includes include the subfolders now and are reordered and
cleaned up. Existing structure and alphabetic ordering shall be
kept.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ba6ad45fbd4f8130139c32901c46cbab875d0871
---

 .../package/macosx/VLC.xcodeproj/project.pbxproj   | 973 +++++++++------------
 modules/gui/macosx/Makefile.am                     | 314 ++++---
 .../{ => coreinteraction}/VLCClickerManager.h      |   0
 .../{ => coreinteraction}/VLCClickerManager.m      |  21 +-
 .../{ => coreinteraction}/VLCCoreInteraction.h     |   3 +-
 .../{ => coreinteraction}/VLCCoreInteraction.m     |  13 +-
 .../macosx/{ => coreinteraction}/VLCInputManager.h |   0
 .../macosx/{ => coreinteraction}/VLCInputManager.m |  30 +-
 .../{ => coreinteraction}/VLCVideoFilterHelper.h   |   0
 .../{ => coreinteraction}/VLCVideoFilterHelper.m   |   4 +-
 .../{ => extensions}/NSScreen+VLCAdditions.h       |   0
 .../{ => extensions}/NSScreen+VLCAdditions.m       |   4 +-
 .../macosx/{ => extensions}/NSSound+VLCAdditions.h |   0
 .../macosx/{ => extensions}/NSSound+VLCAdditions.m |   3 +-
 .../gui/macosx/{ => extensions}/NSString+Helpers.h |   0
 .../gui/macosx/{ => extensions}/NSString+Helpers.m |   0
 .../{ => extensions}/VLCHexNumberFormatter.h       |   0
 .../{ => extensions}/VLCHexNumberFormatter.m       |   0
 modules/gui/macosx/{ => extensions}/helpers.h      |   3 +-
 modules/gui/macosx/{ => extensions}/misc.h         |   0
 modules/gui/macosx/{ => extensions}/misc.m         |  17 +-
 .../{ => imported/AppleRemote}/AppleRemote.h       |   0
 .../{ => imported/AppleRemote}/AppleRemote.m       |   4 +-
 .../Internal/PXSourceListDelegateDataSourceProxy.h |   0
 .../Internal/PXSourceListDelegateDataSourceProxy.m |   0
 .../Internal/PXSourceListPrivateConstants.h        |   0
 .../Internal/PXSourceListRuntimeAdditions.h        |   0
 .../Internal/PXSourceListRuntimeAdditions.m        |   0
 .../{ => imported}/PXSourceList/PXSourceList.h     |   0
 .../{ => imported}/PXSourceList/PXSourceList.m     |   0
 .../PXSourceList/PXSourceListBadgeCell.h           |   0
 .../PXSourceList/PXSourceListBadgeCell.m           |   0
 .../PXSourceList/PXSourceListBadgeView.h           |   0
 .../PXSourceList/PXSourceListBadgeView.m           |   0
 .../PXSourceList/PXSourceListDataSource.h          |   0
 .../PXSourceList/PXSourceListDelegate.h            |   0
 .../{ => imported}/PXSourceList/PXSourceListItem.h |   0
 .../{ => imported}/PXSourceList/PXSourceListItem.m |   0
 .../PXSourceList/PXSourceListTableCellView.h       |   0
 .../PXSourceList/PXSourceListTableCellView.m       |   0
 .../{ => imported/SPMediaKeyTap}/SPMediaKeyTap.h   |   0
 .../{ => imported/SPMediaKeyTap}/SPMediaKeyTap.m   |   0
 .../{ => library}/VLCLibraryCollectionViewItem.h   |   0
 .../{ => library}/VLCLibraryCollectionViewItem.m   |   0
 .../gui/macosx/{ => library}/VLCLibraryWindow.h    |   2 +-
 .../gui/macosx/{ => library}/VLCLibraryWindow.m    |  12 +-
 modules/gui/macosx/{ => main}/CompatibilityFixes.h |   0
 modules/gui/macosx/{ => main}/CompatibilityFixes.m |   0
 modules/gui/macosx/{ => main}/VLCApplication.h     |   0
 modules/gui/macosx/{ => main}/VLCApplication.m     |   0
 modules/gui/macosx/{ => main}/VLCMain+OldPrefs.h   |   2 +-
 modules/gui/macosx/{ => main}/VLCMain+OldPrefs.m   |   7 +-
 modules/gui/macosx/{ => main}/VLCMain.h            |  18 +-
 modules/gui/macosx/{ => main}/VLCMain.m            |  57 +-
 modules/gui/macosx/{ => main}/macosx.m             |   0
 modules/gui/macosx/{ => menus}/VLCMainMenu.h       |   1 +
 modules/gui/macosx/{ => menus}/VLCMainMenu.m       |  57 +-
 modules/gui/macosx/{ => menus}/VLCStatusBarIcon.h  |   0
 modules/gui/macosx/{ => menus}/VLCStatusBarIcon.m  |   8 +-
 .../{ => menus/renderers}/VLCRendererDiscovery.h   |   2 +-
 .../{ => menus/renderers}/VLCRendererDiscovery.m   |   4 +-
 .../macosx/{ => menus/renderers}/VLCRendererItem.h |   0
 .../macosx/{ => menus/renderers}/VLCRendererItem.m |   2 +-
 .../renderers}/VLCRendererMenuController.h         |   4 +-
 .../renderers}/VLCRendererMenuController.m         |   4 +-
 modules/gui/macosx/{ => os-integration}/Spotify.h  |   0
 .../{ => os-integration}/VLCDocumentController.h   |   0
 .../{ => os-integration}/VLCDocumentController.m   |   2 +-
 .../VLCKeyboardBacklightControl.h                  |   0
 .../VLCKeyboardBacklightControl.m                  |   0
 .../{ => os-integration}/VLCRemoteControlService.h |   0
 .../{ => os-integration}/VLCRemoteControlService.m |   6 +-
 .../gui/macosx/{ => os-integration}/applescript.h  |   0
 .../gui/macosx/{ => os-integration}/applescript.m  |  12 +-
 modules/gui/macosx/{ => os-integration}/iTunes.h   |   0
 .../{ => panels}/VLCAudioEffectsWindowController.h |   0
 .../{ => panels}/VLCAudioEffectsWindowController.m |  16 +-
 .../{ => panels}/VLCBookmarksWindowController.h    |   2 +-
 .../{ => panels}/VLCBookmarksWindowController.m    |   3 +-
 modules/gui/macosx/{ => panels}/VLCPlaylistInfo.h  |   3 +
 modules/gui/macosx/{ => panels}/VLCPlaylistInfo.m  |   6 +-
 .../{ => panels}/VLCTimeSelectionPanelController.h |   0
 .../{ => panels}/VLCTimeSelectionPanelController.m |   5 +-
 .../VLCTrackSynchronizationWindowController.h      |   0
 .../VLCTrackSynchronizationWindowController.m      |  10 +-
 .../{ => panels}/VLCVideoEffectsWindowController.h |   0
 .../{ => panels}/VLCVideoEffectsWindowController.m |  15 +-
 .../{ => panels/dialogs}/VLCCoreDialogProvider.h   |   0
 .../{ => panels/dialogs}/VLCCoreDialogProvider.m   |   6 +-
 .../{ => panels/dialogs}/VLCPopupPanelController.h |   0
 .../{ => panels/dialogs}/VLCPopupPanelController.m |   0
 .../dialogs}/VLCResumeDialogController.h           |   0
 .../dialogs}/VLCResumeDialogController.m           |   6 +-
 .../dialogs}/VLCTextfieldPanelController.h         |   0
 .../dialogs}/VLCTextfieldPanelController.m         |   0
 .../macosx/{ => playlist}/VLCPlaylistController.h  |   0
 .../macosx/{ => playlist}/VLCPlaylistController.m  |  12 +-
 .../macosx/{ => playlist}/VLCPlaylistDataSource.h  |   0
 .../macosx/{ => playlist}/VLCPlaylistDataSource.m  |  13 +-
 .../gui/macosx/{ => playlist}/VLCPlaylistItem.h    |   0
 .../gui/macosx/{ => playlist}/VLCPlaylistItem.m    |   4 +-
 .../{ => playlist}/VLCPlaylistMenuController.h     |   0
 .../{ => playlist}/VLCPlaylistMenuController.m     |  11 +-
 .../gui/macosx/{ => playlist}/VLCPlaylistModel.h   |   0
 .../gui/macosx/{ => playlist}/VLCPlaylistModel.m   |   6 +-
 .../{ => playlist}/VLCPlaylistTableCellView.h      |   0
 .../{ => playlist}/VLCPlaylistTableCellView.m      |   0
 .../macosx/{ => playlist}/VLCPlaylistTableView.h   |   0
 .../macosx/{ => playlist}/VLCPlaylistTableView.m   |   7 +-
 .../{ => preferences}/VLCHotkeyChangeWindow.h      |   0
 .../{ => preferences}/VLCHotkeyChangeWindow.m      |   3 +-
 .../{ => preferences}/VLCSimplePrefsController.h   |   4 +-
 .../{ => preferences}/VLCSimplePrefsController.m   |  22 +-
 .../{ => preferences}/VLCSimplePrefsWindow.h       |   0
 .../{ => preferences}/VLCSimplePrefsWindow.m       |   3 +-
 modules/gui/macosx/{ => preferences}/prefs.h       |   0
 modules/gui/macosx/{ => preferences}/prefs.m       |  23 +-
 .../gui/macosx/{ => preferences}/prefs_widgets.h   |   0
 .../gui/macosx/{ => preferences}/prefs_widgets.m   |   6 +-
 modules/gui/macosx/{ => views}/VLCBottomBarView.h  |   0
 modules/gui/macosx/{ => views}/VLCBottomBarView.m  |   3 +-
 .../gui/macosx/{ => views}/VLCDefaultValueSlider.h |   0
 .../gui/macosx/{ => views}/VLCDefaultValueSlider.m |   3 +-
 .../macosx/{ => views}/VLCDefaultValueSliderCell.h |   0
 .../macosx/{ => views}/VLCDefaultValueSliderCell.m |   3 +-
 .../macosx/{ => views}/VLCFSPanelDraggableView.h   |   0
 .../macosx/{ => views}/VLCFSPanelDraggableView.m   |   2 +-
 modules/gui/macosx/{ => views}/VLCHUDOutlineView.h |   0
 modules/gui/macosx/{ => views}/VLCHUDOutlineView.m |   3 +-
 .../gui/macosx/{ => views}/VLCHUDTableCornerView.h |   0
 .../gui/macosx/{ => views}/VLCHUDTableCornerView.m |   0
 modules/gui/macosx/{ => views}/VLCHUDTableView.h   |   0
 modules/gui/macosx/{ => views}/VLCHUDTableView.m   |   3 +-
 modules/gui/macosx/{ => views}/VLCImageButton.h    |   0
 modules/gui/macosx/{ => views}/VLCImageButton.m    |   0
 .../gui/macosx/{ => views}/VLCScrollingClipView.h  |   0
 .../gui/macosx/{ => views}/VLCScrollingClipView.m  |   0
 modules/gui/macosx/{ => views}/VLCSlider.h         |   0
 modules/gui/macosx/{ => views}/VLCSlider.m         |   5 +-
 modules/gui/macosx/{ => views}/VLCSliderCell.h     |   0
 modules/gui/macosx/{ => views}/VLCSliderCell.m     |   3 +-
 modules/gui/macosx/{ => views}/VLCTimeField.h      |   0
 modules/gui/macosx/{ => views}/VLCTimeField.m      |   4 +-
 modules/gui/macosx/{ => views}/VLCVolumeSlider.h   |   3 +-
 modules/gui/macosx/{ => views}/VLCVolumeSlider.m   |   5 +-
 .../gui/macosx/{ => views}/VLCVolumeSliderCell.h   |   4 +-
 .../gui/macosx/{ => views}/VLCVolumeSliderCell.m   |   3 +-
 .../gui/macosx/{ => views}/VLCWrappableTextField.h |   0
 .../gui/macosx/{ => views}/VLCWrappableTextField.m |   2 +-
 .../{ => windows}/VLCAboutWindowController.h       |   0
 .../{ => windows}/VLCAboutWindowController.m       |   7 +-
 .../{ => windows}/VLCErrorWindowController.h       |   0
 .../{ => windows}/VLCErrorWindowController.m       |   2 +-
 .../macosx/{ => windows}/VLCHelpWindowController.h |   0
 .../macosx/{ => windows}/VLCHelpWindowController.m |   7 +-
 .../macosx/{ => windows}/VLCOpenInputMetadata.h    |   0
 .../macosx/{ => windows}/VLCOpenInputMetadata.m    |   0
 .../macosx/{ => windows}/VLCOpenWindowController.h |   0
 .../macosx/{ => windows}/VLCOpenWindowController.m |  15 +-
 .../macosx/{ => windows/addons}/VLCAddonListItem.h |   0
 .../macosx/{ => windows/addons}/VLCAddonListItem.m |   5 +-
 .../addons}/VLCAddonsWindowController.h            |   0
 .../addons}/VLCAddonsWindowController.m            |   9 +-
 .../VLCConvertAndSaveWindowController.h            |   0
 .../VLCConvertAndSaveWindowController.m            |   8 +-
 .../{ => windows/convertandsave}/VLCOutput.h       |   0
 .../{ => windows/convertandsave}/VLCOutput.m       |   2 +-
 .../extensions}/VLCExtensionsDialogProvider.h      |   5 +-
 .../extensions}/VLCExtensionsDialogProvider.m      |   4 +-
 .../extensions}/VLCExtensionsManager.h             |   2 +-
 .../extensions}/VLCExtensionsManager.m             |   6 +-
 .../macosx/{ => windows/extensions}/VLCUIWidgets.h |   0
 .../macosx/{ => windows/extensions}/VLCUIWidgets.m |   3 +-
 .../macosx/{ => windows/logging}/VLCLogMessage.h   |   0
 .../macosx/{ => windows/logging}/VLCLogMessage.m   |   0
 .../{ => windows/logging}/VLCLogWindowController.h |   0
 .../{ => windows/logging}/VLCLogWindowController.m |   6 +-
 .../mainwindow}/VLCControlsBarCommon.h             |   8 +-
 .../mainwindow}/VLCControlsBarCommon.m             |  11 +-
 .../{ => windows/mainwindow}/VLCMainWindow.h       |   6 +-
 .../{ => windows/mainwindow}/VLCMainWindow.m       |  32 +-
 .../mainwindow}/VLCMainWindowControlsBar.h         |   7 +-
 .../mainwindow}/VLCMainWindowControlsBar.m         |  13 +-
 .../mainwindow}/VLCSourceListBadgeButton.h         |   0
 .../mainwindow}/VLCSourceListBadgeButton.m         |   0
 .../{ => windows/mainwindow}/VLCSourceListItem.h   |   2 +-
 .../{ => windows/mainwindow}/VLCSourceListItem.m   |   0
 .../mainwindow}/VLCSourceListTableCellView.h       |   3 +-
 .../mainwindow}/VLCSourceListTableCellView.m       |   0
 .../{ => windows/video}/VLCDetachedVideoWindow.h   |   0
 .../{ => windows/video}/VLCDetachedVideoWindow.m   |   3 +-
 .../{ => windows/video}/VLCFSPanelController.h     |   6 +-
 .../{ => windows/video}/VLCFSPanelController.m     |   8 +-
 .../{ => windows/video}/VLCVideoOutputProvider.h   |   3 +-
 .../{ => windows/video}/VLCVideoOutputProvider.m   |  30 +-
 .../{ => windows/video}/VLCVideoWindowCommon.h     |   3 +-
 .../{ => windows/video}/VLCVideoWindowCommon.m     |  13 +-
 .../gui/macosx/{ => windows/video}/VLCVoutView.h   |   2 +
 .../gui/macosx/{ => windows/video}/VLCVoutView.m   |  12 +-
 modules/gui/macosx/{ => windows/video}/VLCWindow.h |   0
 modules/gui/macosx/{ => windows/video}/VLCWindow.m |   7 +-
 po/POTFILES.in                                     | 303 ++++---
 202 files changed, 1252 insertions(+), 1122 deletions(-)

Diff:   http://git.videolan.org/gitweb.cgi/vlc.git/?a=commitdiff;h=ba6ad45fbd4f8130139c32901c46cbab875d0871


More information about the vlc-commits mailing list