Skip to content

Commit

Permalink
Started implementation of rules editor window
Browse files Browse the repository at this point in the history
  • Loading branch information
Pyroh committed Sep 5, 2016
1 parent f41ba65 commit c4798d5
Show file tree
Hide file tree
Showing 12 changed files with 706 additions and 55 deletions.
58 changes: 53 additions & 5 deletions Fluor.xcodeproj/project.pbxproj
Expand Up @@ -15,6 +15,11 @@
3FCD16A71D79793600C57B22 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3FCD16A61D79793600C57B22 /* Assets.xcassets */; };
3FCD16AA1D79793600C57B22 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3FCD16A81D79793600C57B22 /* MainMenu.xib */; };
3FCD16B41D79797600C57B22 /* utils.m in Sources */ = {isa = PBXBuildFile; fileRef = 3FCD16B31D79797600C57B22 /* utils.m */; };
3FE7E0E01D7CA14600DC754D /* LaunchAtLoginController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3FE7E0DF1D7CA14600DC754D /* LaunchAtLoginController.m */; };
3FE7E0E31D7CBE1700DC754D /* AboutWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3FE7E0E11D7CBE1700DC754D /* AboutWindowController.swift */; };
3FE7E0E41D7CBE1700DC754D /* AboutWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3FE7E0E21D7CBE1700DC754D /* AboutWindowController.xib */; };
3FE7E0EA1D7CC01B00DC754D /* RulesEditorWindowController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3FE7E0E81D7CC01B00DC754D /* RulesEditorWindowController.swift */; };
3FE7E0EB1D7CC01B00DC754D /* RulesEditorWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3FE7E0E91D7CC01B00DC754D /* RulesEditorWindowController.xib */; };
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
Expand All @@ -30,6 +35,12 @@
3FCD16B11D79797600C57B22 /* Fluor-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Fluor-Bridging-Header.h"; sourceTree = "<group>"; };
3FCD16B21D79797600C57B22 /* utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = utils.h; sourceTree = "<group>"; };
3FCD16B31D79797600C57B22 /* utils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = utils.m; sourceTree = "<group>"; };
3FE7E0DE1D7CA14600DC754D /* LaunchAtLoginController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LaunchAtLoginController.h; sourceTree = "<group>"; };
3FE7E0DF1D7CA14600DC754D /* LaunchAtLoginController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LaunchAtLoginController.m; sourceTree = "<group>"; };
3FE7E0E11D7CBE1700DC754D /* AboutWindowController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AboutWindowController.swift; sourceTree = "<group>"; };
3FE7E0E21D7CBE1700DC754D /* AboutWindowController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = AboutWindowController.xib; sourceTree = "<group>"; };
3FE7E0E81D7CC01B00DC754D /* RulesEditorWindowController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = RulesEditorWindowController.swift; sourceTree = "<group>"; };
3FE7E0E91D7CC01B00DC754D /* RulesEditorWindowController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = RulesEditorWindowController.xib; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -62,21 +73,51 @@
3FCD16A31D79793600C57B22 /* Fluor */ = {
isa = PBXGroup;
children = (
3FCD16B11D79797600C57B22 /* Fluor-Bridging-Header.h */,
3FCD16A41D79793600C57B22 /* AppDelegate.swift */,
3FCD16A81D79793600C57B22 /* MainMenu.xib */,
3F2FA4021D7A059F003E2AD8 /* CurrentAppView.swift */,
3F2FA4001D79D66D003E2AD8 /* StateView.swift */,
3F2FA3FE1D79D094003E2AD8 /* StatusMenuController.swift */,
3F2FA4041D7A1F87003E2AD8 /* BehaviorManager.swift */,
3FE7E0E51D7CBEAE00DC754D /* Controllers */,
3FE7E0E61D7CBEB900DC754D /* Views */,
3FE7E0E71D7CBEC700DC754D /* XIBs */,
3FCD16A61D79793600C57B22 /* Assets.xcassets */,
3FCD16AB1D79793600C57B22 /* Info.plist */,
3FCD16B21D79797600C57B22 /* utils.h */,
3FCD16B31D79797600C57B22 /* utils.m */,
3FCD16B11D79797600C57B22 /* Fluor-Bridging-Header.h */,
);
path = Fluor;
sourceTree = "<group>";
};
3FE7E0E51D7CBEAE00DC754D /* Controllers */ = {
isa = PBXGroup;
children = (
3FE7E0DE1D7CA14600DC754D /* LaunchAtLoginController.h */,
3FE7E0DF1D7CA14600DC754D /* LaunchAtLoginController.m */,
3F2FA3FE1D79D094003E2AD8 /* StatusMenuController.swift */,
3FE7E0E11D7CBE1700DC754D /* AboutWindowController.swift */,
3FE7E0E81D7CC01B00DC754D /* RulesEditorWindowController.swift */,
);
name = Controllers;
sourceTree = "<group>";
};
3FE7E0E61D7CBEB900DC754D /* Views */ = {
isa = PBXGroup;
children = (
3F2FA4021D7A059F003E2AD8 /* CurrentAppView.swift */,
3F2FA4001D79D66D003E2AD8 /* StateView.swift */,
);
name = Views;
sourceTree = "<group>";
};
3FE7E0E71D7CBEC700DC754D /* XIBs */ = {
isa = PBXGroup;
children = (
3FCD16A81D79793600C57B22 /* MainMenu.xib */,
3FE7E0E21D7CBE1700DC754D /* AboutWindowController.xib */,
3FE7E0E91D7CC01B00DC754D /* RulesEditorWindowController.xib */,
);
name = XIBs;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
Expand Down Expand Up @@ -143,7 +184,9 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
3FE7E0E41D7CBE1700DC754D /* AboutWindowController.xib in Resources */,
3FCD16A71D79793600C57B22 /* Assets.xcassets in Resources */,
3FE7E0EB1D7CC01B00DC754D /* RulesEditorWindowController.xib in Resources */,
3FCD16AA1D79793600C57B22 /* MainMenu.xib in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand All @@ -160,6 +203,9 @@
3FCD16A51D79793600C57B22 /* AppDelegate.swift in Sources */,
3F2FA4011D79D66D003E2AD8 /* StateView.swift in Sources */,
3FCD16B41D79797600C57B22 /* utils.m in Sources */,
3FE7E0EA1D7CC01B00DC754D /* RulesEditorWindowController.swift in Sources */,
3FE7E0E31D7CBE1700DC754D /* AboutWindowController.swift in Sources */,
3FE7E0E01D7CA14600DC754D /* LaunchAtLoginController.m in Sources */,
3F2FA4051D7A1F87003E2AD8 /* BehaviorManager.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -273,6 +319,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Mac Developer";
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = Q2E884V952;
INFOPLIST_FILE = Fluor/Info.plist;
Expand All @@ -290,6 +337,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_IDENTITY = "Mac Developer";
COMBINE_HIDPI_IMAGES = YES;
DEVELOPMENT_TEAM = Q2E884V952;
INFOPLIST_FILE = Fluor/Info.plist;
Expand Down
21 changes: 21 additions & 0 deletions Fluor/AboutWindowController.swift
@@ -0,0 +1,21 @@
//
// AboutWindowController.swift
// Fluor
//
// Created by Pierre TACCHI on 04/09/16.
// Copyright © 2016 Pyrolyse. All rights reserved.
//

import Cocoa

class AboutWindowController: NSWindowController {

override func windowDidLoad() {
super.windowDidLoad()

window?.styleMask.formUnion(.fullSizeContentView)
window?.titleVisibility = .hidden
window?.setFrameAutosaveName("AboutWindowAutosaveName")
}

}
40 changes: 40 additions & 0 deletions Fluor/AboutWindowController.xib
@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11198.2" systemVersion="15G1004" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
<dependencies>
<deployment identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11198.2"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="AboutWindowController" customModule="Fluor" customModuleProvider="target">
<connections>
<outlet property="window" destination="F0z-JX-Cv5" id="gIp-Ho-8D9"/>
</connections>
</customObject>
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
<window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" oneShot="NO" releasedWhenClosed="NO" animationBehavior="default" id="F0z-JX-Cv5">
<windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES" texturedBackground="YES"/>
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
<rect key="contentRect" x="196" y="240" width="273" height="249"/>
<rect key="screenRect" x="0.0" y="0.0" width="1440" height="900"/>
<view key="contentView" wantsLayer="YES" id="se5-gp-TjO">
<rect key="frame" x="0.0" y="0.0" width="273" height="249"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="XgN-Gd-YMR">
<rect key="frame" x="104" y="165" width="64" height="64"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
<imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="NSApplicationIcon" id="4oW-VD-wt3"/>
</imageView>
</subviews>
</view>
<connections>
<outlet property="delegate" destination="-2" id="0bl-1N-AYu"/>
</connections>
<point key="canvasLocation" x="35.5" y="150.5"/>
</window>
</objects>
<resources>
<image name="NSApplicationIcon" width="128" height="128"/>
</resources>
</document>

0 comments on commit c4798d5

Please sign in to comment.