Revision: 25846
http://sourceforge.net/p/bibdesk/svn/25846
Author: hofman
Date: 2021-05-03 16:30:57 +0000 (Mon, 03 May 2021)
Log Message:
-----------
Replace matrixes in BibPref_AutoFile by radio buttons
Modified Paths:
--------------
trunk/bibdesk/Base.lproj/BibPref_AutoFile.xib
trunk/bibdesk/BibPref_AutoFile.h
trunk/bibdesk/BibPref_AutoFile.m
trunk/bibdesk/de.lproj/BibPref_AutoFile.strings
trunk/bibdesk/en.lproj/BibPref_AutoFile.strings
trunk/bibdesk/fr.lproj/BibPref_AutoFile.strings
Modified: trunk/bibdesk/Base.lproj/BibPref_AutoFile.xib
===================================================================
--- trunk/bibdesk/Base.lproj/BibPref_AutoFile.xib 2021-05-03 15:54:07 UTC
(rev 25845)
+++ trunk/bibdesk/Base.lproj/BibPref_AutoFile.xib 2021-05-03 16:30:57 UTC
(rev 25846)
@@ -11,7 +11,7 @@
<connections>
<outlet property="choosePapersFolderLocationButton"
destination="32" id="35"/>
<outlet property="filePapersAutomaticallyCheckButton"
destination="23" id="36"/>
- <outlet property="formatCleanRadio" destination="159"
id="195"/>
+ <outlet property="fixedPapersFolderRadioButton"
destination="m7B-Lp-L3I" id="iud-J9-o52"/>
<outlet property="formatField" destination="226" id="229"/>
<outlet property="formatLowercaseCheckButton"
destination="169" id="194"/>
<outlet property="formatPresetPopUp" destination="85" id="94"/>
@@ -20,10 +20,10 @@
<outlet property="formatSheet" destination="137" id="190"/>
<outlet property="formatSheetField" destination="150"
id="228"/>
<outlet property="formatWarningButton" destination="179"
id="206"/>
- <outlet property="papersFolderLocationRadio" destination="275"
id="280"/>
<outlet property="papersFolderLocationTextField"
destination="102" id="103"/>
<outlet property="previewDisplay" destination="82" id="263"/>
<outlet property="previewTextField" destination="104"
id="105"/>
+ <outlet property="relativePapersFolderRadioButton"
destination="XO8-BL-RE7" id="XCV-IJ-xH9"/>
<outlet property="view" destination="5" id="327"/>
<outlet property="warnOnMoveFolderCheckButton"
destination="265" id="268"/>
</connections>
@@ -33,31 +33,6 @@
<customView translatesAutoresizingMaskIntoConstraints="NO" id="5"
userLabel="View">
<rect key="frame" x="0.0" y="0.0" width="586" height="429"/>
<subviews>
- <matrix toolTip="Choose to automatically file papers in
dedicated folder or in the same folder as the document"
horizontalHuggingPriority="750" verticalHuggingPriority="750"
allowsEmptySelection="NO" autosizesCells="NO"
translatesAutoresizingMaskIntoConstraints="NO" id="275">
- <rect key="frame" x="32" y="347" width="263" height="38"/>
- <color key="backgroundColor" name="controlColor"
catalog="System" colorSpace="catalog"/>
- <size key="cellSize" width="263" height="18"/>
- <size key="intercellSpacing" width="4" height="2"/>
- <buttonCell key="prototype" type="radio" title="Radio"
imagePosition="left" alignment="left" inset="2" id="387">
- <behavior key="behavior" changeContents="YES"
doesNotDimImage="YES" lightByContents="YES"/>
- <font key="font" metaFont="system"/>
- </buttonCell>
- <cells>
- <column>
- <buttonCell type="radio" title="File papers in
fixed location:" bezelStyle="regularSquare" imagePosition="left"
alignment="left" state="on" inset="2" id="276">
- <behavior key="behavior" changeContents="YES"
doesNotDimImage="YES" lightByContents="YES"/>
- <font key="font" metaFont="system"/>
- </buttonCell>
- <buttonCell type="radio" title="File papers
relative to each document." bezelStyle="regularSquare" imagePosition="left"
alignment="left" tag="1" inset="2" id="277">
- <behavior key="behavior" changeContents="YES"
doesNotDimImage="YES" lightByContents="YES"/>
- <font key="font" metaFont="system"/>
- </buttonCell>
- </column>
- </cells>
- <connections>
- <action selector="papersFolderLocationAction:"
target="-2" id="281"/>
- </connections>
- </matrix>
<textField horizontalHuggingPriority="750"
verticalHuggingPriority="750" preferredMaxLayoutWidth="63"
translatesAutoresizingMaskIntoConstraints="NO" id="267">
<rect key="frame" x="18" y="291" width="65" height="16"/>
<textFieldCell key="cell" scrollable="YES"
lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left"
title="Warnings" id="375">
@@ -135,7 +110,7 @@
</connections>
</textField>
<textField toolTip="The folder to use for automatically filed
papers" horizontalHuggingPriority="249" verticalHuggingPriority="750"
translatesAutoresizingMaskIntoConstraints="NO" id="102">
- <rect key="frame" x="303" y="364" width="178" height="21"/>
+ <rect key="frame" x="233" y="366" width="248" height="21"/>
<textFieldCell key="cell" scrollable="YES"
lineBreakMode="clipping" selectable="YES" editable="YES"
sendsActionOnEndEditing="YES" state="on" borderStyle="bezel"
drawsBackground="YES" id="367">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor"
catalog="System" colorSpace="catalog"/>
@@ -142,7 +117,6 @@
<color key="backgroundColor"
name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
<connections>
- <accessibilityConnection property="title"
destination="276" id="284"/>
<action selector="setPapersFolderPathFromTextField:"
target="-2" id="243"/>
<outlet property="delegate" destination="-2" id="234"/>
<outlet property="nextKeyView" destination="32"
id="235"/>
@@ -228,13 +202,12 @@
</connections>
</button>
<button toolTip="Choose the folder to use for automatically
filed papers" verticalHuggingPriority="750"
translatesAutoresizingMaskIntoConstraints="NO" id="32">
- <rect key="frame" x="482" y="357" width="91" height="32"/>
+ <rect key="frame" x="482" y="359" width="91" height="32"/>
<buttonCell key="cell" type="push" title="Choose…"
bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="361">
<behavior key="behavior" pushIn="YES"
lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
<connections>
- <accessibilityConnection property="title"
destination="276" id="285"/>
<action selector="choosePapersFolderLocationAction:"
target="-2" id="39"/>
</connections>
</button>
@@ -249,15 +222,36 @@
<outlet property="nextKeyView" destination="75"
id="211"/>
</connections>
</button>
+ <button toolTip="Choose to automatically file papers in
dedicated folder or in the same folder as the document"
horizontalHuggingPriority="750" verticalHuggingPriority="750"
translatesAutoresizingMaskIntoConstraints="NO" id="m7B-Lp-L3I">
+ <rect key="frame" x="30" y="368" width="195" height="18"/>
+ <buttonCell key="cell" type="radio" title="File papers in
fixed location:" bezelStyle="regularSquare" imagePosition="left"
alignment="left" state="on" inset="2" id="M5a-Xc-egp">
+ <behavior key="behavior" changeContents="YES"
doesNotDimImage="YES" lightByContents="YES"/>
+ <font key="font" metaFont="system"/>
+ </buttonCell>
+ <connections>
+ <action selector="papersFolderLocationAction:"
target="-2" id="zct-dh-lJx"/>
+ </connections>
+ </button>
+ <button toolTip="Choose to automatically file papers in
dedicated folder or in the same folder as the document"
horizontalHuggingPriority="750" verticalHuggingPriority="750" tag="1"
translatesAutoresizingMaskIntoConstraints="NO" id="XO8-BL-RE7">
+ <rect key="frame" x="30" y="346" width="254" height="18"/>
+ <buttonCell key="cell" type="radio" title="File papers
relative to each document" bezelStyle="regularSquare" imagePosition="left"
alignment="left" inset="2" id="Bmz-At-LPw">
+ <behavior key="behavior" changeContents="YES"
doesNotDimImage="YES" lightByContents="YES"/>
+ <font key="font" metaFont="system"/>
+ </buttonCell>
+ <connections>
+ <action selector="papersFolderLocationAction:"
target="-2" id="W8j-7v-qDi"/>
+ </connections>
+ </button>
</subviews>
<constraints>
- <constraint firstItem="23" firstAttribute="top"
secondItem="275" secondAttribute="bottom" constant="12" id="0ms-VS-DDi"/>
<constraint firstAttribute="trailing"
relation="greaterThanOrEqual" secondItem="104" secondAttribute="trailing"
constant="20" symbolic="YES" id="0t1-Ey-gYg"/>
<constraint firstItem="226" firstAttribute="leading"
secondItem="85" secondAttribute="leading" id="2Ad-DU-Z6B"/>
<constraint firstAttribute="trailing" secondItem="265"
secondAttribute="trailing" constant="358" id="2HZ-mn-1bA"/>
<constraint firstItem="85" firstAttribute="leading"
secondItem="93" secondAttribute="trailing" constant="8" symbolic="YES"
id="2Lz-Dh-bd7"/>
<constraint firstItem="93" firstAttribute="leading"
secondItem="5" secondAttribute="leading" priority="749" constant="32"
id="2Q6-4G-hlC"/>
+ <constraint firstItem="XO8-BL-RE7" firstAttribute="top"
secondItem="m7B-Lp-L3I" secondAttribute="bottom" constant="6" symbolic="YES"
id="3og-Nt-I1L"/>
<constraint firstAttribute="trailing"
relation="greaterThanOrEqual" secondItem="107" secondAttribute="trailing"
constant="20" symbolic="YES" id="4lX-Zf-oWR"/>
+ <constraint firstItem="102" firstAttribute="firstBaseline"
secondItem="m7B-Lp-L3I" secondAttribute="firstBaseline" id="7lg-nI-fI8"/>
<constraint firstItem="106" firstAttribute="leading"
secondItem="107" secondAttribute="leading" id="9lA-dB-Dmr"/>
<constraint firstItem="267" firstAttribute="leading"
secondItem="107" secondAttribute="leading" id="BYN-LN-UBS"/>
<constraint firstAttribute="trailing"
relation="greaterThanOrEqual" secondItem="78" secondAttribute="trailing"
constant="20" symbolic="YES" id="Bnn-Zx-tyn"/>
@@ -268,7 +262,6 @@
<constraint firstItem="204" firstAttribute="leading"
secondItem="226" secondAttribute="trailing" constant="8" symbolic="YES"
id="FuX-wZ-XXF"/>
<constraint firstAttribute="trailing"
relation="greaterThanOrEqual" secondItem="106" secondAttribute="trailing"
constant="20" symbolic="YES" id="GNT-9h-cR4"/>
<constraint firstItem="80" firstAttribute="leading"
secondItem="104" secondAttribute="leading" id="Geu-XJ-1Si"/>
- <constraint firstItem="102" firstAttribute="leading"
secondItem="275" secondAttribute="trailing" constant="8" symbolic="YES"
id="HDF-4E-tBP"/>
<constraint firstItem="75" firstAttribute="leading"
relation="greaterThanOrEqual" secondItem="23" secondAttribute="trailing"
constant="12" symbolic="YES" id="HQw-6f-Sfb"/>
<constraint firstItem="32" firstAttribute="trailing"
secondItem="85" secondAttribute="trailing" id="IbI-Bx-Wjw"/>
<constraint firstItem="75" firstAttribute="trailing"
secondItem="85" secondAttribute="trailing" id="IlK-19-RB8"/>
@@ -275,21 +268,22 @@
<constraint firstItem="107" firstAttribute="top"
secondItem="5" secondAttribute="top" constant="20" symbolic="YES"
id="LTU-Ik-qzj"/>
<constraint firstItem="78" firstAttribute="top"
secondItem="226" secondAttribute="bottom" constant="20" id="LaR-DN-dV6"/>
<constraint firstItem="106" firstAttribute="top"
secondItem="265" secondAttribute="bottom" constant="12" id="LvE-wQ-XG7"/>
+ <constraint firstItem="102" firstAttribute="leading"
secondItem="m7B-Lp-L3I" secondAttribute="trailing" constant="8" symbolic="YES"
id="MYc-gG-kkB"/>
<constraint firstItem="226" firstAttribute="firstBaseline"
secondItem="230" secondAttribute="firstBaseline" id="N0o-Rt-W1V"/>
<constraint firstItem="75" firstAttribute="firstBaseline"
secondItem="23" secondAttribute="firstBaseline" id="Q3g-Mn-ziN"/>
<constraint firstItem="104" firstAttribute="leading"
secondItem="265" secondAttribute="leading" id="S3A-fM-t9N"/>
+ <constraint firstItem="XO8-BL-RE7" firstAttribute="leading"
secondItem="m7B-Lp-L3I" secondAttribute="leading" id="SFA-YM-vX8"/>
<constraint firstItem="265" firstAttribute="leading"
secondItem="23" secondAttribute="leading" id="TE7-oa-P2p"/>
<constraint firstItem="85" firstAttribute="firstBaseline"
secondItem="93" secondAttribute="firstBaseline" id="VBU-0c-Cf6"/>
- <constraint firstItem="275" firstAttribute="top"
secondItem="107" secondAttribute="bottom" constant="8" symbolic="YES"
id="YJX-zC-0zP"/>
- <constraint firstItem="23" firstAttribute="leading"
secondItem="275" secondAttribute="leading" id="agX-qE-jVM"/>
<constraint firstItem="85" firstAttribute="top"
secondItem="106" secondAttribute="bottom" constant="8" symbolic="YES"
id="bpH-bb-gCQ"/>
<constraint firstItem="32" firstAttribute="leading"
secondItem="102" secondAttribute="trailing" constant="8" symbolic="YES"
id="dye-Sq-8KE"/>
<constraint firstItem="226" firstAttribute="leading"
secondItem="230" secondAttribute="trailing" constant="8" symbolic="YES"
id="gDw-SV-z9f"/>
- <constraint firstItem="102" firstAttribute="top"
secondItem="275" secondAttribute="top" id="j9A-Gu-DmG"/>
<constraint firstItem="104" firstAttribute="top"
secondItem="78" secondAttribute="bottom" constant="8" symbolic="YES"
id="jAj-wN-iq0"/>
<constraint firstItem="265" firstAttribute="top"
secondItem="267" secondAttribute="bottom" constant="8" symbolic="YES"
id="kH1-zW-ukO"/>
<constraint firstItem="226" firstAttribute="top"
secondItem="85" secondAttribute="bottom" constant="20" id="lBg-nF-oeb"/>
<constraint firstAttribute="trailing"
relation="greaterThanOrEqual" secondItem="267" secondAttribute="trailing"
constant="20" symbolic="YES" id="ldE-4w-nGF"/>
+ <constraint firstItem="23" firstAttribute="top"
secondItem="XO8-BL-RE7" secondAttribute="bottom" constant="12" id="lhC-7v-IVK"/>
+ <constraint firstItem="m7B-Lp-L3I" firstAttribute="top"
secondItem="107" secondAttribute="bottom" constant="8" symbolic="YES"
id="lqO-kG-X6e"/>
<constraint firstItem="32" firstAttribute="firstBaseline"
secondItem="102" secondAttribute="firstBaseline" id="m6F-u4-oAY"/>
<constraint firstItem="93" firstAttribute="leading"
relation="greaterThanOrEqual" secondItem="5" secondAttribute="leading"
constant="32" id="nPo-QB-UmX"/>
<constraint firstItem="107" firstAttribute="leading"
secondItem="5" secondAttribute="leading" constant="20" symbolic="YES"
id="nRq-cV-isJ"/>
@@ -296,9 +290,11 @@
<constraint firstItem="23" firstAttribute="leading"
secondItem="5" secondAttribute="leading" constant="32" id="pGo-LZ-bb9"/>
<constraint firstItem="32" firstAttribute="trailing"
secondItem="80" secondAttribute="trailing" id="sM5-7q-2l2"/>
<constraint firstItem="267" firstAttribute="top"
secondItem="23" secondAttribute="bottom" constant="12" id="tJF-ma-TwG"/>
+ <constraint firstAttribute="trailing"
relation="greaterThanOrEqual" secondItem="XO8-BL-RE7"
secondAttribute="trailing" constant="20" symbolic="YES" id="uH7-pr-UEe"/>
<constraint firstAttribute="bottom" secondItem="80"
secondAttribute="bottom" constant="20" symbolic="YES" id="ulR-dO-bCb"/>
<constraint firstAttribute="trailing" secondItem="32"
secondAttribute="trailing" constant="20" symbolic="YES" id="uwg-IW-rDb"/>
<constraint firstItem="230" firstAttribute="leading"
relation="greaterThanOrEqual" secondItem="5" secondAttribute="leading"
constant="32" id="vEL-zS-y0s"/>
+ <constraint firstItem="23" firstAttribute="leading"
secondItem="m7B-Lp-L3I" secondAttribute="leading" id="xoU-s8-H06"/>
</constraints>
<point key="canvasLocation" x="138.5" y="154"/>
</customView>
@@ -309,11 +305,11 @@
<rect key="screenRect" x="0.0" y="0.0" width="1280" height="775"/>
<value key="minSize" type="size" width="213" height="107"/>
<view key="contentView" id="138">
- <rect key="frame" x="0.0" y="0.0" width="613" height="279"/>
+ <rect key="frame" x="0.0" y="0.0" width="613" height="277"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<textField horizontalHuggingPriority="750"
verticalHuggingPriority="750" preferredMaxLayoutWidth="115"
translatesAutoresizingMaskIntoConstraints="NO" id="139">
- <rect key="frame" x="18" y="243" width="114"
height="16"/>
+ <rect key="frame" x="18" y="241" width="114"
height="16"/>
<textFieldCell key="cell" scrollable="YES"
lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left"
title="Local File Format" id="376">
<font key="font" metaFont="systemBold"/>
<color key="textColor" name="controlTextColor"
catalog="System" colorSpace="catalog"/>
@@ -321,7 +317,7 @@
</textFieldCell>
</textField>
<textField horizontalHuggingPriority="750"
verticalHuggingPriority="750" preferredMaxLayoutWidth="122"
translatesAutoresizingMaskIntoConstraints="NO" id="140">
- <rect key="frame" x="30" y="86" width="121"
height="16"/>
+ <rect key="frame" x="30" y="84" width="121"
height="16"/>
<textFieldCell key="cell" scrollable="YES"
lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left"
title="Clean by removing:" id="377">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor"
catalog="System" colorSpace="catalog"/>
@@ -329,7 +325,7 @@
</textFieldCell>
</textField>
<textField toolTip="This is the format string used for the
path to auto filed papers" horizontalHuggingPriority="249"
verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO"
id="150">
- <rect key="frame" x="130" y="174" width="463"
height="21"/>
+ <rect key="frame" x="130" y="172" width="463"
height="21"/>
<textFieldCell key="cell" scrollable="YES"
lineBreakMode="clipping" selectable="YES" editable="YES" enabled="NO"
sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left"
drawsBackground="YES" id="378">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor"
catalog="System" colorSpace="catalog"/>
@@ -342,68 +338,8 @@
<outlet property="nextKeyView" destination="170"
id="220"/>
</connections>
</textField>
- <matrix horizontalHuggingPriority="750"
verticalHuggingPriority="750" allowsEmptySelection="NO" autosizesCells="NO"
translatesAutoresizingMaskIntoConstraints="NO" id="159">
- <rect key="frame" x="52" y="60" width="456"
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="388">
- <behavior key="behavior" changeContents="YES"
doesNotDimImage="YES" lightByContents="YES"/>
- <font key="font" metaFont="system"/>
- </buttonCell>
- <cells>
- <column>
- <buttonCell type="radio" title="Nothing"
imagePosition="left" alignment="left" inset="2" id="244">
- <behavior key="behavior"
changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
- <font key="font" metaFont="system"/>
- <connections>
- <accessibilityConnection
property="title" destination="140" id="292"/>
- </connections>
- </buttonCell>
- </column>
- <column>
- <buttonCell type="radio" title="Braces"
imagePosition="left" alignment="left" state="on" tag="1" inset="2" id="245">
- <behavior key="behavior"
changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
- <font key="font" metaFont="system"/>
- <connections>
- <accessibilityConnection
property="title" destination="140" id="293"/>
- </connections>
- </buttonCell>
- </column>
- <column>
- <buttonCell type="radio" title="TeX"
imagePosition="left" alignment="left" tag="2" inset="2" id="246">
- <behavior key="behavior"
changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
- <font key="font" metaFont="system"/>
- <connections>
- <accessibilityConnection
property="title" destination="140" id="294"/>
- </connections>
- </buttonCell>
- </column>
- <column>
- <buttonCell type="radio" title="Windows"
imagePosition="left" alignment="left" tag="3" inset="2" id="247">
- <behavior key="behavior"
changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
- <font key="font" metaFont="system"/>
- <connections>
- <accessibilityConnection
property="title" destination="140" id="295"/>
- </connections>
- </buttonCell>
- </column>
- <column>
- <buttonCell type="radio" title="Non-ASCII"
imagePosition="left" alignment="left" tag="4" inset="2" id="248">
- <behavior key="behavior"
changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
- <font key="font" metaFont="system"/>
- <connections>
- <accessibilityConnection
property="title" destination="140" id="296"/>
- </connections>
- </buttonCell>
- </column>
- </cells>
- <connections>
- <action selector="setFormatCleanOption:"
target="-2" id="200"/>
- </connections>
- </matrix>
<textField horizontalHuggingPriority="750"
verticalHuggingPriority="750" preferredMaxLayoutWidth="92"
translatesAutoresizingMaskIntoConstraints="NO" id="162">
- <rect key="frame" x="30" y="218" width="94"
height="16"/>
+ <rect key="frame" x="30" y="216" width="94"
height="16"/>
<textFieldCell key="cell" scrollable="YES"
lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right"
title="Preset Format:" id="379">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor"
catalog="System" colorSpace="catalog"/>
@@ -411,7 +347,7 @@
</textFieldCell>
</textField>
<textField horizontalHuggingPriority="750"
verticalHuggingPriority="750" preferredMaxLayoutWidth="90"
translatesAutoresizingMaskIntoConstraints="NO" id="165">
- <rect key="frame" x="33" y="177" width="91"
height="16"/>
+ <rect key="frame" x="33" y="175" width="91"
height="16"/>
<textFieldCell key="cell" scrollable="YES"
lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right"
title="Format String:" id="380">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor"
catalog="System" colorSpace="catalog"/>
@@ -419,7 +355,7 @@
</textFieldCell>
</textField>
<popUpButton toolTip="Select a preset format for the
relative path to auto filed papers" horizontalHuggingPriority="249"
verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO"
id="168">
- <rect key="frame" x="127" y="211" width="470"
height="25"/>
+ <rect key="frame" x="127" y="209" width="470"
height="25"/>
<popUpButtonCell key="cell" type="push"
title="Filename Without Extension + Unique Number + Extension"
bezelStyle="rounded" alignment="left" lineBreakMode="clipping" state="on"
borderStyle="borderAndBezel" tag="1" inset="2" arrowPosition="arrowAtCenter"
preferredEdge="maxY" selectedItem="146" id="381">
<behavior key="behavior" lightByBackground="YES"
lightByGray="YES"/>
<font key="font" metaFont="menu"/>
@@ -442,7 +378,7 @@
</connections>
</popUpButton>
<button toolTip="Choose this to always generate relative
paths using lowercase characters" horizontalHuggingPriority="750"
verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO"
id="169">
- <rect key="frame" x="30" y="109" width="212"
height="18"/>
+ <rect key="frame" x="30" y="107" width="212"
height="18"/>
<buttonCell key="cell" type="check" title="Generate
lowercase file names" bezelStyle="regularSquare" imagePosition="left"
alignment="left" inset="2" id="382">
<behavior key="behavior" changeContents="YES"
doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
@@ -449,11 +385,10 @@
</buttonCell>
<connections>
<action selector="changeLocalUrlLowercase:"
target="-2" id="199"/>
- <outlet property="nextKeyView" destination="159"
id="222"/>
</connections>
</button>
<popUpButton toolTip="Select a format specifier to add to
the custom format string. This replaces the current selection."
horizontalHuggingPriority="249" verticalHuggingPriority="750"
translatesAutoresizingMaskIntoConstraints="NO" id="170">
- <rect key="frame" x="127" y="142" width="470"
height="25"/>
+ <rect key="frame" x="127" y="140" width="470"
height="25"/>
<popUpButtonCell key="cell" type="push" title="Choose
a format specifier to add" bezelStyle="rounded" alignment="left"
lineBreakMode="clipping" borderStyle="borderAndBezel" inset="2" pullsDown="YES"
arrowPosition="arrowAtCenter" preferredEdge="maxY" selectedItem="176" id="383">
<behavior key="behavior" pushIn="YES"
lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="menu"/>
@@ -497,7 +432,7 @@
</connections>
</popUpButton>
<button hidden="YES"
translatesAutoresizingMaskIntoConstraints="NO" id="179">
- <rect key="frame" x="593" y="177" width="16"
height="16"/>
+ <rect key="frame" x="593" y="175" width="16"
height="16"/>
<constraints>
<constraint firstAttribute="width" constant="16"
id="bZL-1k-RyZ"/>
<constraint firstAttribute="height" constant="16"
id="htJ-LV-1oA"/>
@@ -536,11 +471,62 @@
<outlet property="nextKeyView" destination="187"
id="224"/>
</connections>
</button>
+ <button toolTip="Choose to automatically file papers in
dedicated folder or in the same folder as the document"
horizontalHuggingPriority="749" verticalHuggingPriority="750"
translatesAutoresizingMaskIntoConstraints="NO" id="iar-Rb-nG5">
+ <rect key="frame" x="50" y="59" width="90"
height="18"/>
+ <buttonCell key="cell" type="radio" title="Nothing"
bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2"
id="GaR-d2-ybQ">
+ <behavior key="behavior" changeContents="YES"
doesNotDimImage="YES" lightByContents="YES"/>
+ <font key="font" metaFont="system"/>
+ </buttonCell>
+ <connections>
+ <action selector="setFormatCleanOption:"
target="-2" id="LqH-BL-J8L"/>
+ </connections>
+ </button>
+ <button toolTip="Choose to automatically file papers in
dedicated folder or in the same folder as the document"
horizontalHuggingPriority="749" verticalHuggingPriority="750" tag="1"
translatesAutoresizingMaskIntoConstraints="NO" id="jUG-kL-7uR">
+ <rect key="frame" x="146" y="59" width="90"
height="18"/>
+ <buttonCell key="cell" type="radio" title="Braces"
bezelStyle="regularSquare" imagePosition="left" alignment="left" state="on"
inset="2" id="PJZ-dt-ATw">
+ <behavior key="behavior" changeContents="YES"
doesNotDimImage="YES" lightByContents="YES"/>
+ <font key="font" metaFont="system"/>
+ </buttonCell>
+ <connections>
+ <action selector="setFormatCleanOption:"
target="-2" id="5kY-ss-75s"/>
+ </connections>
+ </button>
+ <button toolTip="Choose to automatically file papers in
dedicated folder or in the same folder as the document"
horizontalHuggingPriority="749" verticalHuggingPriority="750" tag="2"
translatesAutoresizingMaskIntoConstraints="NO" id="RD1-gm-l8h">
+ <rect key="frame" x="242" y="59" width="90"
height="18"/>
+ <buttonCell key="cell" type="radio" title="TeX"
bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2"
id="Dbd-fh-K5I">
+ <behavior key="behavior" changeContents="YES"
doesNotDimImage="YES" lightByContents="YES"/>
+ <font key="font" metaFont="system"/>
+ </buttonCell>
+ <connections>
+ <action selector="setFormatCleanOption:"
target="-2" id="Abz-xu-WEB"/>
+ </connections>
+ </button>
+ <button toolTip="Choose to automatically file papers in
dedicated folder or in the same folder as the document"
horizontalHuggingPriority="749" verticalHuggingPriority="750" tag="3"
translatesAutoresizingMaskIntoConstraints="NO" id="2QR-2n-IGI">
+ <rect key="frame" x="338" y="59" width="90"
height="18"/>
+ <buttonCell key="cell" type="radio" title="Windows"
bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2"
id="gcS-1i-XVZ">
+ <behavior key="behavior" changeContents="YES"
doesNotDimImage="YES" lightByContents="YES"/>
+ <font key="font" metaFont="system"/>
+ </buttonCell>
+ <connections>
+ <action selector="setFormatCleanOption:"
target="-2" id="hOm-Us-SME"/>
+ </connections>
+ </button>
+ <button toolTip="Choose to automatically file papers in
dedicated folder or in the same folder as the document"
horizontalHuggingPriority="749" verticalHuggingPriority="750" tag="4"
translatesAutoresizingMaskIntoConstraints="NO" id="DpM-Jc-67U">
+ <rect key="frame" x="434" y="59" width="90"
height="18"/>
+ <buttonCell key="cell" type="radio" title="Non-ASCII"
bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2"
id="Tn2-cj-0kb">
+ <behavior key="behavior" changeContents="YES"
doesNotDimImage="YES" lightByContents="YES"/>
+ <font key="font" metaFont="system"/>
+ </buttonCell>
+ <connections>
+ <action selector="setFormatCleanOption:"
target="-2" id="KbG-AY-HNb"/>
+ </connections>
+ </button>
</subviews>
<constraints>
+ <constraint firstItem="187" firstAttribute="top"
secondItem="iar-Rb-nG5" secondAttribute="bottom" constant="20" id="0Up-Fa-DEI"/>
<constraint firstItem="140" firstAttribute="top"
secondItem="169" secondAttribute="bottom" constant="8" id="2GJ-lp-xVx"/>
- <constraint firstItem="159" firstAttribute="top"
secondItem="140" secondAttribute="bottom" constant="8" symbolic="YES"
id="6VE-EH-j8A"/>
<constraint firstItem="150" firstAttribute="top"
secondItem="168" secondAttribute="bottom" constant="20" id="7DQ-ij-3ry"/>
+ <constraint firstItem="2QR-2n-IGI"
firstAttribute="firstBaseline" secondItem="iar-Rb-nG5"
secondAttribute="firstBaseline" id="8Eb-PH-ol4"/>
<constraint firstItem="168" firstAttribute="top"
secondItem="139" secondAttribute="bottom" constant="8" symbolic="YES"
id="8bH-NN-oRb"/>
<constraint firstAttribute="trailing"
relation="greaterThanOrEqual" secondItem="140" secondAttribute="trailing"
constant="20" symbolic="YES" id="9EG-YC-KSo"/>
<constraint firstItem="170" firstAttribute="trailing"
secondItem="168" secondAttribute="trailing" id="9Kf-qJ-dy7"/>
@@ -547,21 +533,27 @@
<constraint firstItem="187" firstAttribute="trailing"
secondItem="168" secondAttribute="trailing" id="9yO-jW-j3d"/>
<constraint firstItem="179" firstAttribute="centerY"
secondItem="150" secondAttribute="centerY" id="Ayv-zS-xGZ"/>
<constraint firstItem="150" firstAttribute="trailing"
secondItem="168" secondAttribute="trailing" id="B1G-BL-zh4"/>
- <constraint firstItem="159" firstAttribute="leading"
secondItem="138" secondAttribute="leading" constant="52" id="Cs2-PZ-E9L"/>
- <constraint firstItem="187" firstAttribute="top"
secondItem="159" secondAttribute="bottom" constant="20" id="EHI-ci-6yM"/>
+ <constraint firstItem="DpM-Jc-67U" firstAttribute="width"
secondItem="iar-Rb-nG5" secondAttribute="width" id="CTM-f1-eQw"/>
<constraint firstItem="140" firstAttribute="leading"
secondItem="169" secondAttribute="leading" id="Fc6-sj-Zgd"/>
<constraint firstAttribute="trailing"
relation="greaterThanOrEqual" secondItem="139" secondAttribute="trailing"
constant="20" symbolic="YES" id="GL1-nv-fmK"/>
- <constraint firstAttribute="trailing"
relation="greaterThanOrEqual" secondItem="159" secondAttribute="trailing"
constant="20" symbolic="YES" id="Ipp-u5-EhQ"/>
<constraint firstItem="139" firstAttribute="top"
secondItem="138" secondAttribute="top" constant="20" symbolic="YES"
id="KL9-HD-KyR"/>
<constraint firstItem="150" firstAttribute="firstBaseline"
secondItem="165" secondAttribute="firstBaseline" id="Ns9-d7-cBh"/>
+ <constraint firstItem="DpM-Jc-67U"
firstAttribute="firstBaseline" secondItem="iar-Rb-nG5"
secondAttribute="firstBaseline" id="PYF-kF-C9C"/>
<constraint firstItem="169" firstAttribute="leading"
secondItem="138" secondAttribute="leading" constant="32" id="Q4l-w5-6PU"/>
+ <constraint firstItem="jUG-kL-7uR" firstAttribute="width"
secondItem="iar-Rb-nG5" secondAttribute="width" id="QWO-kg-den"/>
<constraint firstItem="162" firstAttribute="leading"
relation="greaterThanOrEqual" secondItem="138" secondAttribute="leading"
constant="32" id="S7c-Z7-Fpb"/>
<constraint firstItem="165" firstAttribute="leading"
relation="greaterThanOrEqual" secondItem="138" secondAttribute="leading"
constant="32" id="S9F-bp-xbo"/>
+ <constraint firstItem="jUG-kL-7uR"
firstAttribute="firstBaseline" secondItem="iar-Rb-nG5"
secondAttribute="firstBaseline" id="SYh-aW-y2x"/>
+ <constraint firstItem="RD1-gm-l8h"
firstAttribute="firstBaseline" secondItem="iar-Rb-nG5"
secondAttribute="firstBaseline" id="TZW-eF-EBO"/>
<constraint firstItem="188" firstAttribute="leading"
secondItem="139" secondAttribute="leading" id="Tgh-Vr-rgJ"/>
<constraint firstItem="139" firstAttribute="top"
secondItem="138" secondAttribute="top" constant="20" symbolic="YES"
id="UxM-vj-69R"/>
+ <constraint firstItem="2QR-2n-IGI"
firstAttribute="leading" secondItem="RD1-gm-l8h" secondAttribute="trailing"
constant="8" symbolic="YES" id="WeF-Tb-mIl"/>
+ <constraint firstAttribute="trailing"
relation="greaterThanOrEqual" secondItem="DpM-Jc-67U"
secondAttribute="trailing" constant="20" symbolic="YES" id="Y7q-DB-AcX"/>
+ <constraint firstItem="RD1-gm-l8h" firstAttribute="width"
secondItem="iar-Rb-nG5" secondAttribute="width" id="ZuH-AJ-avr"/>
<constraint firstAttribute="trailing" secondItem="168"
secondAttribute="trailing" constant="20" symbolic="YES" id="acZ-JI-Ajz"/>
<constraint firstAttribute="bottom" secondItem="187"
secondAttribute="bottom" constant="20" symbolic="YES" id="bfc-IX-GXX"/>
<constraint firstItem="170" firstAttribute="leading"
secondItem="168" secondAttribute="leading" id="cn7-4B-lZI"/>
+ <constraint firstItem="RD1-gm-l8h"
firstAttribute="leading" secondItem="jUG-kL-7uR" secondAttribute="trailing"
constant="8" symbolic="YES" id="e0F-2a-qLz"/>
<constraint firstItem="162" firstAttribute="leading"
secondItem="138" secondAttribute="leading" priority="749" constant="32"
id="e0K-SK-GRa"/>
<constraint firstItem="169" firstAttribute="top"
secondItem="170" secondAttribute="bottom" constant="20" id="eFa-Re-LF9"/>
<constraint firstItem="150" firstAttribute="leading"
secondItem="165" secondAttribute="trailing" constant="8" symbolic="YES"
id="eLA-Zz-PtG"/>
@@ -569,8 +561,13 @@
<constraint firstItem="168" firstAttribute="firstBaseline"
secondItem="162" secondAttribute="firstBaseline" id="hRO-2b-eeP"/>
<constraint firstItem="187" firstAttribute="leading"
relation="greaterThanOrEqual" secondItem="188" secondAttribute="trailing"
constant="12" symbolic="YES" id="hsf-eN-2lX"/>
<constraint firstItem="170" firstAttribute="top"
secondItem="150" secondAttribute="bottom" constant="8" id="iVb-Nt-FZD"/>
+ <constraint firstItem="iar-Rb-nG5"
firstAttribute="leading" secondItem="138" secondAttribute="leading"
constant="52" id="l17-P3-4aD"/>
<constraint firstItem="139" firstAttribute="leading"
secondItem="138" secondAttribute="leading" constant="20" symbolic="YES"
id="lur-Ym-oSc"/>
+ <constraint firstItem="DpM-Jc-67U"
firstAttribute="leading" secondItem="2QR-2n-IGI" secondAttribute="trailing"
constant="8" symbolic="YES" id="ndK-ON-XuS"/>
+ <constraint firstItem="2QR-2n-IGI" firstAttribute="width"
secondItem="iar-Rb-nG5" secondAttribute="width" id="ozf-db-qUs"/>
+ <constraint firstItem="iar-Rb-nG5" firstAttribute="top"
secondItem="140" secondAttribute="bottom" constant="8" symbolic="YES"
id="pNe-C1-BtN"/>
<constraint firstItem="150" firstAttribute="leading"
secondItem="168" secondAttribute="leading" id="sAy-2J-tdg"/>
+ <constraint firstItem="jUG-kL-7uR"
firstAttribute="leading" secondItem="iar-Rb-nG5" secondAttribute="trailing"
constant="8" symbolic="YES" id="tU7-MI-j9G"/>
<constraint firstItem="187" firstAttribute="firstBaseline"
secondItem="188" secondAttribute="firstBaseline" id="vNI-hS-oQ8"/>
<constraint firstItem="179" firstAttribute="leading"
secondItem="150" secondAttribute="trailing" id="vsw-Y8-6gr"/>
<constraint firstItem="140" firstAttribute="leading"
secondItem="169" secondAttribute="leading" id="wNO-tU-FWZ"/>
Modified: trunk/bibdesk/BibPref_AutoFile.h
===================================================================
--- trunk/bibdesk/BibPref_AutoFile.h 2021-05-03 15:54:07 UTC (rev 25845)
+++ trunk/bibdesk/BibPref_AutoFile.h 2021-05-03 16:30:57 UTC (rev 25846)
@@ -45,7 +45,8 @@
NSPanel *formatSheet;
NSTextField *papersFolderLocationTextField;
NSButton *choosePapersFolderLocationButton;
- NSMatrix *papersFolderLocationRadio;
+ NSButton *fixedPapersFolderRadioButton;
+ NSButton *relativesPapersFolderRadioButton;
NSButton *filePapersAutomaticallyCheckButton;
NSButton *warnOnMoveFolderCheckButton;
NSTextField *formatField;
@@ -56,7 +57,11 @@
NSButton *formatWarningButton;
NSButton *formatLowercaseCheckButton;
NSTextField *previewTextField;
- NSMatrix *formatCleanRadio;
+ NSButton *cleanNothingRadioButton;
+ NSButton *cleanBracesRadioButton;
+ NSButton *cleanTeXRadioButton;
+ NSButton *cleanWindowsRadioButton;
+ NSButton *cleanNonASCIIRadioButton;
NSTextField *previewDisplay;
NSString *lastPapersFolderPath;
@@ -65,7 +70,8 @@
@property (nonatomic, assign) IBOutlet NSPanel *formatSheet;
@property (nonatomic, assign) IBOutlet NSTextField
*papersFolderLocationTextField;
@property (nonatomic, assign) IBOutlet NSButton
*choosePapersFolderLocationButton;
-@property (nonatomic, assign) IBOutlet NSMatrix *papersFolderLocationRadio;
+@property (nonatomic, assign) IBOutlet NSButton *fixedPapersFolderRadioButton;
+@property (nonatomic, assign) IBOutlet NSButton
*relativePapersFolderRadioButton;
@property (nonatomic, assign) IBOutlet NSButton
*filePapersAutomaticallyCheckButton;
@property (nonatomic, assign) IBOutlet NSButton *warnOnMoveFolderCheckButton;
@property (nonatomic, assign) IBOutlet NSTextField *formatField;
@@ -76,7 +82,11 @@
@property (nonatomic, assign) IBOutlet NSButton *formatWarningButton;
@property (nonatomic, assign) IBOutlet NSButton *formatLowercaseCheckButton;
@property (nonatomic, assign) IBOutlet NSTextField *previewTextField;
-@property (nonatomic, assign) IBOutlet NSMatrix *formatCleanRadio;
+@property (nonatomic, assign) IBOutlet NSButton *cleanNothingRadioButton;
+@property (nonatomic, assign) IBOutlet NSButton *cleanBracesRadioButton;
+@property (nonatomic, assign) IBOutlet NSButton *cleanTeXRadioButton;
+@property (nonatomic, assign) IBOutlet NSButton *cleanWindowsRadioButton;
+@property (nonatomic, assign) IBOutlet NSButton *cleanNonASCIIRadioButton;
@property (nonatomic, assign) IBOutlet NSTextField *previewDisplay;
- (IBAction)showFormatSheet:(id)sender;
Modified: trunk/bibdesk/BibPref_AutoFile.m
===================================================================
--- trunk/bibdesk/BibPref_AutoFile.m 2021-05-03 15:54:07 UTC (rev 25845)
+++ trunk/bibdesk/BibPref_AutoFile.m 2021-05-03 16:30:57 UTC (rev 25846)
@@ -65,7 +65,7 @@
@implementation BibPref_AutoFile
-@synthesize formatSheet, papersFolderLocationTextField,
choosePapersFolderLocationButton, papersFolderLocationRadio,
filePapersAutomaticallyCheckButton, warnOnMoveFolderCheckButton, formatField,
formatSheetField, formatPresetPopUp, formatPresetSheetPopUp,
formatRepositoryPopUp, formatWarningButton, formatLowercaseCheckButton,
previewTextField, formatCleanRadio, previewDisplay;
+@synthesize formatSheet, papersFolderLocationTextField,
choosePapersFolderLocationButton, fixedPapersFolderRadioButton,
relativePapersFolderRadioButton, filePapersAutomaticallyCheckButton,
warnOnMoveFolderCheckButton, formatField, formatSheetField, formatPresetPopUp,
formatPresetSheetPopUp, formatRepositoryPopUp, formatWarningButton,
formatLowercaseCheckButton, previewTextField, cleanNothingRadioButton,
cleanBracesRadioButton, cleanTeXRadioButton, cleanWindowsRadioButton,
cleanNonASCIIRadioButton, previewDisplay;
// these should correspond to the items in the popups set in IB
static NSString *presetFormatStrings[] = {@"%l%n0%e", @"%a1/%Y%u0%e",
@"%a1/%T5%n0%e"};
@@ -81,7 +81,12 @@
[warnOnMoveFolderCheckButton setState:[sud
boolForKey:BDSKWarnOnMoveFolderKey] ? NSOnState : NSOffState];
[formatLowercaseCheckButton setState:[sud
boolForKey:BDSKLocalFileLowercaseKey] ? NSOnState : NSOffState];
- [formatCleanRadio selectCellWithTag:[sud
integerForKey:BDSKLocalFileCleanOptionKey]];
+ NSInteger cleanOption = [sud integerForKey:BDSKLocalFileCleanOptionKey];
+ [cleanNothingRadioButton setState:[cleanNothingRadioButton tag] ==
cleanOption];
+ [cleanBracesRadioButton setState:[cleanBracesRadioButton tag] ==
cleanOption];
+ [cleanTeXRadioButton setState:[cleanTeXRadioButton tag] == cleanOption];
+ [cleanWindowsRadioButton setState:[cleanWindowsRadioButton tag] ==
cleanOption];
+ [cleanNonASCIIRadioButton setState:[cleanNothingRadioButton tag] ==
cleanOption];
[self updatePapersFolderUI];
[self updateFormatPresetUI];
@@ -121,12 +126,14 @@
[papersFolderLocationTextField
setStringValue:USE_DOCUMENT_FOLDER];
[papersFolderLocationTextField setEnabled:NO];
[choosePapersFolderLocationButton setEnabled:NO];
- [papersFolderLocationRadio selectCellWithTag:1];
+ [fixedPapersFolderRadioButton setState:NSOffState];
+ [relativePapersFolderRadioButton setState:NSOnState];
} else {
[papersFolderLocationTextField setStringValue:papersFolder];
[papersFolderLocationTextField setEnabled:YES];
[choosePapersFolderLocationButton setEnabled:YES];
- [papersFolderLocationRadio selectCellWithTag:0];
+ [fixedPapersFolderRadioButton setState:NSOnState];
+ [relativePapersFolderRadioButton setState:NSOffState];
}
[self updateFormatPreviewUI];
@@ -203,7 +210,7 @@
}
- (IBAction)papersFolderLocationAction:(id)sender{
- if ([[sender selectedCell] tag] == 0) {
+ if ([sender tag] == 0) {
if ([NSString isEmptyString:lastPapersFolderPath]) {
[self choosePapersFolderLocationAction:sender];
} else {
@@ -257,7 +264,7 @@
}
- (IBAction)setFormatCleanOption:(id)sender{
- [sud setInteger:[[sender selectedCell] tag]
forKey:BDSKLocalFileCleanOptionKey];
+ [sud setInteger:[sender tag] forKey:BDSKLocalFileCleanOptionKey];
}
- (IBAction)localUrlFormatAdd:(id)sender{
Modified: trunk/bibdesk/de.lproj/BibPref_AutoFile.strings
===================================================================
(Binary files differ)
Modified: trunk/bibdesk/en.lproj/BibPref_AutoFile.strings
===================================================================
(Binary files differ)
Modified: trunk/bibdesk/fr.lproj/BibPref_AutoFile.strings
===================================================================
(Binary files differ)
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
