mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-05-03 10:59:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

Reset MunkiStatus to match Munki 5.1 release

Browse Source
This commit is contained in:
Greg Neagle
2020-10-03 17:13:58 -07:00
parent e685a55196
commit f69d60118c
7 changed files with 1 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/apps/MunkiStatus/MunkiStatus.xcodeproj/project.pbxproj
-4
View File
@@ -7,7 +7,6 @@
objects = {
/* Begin PBXBuildFile section */
566C4449241927EE00A693BF /* MSWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 566C4448241927EE00A693BF /* MSWindow.swift */; };
9B28B78821E3B88F002C58D2 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 9B28B78A21E3B88F002C58D2 /* InfoPlist.strings */; };
C0168E9020B1E1D80027BD78 /* LogViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = C0168E8F20B1E1D80027BD78 /* LogViewController.swift */; };
C04F824E20BB157800F9C57D /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = C04F825020BB157800F9C57D /* Localizable.strings */; };
@@ -21,7 +20,6 @@
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
566C4448241927EE00A693BF /* MSWindow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MSWindow.swift; sourceTree = "<group>"; };
9B28B78921E3B88F002C58D2 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
9B28B78B21E3B892002C58D2 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/InfoPlist.strings; sourceTree = "<group>"; };
9B28B78C21E3B894002C58D2 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/InfoPlist.strings; sourceTree = "<group>"; };
@@ -110,7 +108,6 @@
children = (
C04F825C20BB15F500F9C57D /* Localization.swift */,
C0787F7A2315C6210054D130 /* main.swift */,
566C4448241927EE00A693BF /* MSWindow.swift */,
C0168E8F20B1E1D80027BD78 /* LogViewController.swift */,
C0A7937D20AFAE0300F56DD5 /* MunkiStatusViewController.swift */,
C0544D4B20AF0EDA00DC86F6 /* AppDelegate.swift */,
@@ -239,7 +236,6 @@
C04F825D20BB15F500F9C57D /* Localization.swift in Sources */,
C0787F7B2315C6210054D130 /* main.swift in Sources */,
C0544D4C20AF0EDA00DC86F6 /* AppDelegate.swift in Sources */,
566C4449241927EE00A693BF /* MSWindow.swift in Sources */,
C0A7937E20AFAE0300F56DD5 /* MunkiStatusViewController.swift in Sources */,
C0168E9020B1E1D80027BD78 /* LogViewController.swift in Sources */,
);
code/apps/MunkiStatus/MunkiStatus/AppDelegate.swift
+1 -3
View File
@@ -17,8 +17,6 @@ class AppDelegate: NSObject, NSApplicationDelegate {
func applicationWillFinishLaunching(_ aNotification: Notification) {
if atLoginWindow() {
// hide background color
self.window.backgroundColor = .clear
// don't show menu bar
NSMenu.setMenuBarVisible(false)
// make sure we're active
@@ -55,7 +53,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
)
thisWindow.canBecomeVisibleWithoutLogin = true
thisWindow.level = backdropWindowLevel
thisWindow.backgroundColor = NSColor.black
thisWindow.backgroundColor = NSColor.black.withAlphaComponent(0.35)
thisWindow.isOpaque = false
thisWindow.ignoresMouseEvents = false
thisWindow.alphaValue = 0.0
code/apps/MunkiStatus/MunkiStatus/Assets.xcassets/Contents.json
-6
View File
@@ -1,6 +0,0 @@
{
"info" : {
"version" : 1,
"author" : "xcode"
}
}
code/apps/MunkiStatus/MunkiStatus/Assets.xcassets/munkiLogoTemplate.imageset/Contents.json
Vendored
-24
View File
@@ -1,24 +0,0 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "icon_512x512@2x.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
},
"properties" : {
"template-rendering-intent" : "original"
}
}
code/apps/MunkiStatus/MunkiStatus/Assets.xcassets/munkiLogoTemplate.imageset/icon_512x512@2x.png
Vendored
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 390 KiB

code/apps/MunkiStatus/MunkiStatus/MSWindow.swift
-15
View File
@@ -1,15 +0,0 @@
//
// MSWindow.swift
// MunkiStatus
//
// Created by Steve Küng on 11.03.20.
// Copyright © 2020 The Munki Project. All rights reserved.
//
import Cocoa
class MSWindow: NSWindow {
override var canBecomeKey: Bool {
return true
}
}
code/apps/MunkiStatus/MunkiStatus/MunkiStatusViewController.swift
-8
View File
@@ -31,15 +31,7 @@ class MunkiStatusViewController: NSViewController {
// Fallback on earlier versions
}
// Do view setup here.
let colorFilter = CIFilter(name: "CIFalseColor")!
colorFilter.setDefaults()
colorFilter.setValue(CIColor(color: .white), forKey: "inputColor0")
colorFilter.setValue(CIColor(color: .black), forKey: "inputColor1")
progressBar.contentFilters = [colorFilter]
if atLoginWindow() {
self.stopButton.isHidden = true
view.window?.canBecomeVisibleWithoutLogin = true
view.window?.level = statusWindowLevel
}