MacGui: reorganize Xcode project groups and fix file copyright headers.

diff --git a/macosx/HBLocalizationUtilities.h b/macosx/HBLocalizationUtilities.h
index 6db55dca29422d62462c11366463427df78a40c2..d87caa0644faa52941720a03965467cbe4fc26c5 100644 (file)
--- a/macosx/HBLocalizationUtilities.h
+++ b/macosx/HBLocalizationUtilities.h
@@ -1,9 +1,8 @@
-//
-//  HBLocalizationUtilities.h
-//  HandBrakeKit
-//
-//  Created by Damiano Galassi on 20/10/2018.
-//
+/*  HBLocalizationUtilities.h
+
+This file is part of the HandBrake source code.
+Homepage: <http://handbrake.fr/>.
+It may be used under the terms of the GNU General Public License. */
 
 #ifndef HBLocalizationUtilities_h
 #define HBLocalizationUtilities_h

diff --git a/macosx/HBPreviewViewController.h b/macosx/HBPreviewViewController.h
index 3b4c0b1111ef8c03a6f64691bb12d2531ce1a4ca..a32d596d4fe69fd589f75f6d40d6f1199c6cf3d7 100644 (file)
--- a/macosx/HBPreviewViewController.h
+++ b/macosx/HBPreviewViewController.h
@@ -1,9 +1,8 @@
-//
-//  HBPreviewViewController.h
-//  HandBrake
-//
-//  Created by Damiano Galassi on 14/12/2017.
-//
+/*  HBPreviewViewController.h
+
+This file is part of the HandBrake source code.
+Homepage: <http://handbrake.fr/>.
+It may be used under the terms of the GNU General Public License. */
 
 #import <Cocoa/Cocoa.h>
 

diff --git a/macosx/HBPreviewViewController.m b/macosx/HBPreviewViewController.m
index 2b8a2363218bdf34df8bf2eb418fae53c0edfa19..6e6063be2c42b243e8a5575dee69fadb4023f90e 100644 (file)
--- a/macosx/HBPreviewViewController.m
+++ b/macosx/HBPreviewViewController.m
@@ -1,9 +1,8 @@
-//
-//  HBPreviewViewController.m
-//  HandBrake
-//
-//  Created by Damiano Galassi on 14/12/2017.
-//
+/*  HBPreviewViewController.m
+
+This file is part of the HandBrake source code.
+Homepage: <http://handbrake.fr/>.
+It may be used under the terms of the GNU General Public License. */
 
 #import <QuartzCore/QuartzCore.h>
 #import "HBPreviewViewController.h"

diff --git a/macosx/HBStateFormatter+Private.h b/macosx/HBStateFormatter+Private.h
index 2f4f261a802f93c047a513323255794698f5cf4a..516e6c1faddfe335cca1b67d13774372f7cd4522 100644 (file)
--- a/macosx/HBStateFormatter+Private.h
+++ b/macosx/HBStateFormatter+Private.h
@@ -1,10 +1,8 @@
-//
-//  HBStateFormatter+Private.h
-//  HandBrake
-//
-//  Created by Damiano Galassi on 24/02/16.
-//
-//
+/*  HBStateFormatter+Private.h
+
+This file is part of the HandBrake source code.
+Homepage: <http://handbrake.fr/>.
+It may be used under the terms of the GNU General Public License. */
 
 #import <Foundation/Foundation.h>
 #import "HBStateFormatter.h"

diff --git a/macosx/HBTrackTitleViewController.h b/macosx/HBTrackTitleViewController.h
index 40efee60c73cc2add89770fb3b2bdcf9771e2635..14bbe531adc3a27bd7c09315f563e3e9aaa12101 100644 (file)
--- a/macosx/HBTrackTitleViewController.h
+++ b/macosx/HBTrackTitleViewController.h
@@ -1,10 +1,8 @@
-//
-//  HBTrackTitleViewController.h
-//  HandBrake
-//
-//  Created by Damiano Galassi on 26/09/2019.
-//
+/*  HBTrackTitleViewController.h
 
+This file is part of the HandBrake source code.
+Homepage: <http://handbrake.fr/>.
+It may be used under the terms of the GNU General Public License. */
 #import <Cocoa/Cocoa.h>
 
 NS_ASSUME_NONNULL_BEGIN

diff --git a/macosx/HBTrackTitleViewController.m b/macosx/HBTrackTitleViewController.m
index e1b19a74fd1ba2ca4706649d3bbbc95c8775d1d2..4ea9142ce21f0682684a63094be69d2f885040d5 100644 (file)
--- a/macosx/HBTrackTitleViewController.m
+++ b/macosx/HBTrackTitleViewController.m
@@ -1,9 +1,10 @@
-//
-//  HBTrackTitleViewController.m
-//  HandBrake
-//
-//  Created by Damiano Galassi on 26/09/2019.
-//
+/*  HBTrackTitleViewController.m
+
+This file is part of the HandBrake source code.
+Homepage: <http://handbrake.fr/>.
+It may be used under the terms of the GNU General Public License. */
+
+#import <Cocoa/Cocoa.h>
 
 #import "HBTrackTitleViewController.h"
 

diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj
index 3c0da1b6b50eb29489fff56d04169739ef6f0404..de5a60985b3ed7e1a696ffe6632c11e0a6448797 100644 (file)
--- a/macosx/HandBrake.xcodeproj/project.pbxproj
+++ b/macosx/HandBrake.xcodeproj/project.pbxproj
@@ -1062,10 +1062,17 @@
                        children = (
                                A9F217E41E2F897D00C10C6E /* HandBrake.entitlements */,
                                A9F217E51E2F934C00C10C6E /* container-migration.plist */,
-                               A9B34D6F197683FE00871B7D /* Controllers */,
+                               A92268761A6E555500A8D5C5 /* HBAppDelegate.h */,
+                               A92268771A6E555500A8D5C5 /* HBAppDelegate.m */,
+                               A9A96BAB20CAD5A100A39AFB /* MainMenu.xib */,
+                               A901C23F1BC7CFD100D77735 /* Main Window */,
+                               A901C2401BC7CFDC00D77735 /* Queue */,
+                               A901C2411BC7CFFD00D77735 /* Preview */,
+                               A9B34D6F197683FE00871B7D /* Preferences */,
+                               A941390123473BE5003B647F /* Presets */,
                                A98F00771A972007001C2298 /* Output Redirect */,
-                               A901C2431BC7D05000D77735 /* Others */,
                                A9B34D711976844500871B7D /* UI Views */,
+                               A901C2431BC7D05000D77735 /* Others */,
                        );
                        name = HandBrake;
                        sourceTree = "<group>";
@@ -1296,6 +1303,24 @@
                        name = Player;
                        sourceTree = "<group>";
                };
+               A941390123473BE5003B647F /* Presets */ = {
+                       isa = PBXGroup;
+                       children = (
+                               A9E2FD241A21BC4A000E8D3F /* HBAddPresetController.h */,
+                               A9E2FD251A21BC4A000E8D3F /* HBAddPresetController.m */,
+                               A91AD3451FB5D9AA00AEA822 /* AddPreset.xib */,
+                               A91AD33D1FB5D2FC00AEA822 /* HBAddCategoryController.h */,
+                               A91AD33E1FB5D2FC00AEA822 /* HBAddCategoryController.m */,
+                               A91AD3421FB5D9A500AEA822 /* HBAddCategoryController.xib */,
+                               A939DD891FC8826A00135F2A /* HBPresetsMenuBuilder.h */,
+                               A939DD8A1FC8826A00135F2A /* HBPresetsMenuBuilder.m */,
+                               1C7776A1202300DC001C31EB /* HBRenamePresetController.h */,
+                               1C7776A0202300DC001C31EB /* HBRenamePresetController.m */,
+                               1C7776A3202301D5001C31EB /* HBRenamePresetController.xib */,
+                       );
+                       name = Presets;
+                       sourceTree = "<group>";
+               };
                A952392E199A647F00588AEF /* Presets */ = {
                        isa = PBXGroup;
                        children = (
@@ -1415,6 +1440,9 @@
                                A91AFD0B1A948827009BECED /* HBOutputFileWriter.m */,
                                A91AFD0D1A949472009BECED /* HBJobOutputFileWriter.h */,
                                A91AFD0E1A949472009BECED /* HBJobOutputFileWriter.m */,
+                               273F209B14ADBE670021BE6D /* HBOutputPanelController.h */,
+                               273F209C14ADBE670021BE6D /* HBOutputPanelController.m */,
+                               A9A96BDB20CAD66000A39AFB /* OutputPanel.xib */,
                        );
                        name = "Output Redirect";
                        sourceTree = "<group>";
@@ -1436,35 +1464,15 @@
                        name = Audio;
                        sourceTree = "<group>";
                };
-               A9B34D6F197683FE00871B7D /* Controllers */ = {
+               A9B34D6F197683FE00871B7D /* Preferences */ = {
                        isa = PBXGroup;
                        children = (
-                               A92268761A6E555500A8D5C5 /* HBAppDelegate.h */,
-                               A92268771A6E555500A8D5C5 /* HBAppDelegate.m */,
-                               A9A96BAB20CAD5A100A39AFB /* MainMenu.xib */,
-                               A901C23F1BC7CFD100D77735 /* Main Window */,
-                               A901C2401BC7CFDC00D77735 /* Queue */,
-                               A901C2411BC7CFFD00D77735 /* Preview */,
-                               A9E2FD241A21BC4A000E8D3F /* HBAddPresetController.h */,
-                               A9E2FD251A21BC4A000E8D3F /* HBAddPresetController.m */,
-                               A91AD3451FB5D9AA00AEA822 /* AddPreset.xib */,
-                               A91AD33D1FB5D2FC00AEA822 /* HBAddCategoryController.h */,
-                               A91AD33E1FB5D2FC00AEA822 /* HBAddCategoryController.m */,
-                               A91AD3421FB5D9A500AEA822 /* HBAddCategoryController.xib */,
-                               273F209B14ADBE670021BE6D /* HBOutputPanelController.h */,
-                               273F209C14ADBE670021BE6D /* HBOutputPanelController.m */,
-                               A9A96BDB20CAD66000A39AFB /* OutputPanel.xib */,
                                A945CC3122ED7C6A00E9C2E3 /* HBPreferencesKeys.h */,
                                273F209F14ADBE670021BE6D /* HBPreferencesController.h */,
                                273F20A014ADBE670021BE6D /* HBPreferencesController.m */,
                                A9A96BDE20CAD66500A39AFB /* Preferences.xib */,
-                               A939DD891FC8826A00135F2A /* HBPresetsMenuBuilder.h */,
-                               A939DD8A1FC8826A00135F2A /* HBPresetsMenuBuilder.m */,
-                               1C7776A1202300DC001C31EB /* HBRenamePresetController.h */,
-                               1C7776A0202300DC001C31EB /* HBRenamePresetController.m */,
-                               1C7776A3202301D5001C31EB /* HBRenamePresetController.xib */,
                        );
-                       name = Controllers;
+                       name = Preferences;
                        sourceTree = "<group>";
                };
                A9B34D701976841800871B7D /* View Controllers */ = {
@@ -1724,7 +1732,7 @@
                273F1FE014AD9DA40021BE6D /* Project object */ = {
                        isa = PBXProject;
                        attributes = {
-                               LastUpgradeCheck = 1110;
+                               LastUpgradeCheck = 1120;
                                TargetAttributes = {
                                        273F203814ADBC200021BE6D = {
                                                SystemCapabilities = {

diff --git a/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Debug-Sandbox.xcscheme b/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Debug-Sandbox.xcscheme
index ffd2cff7687aa42623192bf970f333cad828a48b..1503f92e80138b8251b22d895506fd6c177dacf2 100644 (file)
--- a/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Debug-Sandbox.xcscheme
+++ b/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Debug-Sandbox.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1110"
+   LastUpgradeVersion = "1120"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Debug.xcscheme b/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Debug.xcscheme
index 54dc9470695515d57adb807370fa69dd47c1876b..795d4f686bd511f9191aef74f73e7ffa9b164892 100644 (file)
--- a/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Debug.xcscheme
+++ b/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Debug.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1110"
+   LastUpgradeVersion = "1120"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Distribution.xcscheme b/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Distribution.xcscheme
index 177c890a768760d9d45558125fa3ba2c26d31836..0966840e2fc9ccf3fd0f7c8febd9501457d4b11b 100644 (file)
--- a/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Distribution.xcscheme
+++ b/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Distribution.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1110"
+   LastUpgradeVersion = "1120"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Release-Sandbox.xcscheme b/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Release-Sandbox.xcscheme
index 479033f29a096650376adb91d643ae96e18f538c..a65cddf175a38b72d586c045f17efb198b1a4b87 100644 (file)
--- a/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Release-Sandbox.xcscheme
+++ b/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Release-Sandbox.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1110"
+   LastUpgradeVersion = "1120"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Release.xcscheme b/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Release.xcscheme
index 03a29e905e9b1802aeb95ed1f3583210960022bd..6d67116e9392b41120bcfac315cb3a74899b5793 100644 (file)
--- a/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Release.xcscheme
+++ b/macosx/HandBrake.xcodeproj/xcshareddata/xcschemes/HandBrake-Release.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1110"
+   LastUpgradeVersion = "1120"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/macosx/HandBrakeKitTests/HBDictTests.m b/macosx/HandBrakeKitTests/HBDictTests.m
index 00a2099d7ad7a7577c45d626e990930db62255bb..0327380c469b544451b658f51ba490fa1fb600b0 100644 (file)
--- a/macosx/HandBrakeKitTests/HBDictTests.m
+++ b/macosx/HandBrakeKitTests/HBDictTests.m
@@ -1,10 +1,8 @@
-//
-//  HBDictTests.m
-//  HandBrake
-//
-//  Created by Damiano Galassi on 01/03/16.
-//
-//
+/*  HBDictTests.m
+ 
+This file is part of the HandBrake source code.
+Homepage: <http://handbrake.fr/>.
+It may be used under the terms of the GNU General Public License. */
 
 #import <XCTest/XCTest.h>
 #import "NSDictionary+HBAdditions.h"

diff --git a/macosx/HandBrakeXPCService/de.lproj/Localizable.strings b/macosx/HandBrakeXPCService/de.lproj/Localizable.strings
index 3e46453c3ad9aacad496bad9ebd8b65320d8795b..2bbe7113b29dfde0684254cda71ed8be6711b90f 100644 (file)
--- a/macosx/HandBrakeXPCService/de.lproj/Localizable.strings
+++ b/macosx/HandBrakeXPCService/de.lproj/Localizable.strings
@@ -1,7 +1,4 @@
 /* 
   Localizable.strings
-  HandBrake
-
-  Created by Damiano Galassi on 11/08/2019.
-  
+  HandBrake  
 */

diff --git a/macosx/HandBrakeXPCService/en.lproj/Localizable.strings b/macosx/HandBrakeXPCService/en.lproj/Localizable.strings
index 3e46453c3ad9aacad496bad9ebd8b65320d8795b..6a88a3e08154a37d84d18bcf9bd98298ccf2bbc5 100644 (file)
--- a/macosx/HandBrakeXPCService/en.lproj/Localizable.strings
+++ b/macosx/HandBrakeXPCService/en.lproj/Localizable.strings
@@ -1,7 +1,4 @@
-/* 
+/*
   Localizable.strings
   HandBrake
-
-  Created by Damiano Galassi on 11/08/2019.
-  
 */

diff --git a/macosx/HandBrakeXPCService/fr.lproj/Localizable.strings b/macosx/HandBrakeXPCService/fr.lproj/Localizable.strings
index 3e46453c3ad9aacad496bad9ebd8b65320d8795b..6a88a3e08154a37d84d18bcf9bd98298ccf2bbc5 100644 (file)
--- a/macosx/HandBrakeXPCService/fr.lproj/Localizable.strings
+++ b/macosx/HandBrakeXPCService/fr.lproj/Localizable.strings
@@ -1,7 +1,4 @@
-/* 
+/*
   Localizable.strings
   HandBrake
-
-  Created by Damiano Galassi on 11/08/2019.
-  
 */

diff --git a/macosx/HandBrakeXPCService/it.lproj/Localizable.strings b/macosx/HandBrakeXPCService/it.lproj/Localizable.strings
index 3e46453c3ad9aacad496bad9ebd8b65320d8795b..6a88a3e08154a37d84d18bcf9bd98298ccf2bbc5 100644 (file)
--- a/macosx/HandBrakeXPCService/it.lproj/Localizable.strings
+++ b/macosx/HandBrakeXPCService/it.lproj/Localizable.strings
@@ -1,7 +1,4 @@
-/* 
+/*
   Localizable.strings
   HandBrake
-
-  Created by Damiano Galassi on 11/08/2019.
-  
 */