Revision: 25836
http://sourceforge.net/p/bibdesk/svn/25836
Author: hofman
Date: 2021-05-03 09:36:09 +0000 (Mon, 03 May 2021)
Log Message:
-----------
Replace matrixes by radio buttons in BibPref_Cite
Modified Paths:
--------------
trunk/bibdesk/Base.lproj/BibPref_Cite.xib
trunk/bibdesk/BibPref_Cite.h
trunk/bibdesk/BibPref_Cite.m
Modified: trunk/bibdesk/Base.lproj/BibPref_Cite.xib
===================================================================
--- trunk/bibdesk/Base.lproj/BibPref_Cite.xib 2021-05-03 09:13:12 UTC (rev
25835)
+++ trunk/bibdesk/Base.lproj/BibPref_Cite.xib 2021-05-03 09:36:09 UTC (rev
25836)
@@ -12,12 +12,15 @@
<outlet property="alternateDragCopyPopup" destination="230"
id="242"/>
<outlet property="alternateDragCopyTemplatePopup"
destination="273" id="279"/>
<outlet property="citeBehaviorLine" destination="135"
id="136"/>
- <outlet property="citeBracketRadio" destination="76" id="80"/>
<outlet property="citeStringField" destination="20" id="133"/>
+ <outlet property="contextBracketRadioButton"
destination="x6i-8b-e8N" id="Pfo-kY-PzM"/>
<outlet property="defaultDragCopyPopup" destination="195"
id="220"/>
<outlet property="defaultDragCopyTemplatePopup"
destination="268" id="278"/>
+ <outlet property="multipleRadioButton"
destination="upV-sH-WhN" id="pzW-1Y-N0e"/>
<outlet property="prependTildeCheckButton" destination="151"
id="153"/>
- <outlet property="separateCiteRadio" destination="338"
id="347"/>
+ <outlet property="separateRadioButton"
destination="nxY-l8-mpH" id="7Lt-5C-8Nh"/>
+ <outlet property="singleRadioButton" destination="qwD-ft-Yf2"
id="goO-kI-xHs"/>
+ <outlet property="texBracketRadioButton"
destination="7ds-er-1db" id="ZiV-aQ-yyY"/>
<outlet property="view" destination="5" id="318"/>
</connections>
</customObject>
@@ -24,10 +27,10 @@
<customObject id="-1" userLabel="First Responder"
customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
<customView translatesAutoresizingMaskIntoConstraints="NO" id="5"
userLabel="View">
- <rect key="frame" x="0.0" y="0.0" width="445" height="377"/>
+ <rect key="frame" x="0.0" y="0.0" width="445" height="371"/>
<subviews>
<textField horizontalHuggingPriority="750"
verticalHuggingPriority="750" preferredMaxLayoutWidth="94"
translatesAutoresizingMaskIntoConstraints="NO" id="339">
- <rect key="frame" x="30" y="98" width="93" height="16"/>
+ <rect key="frame" x="30" y="97" width="93" height="16"/>
<textFieldCell key="cell" sendsActionOnEndEditing="YES"
alignment="right" title="Multiple items:" id="405">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor"
catalog="System" colorSpace="catalog"/>
@@ -34,47 +37,8 @@
<color key="backgroundColor" name="controlColor"
catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
- <matrix verticalHuggingPriority="750"
allowsEmptySelection="NO" autosizesCells="NO"
translatesAutoresizingMaskIntoConstraints="NO" id="338">
- <rect key="frame" x="129" y="97" width="239" height="18"/>
- <color key="backgroundColor" name="controlColor"
catalog="System" colorSpace="catalog"/>
- <size key="cellSize" width="77" height="18"/>
- <size key="intercellSpacing" width="4" height="2"/>
- <buttonCell key="prototype" type="radio" title="Radio"
imagePosition="left" alignment="left" inset="2" id="407">
- <behavior key="behavior" changeContents="YES"
doesNotDimImage="YES" lightByContents="YES"/>
- <font key="font" metaFont="system"/>
- </buttonCell>
- <cells>
- <column>
- <buttonCell type="radio" title="Single"
imagePosition="left" alignment="left" state="on" toolTip="Write multiple
citations as a comma-separated list in a single cite command" inset="2"
id="343">
- <behavior key="behavior" changeContents="YES"
doesNotDimImage="YES" lightByContents="YES"/>
- <font key="font" metaFont="system"/>
- <connections>
- <accessibilityConnection property="title"
destination="339" id="344"/>
- </connections>
- </buttonCell>
- </column>
- <column>
- <buttonCell type="radio" title="Separate"
imagePosition="left" alignment="left" toolTip="Write multiple citations in
separate cite commands" tag="1" inset="2" id="342">
- <behavior key="behavior" changeContents="YES"
doesNotDimImage="YES" lightByContents="YES"/>
- <font key="font" metaFont="system"/>
- <connections>
- <accessibilityConnection property="title"
destination="339" id="345"/>
- </connections>
- </buttonCell>
- </column>
- <column>
- <buttonCell type="radio" title="Multiple"
imagePosition="left" alignment="left" toolTip="Write multiple citations as a
biblatex-style multicite command" tag="2" inset="2" id="346">
- <behavior key="behavior" changeContents="YES"
doesNotDimImage="YES" lightByContents="YES"/>
- <font key="font" metaFont="system"/>
- </buttonCell>
- </column>
- </cells>
- <connections>
- <action selector="changeSeparateCite:" target="-2"
id="348"/>
- </connections>
- </matrix>
<popUpButton verticalHuggingPriority="750"
translatesAutoresizingMaskIntoConstraints="NO" id="273">
- <rect key="frame" x="237" y="219" width="192" height="25"/>
+ <rect key="frame" x="237" y="213" width="192" height="25"/>
<popUpButtonCell key="cell" type="push"
bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on"
borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter"
preferredEdge="maxY" selectedItem="276" id="404">
<behavior key="behavior" lightByBackground="YES"
lightByGray="YES"/>
<font key="font" metaFont="menu"/>
@@ -91,7 +55,7 @@
</connections>
</popUpButton>
<popUpButton verticalHuggingPriority="750"
translatesAutoresizingMaskIntoConstraints="NO" id="268">
- <rect key="frame" x="237" y="279" width="192" height="25"/>
+ <rect key="frame" x="237" y="273" width="192" height="25"/>
<popUpButtonCell key="cell" type="push"
bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on"
borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter"
preferredEdge="maxY" selectedItem="272" id="403">
<behavior key="behavior" lightByBackground="YES"
lightByGray="YES"/>
<font key="font" metaFont="menu"/>
@@ -108,7 +72,7 @@
</connections>
</popUpButton>
<textField horizontalHuggingPriority="750"
verticalHuggingPriority="750" horizontalCompressionResistancePriority="250"
preferredMaxLayoutWidth="63" translatesAutoresizingMaskIntoConstraints="NO"
id="267">
- <rect key="frame" x="170" y="226" width="64" height="16"/>
+ <rect key="frame" x="170" y="220" width="64" height="16"/>
<textFieldCell key="cell" sendsActionOnEndEditing="YES"
alignment="right" title="Template:" id="402">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor"
catalog="System" colorSpace="catalog"/>
@@ -116,7 +80,7 @@
</textFieldCell>
</textField>
<textField horizontalHuggingPriority="750"
verticalHuggingPriority="750" horizontalCompressionResistancePriority="250"
preferredMaxLayoutWidth="63" translatesAutoresizingMaskIntoConstraints="NO"
id="243">
- <rect key="frame" x="170" y="286" width="64" height="16"/>
+ <rect key="frame" x="170" y="280" width="64" height="16"/>
<textFieldCell key="cell" sendsActionOnEndEditing="YES"
alignment="right" title="Template:" id="401">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor"
catalog="System" colorSpace="catalog"/>
@@ -124,7 +88,7 @@
</textFieldCell>
</textField>
<popUpButton toolTip="Choose format to drag or copy when
holding the Option key" verticalHuggingPriority="750"
translatesAutoresizingMaskIntoConstraints="NO" id="230">
- <rect key="frame" x="237" y="249" width="192" height="25"/>
+ <rect key="frame" x="237" y="243" width="192" height="25"/>
<popUpButtonCell key="cell" type="push" title="BibTeX
entry" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail"
state="on" borderStyle="borderAndBezel" inset="2" arrowPosition="arrowAtCenter"
preferredEdge="maxY" selectedItem="236" id="400">
<behavior key="behavior" lightByBackground="YES"
lightByGray="YES"/>
<font key="font" metaFont="menu"/>
@@ -150,10 +114,10 @@
</connections>
</popUpButton>
<box verticalHuggingPriority="750" boxType="separator"
translatesAutoresizingMaskIntoConstraints="NO" id="205">
- <rect key="frame" x="12" y="208" width="421" height="5"/>
+ <rect key="frame" x="12" y="202" width="421" height="5"/>
</box>
<popUpButton toolTip="Choose format to drag or copy by
default" verticalHuggingPriority="750"
translatesAutoresizingMaskIntoConstraints="NO" id="195">
- <rect key="frame" x="237" y="309" width="192" height="25"/>
+ <rect key="frame" x="237" y="303" width="192" height="25"/>
<popUpButtonCell key="cell" type="push" title="TeX cite
command" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail"
state="on" borderStyle="borderAndBezel" tag="1" inset="2"
arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="197" id="399">
<behavior key="behavior" lightByBackground="YES"
lightByGray="YES"/>
<font key="font" metaFont="menu"/>
@@ -179,7 +143,7 @@
</connections>
</popUpButton>
<textField horizontalHuggingPriority="750"
verticalHuggingPriority="750" horizontalCompressionResistancePriority="250"
preferredMaxLayoutWidth="211" translatesAutoresizingMaskIntoConstraints="NO"
id="194">
- <rect key="frame" x="30" y="256" width="204" height="16"/>
+ <rect key="frame" x="30" y="250" width="204" height="16"/>
<textFieldCell key="cell" sendsActionOnEndEditing="YES"
alignment="right" title="Format when holding Option key:" id="398">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor"
catalog="System" colorSpace="catalog"/>
@@ -187,7 +151,7 @@
</textFieldCell>
</textField>
<textField horizontalHuggingPriority="750"
verticalHuggingPriority="750" horizontalCompressionResistancePriority="250"
preferredMaxLayoutWidth="97" translatesAutoresizingMaskIntoConstraints="NO"
id="193">
- <rect key="frame" x="139" y="316" width="95" height="16"/>
+ <rect key="frame" x="139" y="310" width="95" height="16"/>
<textFieldCell key="cell" sendsActionOnEndEditing="YES"
alignment="right" title="Default format:" id="397">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor"
catalog="System" colorSpace="catalog"/>
@@ -195,7 +159,7 @@
</textFieldCell>
</textField>
<button toolTip="Choose to write multiple citations in
separate cite commands or as a comma-separated list in a single cite-command"
horizontalHuggingPriority="750" verticalHuggingPriority="750"
translatesAutoresizingMaskIntoConstraints="NO" id="151">
- <rect key="frame" x="127" y="72" width="118" height="18"/>
+ <rect key="frame" x="125" y="72" width="118" height="18"/>
<buttonCell key="cell" type="check" title="Prepend a
tilde" bezelStyle="regularSquare" imagePosition="left" alignment="left"
inset="2" id="396">
<behavior key="behavior" changeContents="YES"
doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
@@ -224,7 +188,7 @@
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750"
horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="138"
translatesAutoresizingMaskIntoConstraints="NO" id="106">
- <rect key="frame" x="18" y="182" width="136" height="16"/>
+ <rect key="frame" x="18" y="176" width="136" height="16"/>
<textFieldCell key="cell" sendsActionOnEndEditing="YES"
alignment="left" title="Cite Command Style" id="393">
<font key="font" metaFont="systemBold"/>
<color key="textColor" name="controlTextColor"
catalog="System" colorSpace="catalog"/>
@@ -232,7 +196,7 @@
</textFieldCell>
</textField>
<textField horizontalHuggingPriority="750"
verticalHuggingPriority="750" preferredMaxLayoutWidth="84"
translatesAutoresizingMaskIntoConstraints="NO" id="94">
- <rect key="frame" x="36" y="124" width="87" height="16"/>
+ <rect key="frame" x="36" y="119" width="87" height="16"/>
<textFieldCell key="cell" sendsActionOnEndEditing="YES"
alignment="right" title="Bracket style:" id="392">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor"
catalog="System" colorSpace="catalog"/>
@@ -240,7 +204,7 @@
</textFieldCell>
</textField>
<textField toolTip="Enter the TeX cite command to use"
verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO"
id="20">
- <rect key="frame" x="129" y="149" width="80" height="21"/>
+ <rect key="frame" x="127" y="143" width="80" height="21"/>
<constraints>
<constraint firstAttribute="width" priority="749"
constant="80" id="BE5-v8-Q9w"/>
</constraints>
@@ -252,11 +216,10 @@
<connections>
<accessibilityConnection property="title"
destination="89" id="295"/>
<action selector="citeStringFieldChanged:" target="-2"
id="137"/>
- <outlet property="nextKeyView" destination="76"
id="130"/>
</connections>
</textField>
<textField horizontalHuggingPriority="750"
verticalHuggingPriority="750" preferredMaxLayoutWidth="69"
translatesAutoresizingMaskIntoConstraints="NO" id="89">
- <rect key="frame" x="53" y="152" width="70" height="16"/>
+ <rect key="frame" x="51" y="146" width="70" height="16"/>
<textFieldCell key="cell" sendsActionOnEndEditing="YES"
alignment="right" title="Command:" id="391">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor"
catalog="System" colorSpace="catalog"/>
@@ -264,7 +227,7 @@
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750"
horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="151"
translatesAutoresizingMaskIntoConstraints="NO" id="88">
- <rect key="frame" x="18" y="341" width="148" height="16"/>
+ <rect key="frame" x="18" y="335" width="148" height="16"/>
<textFieldCell key="cell" sendsActionOnEndEditing="YES"
alignment="left" title="Copying and Dragging" id="390">
<font key="font" metaFont="systemBold"/>
<color key="textColor" name="controlTextColor"
catalog="System" colorSpace="catalog"/>
@@ -271,39 +234,56 @@
<color key="backgroundColor" name="controlColor"
catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
- <matrix verticalHuggingPriority="750"
allowsEmptySelection="NO" autosizesCells="NO"
translatesAutoresizingMaskIntoConstraints="NO" id="76">
- <rect key="frame" x="129" y="123" width="180" height="18"/>
- <color key="backgroundColor" name="controlColor"
catalog="System" colorSpace="catalog"/>
- <size key="cellSize" width="88" height="18"/>
- <size key="intercellSpacing" width="4" height="2"/>
- <buttonCell key="prototype" type="radio" title="Radio"
imagePosition="left" alignment="left" inset="2" id="406">
+ <button toolTip="Use TeX curly braces after the cite command"
verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO"
id="7ds-er-1db">
+ <rect key="frame" x="125" y="118" width="63" height="18"/>
+ <buttonCell key="cell" type="radio" title="TeX {}"
bezelStyle="regularSquare" imagePosition="left" alignment="left" state="on"
inset="2" id="vWv-sT-ItD">
<behavior key="behavior" changeContents="YES"
doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
- <cells>
- <column>
- <buttonCell type="radio" title="TeX {}"
imagePosition="left" alignment="left" state="on" toolTip="Use TeX curly braces
after the cite command" tag="1" inset="2" id="102">
- <behavior key="behavior" changeContents="YES"
doesNotDimImage="YES" lightByContents="YES"/>
- <font key="font" metaFont="system"/>
- <connections>
- <accessibilityConnection property="title"
destination="94" id="296"/>
- </connections>
- </buttonCell>
- </column>
- <column>
- <buttonCell type="radio" title="ConTeXt []"
imagePosition="left" alignment="left" toolTip="Use ConTeXt square brackets
after the cite command" tag="2" inset="2" id="103">
- <behavior key="behavior" changeContents="YES"
doesNotDimImage="YES" lightByContents="YES"/>
- <font key="font" metaFont="system"/>
- <connections>
- <accessibilityConnection property="title"
destination="94" id="297"/>
- </connections>
- </buttonCell>
- </column>
- </cells>
<connections>
- <action selector="setCitationBracketStyle:"
target="-2" id="79"/>
+ <action selector="setCitationBracketStyle:"
target="-2" id="Uhe-Vs-66W"/>
</connections>
- </matrix>
+ </button>
+ <button toolTip="Write multiple citations as a comma-separated
list in a single cite command" horizontalHuggingPriority="749"
verticalHuggingPriority="750" horizontalCompressionResistancePriority="751"
translatesAutoresizingMaskIntoConstraints="NO" id="qwD-ft-Yf2">
+ <rect key="frame" x="125" y="96" width="81" height="18"/>
+ <buttonCell key="cell" type="radio" title="Single"
bezelStyle="regularSquare" imagePosition="left" alignment="left" state="on"
inset="2" id="Iw7-vr-O8F">
+ <behavior key="behavior" changeContents="YES"
doesNotDimImage="YES" lightByContents="YES"/>
+ <font key="font" metaFont="system"/>
+ </buttonCell>
+ <connections>
+ <action selector="changeSeparateCite:" target="-2"
id="qSH-ND-9RR"/>
+ </connections>
+ </button>
+ <button toolTip="Write multiple citations in separate cite
commands" horizontalHuggingPriority="749" verticalHuggingPriority="750"
horizontalCompressionResistancePriority="751" tag="1"
translatesAutoresizingMaskIntoConstraints="NO" id="nxY-l8-mpH">
+ <rect key="frame" x="212" y="96" width="81" height="18"/>
+ <buttonCell key="cell" type="radio" title="Separate"
bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2"
id="SAc-zv-m8Y">
+ <behavior key="behavior" changeContents="YES"
doesNotDimImage="YES" lightByContents="YES"/>
+ <font key="font" metaFont="system"/>
+ </buttonCell>
+ <connections>
+ <action selector="changeSeparateCite:" target="-2"
id="BDn-q0-sQn"/>
+ </connections>
+ </button>
+ <button toolTip="Use ConTeXt square brackets after the cite
command" verticalHuggingPriority="750" tag="1"
translatesAutoresizingMaskIntoConstraints="NO" id="x6i-8b-e8N">
+ <rect key="frame" x="194" y="118" width="90" height="18"/>
+ <buttonCell key="cell" type="radio" title="ConTeXt []"
bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2"
id="Sic-24-HFA">
+ <behavior key="behavior" changeContents="YES"
doesNotDimImage="YES" lightByContents="YES"/>
+ <font key="font" metaFont="system"/>
+ </buttonCell>
+ <connections>
+ <action selector="setCitationBracketStyle:"
target="-2" id="kbc-1K-KjL"/>
+ </connections>
+ </button>
+ <button toolTip="Write multiple citations as a biblatex-style
multicite command" horizontalHuggingPriority="749"
verticalHuggingPriority="750" horizontalCompressionResistancePriority="751"
tag="2" translatesAutoresizingMaskIntoConstraints="NO" id="upV-sH-WhN">
+ <rect key="frame" x="299" y="96" width="81" height="18"/>
+ <buttonCell key="cell" type="radio" title="Multiple"
bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2"
id="tzi-35-nxY">
+ <behavior key="behavior" changeContents="YES"
doesNotDimImage="YES" lightByContents="YES"/>
+ <font key="font" metaFont="system"/>
+ </buttonCell>
+ <connections>
+ <action selector="changeSeparateCite:" target="-2"
id="P4a-Jb-NzG"/>
+ </connections>
+ </button>
</subviews>
<constraints>
<constraint firstItem="195" firstAttribute="top"
secondItem="88" secondAttribute="bottom" constant="8" symbolic="YES"
id="0ad-It-vBG"/>
@@ -311,16 +291,16 @@
<constraint firstAttribute="trailing" secondItem="195"
secondAttribute="trailing" constant="20" symbolic="YES" id="2le-4f-mpI"/>
<constraint firstItem="273" firstAttribute="leading"
secondItem="195" secondAttribute="leading" id="37v-dT-q9K"/>
<constraint firstAttribute="trailing"
relation="greaterThanOrEqual" secondItem="110" secondAttribute="trailing"
constant="20" symbolic="YES" id="53e-mc-YhZ"/>
- <constraint firstItem="76" firstAttribute="leading"
secondItem="94" secondAttribute="trailing" constant="8" symbolic="YES"
id="55W-nu-1iz"/>
+ <constraint firstItem="nxY-l8-mpH" firstAttribute="leading"
secondItem="qwD-ft-Yf2" secondAttribute="trailing" constant="8" symbolic="YES"
id="5aG-bN-p62"/>
<constraint firstItem="267" firstAttribute="leading"
relation="greaterThanOrEqual" secondItem="5" secondAttribute="leading"
constant="32" id="5yq-Kp-ZIu"/>
<constraint firstItem="273" firstAttribute="trailing"
secondItem="195" secondAttribute="trailing" id="6AT-J4-8PE"/>
<constraint firstItem="268" firstAttribute="trailing"
secondItem="195" secondAttribute="trailing" id="6Fl-dW-GO9"/>
+ <constraint firstAttribute="trailing"
relation="greaterThanOrEqual" secondItem="x6i-8b-e8N"
secondAttribute="trailing" constant="20" symbolic="YES" id="6XE-w6-kfc"/>
<constraint firstItem="110" firstAttribute="top"
secondItem="151" secondAttribute="bottom" constant="8" symbolic="YES"
id="7rV-8B-8O6"/>
<constraint firstItem="20" firstAttribute="firstBaseline"
secondItem="89" secondAttribute="firstBaseline" id="7wV-Vc-5aj"/>
<constraint firstItem="88" firstAttribute="leading"
secondItem="5" secondAttribute="leading" constant="20" symbolic="YES"
id="80z-0A-Lye"/>
<constraint firstAttribute="trailing" secondItem="135"
secondAttribute="trailing" constant="20" symbolic="YES" id="8sb-Na-Xs9"/>
<constraint firstItem="194" firstAttribute="leading"
relation="greaterThanOrEqual" secondItem="5" secondAttribute="leading"
constant="32" id="942-R7-eib"/>
- <constraint firstItem="338" firstAttribute="leading"
secondItem="339" secondAttribute="trailing" constant="8" symbolic="YES"
id="BTu-gn-ked"/>
<constraint firstItem="20" firstAttribute="leading"
secondItem="89" secondAttribute="trailing" constant="8" symbolic="YES"
id="CAW-JT-3lD"/>
<constraint firstItem="205" firstAttribute="top"
secondItem="273" secondAttribute="bottom" constant="12" id="CPZ-Px-SjT"/>
<constraint firstItem="273" firstAttribute="top"
secondItem="230" secondAttribute="bottom" constant="10" symbolic="YES"
id="CwH-YK-SSt"/>
@@ -328,43 +308,51 @@
<constraint firstAttribute="bottom" secondItem="135"
secondAttribute="bottom" constant="20" symbolic="YES" id="Fh6-20-BUf"/>
<constraint firstItem="195" firstAttribute="leading"
secondItem="193" secondAttribute="trailing" constant="8" symbolic="YES"
id="H2O-jW-57s"/>
<constraint firstItem="94" firstAttribute="leading"
relation="greaterThanOrEqual" secondItem="5" secondAttribute="leading"
constant="32" id="IRb-qa-iKk"/>
+ <constraint firstItem="qwD-ft-Yf2" firstAttribute="top"
secondItem="7ds-er-1db" secondAttribute="bottom" constant="6" symbolic="YES"
id="J1Y-Gg-BGT"/>
<constraint firstAttribute="trailing"
relation="greaterThanOrEqual" secondItem="20" secondAttribute="trailing"
constant="20" symbolic="YES" id="Je6-c7-Q9I"/>
<constraint firstItem="243" firstAttribute="leading"
relation="greaterThanOrEqual" secondItem="5" secondAttribute="leading"
constant="32" id="KF4-7E-pCE"/>
<constraint firstItem="106" firstAttribute="top"
secondItem="205" secondAttribute="bottom" constant="12" id="KK1-20-Y8L"/>
<constraint firstAttribute="trailing"
relation="greaterThanOrEqual" secondItem="106" secondAttribute="trailing"
constant="20" symbolic="YES" id="KKp-fE-NSr"/>
+ <constraint firstItem="nxY-l8-mpH"
firstAttribute="firstBaseline" secondItem="339" secondAttribute="firstBaseline"
id="MTL-tT-eu3"/>
<constraint firstItem="193" firstAttribute="leading"
relation="greaterThanOrEqual" secondItem="5" secondAttribute="leading"
constant="32" id="O2w-q7-IPt"/>
- <constraint firstItem="151" firstAttribute="top"
secondItem="338" secondAttribute="bottom" constant="8" symbolic="YES"
id="PRk-cW-7AL"/>
+ <constraint firstItem="7ds-er-1db" firstAttribute="leading"
secondItem="20" secondAttribute="leading" id="Peu-Hl-2rh"/>
<constraint firstItem="194" firstAttribute="leading"
secondItem="5" secondAttribute="leading" priority="749" constant="32"
id="Q92-SG-EUX"/>
<constraint firstItem="89" firstAttribute="leading"
relation="greaterThanOrEqual" secondItem="5" secondAttribute="leading"
constant="32" id="SuB-8B-QlG"/>
+ <constraint firstItem="x6i-8b-e8N" firstAttribute="leading"
secondItem="7ds-er-1db" secondAttribute="trailing" constant="8" symbolic="YES"
id="TEV-c7-V4G"/>
<constraint firstItem="135" firstAttribute="top"
secondItem="110" secondAttribute="bottom" constant="8" symbolic="YES"
id="UPT-2v-3Hy"/>
<constraint firstAttribute="trailing" secondItem="205"
secondAttribute="trailing" constant="12" id="UzN-Ou-xIR"/>
+ <constraint firstItem="x6i-8b-e8N"
firstAttribute="firstBaseline" secondItem="94" secondAttribute="firstBaseline"
id="VHp-kc-m3n"/>
<constraint firstItem="339" firstAttribute="leading"
relation="greaterThanOrEqual" secondItem="5" secondAttribute="leading"
constant="32" id="WG8-P7-QAZ"/>
<constraint firstItem="106" firstAttribute="leading"
secondItem="88" secondAttribute="leading" id="XRr-QH-nQ1"/>
<constraint firstItem="273" firstAttribute="leading"
secondItem="267" secondAttribute="trailing" constant="8" symbolic="YES"
id="Xqv-Dx-nzV"/>
+ <constraint firstItem="qwD-ft-Yf2" firstAttribute="leading"
secondItem="339" secondAttribute="trailing" constant="6" symbolic="YES"
id="XyT-Rg-lmT"/>
<constraint firstItem="205" firstAttribute="leading"
secondItem="5" secondAttribute="leading" constant="12" id="a6g-kB-U0J"/>
- <constraint firstAttribute="trailing"
relation="greaterThanOrEqual" secondItem="338" secondAttribute="trailing"
constant="20" symbolic="YES" id="bMa-zr-lY9"/>
+ <constraint firstItem="upV-sH-WhN"
firstAttribute="firstBaseline" secondItem="339" secondAttribute="firstBaseline"
id="arS-Xo-qlW"/>
<constraint firstItem="110" firstAttribute="leading"
secondItem="5" secondAttribute="leading" constant="32" id="cQW-f9-sjw"/>
<constraint firstItem="339" firstAttribute="leading"
secondItem="5" secondAttribute="leading" priority="749" constant="32"
id="d3Q-Lj-FTg"/>
<constraint firstItem="273" firstAttribute="firstBaseline"
secondItem="267" secondAttribute="firstBaseline" id="dnW-hs-BPs"/>
- <constraint firstItem="338" firstAttribute="leading"
secondItem="20" secondAttribute="leading" id="ea8-xS-mEM"/>
- <constraint firstItem="338" firstAttribute="top"
secondItem="76" secondAttribute="bottom" constant="8" symbolic="YES"
id="eeV-1e-LeZ"/>
<constraint firstItem="230" firstAttribute="leading"
secondItem="195" secondAttribute="leading" id="ehH-wE-0yQ"/>
+ <constraint firstItem="upV-sH-WhN" firstAttribute="width"
secondItem="qwD-ft-Yf2" secondAttribute="width" id="eqN-eb-SW8"/>
<constraint firstItem="151" firstAttribute="leading"
secondItem="20" secondAttribute="leading" id="f4f-HQ-BhN"/>
- <constraint firstAttribute="trailing"
relation="greaterThanOrEqual" secondItem="76" secondAttribute="trailing"
constant="20" symbolic="YES" id="gLx-CX-Ep7"/>
<constraint firstItem="230" firstAttribute="top"
secondItem="268" secondAttribute="bottom" constant="10" symbolic="YES"
id="gUE-FD-55d"/>
- <constraint firstItem="338" firstAttribute="centerY"
secondItem="339" secondAttribute="centerY" id="iDk-7g-MGk"/>
+ <constraint firstAttribute="trailing"
relation="greaterThanOrEqual" secondItem="upV-sH-WhN"
secondAttribute="trailing" constant="20" symbolic="YES" id="gly-1w-Av1"/>
+ <constraint firstItem="nxY-l8-mpH" firstAttribute="width"
secondItem="qwD-ft-Yf2" secondAttribute="width" id="i77-at-X5H"/>
<constraint firstItem="20" firstAttribute="top"
secondItem="106" secondAttribute="bottom" constant="12" id="j8h-GC-LUY"/>
<constraint firstItem="230" firstAttribute="leading"
secondItem="194" secondAttribute="trailing" constant="8" symbolic="YES"
id="lNN-QV-2BP"/>
- <constraint firstItem="76" firstAttribute="centerY"
secondItem="94" secondAttribute="centerY" id="m5e-CH-Vx5"/>
<constraint firstAttribute="trailing"
relation="greaterThanOrEqual" secondItem="151" secondAttribute="trailing"
constant="20" symbolic="YES" id="m9U-Lz-85R"/>
<constraint firstItem="195" firstAttribute="firstBaseline"
secondItem="193" secondAttribute="firstBaseline" id="mGM-Ad-MXA"/>
- <constraint firstItem="76" firstAttribute="leading"
secondItem="20" secondAttribute="leading" id="qFf-wM-bVM"/>
+ <constraint firstItem="151" firstAttribute="top"
secondItem="qwD-ft-Yf2" secondAttribute="bottom" constant="8" symbolic="YES"
id="nL3-Mv-NZV"/>
+ <constraint firstItem="7ds-er-1db"
firstAttribute="firstBaseline" secondItem="94" secondAttribute="firstBaseline"
id="roE-2g-jvv"/>
<constraint firstItem="268" firstAttribute="top"
secondItem="195" secondAttribute="bottom" constant="10" symbolic="YES"
id="rtR-5A-NrW"/>
- <constraint firstItem="76" firstAttribute="top"
secondItem="20" secondAttribute="bottom" constant="8" symbolic="YES"
id="s0s-kq-o5J"/>
+ <constraint firstItem="qwD-ft-Yf2"
firstAttribute="firstBaseline" secondItem="339" secondAttribute="firstBaseline"
id="s6a-fx-G0S"/>
<constraint firstAttribute="trailing"
relation="greaterThanOrEqual" secondItem="88" secondAttribute="trailing"
constant="20" symbolic="YES" id="sKV-RD-ZiV"/>
<constraint firstItem="88" firstAttribute="top" secondItem="5"
secondAttribute="top" constant="20" symbolic="YES" id="slc-9e-5KL"/>
<constraint firstItem="268" firstAttribute="firstBaseline"
secondItem="243" secondAttribute="firstBaseline" id="tlI-68-Acl"/>
<constraint firstItem="230" firstAttribute="firstBaseline"
secondItem="194" secondAttribute="firstBaseline" id="vkf-oL-kx8"/>
+ <constraint firstItem="upV-sH-WhN" firstAttribute="leading"
secondItem="nxY-l8-mpH" secondAttribute="trailing" constant="8" symbolic="YES"
id="wSw-re-j1a"/>
+ <constraint firstItem="7ds-er-1db" firstAttribute="leading"
secondItem="94" secondAttribute="trailing" constant="6" symbolic="YES"
id="xH0-yv-o9Y"/>
+ <constraint firstItem="20" firstAttribute="leading"
secondItem="qwD-ft-Yf2" secondAttribute="leading" id="ypt-LZ-bGv"/>
+ <constraint firstItem="7ds-er-1db" firstAttribute="top"
secondItem="20" secondAttribute="bottom" constant="8" symbolic="YES"
id="z4o-xO-4Ov"/>
<constraint firstItem="135" firstAttribute="leading"
secondItem="5" secondAttribute="leading" constant="52" id="zIN-V4-9ZW"/>
<constraint firstItem="268" firstAttribute="leading"
secondItem="195" secondAttribute="leading" id="zm5-of-u8b"/>
</constraints>
Modified: trunk/bibdesk/BibPref_Cite.h
===================================================================
--- trunk/bibdesk/BibPref_Cite.h 2021-05-03 09:13:12 UTC (rev 25835)
+++ trunk/bibdesk/BibPref_Cite.h 2021-05-03 09:36:09 UTC (rev 25836)
@@ -45,9 +45,12 @@
NSTextField *citeBehaviorLine;
NSTextField *citeStringField;
- NSMatrix *separateCiteRadio;
+ NSButton *singleRadioButton;
+ NSButton *separateRadioButton;
+ NSButton *multipleRadioButton;
NSButton *prependTildeCheckButton;
- NSMatrix *citeBracketRadio;
+ NSButton *texBracketRadioButton;
+ NSButton *contextBracketRadioButton;
}
@property (nonatomic, assign) IBOutlet NSPopUpButton *defaultDragCopyPopup;
@@ -56,9 +59,12 @@
@property (nonatomic, assign) IBOutlet NSPopUpButton
*alternateDragCopyTemplatePopup;
@property (nonatomic, assign) IBOutlet NSTextField *citeBehaviorLine;
@property (nonatomic, assign) IBOutlet NSTextField *citeStringField;
-@property (nonatomic, assign) IBOutlet NSMatrix *separateCiteRadio;
+@property (nonatomic, assign) IBOutlet NSButton *singleRadioButton;
+@property (nonatomic, assign) IBOutlet NSButton *separateRadioButton;
+@property (nonatomic, assign) IBOutlet NSButton *multipleRadioButton;
@property (nonatomic, assign) IBOutlet NSButton *prependTildeCheckButton;
-@property (nonatomic, assign) IBOutlet NSMatrix *citeBracketRadio;
+@property (nonatomic, assign) IBOutlet NSButton *texBracketRadioButton;
+@property (nonatomic, assign) IBOutlet NSButton *contextBracketRadioButton;
- (IBAction)changeDefaultDragCopyFormat:(id)sender;
- (IBAction)changeDefaultDragCopyTemplate:(id)sender;
Modified: trunk/bibdesk/BibPref_Cite.m
===================================================================
--- trunk/bibdesk/BibPref_Cite.m 2021-05-03 09:13:12 UTC (rev 25835)
+++ trunk/bibdesk/BibPref_Cite.m 2021-05-03 09:36:09 UTC (rev 25836)
@@ -52,7 +52,7 @@
@implementation BibPref_Cite
-@synthesize defaultDragCopyPopup, defaultDragCopyTemplatePopup,
alternateDragCopyPopup, alternateDragCopyTemplatePopup, citeBehaviorLine,
citeStringField, separateCiteRadio, prependTildeCheckButton, citeBracketRadio;
+@synthesize defaultDragCopyPopup, defaultDragCopyTemplatePopup,
alternateDragCopyPopup, alternateDragCopyTemplatePopup, citeBehaviorLine,
citeStringField, singleRadioButton, separateRadioButton, multipleRadioButton,
prependTildeCheckButton, texBracketRadioButton, contextBracketRadioButton;
- (void)loadView {
[super loadView];
@@ -90,12 +90,17 @@
NSString *endCiteBracket = [sud stringForKey:BDSKCiteEndBracketKey];
BOOL prependTilde = [sud boolForKey:BDSKCitePrependTildeKey];
NSString *startCite = [NSString stringWithFormat:@"%@\\%@%@",
(prependTilde? @"~" : @""), citeString, startCiteBracket];
-
- [separateCiteRadio selectCellWithTag:[sud
integerForKey:BDSKSeparateCiteKey]];
+ NSInteger citeBracket = [startCiteBracket isEqualToString:@"{"] ? 0 : 1;
+ NSInteger separateCite = [sud integerForKey:BDSKSeparateCiteKey];
+
+ [singleRadioButton setState:separateCite == [singleRadioButton state] ?
NSOnState : NSOffState];
+ [separateRadioButton setState:separateCite == [separateRadioButton state]
? NSOnState : NSOffState];
+ [multipleRadioButton setState:separateCite == [multipleRadioButton state]
? NSOnState : NSOffState];
[prependTildeCheckButton setState:[sud boolForKey:BDSKCitePrependTildeKey]
? NSOnState : NSOffState];
- [citeBracketRadio selectCellWithTag:[[sud
stringForKey:BDSKCiteStartBracketKey] isEqualToString:@"{"] ? 1 : 2];
+ [texBracketRadioButton setState:citeBracket == [texBracketRadioButton
state] ? NSOnState : NSOffState];
+ [contextBracketRadioButton setState:citeBracket ==
[contextBracketRadioButton state] ? NSOnState : NSOffState];
[citeStringField setStringValue:[NSString stringWithFormat:@"\\%@",
citeString]];
- switch([[separateCiteRadio selectedCell] tag]){
+ switch (separateCite) {
case 2:
[citeBehaviorLine setStringValue:[NSString
stringWithFormat:@"%@key1%@%@key2%@", startCite, endCiteBracket,
startCiteBracket, endCiteBracket]];
break;
@@ -165,7 +170,7 @@
}
- (IBAction)changeSeparateCite:(id)sender{
- [sud setInteger:[[sender selectedCell] tag] forKey:BDSKSeparateCiteKey];
+ [sud setInteger:[sender tag] forKey:BDSKSeparateCiteKey];
[self updateCiteCommandUI];
}
@@ -181,12 +186,12 @@
}
- (IBAction)setCitationBracketStyle:(id)sender{
- // 1 - tex 2 - context
- NSInteger tag = [[sender selectedCell] tag];
- if(tag == 1){
+ // 0 - tex 1 - context
+ NSInteger tag = [sender tag];
+ if (tag == 0) {
[sud setObject:@"{" forKey:BDSKCiteStartBracketKey];
[sud setObject:@"}" forKey:BDSKCiteEndBracketKey];
- }else if(tag == 2){
+ } else if (tag == 1) {
[sud setObject:@"[" forKey:BDSKCiteStartBracketKey];
[sud setObject:@"]" forKey:BDSKCiteEndBracketKey];
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Bibdesk-commit mailing list
Bibdesk-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
