pegasus/unrealircd
1
0
Fork 0
mirror of https://github.com/unrealircd/unrealircd.git synced 2026-07-01 20:46:38 +02:00
Code Activity

Update menu and hide window in app

Browse Source
This commit is contained in:
Travis McArthur
2015-07-17 20:01:01 -07:00
parent b67d4a0e64
commit ab4e4bd306
4 changed files with 74 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/macosx/UnrealIRCd.xcodeproj/project.pbxproj
+25 -4
View File
@@ -7,7 +7,8 @@
objects = {
/* Begin PBXBuildFile section */
1FC660CF1B3EA90B008EFAD1 /* bat23.png in Resources */ = {isa = PBXBuildFile; fileRef = 1FC660CE1B3EA90B008EFAD1 /* bat23.png */; };
1F101A741B59EF2F00FE6A5B /* logo.png in Resources */ = {isa = PBXBuildFile; fileRef = 1F101A721B59EF2F00FE6A5B /* logo.png */; };
1F101A751B59EF2F00FE6A5B /* logo@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 1F101A731B59EF2F00FE6A5B /* logo@2x.png */; };
1FE784F51B3DF0DD006CB6DD /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FE784F41B3DF0DD006CB6DD /* AppDelegate.swift */; };
1FE784F71B3DF0DD006CB6DD /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1FE784F61B3DF0DD006CB6DD /* ViewController.swift */; };
1FE784F91B3DF0DD006CB6DD /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 1FE784F81B3DF0DD006CB6DD /* Images.xcassets */; };
@@ -26,7 +27,8 @@
/* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */
1FC660CE1B3EA90B008EFAD1 /* bat23.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = bat23.png; sourceTree = "<group>"; };
1F101A721B59EF2F00FE6A5B /* logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = logo.png; sourceTree = "<group>"; };
1F101A731B59EF2F00FE6A5B /* logo@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "logo@2x.png"; sourceTree = "<group>"; };
1FE784EF1B3DF0DD006CB6DD /* UnrealIRCd.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = UnrealIRCd.app; sourceTree = BUILT_PRODUCTS_DIR; };
1FE784F31B3DF0DD006CB6DD /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
1FE784F41B3DF0DD006CB6DD /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
@@ -89,7 +91,8 @@
1FE784F21B3DF0DD006CB6DD /* Supporting Files */ = {
isa = PBXGroup;
children = (
1FC660CE1B3EA90B008EFAD1 /* bat23.png */,
1F101A721B59EF2F00FE6A5B /* logo.png */,
1F101A731B59EF2F00FE6A5B /* logo@2x.png */,
1FE784F31B3DF0DD006CB6DD /* Info.plist */,
);
name = "Supporting Files";
@@ -122,6 +125,7 @@
1FE784EB1B3DF0DD006CB6DD /* Sources */,
1FE784EC1B3DF0DD006CB6DD /* Frameworks */,
1FE784ED1B3DF0DD006CB6DD /* Resources */,
1F91FBDA1B58D9EB00A60151 /* ShellScript */,
);
buildRules = (
);
@@ -192,9 +196,10 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
1FC660CF1B3EA90B008EFAD1 /* bat23.png in Resources */,
1FE784F91B3DF0DD006CB6DD /* Images.xcassets in Resources */,
1F101A751B59EF2F00FE6A5B /* logo@2x.png in Resources */,
1FE784FC1B3DF0DD006CB6DD /* Main.storyboard in Resources */,
1F101A741B59EF2F00FE6A5B /* logo.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -207,6 +212,22 @@
};
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
1F91FBDA1B58D9EB00A60151 /* ShellScript */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "";
};
/* End PBXShellScriptBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
1FE784EB1B3DF0DD006CB6DD /* Sources */ = {
isa = PBXSourcesBuildPhase;
src/macosx/UnrealIRCd/AppDelegate.swift
+22 -5
View File
@@ -7,25 +7,42 @@
//
import Cocoa
import AppKit
@NSApplicationMain
class AppDelegate: NSObject, NSApplicationDelegate {
var menuItem : NSStatusItem!;
@IBOutlet var mainMenu : NSMenu?
var menuItem : NSStatusItem!
func applicationDidFinishLaunching(aNotification: NSNotification) {
println("App did finish launching!")
// Compiler error - hack below
menuItem = NSStatusBar.systemStatusBar().statusItemWithLength(-1/*NSVariableStatusItemLength*/)
menuItem.image = NSImage(named: "bat23.png")
menuItem.image = NSImage(named: "logo.png")
menuItem.menu = mainMenu!
}
func applicationWillTerminate(aNotification: NSNotification) {
}
@IBAction func startDaemon(sender: AnyObject) {
}
@IBAction func stopDaemon(sender: AnyObject) {
}
@IBAction func configureDaemon(sender: AnyObject) {
let storyboard = NSStoryboard(name: "Main", bundle:nil)
let controller = storyboard!.instantiateControllerWithIdentifier("Configuration")
controller!.showWindow(self)
}
@IBAction func help(sender: AnyObject) {
}
}
src/macosx/UnrealIRCd/Base.lproj/Main.storyboard
+26 -91
View File
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="7706" systemVersion="14D136" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="7706" systemVersion="14E46" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="7706"/>
</dependencies>
@@ -10,98 +10,29 @@
<application id="hnw-xV-0zn" sceneMemberID="viewController">
<menu key="mainMenu" title="Main Menu" systemMenu="main" id="AYu-sK-qS6">
<items>
<menuItem title="UnrealIRCd" id="1Xt-HY-uBw">
<menuItem title="Configure UnrealIRCd" id="dMs-cI-mzQ">
<modifierMask key="keyEquivalentModifierMask"/>
<menu key="submenu" title="UnrealIRCd" systemMenu="apple" id="uQy-DD-JDr">
<items>
<menuItem title="About UnrealIRCd" id="5kV-Vb-QxS">
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
<action selector="orderFrontStandardAboutPanel:" target="Ady-hI-5gd" id="Exp-CZ-Vem"/>
</connections>
</menuItem>
<menuItem isSeparatorItem="YES" id="VOq-y0-SEH"/>
<menuItem title="Preferences…" keyEquivalent="," id="BOF-NM-1cW"/>
<menuItem isSeparatorItem="YES" id="wFC-TO-SCJ"/>
<menuItem title="Services" id="NMo-om-nkz">
<modifierMask key="keyEquivalentModifierMask"/>
<menu key="submenu" title="Services" systemMenu="services" id="hz9-B4-Xy5"/>
</menuItem>
<menuItem isSeparatorItem="YES" id="4je-JR-u6R"/>
<menuItem title="Hide UnrealIRCd" keyEquivalent="h" id="Olw-nP-bQN">
<connections>
<action selector="hide:" target="Ady-hI-5gd" id="PnN-Uc-m68"/>
</connections>
</menuItem>
<menuItem title="Hide Others" keyEquivalent="h" id="Vdr-fp-XzO">
<modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
<connections>
<action selector="hideOtherApplications:" target="Ady-hI-5gd" id="VT4-aY-XCT"/>
</connections>
</menuItem>
<menuItem title="Show All" id="Kd2-mp-pUS">
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
<action selector="unhideAllApplications:" target="Ady-hI-5gd" id="Dhg-Le-xox"/>
</connections>
</menuItem>
<menuItem isSeparatorItem="YES" id="kCx-OE-vgT"/>
<menuItem title="Quit UnrealIRCd" keyEquivalent="q" id="4sb-4s-VLi">
<connections>
<action selector="terminate:" target="Ady-hI-5gd" id="Te7-pn-YzF"/>
</connections>
</menuItem>
</items>
</menu>
<connections>
<action selector="configureDaemon:" target="Voe-Tx-rLC" id="jAU-2P-oeO"/>
</connections>
</menuItem>
<menuItem title="File" id="dMs-cI-mzQ">
<menuItem title="Start UnrealIRCd" id="aUF-d1-5bR">
<modifierMask key="keyEquivalentModifierMask"/>
<menu key="submenu" title="File" id="bib-Uj-vzu">
<items>
<menuItem title="Start Daemon" keyEquivalent="n" id="Was-JA-tGl">
<connections>
<action selector="newDocument:" target="Ady-hI-5gd" id="4Si-XN-c54"/>
</connections>
</menuItem>
</items>
</menu>
<connections>
<action selector="startDaemon:" target="Voe-Tx-rLC" id="JJ6-R9-Yqf"/>
</connections>
</menuItem>
<menuItem title="Window" id="aUF-d1-5bR">
<menuItem title="Stop UnrealIRCd" id="wpr-3q-Mcd">
<modifierMask key="keyEquivalentModifierMask"/>
<menu key="submenu" title="Window" systemMenu="window" id="Td7-aD-5lo">
<items>
<menuItem title="Minimize" keyEquivalent="m" id="OY7-WF-poV">
<connections>
<action selector="performMiniaturize:" target="Ady-hI-5gd" id="VwT-WD-YPe"/>
</connections>
</menuItem>
<menuItem title="Zoom" id="R4o-n2-Eq4">
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
<action selector="performZoom:" target="Ady-hI-5gd" id="DIl-cC-cCs"/>
</connections>
</menuItem>
<menuItem isSeparatorItem="YES" id="eu3-7i-yIM"/>
<menuItem title="Bring All to Front" id="LE2-aR-0XJ">
<modifierMask key="keyEquivalentModifierMask"/>
<connections>
<action selector="arrangeInFront:" target="Ady-hI-5gd" id="DRN-fu-gQh"/>
</connections>
</menuItem>
</items>
</menu>
<connections>
<action selector="stopDaemon:" target="Voe-Tx-rLC" id="EhI-ZX-pmo"/>
</connections>
</menuItem>
<menuItem title="Help" id="wpr-3q-Mcd">
<menuItem title="Help" id="GJF-j3-lpm">
<modifierMask key="keyEquivalentModifierMask"/>
<menu key="submenu" title="Help" systemMenu="help" id="F2S-fz-NVQ">
<items>
<menuItem title="UnrealIRCd Help" keyEquivalent="?" id="FKE-Sm-Kum">
<connections>
<action selector="showHelp:" target="Ady-hI-5gd" id="y7X-2Q-9no"/>
</connections>
</menuItem>
</items>
</menu>
<connections>
<action selector="help:" target="Voe-Tx-rLC" id="ljC-El-YsA"/>
</connections>
</menuItem>
</items>
</menu>
@@ -109,17 +40,21 @@
<outlet property="delegate" destination="Voe-Tx-rLC" id="PrD-fu-P6m"/>
</connections>
</application>
<customObject id="Voe-Tx-rLC" customClass="AppDelegate" customModule="UnrealIRCd" customModuleProvider="target"/>
<customObject id="Voe-Tx-rLC" customClass="AppDelegate" customModule="UnrealIRCd" customModuleProvider="target">
<connections>
<outlet property="mainMenu" destination="AYu-sK-qS6" id="YPC-KJ-UJI"/>
</connections>
</customObject>
<customObject id="Ady-hI-5gd" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
</objects>
<point key="canvasLocation" x="75" y="0.0"/>
<point key="canvasLocation" x="16.5" y="-49"/>
</scene>
<!--Window Controller-->
<scene sceneID="R2V-B0-nI4">
<objects>
<windowController id="B8D-0N-5wS" sceneMemberID="viewController">
<window key="window" title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" animationBehavior="default" id="IQv-IB-iLA">
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
<windowController storyboardIdentifier="Configuration" id="B8D-0N-5wS" sceneMemberID="viewController">
<window key="window" title="UnrealIRCd Configuration" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" animationBehavior="default" id="IQv-IB-iLA">
<windowStyleMask key="styleMask" titled="YES" closable="YES"/>
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
<rect key="contentRect" x="196" y="240" width="480" height="270"/>
<rect key="screenRect" x="0.0" y="0.0" width="1680" height="1027"/>
src/macosx/UnrealIRCd/ViewController.swift
+1 -4
View File
@@ -9,16 +9,13 @@
import Cocoa
class ViewController: NSViewController {
override func viewDidLoad() {
super.viewDidLoad()
// Do any additional setup after loading the view.
}
override var representedObject: AnyObject? {
didSet {
// Update the view, if already loaded.
}
}