Skip to content

Commit 9131506

Browse files
ruittenbruittenb
committed
Merge branch 'feature' into main
2 parents 585954c + 59d3acb commit 9131506

File tree

26 files changed

+74
-53
lines changed

26 files changed

+74
-53
lines changed

‎CHANGELOG

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
1.6.12: Update name in preferences when it changes.
12
1.6.11: Fix restart numbering by desktop
23
1.6.10: More friendly error dialog
34
1.6.9 : Fix corrupted installer disk image

‎Spaceman.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@
461461
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
462462
CODE_SIGN_STYLE = Manual;
463463
COMBINE_HIDPI_IMAGES = YES;
464-
CURRENT_PROJECT_VERSION = 1.6.11;
464+
CURRENT_PROJECT_VERSION = 1.6.12;
465465
DEAD_CODE_STRIPPING = YES;
466466
DEVELOPMENT_ASSET_PATHS = "\"Spaceman/Preview Content\"";
467467
DEVELOPMENT_TEAM = "";
@@ -476,7 +476,7 @@
476476
"@executable_path/../Frameworks",
477477
);
478478
MACOSX_DEPLOYMENT_TARGET = 11.0;
479-
MARKETING_VERSION = 1.6.11;
479+
MARKETING_VERSION = 1.6.12;
480480
PRODUCT_BUNDLE_IDENTIFIER = dev.ruittenb.Spaceman;
481481
PRODUCT_NAME = "$(TARGET_NAME)";
482482
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -495,7 +495,7 @@
495495
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
496496
CODE_SIGN_STYLE = Manual;
497497
COMBINE_HIDPI_IMAGES = YES;
498-
CURRENT_PROJECT_VERSION = 1.6.11;
498+
CURRENT_PROJECT_VERSION = 1.6.12;
499499
DEAD_CODE_STRIPPING = YES;
500500
DEVELOPMENT_ASSET_PATHS = "\"Spaceman/Preview Content\"";
501501
DEVELOPMENT_TEAM = "";
@@ -510,7 +510,7 @@
510510
"@executable_path/../Frameworks",
511511
);
512512
MACOSX_DEPLOYMENT_TARGET = 11.0;
513-
MARKETING_VERSION = 1.6.11;
513+
MARKETING_VERSION = 1.6.12;
514514
PRODUCT_BUNDLE_IDENTIFIER = dev.ruittenb.Spaceman;
515515
PRODUCT_NAME = "$(TARGET_NAME)";
516516
PROVISIONING_PROFILE_SPECIFIER = "";

‎Spaceman/Assets.xcassets/SpaceIconBorderedNumInactive.imageset/Contents.json

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "SpaceIconBorderedNumInactive.png",
5+
"idiom" : "universal",
6+
"scale" : "1x"
7+
},
8+
{
9+
"idiom" : "universal",
10+
"scale" : "2x"
11+
},
12+
{
13+
"idiom" : "universal",
14+
"scale" : "3x"
15+
}
16+
],
17+
"info" : {
18+
"author" : "xcode",
19+
"version" : 1
20+
}
21+
}

‎Spaceman/Assets.xcassets/SpaceIconBorderedNumInactive.imageset/SpaceIconBorderedNumInactive.png

381 Bytes
Loading

‎Spaceman/Assets.xcassets/SpaceIconBorderedNumInactive.png

381 Bytes
Loading

‎Spaceman/Assets.xcassets/NamedFullActive.imageset/Contents.json renamed to ‎Spaceman/Assets.xcassets/SpaceIconNamedFullActive.imageset/Contents.json

File renamed without changes.

‎Spaceman/Assets.xcassets/NamedFullActive.imageset/NamedFullActive.png renamed to ‎Spaceman/Assets.xcassets/SpaceIconNamedFullActive.imageset/NamedFullActive.png

File renamed without changes.

‎Spaceman/Assets.xcassets/NamedFullInactive.imageset/Contents.json renamed to ‎Spaceman/Assets.xcassets/SpaceIconNamedFullInactive.imageset/Contents.json

File renamed without changes.

‎Spaceman/Assets.xcassets/NamedFullInactive.imageset/NamedFullInactive.png renamed to ‎Spaceman/Assets.xcassets/SpaceIconNamedFullInactive.imageset/NamedFullInactive.png

File renamed without changes.

‎Spaceman/Assets.xcassets/SpaceManIconFullDis.imageset/Contents.json renamed to ‎Spaceman/Assets.xcassets/SpaceIconNamedNormalActive.imageset/Contents.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"images" : [
33
{
4-
"filename" : "Combined Shape.png",
4+
"filename" : "NamedNormalActive.png",
55
"idiom" : "mac"
66
}
77
],

‎Spaceman/Assets.xcassets/SpaceManIconWide.imageset/WideEn.png renamed to ‎Spaceman/Assets.xcassets/SpaceIconNamedNormalActive.imageset/NamedNormalActive.png

File renamed without changes.

‎Spaceman/Assets.xcassets/SpaceIconNamedNormalInactive.imageset/Contents.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "NamedNormalInactive.png",
5+
"idiom" : "mac"
6+
}
7+
],
8+
"info" : {
9+
"author" : "xcode",
10+
"version" : 1
11+
},
12+
"properties" : {
13+
"template-rendering-intent" : "template"
14+
}
15+
}

‎Spaceman/Assets.xcassets/SpaceManIconBorderWide.imageset/WideDis.png renamed to ‎Spaceman/Assets.xcassets/SpaceIconNamedNormalInactive.imageset/NamedNormalInactive.png

File renamed without changes.

‎Spaceman/Assets.xcassets/SpaceManIcon.imageset/Contents.json renamed to ‎Spaceman/Assets.xcassets/SpaceIconNumFullActive.imageset/Contents.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"images" : [
33
{
4-
"filename" : "Rectangle.png",
4+
"filename" : "NumFullActive.png",
55
"idiom" : "mac"
66
}
77
],

‎Spaceman/Assets.xcassets/SpaceManIconFullEn.imageset/Combined Shape.png renamed to ‎Spaceman/Assets.xcassets/SpaceIconNumFullActive.imageset/NumFullActive.png

File renamed without changes.

‎Spaceman/Assets.xcassets/SpaceManIconBorder.imageset/Contents.json renamed to ‎Spaceman/Assets.xcassets/SpaceIconNumFullInactive.imageset/Contents.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"images" : [
33
{
4-
"filename" : "Rectangle.png",
4+
"filename" : "NumFullInactive.png",
55
"idiom" : "mac"
66
}
77
],

‎Spaceman/Assets.xcassets/SpaceManIconFullDis.imageset/Combined Shape.png renamed to ‎Spaceman/Assets.xcassets/SpaceIconNumFullInactive.imageset/NumFullInactive.png

File renamed without changes.

‎Spaceman/Assets.xcassets/SpaceManIconBorderWide.imageset/Contents.json renamed to ‎Spaceman/Assets.xcassets/SpaceIconNumNormalActive.imageset/Contents.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"images" : [
33
{
4-
"filename" : "WideDis.png",
4+
"filename" : "NumNormalActive.png",
55
"idiom" : "mac"
66
}
77
],

‎Spaceman/Assets.xcassets/SpaceManIcon.imageset/Rectangle.png renamed to ‎Spaceman/Assets.xcassets/SpaceIconNumNormalActive.imageset/NumNormalActive.png

File renamed without changes.

‎Spaceman/Assets.xcassets/SpaceIconNumNormalInactive.imageset/Contents.json

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "NumNormalInactive.png",
5+
"idiom" : "mac"
6+
}
7+
],
8+
"info" : {
9+
"author" : "xcode",
10+
"version" : 1
11+
},
12+
"properties" : {
13+
"template-rendering-intent" : "template"
14+
}
15+
}

‎Spaceman/Assets.xcassets/SpaceManIconBorder.imageset/Rectangle.png renamed to ‎Spaceman/Assets.xcassets/SpaceIconNumNormalInactive.imageset/NumNormalInactive.png

File renamed without changes.

‎Spaceman/Assets.xcassets/SpaceManIconFullEn.imageset/Contents.json

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎Spaceman/Assets.xcassets/SpaceManIconWide.imageset/Contents.json

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎Spaceman/Helpers/IconCreator.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,19 +35,19 @@ class IconCreator {
3535
let iconResourceName: String
3636
switch (s.isCurrentSpace, s.isFullScreen, spacemanStyle) {
3737
case (true, true, .names):
38-
iconResourceName = "NamedFullActive"
38+
iconResourceName = "SpaceIconNamedFullActive"
3939
case (false, true, .names):
40-
iconResourceName = "NamedFullInactive"
40+
iconResourceName = "SpaceIconNamedFullInactive"
4141
case (true, true, .rects):
42-
iconResourceName = "SpaceManIconFullEn"
42+
iconResourceName = "SpaceIconNumFullActive"
4343
case (false, true, .rects):
44-
iconResourceName = "SpaceManIconFullDis"
44+
iconResourceName = "SpaceIconNumFullInactive"
4545
case (true, false, _):
46-
iconResourceName = "SpaceManIcon"
46+
iconResourceName = "SpaceIconNumNormalActive"
4747
default:
4848
// (true, true, .numbersAndNames)
4949
// (false, true, .numbersAndNames)
50-
iconResourceName = "SpaceManIconBorder"
50+
iconResourceName = "SpaceIconNumNormalInactive"
5151
}
5252

5353
icons.append(NSImage(imageLiteralResourceName: iconResourceName))

‎Spaceman/View/PreferencesView.swift

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -225,12 +225,13 @@ struct PreferencesView: View {
225225
"Name (max 4 char.)",
226226
text: Binding(
227227
get: {prefsVM.spaceName},
228-
set: {prefsVM.spaceName = $0.prefix(4).trimmingCharacters(in: .whitespacesAndNewlines)}),
229-
onCommit: {}) // removed `updateName` callback so as to avoid unwanted writes
230-
231-
Button("Update name") {
232-
updateName()
233-
}
228+
set: {
229+
prefsVM.spaceName = $0.prefix(4).trimmingCharacters(in: .whitespacesAndNewlines)
230+
updateName()
231+
}
232+
233+
)
234+
)
234235
}
235236
}
236237

@@ -277,8 +278,6 @@ struct PreferencesView: View {
277278
NotificationCenter.default.post(name: NSNotification.Name(rawValue: "ButtonPressed"), object: nil)
278279
}
279280
}
280-
281-
282281
}
283282

284283
struct ContentView_Previews: PreviewProvider {

‎Spaceman/View/StatusBar.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ class StatusBar: NSObject, NSMenuDelegate {
161161
shortcutKey = "0"
162162
}
163163

164-
let icon = NSImage(imageLiteralResourceName: "SpaceManIcon")
164+
let icon = NSImage(imageLiteralResourceName: "SpaceIconNumNormalActive")
165165
let menuIcon = iconCreator.createRectWithNumberIcon(
166166
icons: [icon],
167167
index: 0,

0 commit comments

Comments
 (0)