Skip to content

Commit a3e8107

Browse files
idpatersonidpaterson
committed
Handle prefix selection by setting the selected cell on the matrix rather than setting the state of individual radio buttons.
1 parent 2ee774a commit a3e8107

2 files changed

Lines changed: 13 additions & 9 deletions

File tree

‎VVDocumenter-Xcode/Setting/VVDSettingPanelWindowController.m‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,17 @@ - (void)windowDidLoad
4444
// Implement this method to handle any initialization after your window controller's window has been loaded from its nib file.
4545
[self.tfTrigger setStringValue:[[VVDocumenterSetting defaultSetting] triggerString]];
4646
self.btnUseSpaces.state = (NSCellStateValue)[[VVDocumenterSetting defaultSetting] useSpaces];
47-
48-
self.btnPrefixWithStar.state = (NSCellStateValue)[[VVDocumenterSetting defaultSetting] prefixWithStar];
49-
self.btnPrefixWithSlashes.state = (NSCellStateValue)[[VVDocumenterSetting defaultSetting] prefixWithSlashes];
50-
self.btnPrefixWithWhitespace.state = (self.btnPrefixWithStar.state == NSOffState &&
51-
self.btnPrefixWithSlashes.state == NSOffState);
47+
5248
self.btnAddSinceToComment.state = (NSCellStateValue)[[VVDocumenterSetting defaultSetting] addSinceToComments];
5349
self.btnUseHeaderDoc.state = (NSCellStateValue)[[VVDocumenterSetting defaultSetting] useHeaderDoc];
50+
51+
if ([[VVDocumenterSetting defaultSetting] prefixWithStar]) {
52+
[self.mtxPrefixOptions selectCell:self.btnPrefixWithStar];
53+
} else if ([[VVDocumenterSetting defaultSetting] prefixWithSlashes]) {
54+
[self.mtxPrefixOptions selectCell:self.btnPrefixWithSlashes];
55+
} else {
56+
[self.mtxPrefixOptions selectCell:self.btnPrefixWithWhitespace];
57+
}
5458

5559
[self updateUseSpace:self.btnUseSpaces.state];
5660
[self syncSpaceCount];

‎VVDocumenter-Xcode/Setting/VVDSettingPanelWindowController.xib‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@
292292
<string key="NSReuseIdentifierKey">_NS:9</string>
293293
<bool key="NSEnabled">YES</bool>
294294
<object class="NSButtonCell" key="NSCell" id="716256895">
295-
<int key="NSCellFlags">-2080374784</int>
295+
<int key="NSCellFlags">67108864</int>
296296
<int key="NSCellFlags2">268435456</int>
297297
<string key="NSContents">Add @since to all comments</string>
298298
<reference key="NSSupport" ref="45273652"/>
@@ -319,7 +319,7 @@
319319
<string key="NSReuseIdentifierKey">_NS:9</string>
320320
<bool key="NSEnabled">YES</bool>
321321
<object class="NSButtonCell" key="NSCell" id="619578983">
322-
<int key="NSCellFlags">-2080374784</int>
322+
<int key="NSCellFlags">67108864</int>
323323
<int key="NSCellFlags2">268435456</int>
324324
<string key="NSContents">Use /*! (HeaderDoc style) instead of /**</string>
325325
<reference key="NSSupport" ref="45273652"/>
@@ -350,7 +350,7 @@
350350
<int key="NSNumCols">1</int>
351351
<array class="NSMutableArray" key="NSCells">
352352
<object class="NSButtonCell" id="337386906">
353-
<int key="NSCellFlags">-2080374784</int>
353+
<int key="NSCellFlags">67108864</int>
354354
<int key="NSCellFlags2">0</int>
355355
<string key="NSContents">Prefix each comment line with whitespace only</string>
356356
<reference key="NSSupport" ref="45273652"/>
@@ -367,7 +367,7 @@
367367
<int key="NSPeriodicInterval">25</int>
368368
</object>
369369
<object class="NSButtonCell" id="482624575">
370-
<int key="NSCellFlags">67108864</int>
370+
<int key="NSCellFlags">-2080374784</int>
371371
<int key="NSCellFlags2">0</int>
372372
<string key="NSContents">Prefix each comment line with a star</string>
373373
<reference key="NSSupport" ref="45273652"/>

0 commit comments

Comments
 (0)