Revision: 25942
http://sourceforge.net/p/bibdesk/svn/25942
Author: hofman
Date: 2021-05-12 21:55:38 +0000 (Wed, 12 May 2021)
Log Message:
-----------
Replace localized xib strigns for BDSKSearchGroupView by strings files, resize
localized button to fit in code as we don't use auto layout
Modified Paths:
--------------
trunk/bibdesk/BDSKSearchGroupViewController.m
trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj
Added Paths:
-----------
trunk/bibdesk/de.lproj/BDSKSearchGroupView.strings
trunk/bibdesk/fr.lproj/BDSKSearchGroupView.strings
Removed Paths:
-------------
trunk/bibdesk/de.lproj/BDSKSearchGroupView.xib
trunk/bibdesk/fr.lproj/BDSKSearchGroupView.xib
Modified: trunk/bibdesk/BDSKSearchGroupViewController.m
===================================================================
--- trunk/bibdesk/BDSKSearchGroupViewController.m 2021-05-12 21:36:21 UTC
(rev 25941)
+++ trunk/bibdesk/BDSKSearchGroupViewController.m 2021-05-12 21:55:38 UTC
(rev 25942)
@@ -64,6 +64,17 @@
[edgeView setColor:[edgeView colorForEdge:NSMaxYEdge] forEdge:NSMinYEdge];
[edgeView setMinSize:[edgeView contentRect].size];
[edgeView setCollapseEdges:BDSKMaxXEdgeMask | BDSKMaxYEdgeMask];
+
+ CGFloat dx = NSWidth([searchButton frame]);
+ [searchButton sizeToFit];
+ [searchButton frame];
+ NSRect rect = [searchButton frame];
+ dx -= NSWidth(rect);
+ rect.origin.x += dx;
+ [searchButton setFrame:rect];
+ rect = [searchField frame];
+ rect.size.width += dx;
+ [searchField setFrame:rect];
}
- (void)updateSearchView {
Modified: trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj
===================================================================
--- trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj 2021-05-12 21:36:21 UTC
(rev 25941)
+++ trunk/bibdesk/Bibdesk.xcodeproj/project.pbxproj 2021-05-12 21:55:38 UTC
(rev 25942)
@@ -1444,7 +1444,6 @@
CE3B682909D1B0190017D339 /* BDSKImagePopUpButtonCell.m */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.objc; path = BDSKImagePopUpButtonCell.m; sourceTree = "<group>"; };
CE3D8D7F125E69BB00AE0232 /* de */ = {isa = PBXFileReference;
lastKnownFileType = file.xib; name = de; path = de.lproj/BDSKCondition.xib;
sourceTree = "<group>"; };
CE3D8D86125E69BB00AE0232 /* de */ = {isa = PBXFileReference;
lastKnownFileType = file.xib; name = de; path = de.lproj/BDSKFilter.xib;
sourceTree = "<group>"; };
- CE3D8D8E125E69BB00AE0232 /* de */ = {isa = PBXFileReference;
lastKnownFileType = file.xib; name = de; path =
de.lproj/BDSKSearchGroupView.xib; sourceTree = "<group>"; };
CE3D8DA0125E69BB00AE0232 /* de */ = {isa = PBXFileReference;
fileEncoding = 10; lastKnownFileType = text.plist.strings; name = de; path =
de.lproj/BibTeXKeys.strings; sourceTree = "<group>"; };
CE3D8DA5125E69BB00AE0232 /* de */ = {isa = PBXFileReference;
lastKnownFileType = text.rtf; name = de; path = de.lproj/Credits.rtf;
sourceTree = "<group>"; };
CE3D8DA9125E69BB00AE0232 /* de */ = {isa = PBXFileReference;
fileEncoding = 10; lastKnownFileType = text.plist.strings; name = de; path =
de.lproj/InfoPlist.strings; sourceTree = "<group>"; };
@@ -1616,6 +1615,8 @@
CE83E3A40D294EE300BB7AD8 /* BDSKSortCommand.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= BDSKSortCommand.m; sourceTree = "<group>"; };
CE8526D2264C81B100C7755B /* fr */ = {isa = PBXFileReference;
lastKnownFileType = text.plist.strings; name = fr; path =
fr.lproj/BDSKPersonWindow.strings; sourceTree = "<group>"; };
CE8526D3264C81B300C7755B /* de */ = {isa = PBXFileReference;
lastKnownFileType = text.plist.strings; name = de; path =
de.lproj/BDSKPersonWindow.strings; sourceTree = "<group>"; };
+ CE8526D7264C861B00C7755B /* fr */ = {isa = PBXFileReference;
lastKnownFileType = text.plist.strings; name = fr; path =
fr.lproj/BDSKSearchGroupView.strings; sourceTree = "<group>"; };
+ CE8526D8264C861D00C7755B /* de */ = {isa = PBXFileReference;
lastKnownFileType = text.plist.strings; name = de; path =
de.lproj/BDSKSearchGroupView.strings; sourceTree = "<group>"; };
CE8961850CBEB59800EA2D98 /* BDSKToken.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
BDSKToken.h; sourceTree = "<group>"; };
CE8961860CBEB59800EA2D98 /* BDSKToken.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= BDSKToken.m; sourceTree = "<group>"; };
CE8961870CBEB59800EA2D98 /* BDSKTypeTemplate.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
BDSKTypeTemplate.h; sourceTree = "<group>"; };
@@ -1813,7 +1814,6 @@
CEB596C0263C5029000798F9 /* BDSKRadioTransformer.m */ = {isa =
PBXFileReference; lastKnownFileType = sourcecode.c.objc; path =
BDSKRadioTransformer.m; sourceTree = "<group>"; };
CEB5D6551072AE950001C135 /* fr */ = {isa = PBXFileReference;
lastKnownFileType = file.xib; name = fr; path = fr.lproj/BDSKCondition.xib;
sourceTree = "<group>"; };
CEB5D65F1072AE950001C135 /* fr */ = {isa = PBXFileReference;
lastKnownFileType = file.xib; name = fr; path = fr.lproj/BDSKFilter.xib;
sourceTree = "<group>"; };
- CEB5D6681072AE950001C135 /* fr */ = {isa = PBXFileReference;
lastKnownFileType = file.xib; name = fr; path =
fr.lproj/BDSKSearchGroupView.xib; sourceTree = "<group>"; };
CEB5D6961072AE950001C135 /* fr */ = {isa = PBXFileReference;
lastKnownFileType = file.xib; name = fr; path = fr.lproj/TemplateDocument.xib;
sourceTree = "<group>"; };
CEB5D6971072AE950001C135 /* fr */ = {isa = PBXFileReference;
lastKnownFileType = file.xib; name = fr; path = fr.lproj/TextImport.xib;
sourceTree = "<group>"; };
CEB772E80A34529D00B8A299 /* NSAttributedString_BDSKExtensions.h
*/ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.h; path = NSAttributedString_BDSKExtensions.h; sourceTree =
"<group>"; };
@@ -5222,6 +5222,8 @@
isa = PBXVariantGroup;
children = (
CEB0C6DB26385D8600B63A29 /* en */,
+ CE8526D7264C861B00C7755B /* fr */,
+ CE8526D8264C861D00C7755B /* de */,
);
name = BDSKSearchGroupView.strings;
sourceTree = "<group>";
@@ -5647,8 +5649,6 @@
CEB5D5B61072AE350001C135 /* BDSKSearchGroupView.xib */ = {
isa = PBXVariantGroup;
children = (
- CEB5D6681072AE950001C135 /* fr */,
- CE3D8D8E125E69BB00AE0232 /* de */,
CEB0C61D2638508500B63A29 /* Base */,
);
name = BDSKSearchGroupView.xib;
Added: trunk/bibdesk/de.lproj/BDSKSearchGroupView.strings
===================================================================
(Binary files differ)
Index: trunk/bibdesk/de.lproj/BDSKSearchGroupView.strings
===================================================================
--- trunk/bibdesk/de.lproj/BDSKSearchGroupView.strings 2021-05-12 21:36:21 UTC
(rev 25941)
+++ trunk/bibdesk/de.lproj/BDSKSearchGroupView.strings 2021-05-12 21:55:38 UTC
(rev 25942)
Property changes on: trunk/bibdesk/de.lproj/BDSKSearchGroupView.strings
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Deleted: trunk/bibdesk/de.lproj/BDSKSearchGroupView.xib
===================================================================
--- trunk/bibdesk/de.lproj/BDSKSearchGroupView.xib 2021-05-12 21:36:21 UTC
(rev 25941)
+++ trunk/bibdesk/de.lproj/BDSKSearchGroupView.xib 2021-05-12 21:55:38 UTC
(rev 25942)
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0"
toolsVersion="16097.3" targetRuntime="MacOSX.Cocoa"
propertyAccessControl="none" useAutolayout="YES">
- <dependencies>
- <deployment identifier="macosx"/>
- <development version="8000" identifier="xcode"/>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin"
version="16097.3"/>
- <capability name="documents saved in the Xcode 8 format"
minToolsVersion="8.0"/>
- </dependencies>
- <objects>
- <customObject id="-2" userLabel="File's Owner"
customClass="BDSKSearchGroupViewController">
- <connections>
- <outlet property="searchButton" destination="8" id="26"/>
- <outlet property="searchField" destination="9" id="25"/>
- <outlet property="view" destination="5" id="23"/>
- </connections>
- </customObject>
- <customObject id="-1" userLabel="First Responder"
customClass="FirstResponder"/>
- <customObject id="-3" userLabel="Application" customClass="NSObject"/>
- <customView id="5" userLabel="View" customClass="BDSKEdgeView">
- <rect key="frame" x="0.0" y="0.0" width="230" height="44"/>
- <autoresizingMask key="autoresizingMask" widthSizable="YES"
flexibleMinY="YES"/>
- <subviews>
- <button horizontalHuggingPriority="750"
verticalHuggingPriority="750" id="30">
- <rect key="frame" x="202" y="8" width="21" height="23"/>
- <autoresizingMask key="autoresizingMask"
flexibleMinX="YES"/>
- <buttonCell key="cell" type="help" bezelStyle="helpButton"
alignment="center" borderStyle="border" inset="2" id="36">
- <behavior key="behavior" pushIn="YES"
lightByBackground="YES" lightByGray="YES"/>
- <font key="font" metaFont="system"/>
- </buttonCell>
- <connections>
- <action selector="searchHelp:" target="-2" id="31"/>
- </connections>
- </button>
- <searchField verticalHuggingPriority="750" textCompletion="NO"
id="9">
- <rect key="frame" x="10" y="10" width="90" height="22"/>
- <autoresizingMask key="autoresizingMask"
widthSizable="YES"/>
- <searchFieldCell key="cell" scrollable="YES"
lineBreakMode="clipping" selectable="YES" editable="YES" borderStyle="bezel"
placeholderString="Suche" bezelStyle="round" sendsWholeSearchString="YES"
id="35">
- <font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor"
catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor"
name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
- </searchFieldCell>
- <connections>
- <action selector="changeSearchTerm:" target="-2"
id="28"/>
- <outlet property="delegate" destination="-2" id="32"/>
- <outlet property="searchMenuTemplate" destination="17"
id="20"/>
- </connections>
- </searchField>
- <button toolTip="Nach weiteren Ergebnissen suchen"
verticalHuggingPriority="750" id="8">
- <rect key="frame" x="108.5" y="9" width="82" height="25"/>
- <autoresizingMask key="autoresizingMask"
flexibleMinX="YES"/>
- <buttonCell key="cell" type="roundTextured" title="Suche"
bezelStyle="texturedRounded" alignment="center" borderStyle="border" inset="2"
id="34">
- <behavior key="behavior" pushIn="YES"
lightByBackground="YES" lightByGray="YES"/>
- <font key="font" metaFont="system"/>
- </buttonCell>
- <connections>
- <action selector="nextSearch:" target="-2" id="27"/>
- </connections>
- </button>
- </subviews>
- <point key="canvasLocation" x="139" y="154"/>
- </customView>
- <menu id="17" userLabel="SearchMenuTemplate">
- <items>
- <menuItem title="Zuletzt Gesucht" tag="1000" id="18"/>
- <menuItem title="Letzte" tag="1001" id="22"/>
- <menuItem title="Löschen" tag="1002" id="19"/>
- </items>
- </menu>
- </objects>
-</document>
Added: trunk/bibdesk/fr.lproj/BDSKSearchGroupView.strings
===================================================================
(Binary files differ)
Index: trunk/bibdesk/fr.lproj/BDSKSearchGroupView.strings
===================================================================
--- trunk/bibdesk/fr.lproj/BDSKSearchGroupView.strings 2021-05-12 21:36:21 UTC
(rev 25941)
+++ trunk/bibdesk/fr.lproj/BDSKSearchGroupView.strings 2021-05-12 21:55:38 UTC
(rev 25942)
Property changes on: trunk/bibdesk/fr.lproj/BDSKSearchGroupView.strings
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Deleted: trunk/bibdesk/fr.lproj/BDSKSearchGroupView.xib
===================================================================
--- trunk/bibdesk/fr.lproj/BDSKSearchGroupView.xib 2021-05-12 21:36:21 UTC
(rev 25941)
+++ trunk/bibdesk/fr.lproj/BDSKSearchGroupView.xib 2021-05-12 21:55:38 UTC
(rev 25942)
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0"
toolsVersion="16097.3" targetRuntime="MacOSX.Cocoa"
propertyAccessControl="none" useAutolayout="YES">
- <dependencies>
- <deployment identifier="macosx"/>
- <development version="8000" identifier="xcode"/>
- <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin"
version="16097.3"/>
- <capability name="documents saved in the Xcode 8 format"
minToolsVersion="8.0"/>
- </dependencies>
- <objects>
- <customObject id="-2" userLabel="File's Owner"
customClass="BDSKSearchGroupViewController">
- <connections>
- <outlet property="searchButton" destination="8" id="26"/>
- <outlet property="searchField" destination="9" id="25"/>
- <outlet property="view" destination="5" id="23"/>
- </connections>
- </customObject>
- <customObject id="-1" userLabel="First Responder"
customClass="FirstResponder"/>
- <customObject id="-3" userLabel="Application" customClass="NSObject"/>
- <customView id="5" userLabel="View" customClass="BDSKEdgeView">
- <rect key="frame" x="0.0" y="0.0" width="230" height="44"/>
- <autoresizingMask key="autoresizingMask" widthSizable="YES"
flexibleMinY="YES"/>
- <subviews>
- <button horizontalHuggingPriority="750"
verticalHuggingPriority="750" id="30">
- <rect key="frame" x="202" y="8" width="21" height="23"/>
- <autoresizingMask key="autoresizingMask"
flexibleMinX="YES"/>
- <buttonCell key="cell" type="help" bezelStyle="helpButton"
alignment="center" borderStyle="border" inset="2" id="36">
- <behavior key="behavior" pushIn="YES"
lightByBackground="YES" lightByGray="YES"/>
- <font key="font" metaFont="system"/>
- </buttonCell>
- <connections>
- <action selector="searchHelp:" target="-2" id="31"/>
- </connections>
- </button>
- <searchField verticalHuggingPriority="750" textCompletion="NO"
id="9">
- <rect key="frame" x="10" y="10" width="90" height="22"/>
- <autoresizingMask key="autoresizingMask"
widthSizable="YES"/>
- <searchFieldCell key="cell" scrollable="YES"
lineBreakMode="clipping" selectable="YES" editable="YES" borderStyle="bezel"
placeholderString="Rechercher" bezelStyle="round" sendsWholeSearchString="YES"
id="35">
- <font key="font" metaFont="system"/>
- <color key="textColor" name="controlTextColor"
catalog="System" colorSpace="catalog"/>
- <color key="backgroundColor"
name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
- </searchFieldCell>
- <connections>
- <action selector="changeSearchTerm:" target="-2"
id="28"/>
- <outlet property="delegate" destination="-2" id="32"/>
- <outlet property="searchMenuTemplate" destination="17"
id="20"/>
- </connections>
- </searchField>
- <button toolTip="Rechercher plus de résultats"
verticalHuggingPriority="750" id="8">
- <rect key="frame" x="108.5" y="9" width="85" height="25"/>
- <autoresizingMask key="autoresizingMask"
flexibleMinX="YES"/>
- <buttonCell key="cell" type="roundTextured"
title="Rechercher" bezelStyle="texturedRounded" alignment="center"
borderStyle="border" inset="2" id="34">
- <behavior key="behavior" pushIn="YES"
lightByBackground="YES" lightByGray="YES"/>
- <font key="font" metaFont="system"/>
- </buttonCell>
- <connections>
- <action selector="nextSearch:" target="-2" id="27"/>
- </connections>
- </button>
- </subviews>
- <point key="canvasLocation" x="139" y="154"/>
- </customView>
- <menu id="17" userLabel="SearchMenuTemplate">
- <items>
- <menuItem title="Recherches récentes" tag="1000" id="18"/>
- <menuItem title="Récents" tag="1001" id="22"/>
- <menuItem title="Réinitialiser" tag="1002" id="19"/>
- </items>
- </menu>
- </objects>
-</document>
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
