Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

Merge pull request #4673 from BOINC/mac_fix_ss_for_MacOS12 

Mac: Fix screensaver preferences dialog compatibility with MacOS 12 Monterey
This commit is contained in:
Charlie Fenton 2022-03-22 02:47:55 -07:00
parent b412a6e1f6
commit bcab4aa211
7 changed files with 243 additions and 1409 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

105
clientscr/Mac_Saver_ModuleView.m
View File

@ -201,7 +201,13 @@ void launchedGfxApp(char * appPath, pid_t thePID, int slot) {
@implementation BOINC_Saver_ModuleView
// If there are multiple displays, this may get called
// multiple times (once for each display), so we need to guard
// against any problems that may cause.
- (id)initWithFrame:(NSRect)frame isPreview:(BOOL)isPreview {
NSBundle * myBundle;
int period;
self = [ super initWithFrame:frame isPreview:isPreview ];
gIsHighSierra = (compareOSVersionTo(10, 13) >= 0);
@ -245,33 +251,14 @@ void launchedGfxApp(char * appPath, pid_t thePID, int slot) {
DPI_multiplier = [((NSScreen*)allScreens[0]) backingScaleFactor];
}
}
return self;
}
// If there are multiple displays, this may get called
// multiple times (once for each display), so we need to guard
// against any problems that may cause.
- (void)startAnimation {
NSBundle * myBundle;
int newFrequency;
int period;
gEventHandle = NXOpenEventStatus();
mainThreadID = pthread_self();
// Under OS 10.14 Mojave, [super drawRect:] is slow but not needed if we do this:
[[self window] setBackgroundColor:[NSColor blackColor]];
initBOINCSaver();
if (gBOINC_Logo == NULL) {
if (self) {
if (self) {
if (mBundleID == NULL) {
myBundle = [ NSBundle bundleForClass:[self class]];
// grab the screensaver defaults
if (mBundleID == NULL) {
mBundleID = [ myBundle bundleIdentifier ];
}
mBundleID = [ myBundle bundleIdentifier ];
// Path to our copy of switcher utility application in this screensaver bundle
if (gPathToBundleResources == NULL) {
@ -318,34 +305,6 @@ void launchedGfxApp(char * appPath, pid_t thePID, int slot) {
setGGFXChangePeriod((double)(period * 60));
[ self setAutoresizesSubviews:YES ]; // make sure the subview resizes.
NSString *fileName = [[ NSBundle bundleForClass:[ self class ]] pathForImageResource:@"boinc_ss_logo" ];
if (! fileName) {
// What should we do in this case?
return;
}
gBOINC_Logo = [[ NSImage alloc ] initWithContentsOfFile:fileName ];
gMovingRect.origin.x = 0.0;
gMovingRect.origin.y = 0.0;
gMovingRect.size = [gBOINC_Logo size];
if (gMovingRect.size.width < TEXTBOXMINWIDTH) {
gImageXIndent = (TEXTBOXMINWIDTH - gMovingRect.size.width) / 2;
gMovingRect.size.width = TEXTBOXMINWIDTH;
} else {
gImageXIndent = 0.0;
}
gTextBoxHeight = MINTEXTBOXHEIGHT;
gMovingRect.size.height += gTextBoxHeight;
gCurrentPosition.x = SAFETYBORDER + 1;
gCurrentPosition.y = SAFETYBORDER + 1 + gTextBoxHeight;
gCurrentDelta.x = 1.0;
gCurrentDelta.y = 1.0;
gActualTextBoxHeight = MINTEXTBOXHEIGHT;
[ self setAnimationTimeInterval:1/8.0 ];
}
}
@ -353,6 +312,52 @@ void launchedGfxApp(char * appPath, pid_t thePID, int slot) {
if (gPathToBundleResources == NULL) {
gPathToBundleResources = [ myBundle resourcePath ];
}
return self;
}
// If there are multiple displays, this may get called
// multiple times (once for each display), so we need to guard
// against any problems that may cause.
- (void)startAnimation {
int newFrequency;
gEventHandle = NXOpenEventStatus();
mainThreadID = pthread_self();
// Under OS 10.14 Mojave, [super drawRect:] is slow but not needed if we do this:
[[self window] setBackgroundColor:[NSColor blackColor]];
if (gBOINC_Logo == NULL) {
NSString *fileName = [[ NSBundle bundleForClass:[ self class ]] pathForImageResource:@"boinc_ss_logo" ];
if (! fileName) {
// What should we do in this case?
return;
}
gBOINC_Logo = [[ NSImage alloc ] initWithContentsOfFile:fileName ];
gMovingRect.origin.x = 0.0;
gMovingRect.origin.y = 0.0;
gMovingRect.size = [gBOINC_Logo size];
if (gMovingRect.size.width < TEXTBOXMINWIDTH) {
gImageXIndent = (TEXTBOXMINWIDTH - gMovingRect.size.width) / 2;
gMovingRect.size.width = TEXTBOXMINWIDTH;
} else {
gImageXIndent = 0.0;
}
gTextBoxHeight = MINTEXTBOXHEIGHT;
gMovingRect.size.height += gTextBoxHeight;
gCurrentPosition.x = SAFETYBORDER + 1;
gCurrentPosition.y = SAFETYBORDER + 1 + gTextBoxHeight;
gCurrentDelta.x = 1.0;
gCurrentDelta.y = 1.0;
gActualTextBoxHeight = MINTEXTBOXHEIGHT;
[ self setAnimationTimeInterval:1/8.0 ];
}
[ super startAnimation ];

24
clientscr/res/BOINCSaver.nib/classes.nib generated
View File

@ -1,24 +0,0 @@
{
IBClasses = (
{
ACTIONS = {closeSheetCancel = id; closeSheetSave = id; };
CLASS = "BOINC_Saver_ModuleView";
LANGUAGE = ObjC;
OUTLETS = {
mBlankingTimeTextField = NSTextField;
mConfigureSheet = id;
mGoToBlankCheckbox = NSButton;
};
SUPERCLASS = ScreenSaverView;
},
{CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
{
ACTIONS = {closeSheetCancel = id; closeSheetSave = id; };
CLASS = NSButton;
LANGUAGE = ObjC;
SUPERCLASS = NSControl;
},
{CLASS = ScreenSaverView; LANGUAGE = ObjC; SUPERCLASS = NSView; }
);
IBVersion = 1;
}

1315
clientscr/res/BOINCSaver.nib/designable.nib generated
View File

File diff suppressed because it is too large Load Diff

16
clientscr/res/BOINCSaver.nib/info.nib generated
View File

@ -1,16 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
<string>104 64 503 301 0 0 1024 746 </string>
<key>IBFramework Version</key>
<string>364.0</string>
<key>IBOpenObjects</key>
<array>
<integer>7</integer>
</array>
<key>IBSystem Version</key>
<string>7W98</string>
</dict>
</plist>

BIN
clientscr/res/BOINCSaver.nib/keyedobjects.nib generated
View File

Binary file not shown.

183
clientscr/res/BOINCSaver.xib Normal file
View File

@ -0,0 +1,183 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="20037" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
<dependencies>
<deployment version="101003" identifier="macosx"/>
<plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="20037"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<customObject id="-2" userLabel="File's Owner" customClass="BOINC_Saver_ModuleView">
<connections>
<outlet property="mBlankingTimeTextField" destination="12" id="16"/>
<outlet property="mChangePeriodTextField" destination="37" id="49"/>
<outlet property="mConfigureSheet" destination="7" id="17"/>
<outlet property="mDefaultPeriodTextField" destination="33" id="47"/>
<outlet property="mGoToBlankCheckbox" destination="11" id="18"/>
<outlet property="mSciencePeriodTextField" destination="35" id="48"/>
</connections>
</customObject>
<customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
<customObject id="-3" userLabel="Application" customClass="NSObject"/>
<window title="Configure BOINCSaver" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" animationBehavior="default" id="7" userLabel="Panel" customClass="NSPanel">
<windowStyleMask key="styleMask" titled="YES"/>
<windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
<rect key="contentRect" x="370" y="478" width="442" height="246"/>
<rect key="screenRect" x="0.0" y="0.0" width="2240" height="1235"/>
<value key="minSize" type="size" width="213" height="107"/>
<view key="contentView" id="8">
<rect key="frame" x="0.0" y="0.0" width="442" height="246"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<button verticalHuggingPriority="750" imageHugsTitle="YES" id="9">
<rect key="frame" x="255" y="12" width="78" height="32"/>
<autoresizingMask key="autoresizingMask"/>
<buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="20">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
<connections>
<action selector="closeSheetCancel:" target="-2" id="14"/>
</connections>
</button>
<button verticalHuggingPriority="750" imageHugsTitle="YES" id="10">
<rect key="frame" x="350" y="12" width="78" height="32"/>
<autoresizingMask key="autoresizingMask"/>
<buttonCell key="cell" type="push" title="Save" bezelStyle="rounded" alignment="center" borderStyle="border" inset="2" id="21">
<behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
<connections>
<action selector="closeSheetSave:" target="-2" id="15"/>
</connections>
</button>
<button imageHugsTitle="YES" id="11">
<rect key="frame" x="203" y="202" width="144" height="18"/>
<autoresizingMask key="autoresizingMask"/>
<buttonCell key="cell" type="check" title="Go to blank screen" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="22">
<behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
<font key="font" metaFont="system"/>
</buttonCell>
</button>
<textField verticalHuggingPriority="750" id="12">
<rect key="frame" x="318" y="159" width="41" height="21"/>
<autoresizingMask key="autoresizingMask" heightSizable="YES"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" title="9999" drawsBackground="YES" id="23">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" id="33">
<rect key="frame" x="318" y="134" width="41" height="21"/>
<autoresizingMask key="autoresizingMask"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" title="9999" drawsBackground="YES" id="34">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" id="35">
<rect key="frame" x="318" y="109" width="41" height="21"/>
<autoresizingMask key="autoresizingMask"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" title="9999" drawsBackground="YES" id="36">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" id="37">
<rect key="frame" x="318" y="81" width="41" height="21"/>
<autoresizingMask key="autoresizingMask"/>
<textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" title="9999" drawsBackground="YES" id="38">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="152" id="13">
<rect key="frame" x="167" y="161" width="147" height="16"/>
<autoresizingMask key="autoresizingMask"/>
<textFieldCell key="cell" enabled="NO" sendsActionOnEndEditing="YES" alignment="left" title="Blank screensaver after" id="24">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="189" id="27">
<rect key="frame" x="132" y="137" width="183" height="16"/>
<autoresizingMask key="autoresizingMask"/>
<textFieldCell key="cell" enabled="NO" sendsActionOnEndEditing="YES" alignment="left" title="Run overview screensaver for" id="28">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="57" id="39">
<rect key="frame" x="363" y="136" width="53" height="16"/>
<autoresizingMask key="autoresizingMask"/>
<textFieldCell key="cell" enabled="NO" sendsActionOnEndEditing="YES" alignment="left" title="minutes" id="40">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="57" id="45">
<rect key="frame" x="363" y="161" width="53" height="16"/>
<autoresizingMask key="autoresizingMask"/>
<textFieldCell key="cell" enabled="NO" sendsActionOnEndEditing="YES" alignment="left" title="minutes" id="46">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="57" id="41">
<rect key="frame" x="363" y="111" width="53" height="16"/>
<autoresizingMask key="autoresizingMask"/>
<textFieldCell key="cell" enabled="NO" sendsActionOnEndEditing="YES" alignment="left" title="minutes" id="42">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="57" id="43">
<rect key="frame" x="363" y="86" width="53" height="16"/>
<autoresizingMask key="autoresizingMask"/>
<textFieldCell key="cell" enabled="NO" sendsActionOnEndEditing="YES" alignment="left" title="minutes" id="44">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="184" id="29">
<rect key="frame" x="137" y="111" width="178" height="16"/>
<autoresizingMask key="autoresizingMask"/>
<textFieldCell key="cell" enabled="NO" sendsActionOnEndEditing="YES" alignment="left" title="Run project screensavers for" id="30">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="273" id="31">
<rect key="frame" x="49" y="86" width="267" height="16"/>
<autoresizingMask key="autoresizingMask"/>
<textFieldCell key="cell" enabled="NO" sendsActionOnEndEditing="YES" alignment="left" title="Switch between project screensavers every" id="32">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
<textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" preferredMaxLayoutWidth="122" id="54">
<rect key="frame" x="295" y="61" width="116" height="16"/>
<autoresizingMask key="autoresizingMask"/>
<textFieldCell key="cell" enabled="NO" sendsActionOnEndEditing="YES" alignment="left" title="Note: zero = never" id="55">
<font key="font" metaFont="system"/>
<color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
<color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
</textFieldCell>
</textField>
</subviews>
</view>
<point key="canvasLocation" x="140" y="133"/>
</window>
</objects>
</document>

9
mac_build/boinc.xcodeproj/project.pbxproj
View File

@ -94,6 +94,7 @@
DD33C6F808B5BB4500768630 /* acct_setup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD33C6F708B5BB4500768630 /* acct_setup.cpp */; };
DD33C70408B5BEDE00768630 /* http_curl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD33C70208B5BEDE00768630 /* http_curl.cpp */; };
DD35353607E1E13F00C4718D /* boinc_api.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5755AD302FE063A012012A7 /* boinc_api.cpp */; };
DD35BF3A27E3601800F1BBFC /* BOINCSaver.xib in Resources */ = {isa = PBXBuildFile; fileRef = DD35BF3927E3601800F1BBFC /* BOINCSaver.xib */; };
DD3741D610FC948C001257EB /* filesys.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5EAD475031AEFF8018E201A /* filesys.cpp */; };
DD3741D910FC94BA001257EB /* url.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDC06AB210A3E93F00C8D9A5 /* url.cpp */; };
DD3E14DB0A774397007E0084 /* boinc in Resources */ = {isa = PBXBuildFile; fileRef = DDD74D8707CF482E0065AC9D /* boinc */; };
@ -178,7 +179,7 @@
DD407ABB07D2FC7D00163EF5 /* mem_usage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD407AB707D2FC7D00163EF5 /* mem_usage.cpp */; };
DD431FAA0A41660D0060585A /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20286C33FDCF999611CA2CEA /* Carbon.framework */; };
DD4329910BA63DEC007CDF2A /* str_util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD7BF7D70B8E7A9800A009F7 /* str_util.cpp */; };
DD48091F081A66F100A174AA /* BOINCSaver.nib in Resources */ = {isa = PBXBuildFile; fileRef = DD48091E081A66F100A174AA /* BOINCSaver.nib */; };
DD43475826FB397A00B8880F /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DD43474F26FB378100B8880F /* QuartzCore.framework */; };
DD4AE04D13652BD700285859 /* cc_config.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD4AE04B13652BD700285859 /* cc_config.cpp */; };
DD4AE05013652C1300285859 /* cc_config.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD4AE04B13652BD700285859 /* cc_config.cpp */; };
DD4EC65A08A0A7AF009AA08F /* gui_rpc_client_ops.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD73E34E08A0694000656EB1 /* gui_rpc_client_ops.cpp */; };
@ -993,6 +994,7 @@
DD344BEE07C5B1770043025C /* proxy_info.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = proxy_info.h; path = ../lib/proxy_info.h; sourceTree = SOURCE_ROOT; };
DD344BEF07C5B1770043025C /* proxy_info.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = proxy_info.cpp; sourceTree = "<group>"; };
DD35353107E1E05C00C4718D /* libboinc_api.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libboinc_api.a; sourceTree = BUILT_PRODUCTS_DIR; };
DD35BF3927E3601800F1BBFC /* BOINCSaver.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = BOINCSaver.xib; path = ../clientscr/res/BOINCSaver.xib; sourceTree = "<group>"; };
DD3E15420A774397007E0084 /* BOINCManager.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = BOINCManager.app; sourceTree = BUILT_PRODUCTS_DIR; };
DD3EAAA6216A25AD00BC673C /* boinc_finish_install */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = boinc_finish_install; sourceTree = BUILT_PRODUCTS_DIR; };
DD3EAAAE216A268500BC673C /* finish_install.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = finish_install.cpp; path = ../mac_installer/finish_install.cpp; sourceTree = "<group>"; };
@ -1012,7 +1014,6 @@
DD4688410C165F3C0089F500 /* Uninstall BOINC.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Uninstall BOINC.app"; sourceTree = BUILT_PRODUCTS_DIR; };
DD4688430C165F3C0089F500 /* Uninstaller-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Uninstaller-Info.plist"; sourceTree = "<group>"; };
DD4688590C1661970089F500 /* uninstall.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = uninstall.cpp; path = ../mac_installer/uninstall.cpp; sourceTree = SOURCE_ROOT; };
DD48091E081A66F100A174AA /* BOINCSaver.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = BOINCSaver.nib; path = ../clientscr/res/BOINCSaver.nib; sourceTree = SOURCE_ROOT; };
DD4AE04B13652BD700285859 /* cc_config.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = cc_config.cpp; path = ../lib/cc_config.cpp; sourceTree = SOURCE_ROOT; };
DD4AE04C13652BD700285859 /* cc_config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = cc_config.h; path = ../lib/cc_config.h; sourceTree = SOURCE_ROOT; };
DD4C560C0AD389A2009E23C6 /* sg_DlgMessages.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = sg_DlgMessages.cpp; path = ../clientgui/sg_DlgMessages.cpp; sourceTree = SOURCE_ROOT; };
@ -1650,10 +1651,10 @@
DD957E5A181B908800ECA34E /* thumbnail@2x.png */,
DDBC6CA40D5D458700564C49 /* boinc_ss_logo.png */,
DDF3028907CCCE2C00701169 /* BOINCMgr.icns */,
DD35BF3927E3601800F1BBFC /* BOINCSaver.xib */,
DD531BC50C193D3800742E50 /* MacInstaller.icns */,
DD531BC70C193D5200742E50 /* MacUninstaller.icns */,
DD74B685177074AF005CF7DC /* PutInTrash.icns */,
DD48091E081A66F100A174AA /* BOINCSaver.nib */,
DDEB3CA80981084A0087E200 /* gridrepublic.icns */,
DDF1F4A409822F8A00482C89 /* GR-Branding */,
DD64E7D507D89DB800B176C8 /* Info.plist */,
@ -2732,8 +2733,8 @@
DDFA60E20CB3391C0037B88C /* gfx_switcher in Resources */,
DD5F656623607472009ED2A2 /* gfx_cleanup in Resources */,
DD818295245ED4110076E5D0 /* boinc_ss_helper.sh in Resources */,
DD35BF3A27E3601800F1BBFC /* BOINCSaver.xib in Resources */,
DD0C5A8B0816711400CEC5D7 /* boinc.jpg in Resources */,
DD48091F081A66F100A174AA /* BOINCSaver.nib in Resources */,
DDBC6CA50D5D458700564C49 /* boinc_ss_logo.png in Resources */,
DD957E5B181B908800ECA34E /* thumbnail.png in Resources */,
DD957E5C181B908800ECA34E /* thumbnail@2x.png in Resources */,