Skip to content

Commit 20987ea

Browse files
niki-timofeniki-timofe
committed
migrate to table in menu item
1 parent 76c03b4 commit 20987ea

File tree

5 files changed

+107
-76
lines changed

5 files changed

+107
-76
lines changed

‎NarodMonWidget.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
112ECCB21DC4DB0500E221A3 /* WeatherView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 112ECCB11DC4DB0500E221A3 /* WeatherView.swift */; };
1110
11A4E6701DC24A0B001470BF /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 11A4E66F1DC24A0B001470BF /* AppDelegate.swift */; };
1211
11A4E6721DC24A0B001470BF /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 11A4E6711DC24A0B001470BF /* Assets.xcassets */; };
1312
11A4E6751DC24A0B001470BF /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 11A4E6731DC24A0B001470BF /* MainMenu.xib */; };
@@ -16,7 +15,6 @@
1615
/* End PBXBuildFile section */
1716

1817
/* Begin PBXFileReference section */
19-
112ECCB11DC4DB0500E221A3 /* WeatherView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WeatherView.swift; sourceTree = "<group>"; };
2018
11A4E66C1DC24A0B001470BF /* NarodMonWidget.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = NarodMonWidget.app; sourceTree = BUILT_PRODUCTS_DIR; };
2119
11A4E66F1DC24A0B001470BF /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
2220
11A4E6711DC24A0B001470BF /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
@@ -62,7 +60,6 @@
6260
11A4E66F1DC24A0B001470BF /* AppDelegate.swift */,
6361
11A4E6711DC24A0B001470BF /* Assets.xcassets */,
6462
11A4E6731DC24A0B001470BF /* MainMenu.xib */,
65-
112ECCB11DC4DB0500E221A3 /* WeatherView.swift */,
6663
11A4E6801DC252AE001470BF /* NarodMonAPI.swift */,
6764
11A4E67E1DC24F40001470BF /* StatusMenuController.swift */,
6865
11A4E6761DC24A0B001470BF /* Info.plist */,
@@ -170,7 +167,6 @@
170167
11A4E67F1DC24F40001470BF /* StatusMenuController.swift in Sources */,
171168
11A4E6811DC252AE001470BF /* NarodMonAPI.swift in Sources */,
172169
11A4E6701DC24A0B001470BF /* AppDelegate.swift in Sources */,
173-
112ECCB21DC4DB0500E221A3 /* WeatherView.swift in Sources */,
174170
);
175171
runOnlyForDeploymentPostprocessing = 0;
176172
};

‎NarodMonWidget/Base.lproj/MainMenu.xib‎

Lines changed: 75 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11762" systemVersion="16E154a" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
2+
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11762" systemVersion="16D32" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
33
<dependencies>
44
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11762"/>
55
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -16,10 +16,82 @@
1616
<customObject id="YLy-65-1bz" customClass="NSFontManager"/>
1717
<customObject id="MIc-jK-RNp" customClass="StatusMenuController" customModule="NarodMonWidget" customModuleProvider="target">
1818
<connections>
19+
<outlet property="readingsTable" destination="TLr-yU-ecZ" id="wGO-ha-u0y"/>
1920
<outlet property="statusMenu" destination="wAj-RY-mUf" id="7js-na-PVc"/>
20-
<outlet property="weatherView" destination="sT5-qx-W03" id="xD9-Bu-gip"/>
21+
<outlet property="updateMenuItem" destination="ccc-Rz-wju" id="N6P-38-kC1"/>
2122
</connections>
2223
</customObject>
24+
<scrollView wantsLayer="YES" borderType="none" autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" id="wzJ-Cj-3ka">
25+
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
26+
<clipView key="contentView" drawsBackground="NO" id="mkO-Yh-5pE">
27+
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
28+
<subviews>
29+
<tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="firstColumnOnly" selectionHighlightStyle="none" columnReordering="NO" columnResizing="NO" multipleSelection="NO" emptySelection="NO" autosaveColumns="NO" typeSelect="NO" id="TLr-yU-ecZ">
30+
<rect key="frame" x="0.0" y="0.0" width="135" height="19"/>
31+
<autoresizingMask key="autoresizingMask"/>
32+
<size key="intercellSpacing" width="0.0" height="2"/>
33+
<color key="backgroundColor" name="windowBackgroundColor" catalog="System" colorSpace="catalog"/>
34+
<color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
35+
<tableColumns>
36+
<tableColumn identifier="name" editable="NO" width="60" minWidth="60" maxWidth="3.4028234663852886e+38" id="WFW-jN-D0T">
37+
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
38+
<font key="font" metaFont="smallSystem"/>
39+
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
40+
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
41+
</tableHeaderCell>
42+
<textFieldCell key="dataCell" lineBreakMode="truncatingTail" alignment="left" title="Text Cell" usesSingleLineMode="YES" id="CTN-Ur-iJY">
43+
<font key="font" metaFont="system"/>
44+
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
45+
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
46+
</textFieldCell>
47+
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES"/>
48+
</tableColumn>
49+
<tableColumn identifier="value" width="25" minWidth="5" maxWidth="3.4028234663852886e+38" id="pdt-pb-5xq">
50+
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="right">
51+
<font key="font" metaFont="smallSystem"/>
52+
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
53+
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
54+
</tableHeaderCell>
55+
<textFieldCell key="dataCell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" alignment="right" title="0.0" id="Sc5-dX-Btq">
56+
<font key="font" metaFont="system"/>
57+
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
58+
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
59+
</textFieldCell>
60+
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES"/>
61+
</tableColumn>
62+
<tableColumn identifier="type" editable="NO" width="50" minWidth="5" maxWidth="3.4028234663852886e+38" id="JeS-gu-NdH">
63+
<tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
64+
<font key="font" metaFont="smallSystem"/>
65+
<color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
66+
<color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
67+
</tableHeaderCell>
68+
<textFieldCell key="dataCell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" alignment="left" title="d" id="xUu-PI-1qj">
69+
<font key="font" metaFont="system"/>
70+
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
71+
<color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
72+
</textFieldCell>
73+
<tableColumnResizingMask key="resizingMask" resizeWithTable="YES"/>
74+
</tableColumn>
75+
</tableColumns>
76+
<connections>
77+
<outlet property="dataSource" destination="MIc-jK-RNp" id="ob2-WZ-M9Q"/>
78+
<outlet property="delegate" destination="MIc-jK-RNp" id="zcS-Oa-6iS"/>
79+
</connections>
80+
</tableView>
81+
</subviews>
82+
<color key="backgroundColor" name="windowBackgroundColor" catalog="System" colorSpace="catalog"/>
83+
</clipView>
84+
<edgeInsets key="scrollerInsets" left="60" right="0.0" top="0.0" bottom="0.0"/>
85+
<scroller key="horizontalScroller" verticalHuggingPriority="750" horizontal="YES" id="2xf-Cp-KKN">
86+
<rect key="frame" x="23" y="-15" width="0.0" height="15"/>
87+
<autoresizingMask key="autoresizingMask"/>
88+
</scroller>
89+
<scroller key="verticalScroller" verticalHuggingPriority="750" horizontal="NO" id="6YC-Ef-3rf">
90+
<rect key="frame" x="-15" y="-7" width="15" height="0.0"/>
91+
<autoresizingMask key="autoresizingMask"/>
92+
</scroller>
93+
<point key="canvasLocation" x="412" y="489"/>
94+
</scrollView>
2395
<menu id="wAj-RY-mUf">
2496
<items>
2597
<menuItem title="Обновить" keyEquivalent="u" id="ccc-Rz-wju">
@@ -31,7 +103,7 @@
31103
<menuItem title="Weather" id="6rQ-gp-sD7">
32104
<modifierMask key="keyEquivalentModifierMask"/>
33105
<connections>
34-
<outlet property="view" destination="sT5-qx-W03" id="bp1-4W-HnG"/>
106+
<outlet property="view" destination="TLr-yU-ecZ" id="SuK-G7-wpL"/>
35107
</connections>
36108
</menuItem>
37109
<menuItem isSeparatorItem="YES" id="I6O-iu-YTW"/>
@@ -43,33 +115,5 @@
43115
</items>
44116
<point key="canvasLocation" x="75" y="145"/>
45117
</menu>
46-
<scrollView horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" id="Sw7-fe-Eoh">
47-
<rect key="frame" x="0.0" y="0.0" width="151" height="45"/>
48-
<autoresizingMask key="autoresizingMask"/>
49-
<clipView key="contentView" id="KEO-HK-EM0">
50-
<rect key="frame" x="1" y="1" width="149" height="43"/>
51-
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
52-
<subviews>
53-
<textView editable="NO" selectable="NO" drawsBackground="NO" importsGraphics="NO" richText="NO" horizontallyResizable="YES" findStyle="panel" quoteSubstitution="YES" dashSubstitution="YES" smartInsertDelete="YES" id="sT5-qx-W03" customClass="WeatherView" customModule="NarodMonWidget" customModuleProvider="target">
54-
<rect key="frame" x="0.0" y="0.0" width="149" height="43"/>
55-
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" heightSizable="YES"/>
56-
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
57-
<size key="minSize" width="149" height="43"/>
58-
<size key="maxSize" width="463" height="10000000"/>
59-
<color key="insertionPointColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
60-
</textView>
61-
</subviews>
62-
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
63-
</clipView>
64-
<scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="YES" id="3m9-QC-4GZ">
65-
<rect key="frame" x="-100" y="-100" width="87" height="18"/>
66-
<autoresizingMask key="autoresizingMask"/>
67-
</scroller>
68-
<scroller key="verticalScroller" verticalHuggingPriority="750" horizontal="NO" id="oxT-7l-Ji3">
69-
<rect key="frame" x="134" y="1" width="16" height="43"/>
70-
<autoresizingMask key="autoresizingMask"/>
71-
</scroller>
72-
<point key="canvasLocation" x="74.5" y="257.5"/>
73-
</scrollView>
74118
</objects>
75119
</document>

‎NarodMonWidget/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<key>CFBundleShortVersionString</key>
2020
<string>2.0.0</string>
2121
<key>CFBundleVersion</key>
22-
<string>144</string>
22+
<string>203</string>
2323
<key>LSApplicationCategoryType</key>
2424
<string>public.app-category.weather</string>
2525
<key>LSMinimumSystemVersion</key>

‎NarodMonWidget/StatusMenuController.swift‎

Lines changed: 31 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,22 @@ import Cocoa
1010

1111
class StatusMenuController: NSObject, NarodMonAPIDelegate {
1212
@IBOutlet weak var statusMenu: NSMenu!
13-
@IBOutlet weak var weatherView: WeatherView!
13+
@IBOutlet weak var updateMenuItem: NSMenuItem!
14+
@IBOutlet weak var readingsTable: NSTableView!
1415

1516
let statusItem = NSStatusBar.system().statusItem(withLength: NSVariableStatusItemLength)
1617

17-
var weatherMenuItem: NSMenuItem!
1818
var narodMonAPI: NarodMonAPI!
1919
var sensorsList: [Int:Type] = [:]
2020
var updateTimer: Timer!
21+
22+
var results = [Int:Float]()
23+
var counters = [Int:Float]()
2124

2225
override func awakeFromNib() {
2326
narodMonAPI = NarodMonAPI(delegate: self)
2427
statusItem.title = "~"
2528
statusItem.menu = statusMenu
26-
27-
weatherView.textContainerInset = NSSize(width: 16, height: 0)
2829
}
2930

3031
@IBAction func updateBtnAction(_ sender: NSMenuItem) {
@@ -49,11 +50,6 @@ class StatusMenuController: NSObject, NarodMonAPIDelegate {
4950
}
5051

5152
func gotSensorsValues(rdgs: [Reading]) {
52-
var inTitle = ""
53-
54-
var results = [Int:Float]()
55-
var counters = [Int:Float]()
56-
5753
for reading in rdgs {
5854
if let result = results[sensorsList[reading.sensor]!.id] {
5955
results.updateValue(result + reading.value,
@@ -73,19 +69,8 @@ class StatusMenuController: NSObject, NarodMonAPIDelegate {
7369
results[1]! / counters[1]!,
7470
narodMonAPI.types[1].unit)
7571

76-
for type in Array(results.keys).sorted() {
77-
inTitle += String(format: "%@: %.1f%@\n",
78-
narodMonAPI.types[type].name,
79-
results[type]! / counters[type]!,
80-
narodMonAPI.types[type].unit)
81-
}
82-
inTitle = inTitle.substring(to: inTitle.index(before: inTitle.endIndex))
83-
84-
weatherView.textStorage?.mutableString.setString(inTitle)
85-
var frame = weatherView.frame
86-
frame.size.width = weatherView.attributedString().size().width + 42
87-
weatherView.frame = frame
88-
72+
let updateTime = Calendar.current.dateComponents([.hour, .minute], from: Date())
73+
updateMenuItem.title = String(format: "Обновить (%d:%d)", updateTime.hour!, updateTime.minute!)
8974
}
9075

9176
func performUpdateValues() -> Void {
@@ -115,3 +100,27 @@ class StatusMenuController: NSObject, NarodMonAPIDelegate {
115100
NSApplication.shared().terminate(self)
116101
}
117102
}
103+
104+
extension StatusMenuController: NSTableViewDataSource, NSTableViewDelegate {
105+
func numberOfRows(in tableView: NSTableView) -> Int {
106+
return (results.count)
107+
}
108+
109+
func tableView(_ tableView: NSTableView, objectValueFor tableColumn: NSTableColumn?, row: Int) -> Any?{
110+
var result = ""
111+
112+
let type = Array(results.keys).sorted()[row]
113+
114+
let columnIdentifier = tableColumn?.identifier
115+
if columnIdentifier == "type" {
116+
result = narodMonAPI.types[type].unit
117+
}
118+
if columnIdentifier == "name" {
119+
result = narodMonAPI.types[type].name
120+
}
121+
if columnIdentifier == "value" {
122+
result = String(format:"%.1f", results[type]! / counters[type]!)
123+
}
124+
return result
125+
}
126+
}

‎NarodMonWidget/WeatherView.swift‎

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

0 commit comments

Comments
 (0)