Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

✨ Improved window action selector #545

Merged
merged 9 commits into from
Aug 30, 2024
Merged

✨ Improved window action selector #545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ffbd751
✨ Improved window action selector
MrKai77 Aug 26, 2024
483a513
✨ Keybinds in search popover
MrKai77 Aug 27, 2024
a72c42e
🐞 Fix "macOS Center"
MrKai77 Aug 27, 2024
d91b913
📄 Slightly optimise code
SenpaiHunters Aug 27, 2024
eacac84
🐞 Fix popup changing wrong keybind item
MrKai77 Aug 30, 2024
5425c0d
✨ Remove question mark from "No Action"
MrKai77 Aug 30, 2024
8d7f070
🐞 Fix build mistake
SenpaiHunters Aug 30, 2024
8aab230
✨ Reset Luminare to remote
MrKai77 Aug 30, 2024
e7a9f73
✨ Update `WindowDirection`
SenpaiHunters Aug 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 28 additions & 13 deletions Loop.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1;
classes = {
};
objectVersion = 56;
objectVersion = 70;
objects = {

/* Begin PBXBuildFile section */
Expand All @@ -13,8 +13,8 @@
4C6B93E72C1DCF6E00AFF832 /* TheLoopTimes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C6B93E12C1DCF6E00AFF832 /* TheLoopTimes.swift */; };
4C6B93E82C1DCF6E00AFF832 /* Updater.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C6B93E22C1DCF6E00AFF832 /* Updater.swift */; };
4C6B93E92C1DCF6E00AFF832 /* UpdateView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C6B93E32C1DCF6E00AFF832 /* UpdateView.swift */; };
4C9405052C4A104A0006216C /* Luminare in Frameworks */ = {isa = PBXBuildFile; productRef = 4C9405042C4A104A0006216C /* Luminare */; };
4CD883A42C30F0D7009A132A /* WallpaperColors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4CD883A32C30F0D7009A132A /* WallpaperColors.swift */; };
A800418A2C7C110F005AD0D3 /* Luminare in Frameworks */ = {isa = PBXBuildFile; productRef = A80041892C7C110F005AD0D3 /* Luminare */; };
A8055EC22AFEDE0B00459D13 /* Keycorder.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8055EC12AFEDE0B00459D13 /* Keycorder.swift */; };
A80900D52AA3F9F30085C63B /* VisualEffectView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A80900D32AA3F9F20085C63B /* VisualEffectView.swift */; };
A80D49BB2BAE479900493B67 /* WindowAction+Port.swift in Sources */ = {isa = PBXBuildFile; fileRef = A80D49BA2BAE479900493B67 /* WindowAction+Port.swift */; };
Expand Down Expand Up @@ -58,6 +58,7 @@
A87F78942BAE28050087B1DE /* CustomWindowActionSizeMode.swift in Sources */ = {isa = PBXBuildFile; fileRef = A87F78932BAE28050087B1DE /* CustomWindowActionSizeMode.swift */; };
A87F78962BAE333C0087B1DE /* CustomWindowActionPositionMode.swift in Sources */ = {isa = PBXBuildFile; fileRef = A87F78952BAE333C0087B1DE /* CustomWindowActionPositionMode.swift */; };
A883642F298B7288005D6C19 /* ServiceManagement.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A883642E298B7288005D6C19 /* ServiceManagement.framework */; };
A88699DE2C815E3B007EBF47 /* Luminare in Frameworks */ = {isa = PBXBuildFile; productRef = A88699DD2C815E3B007EBF47 /* Luminare */; };
A8878A252AA3B2C800850A66 /* WindowTransformAnimation.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8878A242AA3B2C800850A66 /* WindowTransformAnimation.swift */; };
A88E27AD2BDDE5300042CF04 /* CustomActionConfigurationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A88E27AC2BDDE5300042CF04 /* CustomActionConfigurationView.swift */; };
A88E83C52B37B354009D332F /* CGEvent+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = A88E83C42B37B354009D332F /* CGEvent+Extensions.swift */; };
Expand Down Expand Up @@ -187,13 +188,18 @@
A8F1E96B2C253FA200AAF871 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFileSystemSynchronizedRootGroup section */
A800418D2C7C118E005AD0D3 /* Searchable Popover Picker */ = {isa = PBXFileSystemSynchronizedRootGroup; explicitFileTypes = {}; explicitFolders = (); path = "Searchable Popover Picker"; sourceTree = "<group>"; };
/* End PBXFileSystemSynchronizedRootGroup section */

/* Begin PBXFrameworksBuildPhase section */
A8E59C32297F5E9A0064D4BA /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
A8DCC97B2980D5F500D41065 /* Defaults in Frameworks */,
4C9405052C4A104A0006216C /* Luminare in Frameworks */,
A88699DE2C815E3B007EBF47 /* Luminare in Frameworks */,
A800418A2C7C110F005AD0D3 /* Luminare in Frameworks */,
A883642F298B7288005D6C19 /* ServiceManagement.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -215,15 +221,16 @@
A80900D12AA3F9F20085C63B /* Utilities */ = {
isa = PBXGroup;
children = (
4C0F2ACE2C3CFD09006CB34D /* RectangleTranslationLayer.swift */,
A8D4327A2C13ED3C007BE4F2 /* Icon.swift */,
A800418D2C7C118E005AD0D3 /* Searchable Popover Picker */,
A82DDBDD2AEC736300D7F974 /* AnimationConfiguration.swift */,
A80900D32AA3F9F20085C63B /* VisualEffectView.swift */,
A85B560D2AAAD62C00386ACE /* EventMonitor.swift */,
A86B97AC2AB79E2500099D7F /* ShakeEffect.swift */,
A8D4327A2C13ED3C007BE4F2 /* Icon.swift */,
A867C20D2C26522B005831BC /* Observer.swift */,
A8D6D3002B6C894C0061B11F /* PaddingModel.swift */,
4C0F2ACE2C3CFD09006CB34D /* RectangleTranslationLayer.swift */,
A86B97AC2AB79E2500099D7F /* ShakeEffect.swift */,
A80900D32AA3F9F20085C63B /* VisualEffectView.swift */,
A8D6D3042B6C92F20061B11F /* WallpaperView.swift */,
A867C20D2C26522B005831BC /* Observer.swift */,
);
path = Utilities;
sourceTree = "<group>";
Expand Down Expand Up @@ -472,10 +479,14 @@
);
dependencies = (
);
fileSystemSynchronizedGroups = (
A800418D2C7C118E005AD0D3 /* Searchable Popover Picker */,
);
name = Loop;
packageProductDependencies = (
A8DCC97A2980D5F500D41065 /* Defaults */,
4C9405042C4A104A0006216C /* Luminare */,
A80041892C7C110F005AD0D3 /* Luminare */,
A88699DD2C815E3B007EBF47 /* Luminare */,
);
productName = WindowManager;
productReference = A8E59C35297F5E9A0064D4BA /* Loop.app */;
Expand Down Expand Up @@ -517,7 +528,7 @@
mainGroup = A8E59C2C297F5E9A0064D4BA;
packageReferences = (
A8DCC9792980D5F500D41065 /* XCRemoteSwiftPackageReference "Defaults" */,
4C9405032C4A104A0006216C /* XCRemoteSwiftPackageReference "Luminare" */,
A88699DC2C815E3B007EBF47 /* XCRemoteSwiftPackageReference "Luminare" */,
);
productRefGroup = A8E59C36297F5E9A0064D4BA /* Products */;
projectDirPath = "";
Expand Down Expand Up @@ -883,7 +894,7 @@
/* End XCConfigurationList section */

/* Begin XCRemoteSwiftPackageReference section */
4C9405032C4A104A0006216C /* XCRemoteSwiftPackageReference "Luminare" */ = {
A88699DC2C815E3B007EBF47 /* XCRemoteSwiftPackageReference "Luminare" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/MrKai77/Luminare";
requirement = {
Expand All @@ -902,9 +913,13 @@
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
4C9405042C4A104A0006216C /* Luminare */ = {
A80041892C7C110F005AD0D3 /* Luminare */ = {
isa = XCSwiftPackageProductDependency;
productName = Luminare;
};
A88699DD2C815E3B007EBF47 /* Luminare */ = {
isa = XCSwiftPackageProductDependency;
package = 4C9405032C4A104A0006216C /* XCRemoteSwiftPackageReference "Luminare" */;
package = A88699DC2C815E3B007EBF47 /* XCRemoteSwiftPackageReference "Luminare" */;
productName = Luminare;
};
A8DCC97A2980D5F500D41065 /* Defaults */ = {
Expand Down
37 changes: 29 additions & 8 deletions Loop/Localizable.xcstrings
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3912,6 +3912,7 @@
}
},
"Halves" : {
"extractionState" : "stale",
"localizations" : {
"ar" : {
"stringUnit" : {
Expand Down Expand Up @@ -4232,6 +4233,7 @@
}
},
"Horizontal Thirds" : {
"extractionState" : "stale",
"localizations" : {
"ar" : {
"stringUnit" : {
Expand Down Expand Up @@ -9556,6 +9558,7 @@
}
},
"More" : {
"extractionState" : "stale",
"localizations" : {
"ar" : {
"stringUnit" : {
Expand Down Expand Up @@ -13552,6 +13555,7 @@
}
},
"Position" : {
"extractionState" : "stale",
"localizations" : {
"ar" : {
"stringUnit" : {
Expand Down Expand Up @@ -13994,6 +13998,7 @@
}
},
"Quarters" : {
"extractionState" : "stale",
"localizations" : {
"ar" : {
"stringUnit" : {
Expand Down Expand Up @@ -15013,6 +15018,7 @@
}
},
"Screen Switching" : {
"extractionState" : "stale",
"localizations" : {
"ar" : {
"stringUnit" : {
Expand Down Expand Up @@ -15076,6 +15082,18 @@
}
}
},
"Search for a window action" : {
"comment" : "Default placeholder",
"extractionState" : "extracted_with_value",
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "new",
"value" : "Search…"
}
}
}
},
"Select Loop keybinds file" : {
"localizations" : {
"ar" : {
Expand Down Expand Up @@ -15653,6 +15671,7 @@
}
},
"Size" : {
"extractionState" : "stale",
"localizations" : {
"ar" : {
"stringUnit" : {
Expand Down Expand Up @@ -17253,6 +17272,7 @@
}
},
"Vertical Thirds" : {
"extractionState" : "stale",
"localizations" : {
"ar" : {
"stringUnit" : {
Expand Down Expand Up @@ -18935,37 +18955,37 @@
}
}
},
"Window Direction/Name: MacOS Center" : {
"Window Direction/Name: macOS Center" : {
"extractionState" : "extracted_with_value",
"localizations" : {
"ar" : {
"stringUnit" : {
"state" : "translated",
"value" : "مركز MacOS"
"value" : "مركز macOS"
}
},
"de" : {
"stringUnit" : {
"state" : "translated",
"value" : "MacOS Mitte"
"value" : "macOS Mitte"
}
},
"en" : {
"stringUnit" : {
"state" : "new",
"value" : "MacOS Center"
"value" : "macOS Center"
}
},
"en-GB" : {
"stringUnit" : {
"state" : "translated",
"value" : "MacOS Centre"
"value" : "macOS Centre"
}
},
"es" : {
"stringUnit" : {
"state" : "translated",
"value" : "Centro de MacOS"
"value" : "Centro de macOS"
}
},
"it" : {
Expand All @@ -18983,13 +19003,13 @@
"nl-BE" : {
"stringUnit" : {
"state" : "translated",
"value" : "MacOS Centrum"
"value" : "macOS Centrum"
}
},
"pt-BR" : {
"stringUnit" : {
"state" : "translated",
"value" : "Centro do MacOS"
"value" : "Centro do macOS"
}
},
"zh-Hans" : {
Expand Down Expand Up @@ -20775,6 +20795,7 @@
}
},
"Window Manipulation" : {
"extractionState" : "stale",
"localizations" : {
"ar" : {
"stringUnit" : {
Expand Down
Loading
Loading