Skip to content

Commit 0bc5e26

Browse files
author
dsward2
committed
In the Status tab view, an "Update" button was added for the Current Tasks text view.
1 parent 4431926 commit 0bc5e26

7 files changed

Lines changed: 25 additions & 14 deletions

File tree

LocalRadio/AppDelegate.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
- (IBAction)editCancelButtonAction:(id)sender;
153153
- (IBAction)editSetDefaultsButtonAction:(id)sender;
154154

155-
- (void)updateCurrentTasksText;
155+
- (IBAction)updateCurrentTasksText:(id)sender;
156156

157157
- (NSString *)localHostString;
158158
- (NSString *)portString;

LocalRadio/AppDelegate.m

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ - (void)terminateTasks
9191

9292
//[self.soxController terminateTasks]; // already handled by sdrController terminateTasks
9393

94-
[self updateCurrentTasksText];
94+
[self updateCurrentTasksText:self];
9595
}
9696

9797
//==================================================================================
@@ -143,7 +143,7 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
143143
// app termination in progress due RTL-SDR device not found
144144
}
145145

146-
[self updateCurrentTasksText];
146+
[self updateCurrentTasksText:self];
147147
}
148148

149149
//==================================================================================
@@ -173,7 +173,7 @@ - (void)startServices
173173

174174
[self.webViewDelegate loadMainPage];
175175

176-
[self updateCurrentTasksText];
176+
[self updateCurrentTasksText:self];
177177
}
178178

179179
//==================================================================================
@@ -228,14 +228,14 @@ - (void)restartServicesOnThread
228228
}
229229
}
230230

231-
[self updateCurrentTasksText];
231+
[self updateCurrentTasksText:self];
232232
}
233233

234234
//==================================================================================
235235
// updateCurrentTasksText:
236236
//==================================================================================
237237

238-
- (void)updateCurrentTasksText
238+
- (IBAction)updateCurrentTasksText:(id)sender
239239
{
240240
NSMutableString * tasksString = [NSMutableString string];
241241

LocalRadio/Base.lproj/MainMenu.xib

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1378,7 +1378,7 @@ Gw
13781378
</view>
13791379
</tabViewItem>
13801380
<tabViewItem label="Status" identifier="" id="GvX-g5-9UV">
1381-
<view key="view" id="qnk-kF-EPU">
1381+
<view key="view" ambiguous="YES" id="qnk-kF-EPU">
13821382
<rect key="frame" x="10" y="33" width="450" height="548"/>
13831383
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
13841384
<subviews>
@@ -1394,7 +1394,7 @@ Gw
13941394
<autoresizingMask key="autoresizingMask"/>
13951395
<clipView key="contentView" ambiguous="YES" id="XFC-hX-hWd">
13961396
<rect key="frame" x="1" y="1" width="432" height="184"/>
1397-
<autoresizingMask key="autoresizingMask"/>
1397+
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
13981398
<subviews>
13991399
<textView ambiguous="YES" editable="NO" importsGraphics="NO" richText="NO" verticallyResizable="YES" findStyle="panel" allowsNonContiguousLayout="YES" id="ydX-HH-DPt">
14001400
<rect key="frame" x="0.0" y="0.0" width="432" height="184"/>
@@ -1412,7 +1412,7 @@ Gw
14121412
<autoresizingMask key="autoresizingMask"/>
14131413
</scroller>
14141414
<scroller key="verticalScroller" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="St6-kL-Qjl">
1415-
<rect key="frame" x="-15" y="1" width="16" height="0.0"/>
1415+
<rect key="frame" x="417" y="1" width="16" height="184"/>
14161416
<autoresizingMask key="autoresizingMask"/>
14171417
</scroller>
14181418
</scrollView>
@@ -1744,11 +1744,22 @@ Gw
17441744
</subviews>
17451745
</view>
17461746
</box>
1747+
<button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="mJC-MF-f1B">
1748+
<rect key="frame" x="361" y="202" width="75" height="16"/>
1749+
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
1750+
<buttonCell key="cell" type="push" title="Update" bezelStyle="rounded" alignment="center" controlSize="mini" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="1do-GF-fAa">
1751+
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
1752+
<font key="font" metaFont="miniSystem"/>
1753+
</buttonCell>
1754+
<connections>
1755+
<action selector="updateCurrentTasksText:" target="Voe-Tx-rLC" id="9So-Bh-vgM"/>
1756+
</connections>
1757+
</button>
17471758
</subviews>
17481759
</view>
17491760
</tabViewItem>
17501761
<tabViewItem label="Configuration" identifier="" id="Amd-pe-F7E">
1751-
<view key="view" ambiguous="YES" id="QdK-3V-Sdm">
1762+
<view key="view" id="QdK-3V-Sdm">
17521763
<rect key="frame" x="10" y="33" width="450" height="548"/>
17531764
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
17541765
<subviews>

LocalRadio/IcecastController.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ - (void)startIcecastTask
354354
weakSelf.icecastTask = NULL;
355355
weakSelf.icecastTaskProcessID = 0;
356356

357-
[weakSelf.appDelegate updateCurrentTasksText];
357+
[weakSelf.appDelegate updateCurrentTasksText:self];
358358
}];
359359

360360
[self.icecastTask launch];

LocalRadio/SDRController.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ - (void)dispatchedStartRtlsdrTasksForFrequencies:(NSArray *)frequenciesArray cat
415415

416416
dispatch_async(dispatch_get_main_queue(), ^{
417417

418-
[weakSelf.appDelegate updateCurrentTasksText];
418+
[weakSelf.appDelegate updateCurrentTasksText:self];
419419

420420
self.appDelegate.statusRTLSDRTextField.stringValue = @"Running";
421421

LocalRadio/TaskItem.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ - (NSError *) createTask
109109

110110
AppDelegate * appDelegate = (AppDelegate *)[NSApp delegate];
111111

112-
[appDelegate updateCurrentTasksText];
112+
[appDelegate updateCurrentTasksText:self];
113113

114114
NSLog(@"TaskItem PID=%d - exit %@ terminationHandler", processIdentifier, weakSelf.functionName);
115115
}];

LocalRadio/TaskPipelineManager.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ - (void) periodicTaskPipelineCheckTimerFired:(NSTimer *)timer
202202

203203
AppDelegate * appDelegate = (AppDelegate *)[NSApp delegate];
204204

205-
[appDelegate updateCurrentTasksText];
205+
[appDelegate updateCurrentTasksText:self];
206206
}
207207
}
208208

0 commit comments

Comments
 (0)