fte
/
quakespasm
mirror of https://github.com/Shpoike/Quakespasm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added version information to launcher window. 

git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@336 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
Kristian Duske 2010-09-20 08:11:33 +00:00
parent 15f1710bc6
commit 4251b8dc1e
9 changed files with 343 additions and 231 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MacOSX/AppController.h
View File

@ -34,6 +34,7 @@ extern NSString *FQPrefScreenModeKey;
IBOutlet NSTabView *updateTabView;
IBOutlet NSProgressIndicator *updateProgressIndicator;
IBOutlet NSButton *updateButton;
IBOutlet NSTextField *versionLabel;
NSMutableArray *screenModes;
QuakeArguments *arguments;

19
MacOSX/AppController.m
View File

@ -110,7 +110,10 @@ NSString *FQPrefScreenModeKey = @"ScreenMode";
[launcherWindow makeKeyAndOrderFront:self];
SUUpdater* updater = [SUUpdater sharedUpdater];
SUUpdaterDelegate* delegate = [[SUUpdaterDelegate alloc] initWithTabView:updateTabView indicator:updateProgressIndicator button:updateButton];
SUUpdaterDelegate* delegate = [[SUUpdaterDelegate alloc] initWithTabView:updateTabView
indicator:updateProgressIndicator
button:updateButton
label:versionLabel];
[updater setDelegate:delegate];
[updater checkForUpdateInformation];
@ -132,18 +135,20 @@ NSString *FQPrefScreenModeKey = @"ScreenMode";
int width = [info width];
int height = [info height];
int bpp = [info bpp];
BOOL fullscreen = [fullscreenCheckBox state] == NSOnState;
[arguments addArgument:@"-width" withValue:[NSString stringWithFormat:@"%d", width]];
[arguments addArgument:@"-height" withValue:[NSString stringWithFormat:@"%d", height]];
[arguments addArgument:@"-bpp" withValue:[NSString stringWithFormat:@"%d", bpp]];
if (fullscreen)
[arguments addArgument:@"-fullscreen"];
else
[arguments addArgument:@"-window"];
}
[arguments removeArgument:@"-fullscreen"];
[arguments removeArgument:@"-window"];
BOOL fullscreen = [fullscreenCheckBox state] == NSOnState;
if (fullscreen)
[arguments addArgument:@"-fullscreen"];
else
[arguments addArgument:@"-window"];
NSString *path = [NSString stringWithCString:gArgv[0] encoding:NSASCIIStringEncoding];
int i;

79
MacOSX/English.lproj/Launcher.nib/designable.nib generated
View File

@ -12,8 +12,8 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="501"/>
<integer value="57"/>
<integer value="501"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@ -1099,7 +1099,7 @@
<object class="NSButton" id="168299184">
<reference key="NSNextResponder" ref="871182022"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{20, 21}, {154, 19}}</string>
<string key="NSFrame">{{18, 21}, {154, 19}}</string>
<reference key="NSSuperview" ref="871182022"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="1038566898">
@ -1109,10 +1109,10 @@
<object class="NSFont" key="NSSupport">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">12</double>
<int key="NSfFlags">4883</int>
<int key="NSfFlags">16</int>
</object>
<reference key="NSControlView" ref="168299184"/>
<int key="NSButtonFlags">-2046541569</int>
<int key="NSButtonFlags">-2043395841</int>
<int key="NSButtonFlags2">164</int>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
@ -1133,6 +1133,33 @@
<object class="NSView" key="NSView" id="824191680">
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSTextField" id="436388064">
<reference key="NSNextResponder" ref="824191680"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{17, 22}, {52, 17}}</string>
<reference key="NSSuperview" ref="824191680"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="105715129">
<int key="NSCellFlags">68288064</int>
<int key="NSCellFlags2">4195328</int>
<string key="NSContents">Version</string>
<reference key="NSSupport" ref="291399836"/>
<reference key="NSControlView" ref="436388064"/>
<reference key="NSBackgroundColor" ref="240731113"/>
<object class="NSColor" key="NSTextColor">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">disabledControlTextColor</string>
<object class="NSColor" key="NSColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC4zMzMzMzMzMzMzAA</bytes>
</object>
</object>
</object>
</object>
</object>
<string key="NSFrameSize">{252, 46}</string>
</object>
<string key="NSLabel">No Update found</string>
@ -1595,6 +1622,14 @@
</object>
<int key="connectionID">516</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">versionLabel</string>
<reference key="source" ref="561825427"/>
<reference key="destination" ref="436388064"/>
</object>
<int key="connectionID">519</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@ -2447,6 +2482,7 @@
<reference key="object" ref="824191680"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="436388064"/>
</object>
<reference key="parent" ref="780397885"/>
</object>
@ -2469,6 +2505,20 @@
<reference key="object" ref="1038566898"/>
<reference key="parent" ref="168299184"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">517</int>
<reference key="object" ref="436388064"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="105715129"/>
</object>
<reference key="parent" ref="824191680"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">518</int>
<reference key="object" ref="105715129"/>
<reference key="parent" ref="436388064"/>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@ -2647,10 +2697,14 @@
<string>502.IBPluginDependency</string>
<string>503.IBPluginDependency</string>
<string>504.IBPluginDependency</string>
<string>505.IBPluginDependency</string>
<string>506.IBPluginDependency</string>
<string>508.IBPluginDependency</string>
<string>512.CustomClassName</string>
<string>512.IBPluginDependency</string>
<string>513.IBPluginDependency</string>
<string>517.IBPluginDependency</string>
<string>518.IBPluginDependency</string>
<string>56.IBPluginDependency</string>
<string>56.ImportedFromIB2</string>
<string>57.IBEditorWindowLastContentRect</string>
@ -2822,9 +2876,9 @@
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>{{596, 464}, {511, 251}}</string>
<string>{{560, 464}, {511, 251}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{596, 464}, {511, 251}}</string>
<string>{{560, 464}, {511, 251}}</string>
<integer value="0"/>
<string>{{412, 523}, {516, 280}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@ -2862,10 +2916,14 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>UpdateButton</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>{{341, 653}, {232, 183}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@ -2916,7 +2974,7 @@
</object>
</object>
<nil key="sourceID"/>
<int key="maxID">516</int>
<int key="maxID">519</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@ -2974,6 +3032,7 @@
<string>updateButton</string>
<string>updateProgressIndicator</string>
<string>updateTabView</string>
<string>versionLabel</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
@ -2984,6 +3043,7 @@
<string>NSButton</string>
<string>NSProgressIndicator</string>
<string>NSTabView</string>
<string>NSTextField</string>
</object>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
@ -2997,6 +3057,7 @@
<string>updateButton</string>
<string>updateProgressIndicator</string>
<string>updateTabView</string>
<string>versionLabel</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
@ -3028,6 +3089,10 @@
<string key="name">updateTabView</string>
<string key="candidateClassName">NSTabView</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">versionLabel</string>
<string key="candidateClassName">NSTextField</string>
</object>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">

BIN
MacOSX/English.lproj/Launcher.nib/keyedobjects.nib generated
View File

Binary file not shown.

378
MacOSX/QuakeSpasm.xcodeproj/kristian.pbxuser
View File

@ -3,8 +3,9 @@
002F3A2C09D0888800EBEB88 /* SDLMain.m */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {1142, 1105}}";
sepNavSelRange = "{0, 0}";
sepNavVisRange = "{0, 1056}";
sepNavSelRange = "{1666, 0}";
sepNavVisRange = "{1506, 823}";
sepNavWindowFrame = "{{15, 140}, {987, 733}}";
};
};
089C165DFE840E0CC02AAC07 /* English */ = {
@ -115,8 +116,8 @@
PBXFileDataSource_Warnings_ColumnID,
);
};
PBXPerProjectTemplateStateSaveDate = 306655362;
PBXWorkspaceStateSaveDate = 306655362;
PBXPerProjectTemplateStateSaveDate = 306660962;
PBXWorkspaceStateSaveDate = 306660962;
};
perUserProjectItems = {
48028D3E12156C670018F743 /* PBXTextBookmark */ = 48028D3E12156C670018F743 /* PBXTextBookmark */;
@ -126,17 +127,8 @@
48134A1D12102F680015BF15 /* PBXTextBookmark */ = 48134A1D12102F680015BF15 /* PBXTextBookmark */;
48134A1E12102F680015BF15 /* PBXTextBookmark */ = 48134A1E12102F680015BF15 /* PBXTextBookmark */;
4845112E1246256F0017BBC3 /* PBXTextBookmark */ = 4845112E1246256F0017BBC3 /* PBXTextBookmark */;
484511C81246277E0017BBC3 /* PBXTextBookmark */ = 484511C81246277E0017BBC3 /* PBXTextBookmark */;
484511D7124628040017BBC3 /* PBXTextBookmark */ = 484511D7124628040017BBC3 /* PBXTextBookmark */;
484511D8124628040017BBC3 /* PBXTextBookmark */ = 484511D8124628040017BBC3 /* PBXTextBookmark */;
484511D9124628040017BBC3 /* PBXTextBookmark */ = 484511D9124628040017BBC3 /* PBXTextBookmark */;
484511DA124628040017BBC3 /* PBXTextBookmark */ = 484511DA124628040017BBC3 /* PBXTextBookmark */;
484511DB124628040017BBC3 /* PBXTextBookmark */ = 484511DB124628040017BBC3 /* PBXTextBookmark */;
484511DC124628040017BBC3 /* PBXTextBookmark */ = 484511DC124628040017BBC3 /* PBXTextBookmark */;
484511DE124628040017BBC3 /* PBXTextBookmark */ = 484511DE124628040017BBC3 /* PBXTextBookmark */;
484511DF124628040017BBC3 /* PBXTextBookmark */ = 484511DF124628040017BBC3 /* PBXTextBookmark */;
484511E0124628040017BBC3 /* PBXTextBookmark */ = 484511E0124628040017BBC3 /* PBXTextBookmark */;
484511FA124629AC0017BBC3 /* PBXTextBookmark */ = 484511FA124629AC0017BBC3 /* PBXTextBookmark */;
4861FA9012144B5300BBDEF1 /* PBXTextBookmark */ = 4861FA9012144B5300BBDEF1 /* PBXTextBookmark */;
4861FA9212144B5300BBDEF1 /* PBXTextBookmark */ = 4861FA9212144B5300BBDEF1 /* PBXTextBookmark */;
48821E16120DF1150008EE50 /* PBXTextBookmark */ = 48821E16120DF1150008EE50 /* PBXTextBookmark */;
@ -153,14 +145,25 @@
48ADA3D512449A40008DB120 /* PBXTextBookmark */ = 48ADA3D512449A40008DB120 /* PBXTextBookmark */;
48ADA3DA12449A40008DB120 /* PBXTextBookmark */ = 48ADA3DA12449A40008DB120 /* PBXTextBookmark */;
48ADA3EB12449C30008DB120 /* PBXTextBookmark */ = 48ADA3EB12449C30008DB120 /* PBXTextBookmark */;
48ADECCB1243E81B000AF19C /* PBXTextBookmark */ = 48ADECCB1243E81B000AF19C /* PBXTextBookmark */;
48BB6B1E124731BE001239EF /* PBXTextBookmark */ = 48BB6B1E124731BE001239EF /* PBXTextBookmark */;
48BB6B20124731BE001239EF /* PBXTextBookmark */ = 48BB6B20124731BE001239EF /* PBXTextBookmark */;
48BB6B21124731BE001239EF /* PBXTextBookmark */ = 48BB6B21124731BE001239EF /* PBXTextBookmark */;
48BB6B22124731BE001239EF /* PBXTextBookmark */ = 48BB6B22124731BE001239EF /* PBXTextBookmark */;
48BB6B4D12473484001239EF /* PBXTextBookmark */ = 48BB6B4D12473484001239EF /* PBXTextBookmark */;
48BB6B4E12473484001239EF /* PlistBookmark */ = 48BB6B4E12473484001239EF /* PlistBookmark */;
48BB6B5112473527001239EF /* PlistBookmark */ = 48BB6B5112473527001239EF /* PlistBookmark */;
48E31D6612474E88003972E7 /* PBXTextBookmark */ = 48E31D6612474E88003972E7 /* PBXTextBookmark */;
48E31D6712474E88003972E7 /* PBXTextBookmark */ = 48E31D6712474E88003972E7 /* PBXTextBookmark */;
48E31D6812474E88003972E7 /* PBXTextBookmark */ = 48E31D6812474E88003972E7 /* PBXTextBookmark */;
48E31D6912474E88003972E7 /* PlistBookmark */ = 48E31D6912474E88003972E7 /* PlistBookmark */;
48E31D6A12474E88003972E7 /* PBXTextBookmark */ = 48E31D6A12474E88003972E7 /* PBXTextBookmark */;
48E31D6B12474E88003972E7 /* PBXTextBookmark */ = 48E31D6B12474E88003972E7 /* PBXTextBookmark */;
48E31D6C12474E88003972E7 /* PBXTextBookmark */ = 48E31D6C12474E88003972E7 /* PBXTextBookmark */;
48E31D6D12474E88003972E7 /* PBXTextBookmark */ = 48E31D6D12474E88003972E7 /* PBXTextBookmark */;
48E31D6E12474E88003972E7 /* PBXTextBookmark */ = 48E31D6E12474E88003972E7 /* PBXTextBookmark */;
48E31D6F12474E88003972E7 /* PBXTextBookmark */ = 48E31D6F12474E88003972E7 /* PBXTextBookmark */;
48E31D7012474E88003972E7 /* PBXTextBookmark */ = 48E31D7012474E88003972E7 /* PBXTextBookmark */;
48E31D7112474E88003972E7 /* PBXTextBookmark */ = 48E31D7112474E88003972E7 /* PBXTextBookmark */;
48E31D7212474E88003972E7 /* PBXTextBookmark */ = 48E31D7212474E88003972E7 /* PBXTextBookmark */;
48E31D7312474E88003972E7 /* XCBuildMessageTextBookmark */ = 48E31D7312474E88003972E7 /* XCBuildMessageTextBookmark */;
48E31D7412474E88003972E7 /* PBXTextBookmark */ = 48E31D7412474E88003972E7 /* PBXTextBookmark */;
48F89F411243A3BA00EB68FB /* PBXTextBookmark */ = 48F89F411243A3BA00EB68FB /* PBXTextBookmark */;
48F89F611243AD1E00EB68FB /* PBXTextBookmark */ = 48F89F611243AD1E00EB68FB /* PBXTextBookmark */;
};
@ -280,16 +283,17 @@
};
483A78130D2EEA5400CB2E4C /* console.c */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {1343, 16809}}";
sepNavIntBoundsRect = "{{0, 0}, {1142, 16770}}";
sepNavSelRange = "{14231, 0}";
sepNavVisRange = "{13841, 810}";
sepNavWindowFrame = "{{38, 119}, {987, 733}}";
};
};
483A781D0D2EEA5400CB2E4C /* sbar.c */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {1411, 16848}}";
sepNavSelRange = "{639, 0}";
sepNavVisRange = "{0, 1513}";
sepNavIntBoundsRect = "{{0, 0}, {1142, 16991}}";
sepNavSelRange = "{12747, 0}";
sepNavVisRange = "{12337, 1030}";
};
};
483A78360D2EEA6D00CB2E4C /* in_sdl.c */ = {
@ -330,26 +334,6 @@
vrLen = 786;
vrLoc = 0;
};
484511C81246277E0017BBC3 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 4890A4601205A27B00452753 /* SUUpdaterDelegate.h */;
name = "SUUpdaterDelegate.h: 21";
rLen = 28;
rLoc = 767;
rType = 0;
vrLen = 1195;
vrLoc = 0;
};
484511D7124628040017BBC3 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 48FE585A0D3A82C8006BB491 /* QuakeArguments.m */;
name = "QuakeArguments.m: 69";
rLen = 0;
rLoc = 1991;
rType = 0;
vrLen = 716;
vrLoc = 5176;
};
484511D8124628040017BBC3 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 489D8D2D0D3A630D00AA4471 /* ScreenInfo.h */;
@ -370,76 +354,6 @@
vrLen = 683;
vrLoc = 411;
};
484511DA124628040017BBC3 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 48B9E7BF0D340EA80001CACF /* SDLApplication.m */;
name = "SDLApplication.m: 1";
rLen = 0;
rLoc = 0;
rType = 0;
vrLen = 976;
vrLoc = 0;
};
484511DB124628040017BBC3 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 002F3A2C09D0888800EBEB88 /* SDLMain.m */;
name = "SDLMain.m: 1";
rLen = 0;
rLoc = 0;
rType = 0;
vrLen = 1056;
vrLoc = 0;
};
484511DC124628040017BBC3 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 48C85E3A0D3AD10E00797678 /* QuakeArgument.m */;
name = "QuakeArgument.m: 1";
rLen = 0;
rLoc = 0;
rType = 0;
vrLen = 455;
vrLoc = 1157;
};
484511DE124628040017BBC3 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 4890A5D11205D55700452753 /* UpdateButton.m */;
name = "UpdateButton.m: 14";
rLen = 0;
rLoc = 203;
rType = 0;
vrLen = 312;
vrLoc = 0;
};
484511DF124628040017BBC3 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 4890A5D01205D55700452753 /* UpdateButton.h */;
name = "UpdateButton.h: 14";
rLen = 0;
rLoc = 210;
rType = 0;
vrLen = 218;
vrLoc = 0;
};
484511E0124628040017BBC3 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 48B9E7A50D340BEA0001CACF /* AppController.h */;
name = "AppController.h: 26";
rLen = 0;
rLoc = 881;
rType = 0;
vrLen = 831;
vrLoc = 645;
};
484511FA124629AC0017BBC3 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 48B9E7A60D340BEA0001CACF /* AppController.m */;
name = "AppController.m: 115";
rLen = 0;
rLoc = 3743;
rType = 0;
vrLen = 1280;
vrLoc = 2769;
};
4847CD3D12057F05000B560F /* QuakeSpasm */ = {
isa = PBXExecutable;
activeArgIndices = (
@ -510,6 +424,13 @@
vrLen = 1193;
vrLoc = 0;
};
486577CA0D31A22A00E7920A /* snd_mix.c */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {1142, 3627}}";
sepNavSelRange = "{0, 0}";
sepNavVisRange = "{0, 1155}";
};
};
48728D280D3004A70004D61B /* net_dgrm.c */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {1168, 18395}}";
@ -536,16 +457,16 @@
};
4890A4601205A27B00452753 /* SUUpdaterDelegate.h */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {1142, 455}}";
sepNavSelRange = "{767, 28}";
sepNavVisRange = "{0, 1195}";
sepNavIntBoundsRect = "{{0, 0}, {1142, 468}}";
sepNavSelRange = "{1088, 0}";
sepNavVisRange = "{3, 1250}";
};
};
4890A4611205A27B00452753 /* SUUpdaterDelegate.m */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {1142, 845}}";
sepNavSelRange = "{1018, 0}";
sepNavVisRange = "{775, 1214}";
sepNavIntBoundsRect = "{{0, 0}, {1142, 1014}}";
sepNavSelRange = "{2019, 247}";
sepNavVisRange = "{1315, 1209}";
};
};
4890A5541205C1FF00452753 /* PBXTextBookmark */ = {
@ -560,14 +481,14 @@
};
4890A5D01205D55700452753 /* UpdateButton.h */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {1142, 429}}";
sepNavIntBoundsRect = "{{0, 0}, {1142, 438}}";
sepNavSelRange = "{210, 0}";
sepNavVisRange = "{0, 218}";
};
};
4890A5D11205D55700452753 /* UpdateButton.m */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {1142, 429}}";
sepNavIntBoundsRect = "{{0, 0}, {1142, 438}}";
sepNavSelRange = "{203, 0}";
sepNavVisRange = "{0, 312}";
};
@ -714,7 +635,7 @@
hitCount = 0;
ignoreCount = 0;
lineNumber = 15;
modificationTime = 306656386.123739;
modificationTime = 306662465.427433;
originalNumberOfMultipleMatches = 1;
state = 0;
};
@ -758,7 +679,7 @@
hitCount = 0;
ignoreCount = 0;
lineNumber = 25;
modificationTime = 306656386.124303;
modificationTime = 306662465.4282;
originalNumberOfMultipleMatches = 1;
state = 0;
};
@ -850,28 +771,18 @@
48ADEC8E1243D946000AF19C /* Distribution */ = {
activeExec = 0;
};
48ADECCB1243E81B000AF19C /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 483A78130D2EEA5400CB2E4C /* console.c */;
name = "console.c: 685";
rLen = 0;
rLoc = 14231;
rType = 0;
vrLen = 810;
vrLoc = 13841;
};
48B9E7A50D340BEA0001CACF /* AppController.h */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {1142, 637}}";
sepNavSelRange = "{881, 0}";
sepNavVisRange = "{645, 831}";
sepNavIntBoundsRect = "{{0, 0}, {1142, 650}}";
sepNavSelRange = "{1263, 0}";
sepNavVisRange = "{585, 931}";
};
};
48B9E7A60D340BEA0001CACF /* AppController.m */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {1379, 2483}}";
sepNavSelRange = "{3743, 0}";
sepNavVisRange = "{2850, 1138}";
sepNavIntBoundsRect = "{{0, 0}, {1142, 2470}}";
sepNavSelRange = "{5006, 0}";
sepNavVisRange = "{4834, 1219}";
};
};
48B9E7BE0D340EA80001CACF /* SDLApplication.h */ = {
@ -885,19 +796,9 @@
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {1142, 455}}";
sepNavSelRange = "{0, 0}";
sepNavVisRange = "{0, 976}";
sepNavVisRange = "{0, 981}";
};
};
48BB6B1E124731BE001239EF /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 4890A4611205A27B00452753 /* SUUpdaterDelegate.m */;
name = "SUUpdaterDelegate.m: 29";
rLen = 0;
rLoc = 1018;
rType = 0;
vrLen = 1214;
vrLoc = 775;
};
48BB6B20124731BE001239EF /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 4890A5E71205D6D400452753 /* rnotes.html */;
@ -938,35 +839,164 @@
vrLen = 944;
vrLoc = 0;
};
48BB6B4E12473484001239EF /* PlistBookmark */ = {
isa = PlistBookmark;
fRef = 8D1107310486CEB800E47090 /* Info.plist */;
fallbackIsa = PBXBookmark;
isK = 0;
kPath = (
);
name = /Users/kristian/Dropbox/Dokumente/Code/XCode/QuakeSpasm/MacOSX/Info.plist;
rLen = 0;
rLoc = 9223372036854775807;
};
48BB6B5112473527001239EF /* PlistBookmark */ = {
isa = PlistBookmark;
fRef = 8D1107310486CEB800E47090 /* Info.plist */;
fallbackIsa = PBXBookmark;
isK = 0;
kPath = (
);
name = /Users/kristian/Dropbox/Dokumente/Code/XCode/QuakeSpasm/MacOSX/Info.plist;
rLen = 0;
rLoc = 9223372036854775807;
};
48C85E3A0D3AD10E00797678 /* QuakeArgument.m */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {1142, 1053}}";
sepNavSelRange = "{0, 0}";
sepNavVisRange = "{1157, 455}";
sepNavVisRange = "{1156, 456}";
};
};
48E31D6612474E88003972E7 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 486577CA0D31A22A00E7920A /* snd_mix.c */;
name = "snd_mix.c: 1";
rLen = 0;
rLoc = 0;
rType = 0;
vrLen = 1155;
vrLoc = 0;
};
48E31D6712474E88003972E7 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 48B9E7A50D340BEA0001CACF /* AppController.h */;
name = "AppController.h: 37";
rLen = 0;
rLoc = 1263;
rType = 0;
vrLen = 931;
vrLoc = 585;
};
48E31D6812474E88003972E7 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 4890A4601205A27B00452753 /* SUUpdaterDelegate.h */;
name = "SUUpdaterDelegate.h: 30";
rLen = 0;
rLoc = 1088;
rType = 0;
vrLen = 1250;
vrLoc = 3;
};
48E31D6912474E88003972E7 /* PlistBookmark */ = {
isa = PlistBookmark;
fRef = 8D1107310486CEB800E47090 /* Info.plist */;
fallbackIsa = PBXBookmark;
isK = 0;
kPath = (
CFBundleVersion,
);
name = /Users/kristian/Dropbox/Dokumente/Code/XCode/QuakeSpasm/MacOSX/Info.plist;
rLen = 0;
rLoc = 9223372036854775807;
};
48E31D6A12474E88003972E7 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 4890A5D01205D55700452753 /* UpdateButton.h */;
name = "UpdateButton.h: 14";
rLen = 0;
rLoc = 210;
rType = 0;
vrLen = 218;
vrLoc = 0;
};
48E31D6B12474E88003972E7 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 4890A5D11205D55700452753 /* UpdateButton.m */;
name = "UpdateButton.m: 14";
rLen = 0;
rLoc = 203;
rType = 0;
vrLen = 312;
vrLoc = 0;
};
48E31D6C12474E88003972E7 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 48C85E3A0D3AD10E00797678 /* QuakeArgument.m */;
name = "QuakeArgument.m: 1";
rLen = 0;
rLoc = 0;
rType = 0;
vrLen = 456;
vrLoc = 1156;
};
48E31D6D12474E88003972E7 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 4890A4611205A27B00452753 /* SUUpdaterDelegate.m */;
name = "SUUpdaterDelegate.m: 59";
rLen = 247;
rLoc = 2019;
rType = 0;
vrLen = 1209;
vrLoc = 1315;
};
48E31D6E12474E88003972E7 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 48B9E7BF0D340EA80001CACF /* SDLApplication.m */;
name = "SDLApplication.m: 1";
rLen = 0;
rLoc = 0;
rType = 0;
vrLen = 981;
vrLoc = 0;
};
48E31D6F12474E88003972E7 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 48FE585A0D3A82C8006BB491 /* QuakeArguments.m */;
name = "QuakeArguments.m: 155";
rLen = 0;
rLoc = 4310;
rType = 0;
vrLen = 710;
vrLoc = 4171;
};
48E31D7012474E88003972E7 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 48B9E7A60D340BEA0001CACF /* AppController.m */;
name = "AppController.m: 147";
rLen = 0;
rLoc = 5006;
rType = 0;
vrLen = 1219;
vrLoc = 4834;
};
48E31D7112474E88003972E7 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 483A781D0D2EEA5400CB2E4C /* sbar.c */;
name = "sbar.c: 507";
rLen = 0;
rLoc = 12747;
rType = 0;
vrLen = 1030;
vrLoc = 12337;
};
48E31D7212474E88003972E7 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 483A78130D2EEA5400CB2E4C /* console.c */;
name = "console.c: 685";
rLen = 0;
rLoc = 14231;
rType = 0;
vrLen = 810;
vrLoc = 13841;
};
48E31D7312474E88003972E7 /* XCBuildMessageTextBookmark */ = {
isa = PBXTextBookmark;
comments = "'poseAsClass:' is deprecated (declared at /Developer/SDKs/MacOSX10.5.sdk/System/Library/Frameworks/Foundation.framework/Headers/NSObject.h:122)";
fRef = 002F3A2C09D0888800EBEB88 /* SDLMain.m */;
fallbackIsa = XCBuildMessageTextBookmark;
rLen = 1;
rLoc = 80;
rType = 1;
};
48E31D7412474E88003972E7 /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 002F3A2C09D0888800EBEB88 /* SDLMain.m */;
name = "SDLMain.m: 63";
rLen = 0;
rLoc = 1666;
rType = 0;
vrLen = 823;
vrLoc = 1506;
};
48F89F411243A3BA00EB68FB /* PBXTextBookmark */ = {
isa = PBXTextBookmark;
fRef = 089C165DFE840E0CC02AAC07 /* English */;
@ -1003,9 +1033,9 @@
};
48FE585A0D3A82C8006BB491 /* QuakeArguments.m */ = {
uiCtxt = {
sepNavIntBoundsRect = "{{0, 0}, {1142, 2938}}";
sepNavSelRange = "{1991, 0}";
sepNavVisRange = "{5176, 716}";
sepNavIntBoundsRect = "{{0, 0}, {1142, 2990}}";
sepNavSelRange = "{4310, 0}";
sepNavVisRange = "{4171, 710}";
};
};
8D1107260486CEB800E47090 /* QuakeSpasm */ = {

76
MacOSX/QuakeSpasm.xcodeproj/kristian.perspectivev3
View File

@ -275,10 +275,9 @@
<string>4890A5EA1205D6ED00452753</string>
<string>29B97323FDCFA39411CA2CEA</string>
<string>1058C7A0FEA54F0111CA2CBB</string>
<string>48348942120595B1004184BC</string>
<string>1058C7A2FEA54F0111CA2CBB</string>
<string>19C28FACFE9D520D11CA2CBB</string>
<string>1C37FBAC04509CD000000102</string>
<string>48BB6B13124730AB001239EF</string>
<string>1C37FAAC04509CD000000102</string>
<string>1CC0EA4004350EF90041110B</string>
<string>1C77FABC04509CD000000102</string>
@ -286,12 +285,13 @@
<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
<array>
<array>
<integer>67</integer>
<integer>66</integer>
<integer>3</integer>
<integer>1</integer>
<integer>0</integer>
</array>
</array>
<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
<string>{{0, 510}, {215, 697}}</string>
<string>{{0, 0}, {215, 697}}</string>
</dict>
<key>PBXTopSmartGroupGIDs</key>
<array/>
@ -319,12 +319,14 @@
<key>Dock</key>
<array>
<dict>
<key>BecomeActive</key>
<true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXProjectModuleGUID</key>
<string>4890A4C11205A7AE00452753</string>
<key>PBXProjectModuleLabel</key>
<string>Info.plist</string>
<string>SDLMain.m</string>
<key>PBXSplitModuleInNavigatorKey</key>
<dict>
<key>Split0</key>
@ -332,11 +334,11 @@
<key>PBXProjectModuleGUID</key>
<string>4890A4C21205A7AE00452753</string>
<key>PBXProjectModuleLabel</key>
<string>Info.plist</string>
<string>SDLMain.m</string>
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
<string>48BB6B5112473527001239EF</string>
<string>48E31D7412474E88003972E7</string>
<key>history</key>
<array>
<string>4890A5541205C1FF00452753</string>
@ -351,7 +353,6 @@
<string>480BB3A312174CA900939117</string>
<string>48F89F411243A3BA00EB68FB</string>
<string>48F89F611243AD1E00EB68FB</string>
<string>48ADECCB1243E81B000AF19C</string>
<string>48ADA34D12448DC4008DB120</string>
<string>48ADA38012448FF7008DB120</string>
<string>48ADA38A124490B6008DB120</string>
@ -365,23 +366,26 @@
<string>48ADA3DA12449A40008DB120</string>
<string>48ADA3EB12449C30008DB120</string>
<string>4845112E1246256F0017BBC3</string>
<string>484511C81246277E0017BBC3</string>
<string>484511D7124628040017BBC3</string>
<string>484511D8124628040017BBC3</string>
<string>484511D9124628040017BBC3</string>
<string>484511DA124628040017BBC3</string>
<string>484511DB124628040017BBC3</string>
<string>484511DC124628040017BBC3</string>
<string>484511DE124628040017BBC3</string>
<string>484511DF124628040017BBC3</string>
<string>484511E0124628040017BBC3</string>
<string>484511FA124629AC0017BBC3</string>
<string>48BB6B1E124731BE001239EF</string>
<string>48BB6B20124731BE001239EF</string>
<string>48BB6B21124731BE001239EF</string>
<string>48BB6B22124731BE001239EF</string>
<string>48BB6B4D12473484001239EF</string>
<string>48BB6B4E12473484001239EF</string>
<string>48E31D6612474E88003972E7</string>
<string>48E31D6712474E88003972E7</string>
<string>48E31D6812474E88003972E7</string>
<string>48E31D6912474E88003972E7</string>
<string>48E31D6A12474E88003972E7</string>
<string>48E31D6B12474E88003972E7</string>
<string>48E31D6C12474E88003972E7</string>
<string>48E31D6D12474E88003972E7</string>
<string>48E31D6E12474E88003972E7</string>
<string>48E31D6F12474E88003972E7</string>
<string>48E31D7012474E88003972E7</string>
<string>48E31D7112474E88003972E7</string>
<string>48E31D7212474E88003972E7</string>
<string>48E31D7312474E88003972E7</string>
</array>
</dict>
<key>SplitCount</key>
@ -395,18 +399,18 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
<string>{{0, 0}, {1203, 477}}</string>
<string>{{0, 0}, {1203, 470}}</string>
<key>RubberWindowFrame</key>
<string>0 122 1440 756 0 0 1440 878 </string>
</dict>
<key>Module</key>
<string>PBXNavigatorGroup</string>
<key>Proportion</key>
<string>477pt</string>
<string>470pt</string>
</dict>
<dict>
<key>Proportion</key>
<string>233pt</string>
<string>240pt</string>
<key>Tabs</key>
<array>
<dict>
@ -420,7 +424,7 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
<string>{{10, 27}, {1203, 206}}</string>
<string>{{10, 27}, {1203, 213}}</string>
</dict>
<key>Module</key>
<string>XCDetailModule</string>
@ -474,7 +478,7 @@
<key>GeometryConfiguration</key>
<dict>
<key>Frame</key>
<string>{{10, 27}, {1203, 206}}</string>
<string>{{10, 27}, {1203, 213}}</string>
<key>RubberWindowFrame</key>
<string>0 122 1440 756 0 0 1440 878 </string>
</dict>
@ -504,11 +508,11 @@
</array>
<key>TableOfContents</key>
<array>
<string>48BB6B15124730AB001239EF</string>
<string>48E31D4D12474671003972E7</string>
<string>1CA23ED40692098700951B8B</string>
<string>48BB6B16124730AB001239EF</string>
<string>48E31D4E12474671003972E7</string>
<string>4890A4C11205A7AE00452753</string>
<string>48BB6B17124730AB001239EF</string>
<string>48E31D4F12474671003972E7</string>
<string>1CA23EDF0692099D00951B8B</string>
<string>1CA23EE00692099D00951B8B</string>
<string>1CA23EE10692099D00951B8B</string>
@ -658,14 +662,14 @@
</array>
<key>TableOfContents</key>
<array>
<string>48BB6B24124731BE001239EF</string>
<string>48E31D7512474E88003972E7</string>
<string>1CCC7628064C1048000F2A68</string>
<string>1CCC7629064C1048000F2A68</string>
<string>48BB6B25124731BE001239EF</string>
<string>48BB6B26124731BE001239EF</string>
<string>48BB6B27124731BE001239EF</string>
<string>48BB6B28124731BE001239EF</string>
<string>48BB6B29124731BE001239EF</string>
<string>48E31D7612474E88003972E7</string>
<string>48E31D7712474E88003972E7</string>
<string>48E31D7812474E88003972E7</string>
<string>48E31D7912474E88003972E7</string>
<string>48E31D7A12474E88003972E7</string>
</array>
<key>ToolbarConfigUserDefaultsMinorVersion</key>
<string>2</string>
@ -699,8 +703,8 @@
<integer>5</integer>
<key>WindowOrderList</key>
<array>
<string>48BB6B2B124731BE001239EF</string>
<string>48BB6B2C124731BE001239EF</string>
<string>48E31D7B12474E88003972E7</string>
<string>48E31D7C12474E88003972E7</string>
<string>/Users/kristian/Dropbox/Dokumente/Code/XCode/QuakeSpasm/MacOSX/QuakeSpasm.xcodeproj</string>
</array>
<key>WindowString</key>

4
MacOSX/QuakeSpasm.xcodeproj/project.pbxproj
View File

@ -845,7 +845,6 @@
ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)";
ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc";
FRAMEWORK_SEARCH_PATHS = (
"$(HOME)/Library/Frameworks",
/Library/Frameworks,
"$(FRAMEWORK_SEARCH_PATHS)",
);
@ -853,7 +852,6 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = (
"$(HOME)/Library/Frameworks/SDL.framework/Headers",
/Library/Frameworks/SDL.framework/Headers,
"$(HEADER_SEARCH_PATHS)",
);
@ -868,7 +866,6 @@
ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)";
ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc";
FRAMEWORK_SEARCH_PATHS = (
"$(HOME)/Library/Frameworks",
/Library/Frameworks,
"$(FRAMEWORK_SEARCH_PATHS)",
);
@ -876,7 +873,6 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = (
"$(HOME)/Library/Frameworks/SDL.framework/Headers",
/Library/Frameworks/SDL.framework/Headers,
"$(HEADER_SEARCH_PATHS)",
);

3
MacOSX/SUUpdaterDelegate.h
View File

@ -24,9 +24,10 @@
NSTabView *updateTabView;
NSProgressIndicator *updateProgressIndicator;
NSButton *updateButton;
NSTextField *versionLabel;
}
- (id)initWithTabView:(NSTabView *)tabView indicator:(NSProgressIndicator *)indicator button:(NSButton *)button;
- (id)initWithTabView:(NSTabView *)tabView indicator:(NSProgressIndicator *)indicator button:(NSButton *)button label:(NSTextField *)label;
- (void)updater:(SUUpdater *)updater didFindValidUpdate:(SUAppcastItem *)update;
- (void)updaterDidNotFindUpdate:(SUUpdater *)updater;

14
MacOSX/SUUpdaterDelegate.m
View File

@ -22,8 +22,11 @@
@implementation SUUpdaterDelegate
- (id)initWithTabView:(NSTabView *)tabView indicator:(NSProgressIndicator *)indicator button:(NSButton *)button {
if (tabView == nil || indicator == nil || button == nil) {
- (id)initWithTabView:(NSTabView *)tabView
indicator:(NSProgressIndicator *)indicator
button:(NSButton *)button
label:(NSTextField *)label{
if (tabView == nil || indicator == nil || button == nil || label == nil) {
[self release];
return nil;
}
@ -32,6 +35,7 @@
updateTabView = [tabView retain];
updateProgressIndicator = [indicator retain];
updateButton = [button retain];
versionLabel = [label retain];
}
return self;
@ -52,6 +56,11 @@
}
- (void)updaterDidNotFindUpdate:(SUUpdater *)updater {
NSBundle* bundle = [NSBundle mainBundle];
NSString* version = [NSString stringWithFormat:@"Version %@", [bundle objectForInfoDictionaryKey:@"CFBundleVersion"], nil];
[versionLabel setStringValue:version];
[versionLabel sizeToFit];
[updateProgressIndicator stopAnimation:updater];
[updateTabView selectTabViewItemAtIndex:2];
}
@ -61,6 +70,7 @@
[updateTabView release];
[updateProgressIndicator release];
[updateButton release];
[versionLabel release];
[super dealloc];
}