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

New app + main menu + menu bar icons #1504

Merged
merged 1 commit into from
Jun 3, 2023
Merged

New app + main menu + menu bar icons #1504

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
44 changes: 25 additions & 19 deletions Amethyst/Base.lproj/MainMenu.xib
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,46 +79,52 @@
</view>
<toolbar key="toolbar" implicitIdentifier="2383369F-98A6-4420-8EFE-319DB9588C53" autosavesConfiguration="NO" allowsUserCustomization="NO" displayMode="iconAndLabel" sizeMode="regular" id="5oI-m4-akz">
<allowedToolbarItems>
<toolbarItem implicitItemIdentifier="D4FDE95C-2F3E-4C93-8777-9FBAD1EDB613" explicitItemIdentifier="general" label="General" paletteLabel="General" image="NSPreferencesGeneral" selectable="YES" id="WV2-G9-AL4">
<toolbarItem implicitItemIdentifier="D4FDE95C-2F3E-4C93-8777-9FBAD1EDB613" explicitItemIdentifier="general" label="General" paletteLabel="General" selectable="YES" id="WV2-G9-AL4">
<imageReference key="image" image="text.and.command.macwindow" catalog="system" symbolScale="large"/>
<size key="minSize" width="22" height="22"/>
<size key="maxSize" width="22" height="22"/>
<connections>
<action selector="selectPane:" target="0fi-bi-huz" id="bq3-bL-T4h"/>
</connections>
</toolbarItem>
<toolbarItem implicitItemIdentifier="04C17AAF-5F6B-422F-8592-E8AA78DEB9C7" explicitItemIdentifier="shortcuts" label="Shortcuts" paletteLabel="Shortcuts" tag="1" image="toolbar-icon-shortcuts" selectable="YES" id="j0a-87-Yvz">
<toolbarItem implicitItemIdentifier="C7D5B660-7047-4353-8F39-18609BCF05D1" explicitItemIdentifier="layouts" label="Layouts" paletteLabel="Layouts" selectable="YES" id="FsX-hN-WZb" userLabel="Layouts">
<imageReference key="image" image="uiwindow.split.2x1" catalog="system" symbolScale="large"/>
<size key="minSize" width="22" height="22"/>
<size key="maxSize" width="22" height="22"/>
<connections>
<action selector="selectPane:" target="0fi-bi-huz" id="9kO-ms-dfq"/>
<action selector="selectPane:" target="0fi-bi-huz" id="mBI-Du-M23"/>
</connections>
</toolbarItem>
<toolbarItem implicitItemIdentifier="A7FE5E71-A3DC-43B8-92B2-5CF107F2DB2F" explicitItemIdentifier="floating" label="Floating" paletteLabel="Floating" tag="-1" image="toolbar-icon-floating" selectable="YES" id="QEp-pN-Lz9">
<toolbarItem implicitItemIdentifier="04C17AAF-5F6B-422F-8592-E8AA78DEB9C7" explicitItemIdentifier="shortcuts" label="Shortcuts" paletteLabel="Shortcuts" tag="1" selectable="YES" id="j0a-87-Yvz">
<imageReference key="image" image="123.rectangle" catalog="system" symbolScale="large"/>
<size key="minSize" width="22" height="22"/>
<size key="maxSize" width="22" height="22"/>
<connections>
<action selector="selectPane:" target="0fi-bi-huz" id="WEg-vF-5FE"/>
<action selector="selectPane:" target="0fi-bi-huz" id="9kO-ms-dfq"/>
</connections>
</toolbarItem>
<toolbarItem implicitItemIdentifier="319E6DB9-3D79-40BF-95A2-B84B5236FF8B" explicitItemIdentifier="debug" label="Debug" paletteLabel="Debug" tag="-1" image="NSAdvanced" selectable="YES" id="KUo-2v-ywG">
<size key="minSize" width="32" height="32"/>
<size key="maxSize" width="32" height="32"/>
<toolbarItem implicitItemIdentifier="74318EC6-A099-4964-B13B-6B2B699C7EC3" explicitItemIdentifier="mouse" label="Mouse" paletteLabel="Mouse" selectable="YES" id="dfc-D6-FsG" userLabel="Mouse">
<imageReference key="image" image="dots.and.line.vertical.and.cursorarrow.rectangle" catalog="system" symbolScale="large"/>
<size key="minSize" width="22" height="22"/>
<size key="maxSize" width="22" height="22"/>
<connections>
<action selector="selectPane:" target="0fi-bi-huz" id="aNs-0B-bfi"/>
<action selector="selectPane:" target="0fi-bi-huz" id="0vo-hl-zVN"/>
</connections>
</toolbarItem>
<toolbarItem implicitItemIdentifier="74318EC6-A099-4964-B13B-6B2B699C7EC3" explicitItemIdentifier="mouse" label="Mouse" paletteLabel="Mouse" image="toolbar-icon-cursor" selectable="YES" id="dfc-D6-FsG" userLabel="Mouse">
<toolbarItem implicitItemIdentifier="A7FE5E71-A3DC-43B8-92B2-5CF107F2DB2F" explicitItemIdentifier="floating" label="Floating" paletteLabel="Floating" tag="-1" selectable="YES" id="QEp-pN-Lz9">
<imageReference key="image" image="macwindow.on.rectangle" catalog="system" symbolScale="large"/>
<size key="minSize" width="22" height="22"/>
<size key="maxSize" width="22" height="22"/>
<connections>
<action selector="selectPane:" target="0fi-bi-huz" id="0vo-hl-zVN"/>
<action selector="selectPane:" target="0fi-bi-huz" id="WEg-vF-5FE"/>
</connections>
</toolbarItem>
<toolbarItem implicitItemIdentifier="C7D5B660-7047-4353-8F39-18609BCF05D1" explicitItemIdentifier="layouts" label="Layouts" paletteLabel="Layouts" image="toolbar-icon-layouts" selectable="YES" id="FsX-hN-WZb" userLabel="Layouts">
<toolbarItem implicitItemIdentifier="319E6DB9-3D79-40BF-95A2-B84B5236FF8B" explicitItemIdentifier="debug" label="Debug" paletteLabel="Debug" tag="-1" selectable="YES" id="KUo-2v-ywG">
<imageReference key="image" image="waveform.path.ecg.rectangle" catalog="system" symbolScale="large"/>
<size key="minSize" width="22" height="22"/>
<size key="maxSize" width="22" height="22"/>
<connections>
<action selector="selectPane:" target="0fi-bi-huz" id="mBI-Du-M23"/>
<action selector="selectPane:" target="0fi-bi-huz" id="aNs-0B-bfi"/>
</connections>
</toolbarItem>
</allowedToolbarItems>
Expand Down Expand Up @@ -153,11 +159,11 @@
</menu>
</objects>
<resources>
<image name="NSAdvanced" width="32" height="32"/>
<image name="NSPreferencesGeneral" width="32" height="32"/>
<image name="toolbar-icon-cursor" width="32" height="32"/>
<image name="toolbar-icon-floating" width="36" height="36"/>
<image name="toolbar-icon-layouts" width="32" height="32"/>
<image name="toolbar-icon-shortcuts" width="32" height="32"/>
<image name="123.rectangle" catalog="system" width="24" height="18"/>
<image name="dots.and.line.vertical.and.cursorarrow.rectangle" catalog="system" width="24" height="23"/>
<image name="macwindow.on.rectangle" catalog="system" width="25" height="20"/>
<image name="text.and.command.macwindow" catalog="system" width="24" height="18"/>
<image name="uiwindow.split.2x1" catalog="system" width="24" height="18"/>
<image name="waveform.path.ecg.rectangle" catalog="system" width="24" height="18"/>
</resources>
</document>
11 changes: 11 additions & 0 deletions Amethyst/Images.xcassets/123.rectangle.imageset/123.rectangle.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions Amethyst/Images.xcassets/123.rectangle.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"images" : [
{
"filename" : "123.rectangle.svg",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
66 changes: 33 additions & 33 deletions Amethyst/Images.xcassets/AppIcon.appiconset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,68 +1,68 @@
{
"images" : [
{
"size" : "16x16",
"idiom" : "mac",
"filename" : "icon_16x16.png",
"scale" : "1x"
"idiom" : "mac",
"scale" : "1x",
"size" : "16x16"
},
{
"size" : "16x16",
"idiom" : "mac",
"filename" : "[email protected]",
"scale" : "2x"
"idiom" : "mac",
"scale" : "2x",
"size" : "16x16"
},
{
"size" : "32x32",
"idiom" : "mac",
"filename" : "icon_32x32.png",
"scale" : "1x"
"idiom" : "mac",
"scale" : "1x",
"size" : "32x32"
},
{
"size" : "32x32",
"idiom" : "mac",
"filename" : "[email protected]",
"scale" : "2x"
"idiom" : "mac",
"scale" : "2x",
"size" : "32x32"
},
{
"size" : "128x128",
"idiom" : "mac",
"filename" : "icon_128x128.png",
"scale" : "1x"
"idiom" : "mac",
"scale" : "1x",
"size" : "128x128"
},
{
"size" : "128x128",
"idiom" : "mac",
"filename" : "[email protected]",
"scale" : "2x"
"idiom" : "mac",
"scale" : "2x",
"size" : "128x128"
},
{
"size" : "256x256",
"idiom" : "mac",
"filename" : "icon_256x256.png",
"scale" : "1x"
"idiom" : "mac",
"scale" : "1x",
"size" : "256x256"
},
{
"size" : "256x256",
"idiom" : "mac",
"filename" : "[email protected]",
"scale" : "2x"
"idiom" : "mac",
"scale" : "2x",
"size" : "256x256"
},
{
"size" : "512x512",
"idiom" : "mac",
"filename" : "icon_512x512.png",
"scale" : "1x"
"idiom" : "mac",
"scale" : "1x",
"size" : "512x512"
},
{
"size" : "512x512",
"idiom" : "mac",
"filename" : "[email protected]",
"scale" : "2x"
"idiom" : "mac",
"scale" : "2x",
"size" : "512x512"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
}
}
}
Binary file modified Amethyst/Images.xcassets/AppIcon.appiconset/icon_128x128.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Amethyst/Images.xcassets/AppIcon.appiconset/[email protected]
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Amethyst/Images.xcassets/AppIcon.appiconset/icon_16x16.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Amethyst/Images.xcassets/AppIcon.appiconset/[email protected]
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Amethyst/Images.xcassets/AppIcon.appiconset/icon_256x256.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Amethyst/Images.xcassets/AppIcon.appiconset/[email protected]
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Amethyst/Images.xcassets/AppIcon.appiconset/icon_32x32.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Amethyst/Images.xcassets/AppIcon.appiconset/[email protected]
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Amethyst/Images.xcassets/AppIcon.appiconset/icon_512x512.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Amethyst/Images.xcassets/AppIcon.appiconset/[email protected]
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions Amethyst/Images.xcassets/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
}
}
}
10 changes: 5 additions & 5 deletions Amethyst/Images.xcassets/amethyst.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
"images" : [
{
"idiom" : "mac",
"filename" : "icon_32x32.png",
"idiom" : "mac",
"scale" : "1x"
},
{
"idiom" : "mac",
"filename" : "[email protected]",
"idiom" : "mac",
"scale" : "2x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
}
}
}
Binary file modified Amethyst/Images.xcassets/amethyst.imageset/icon_32x32.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Amethyst/Images.xcassets/amethyst.imageset/[email protected]
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions ...t/Images.xcassets/dots.and.line.vertical.and.cursorarrow.rectangle.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"images" : [
{
"filename" : "dots.and.line.vertical.and.cursorarrow.rectangle.svg",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
11 changes: 11 additions & 0 deletions ...orarrow.rectangle.imageset/dots.and.line.vertical.and.cursorarrow.rectangle.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 5 additions & 5 deletions Amethyst/Images.xcassets/icon-statusitem-disabled.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
"images" : [
{
"idiom" : "mac",
"filename" : "icon-statusitem-disabled.png",
"idiom" : "mac",
"scale" : "1x"
},
{
"idiom" : "mac",
"filename" : "[email protected]",
"idiom" : "mac",
"scale" : "2x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
}
}
}
Binary file modified .../Images.xcassets/icon-statusitem-disabled.imageset/icon-statusitem-disabled.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ...ages.xcassets/icon-statusitem-disabled.imageset/[email protected]
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 5 additions & 5 deletions Amethyst/Images.xcassets/icon-statusitem.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
"images" : [
{
"idiom" : "mac",
"filename" : "icon-statusitem.png",
"idiom" : "mac",
"scale" : "1x"
},
{
"idiom" : "mac",
"filename" : "[email protected]",
"idiom" : "mac",
"scale" : "2x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
}
}
}
Binary file modified Amethyst/Images.xcassets/icon-statusitem.imageset/icon-statusitem.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Amethyst/Images.xcassets/icon-statusitem.imageset/[email protected]
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions Amethyst/Images.xcassets/macwindow.on.rectangle.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"images" : [
{
"filename" : "macwindow.on.rectangle.svg",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
11 changes: 11 additions & 0 deletions ...hyst/Images.xcassets/macwindow.on.rectangle.imageset/macwindow.on.rectangle.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions Amethyst/Images.xcassets/text.and.command.macwindow.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"images" : [
{
"filename" : "text.and.command.macwindow.svg",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading