Skip to content

Commit b7e2ea1

Browse files
atgatg
committed
Beta 2
1 parent 2a6bb38 commit b7e2ea1

File tree

3 files changed

+250
-12
lines changed

3 files changed

+250
-12
lines changed

‎source/TCAppDelegate.m‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
142142
}
143143

144144
// Send times once every 10 minutes
145-
[NSTimer scheduledTimerWithTimeInterval:10 * 60 target:self selector:@selector(sendTimes) userInfo:nil repeats:YES];
145+
[NSTimer scheduledTimerWithTimeInterval:1 * 60 target:self selector:@selector(sendTimes) userInfo:nil repeats:YES];
146146

147147
NSMutableDictionary* registeredDefaults = [[NSMutableDictionary alloc] init];
148148
[registeredDefaults setValue:[NSNumber numberWithBool:YES] forKey:@"TCShowTrollface"];
@@ -201,15 +201,19 @@ - (void)sendTimes {
201201

202202
NSString* trollcodev = [self versionForRunningApp:[NSRunningApplication currentApplication]];
203203
NSString* xcodev = [self versionForRunningApp:[[NSRunningApplication runningApplicationsWithBundleIdentifier:XCODE_IDENTIFIER] lastObject]];
204+
NSString* nick = [[NSUserDefaults standardUserDefaults] valueForKey:@"TCNick"];
205+
if (![nick length])
206+
nick = @"anon";
207+
204208
NSString* submitURLString = [NSString stringWithFormat:@"http://chocolatapp.com/trollcode-server/submit.php?"
205-
@"trollcodev=%@&xcodev=%@&times=%@",
206-
trollcodev, xcodev, runningTimes];
209+
@"trollcodev=%@&xcodev=%@&times=%@&nick=%@",
210+
trollcodev, xcodev, runningTimes, nick];
207211

208212
NSLog(@"Submit URL = %@", submitURLString);
209213
dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
210214

211215
NSURL* submitURL = [NSURL URLWithString:submitURLString];
212-
NSString* result = nil;//[NSString stringWithContentsOfURL:submitURL encoding:NSUTF8StringEncoding error:NULL];
216+
NSString* result = [NSString stringWithContentsOfURL:submitURL encoding:NSUTF8StringEncoding error:NULL];
213217
NSLog(@"Our server said: %@", result);
214218
});
215219
}

‎trollcode/en.lproj/MainMenu.xib‎

Lines changed: 241 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,15 @@
1212
</object>
1313
<array key="IBDocument.IntegratedClassDependencies">
1414
<string>NSUserDefaultsController</string>
15+
<string>NSTextFieldCell</string>
1516
<string>NSMenuItem</string>
1617
<string>NSView</string>
1718
<string>NSButton</string>
1819
<string>NSWindowTemplate</string>
1920
<string>NSCustomObject</string>
21+
<string>NSTextField</string>
2022
<string>NSMenu</string>
23+
<string>NSBox</string>
2124
<string>NSButtonCell</string>
2225
</array>
2326
<array key="IBDocument.PluginDependencies">
@@ -1295,7 +1298,7 @@
12951298
<object class="NSWindowTemplate" id="972006081">
12961299
<int key="NSWindowStyleMask">15</int>
12971300
<int key="NSWindowBacking">2</int>
1298-
<string key="NSWindowRect">{{335, 390}, {413, 81}}</string>
1301+
<string key="NSWindowRect">{{335, 390}, {413, 137}}</string>
12991302
<int key="NSWTFlags">1954021376</int>
13001303
<string key="NSWindowTitle">trollcode</string>
13011304
<string key="NSWindowClass">NSWindow</string>
@@ -1308,8 +1311,9 @@
13081311
<object class="NSButton" id="753981213">
13091312
<reference key="NSNextResponder" ref="439893737"/>
13101313
<int key="NSvFlags">268</int>
1311-
<string key="NSFrame">{{18, 45}, {111, 18}}</string>
1314+
<string key="NSFrame">{{18, 101}, {111, 18}}</string>
13121315
<reference key="NSSuperview" ref="439893737"/>
1316+
<reference key="NSWindow"/>
13131317
<reference key="NSNextKeyView" ref="465448928"/>
13141318
<string key="NSReuseIdentifierKey">_NS:771</string>
13151319
<bool key="NSEnabled">YES</bool>
@@ -1342,9 +1346,10 @@
13421346
<object class="NSButton" id="465448928">
13431347
<reference key="NSNextResponder" ref="439893737"/>
13441348
<int key="NSvFlags">268</int>
1345-
<string key="NSFrame">{{18, 18}, {377, 18}}</string>
1349+
<string key="NSFrame">{{18, 74}, {377, 18}}</string>
13461350
<reference key="NSSuperview" ref="439893737"/>
1347-
<reference key="NSNextKeyView"/>
1351+
<reference key="NSWindow"/>
1352+
<reference key="NSNextKeyView" ref="687538451"/>
13481353
<string key="NSReuseIdentifierKey">_NS:771</string>
13491354
<bool key="NSEnabled">YES</bool>
13501355
<object class="NSButtonCell" key="NSCell" id="905921915">
@@ -1364,9 +1369,106 @@
13641369
<int key="NSPeriodicInterval">25</int>
13651370
</object>
13661371
</object>
1372+
<object class="NSTextField" id="214249930">
1373+
<reference key="NSNextResponder" ref="439893737"/>
1374+
<int key="NSvFlags">268</int>
1375+
<string key="NSFrame">{{93, 20}, {300, 22}}</string>
1376+
<reference key="NSSuperview" ref="439893737"/>
1377+
<reference key="NSWindow"/>
1378+
<reference key="NSNextKeyView"/>
1379+
<string key="NSReuseIdentifierKey">_NS:903</string>
1380+
<bool key="NSEnabled">YES</bool>
1381+
<object class="NSTextFieldCell" key="NSCell" id="902112985">
1382+
<int key="NSCellFlags">-1804468671</int>
1383+
<int key="NSCellFlags2">272630784</int>
1384+
<string key="NSContents"/>
1385+
<reference key="NSSupport" ref="590008589"/>
1386+
<string key="NSPlaceholderString">(so you can track your score)</string>
1387+
<string key="NSCellIdentifier">_NS:903</string>
1388+
<reference key="NSControlView" ref="214249930"/>
1389+
<bool key="NSDrawsBackground">YES</bool>
1390+
<object class="NSColor" key="NSBackgroundColor" id="890894924">
1391+
<int key="NSColorSpace">6</int>
1392+
<string key="NSCatalogName">System</string>
1393+
<string key="NSColorName">textBackgroundColor</string>
1394+
<object class="NSColor" key="NSColor">
1395+
<int key="NSColorSpace">3</int>
1396+
<bytes key="NSWhite">MQA</bytes>
1397+
</object>
1398+
</object>
1399+
<object class="NSColor" key="NSTextColor">
1400+
<int key="NSColorSpace">6</int>
1401+
<string key="NSCatalogName">System</string>
1402+
<string key="NSColorName">textColor</string>
1403+
<object class="NSColor" key="NSColor" id="972337401">
1404+
<int key="NSColorSpace">3</int>
1405+
<bytes key="NSWhite">MAA</bytes>
1406+
</object>
1407+
</object>
1408+
</object>
1409+
</object>
1410+
<object class="NSTextField" id="965720692">
1411+
<reference key="NSNextResponder" ref="439893737"/>
1412+
<int key="NSvFlags">268</int>
1413+
<string key="NSFrame">{{17, 22}, {71, 17}}</string>
1414+
<reference key="NSSuperview" ref="439893737"/>
1415+
<reference key="NSWindow"/>
1416+
<reference key="NSNextKeyView" ref="214249930"/>
1417+
<string key="NSReuseIdentifierKey">_NS:3944</string>
1418+
<bool key="NSEnabled">YES</bool>
1419+
<object class="NSTextFieldCell" key="NSCell" id="179032962">
1420+
<int key="NSCellFlags">68288064</int>
1421+
<int key="NSCellFlags2">272630784</int>
1422+
<string key="NSContents">Nickname:</string>
1423+
<reference key="NSSupport" ref="590008589"/>
1424+
<string key="NSCellIdentifier">_NS:3944</string>
1425+
<reference key="NSControlView" ref="965720692"/>
1426+
<object class="NSColor" key="NSBackgroundColor">
1427+
<int key="NSColorSpace">6</int>
1428+
<string key="NSCatalogName">System</string>
1429+
<string key="NSColorName">controlColor</string>
1430+
<object class="NSColor" key="NSColor">
1431+
<int key="NSColorSpace">3</int>
1432+
<bytes key="NSWhite">MC42NjY2NjY2ODY1AA</bytes>
1433+
</object>
1434+
</object>
1435+
<object class="NSColor" key="NSTextColor">
1436+
<int key="NSColorSpace">6</int>
1437+
<string key="NSCatalogName">System</string>
1438+
<string key="NSColorName">controlTextColor</string>
1439+
<reference key="NSColor" ref="972337401"/>
1440+
</object>
1441+
</object>
1442+
</object>
1443+
<object class="NSBox" id="687538451">
1444+
<reference key="NSNextResponder" ref="439893737"/>
1445+
<int key="NSvFlags">12</int>
1446+
<string key="NSFrame">{{0, 53}, {413, 5}}</string>
1447+
<reference key="NSSuperview" ref="439893737"/>
1448+
<reference key="NSWindow"/>
1449+
<reference key="NSNextKeyView" ref="965720692"/>
1450+
<string key="NSReuseIdentifierKey">_NS:2411</string>
1451+
<string key="NSOffsets">{0, 0}</string>
1452+
<object class="NSTextFieldCell" key="NSTitleCell">
1453+
<int key="NSCellFlags">67239424</int>
1454+
<int key="NSCellFlags2">0</int>
1455+
<string key="NSContents">Box</string>
1456+
<reference key="NSSupport" ref="590008589"/>
1457+
<reference key="NSBackgroundColor" ref="890894924"/>
1458+
<object class="NSColor" key="NSTextColor">
1459+
<int key="NSColorSpace">3</int>
1460+
<bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes>
1461+
</object>
1462+
</object>
1463+
<int key="NSBorderType">3</int>
1464+
<int key="NSBoxType">2</int>
1465+
<int key="NSTitlePosition">0</int>
1466+
<bool key="NSTransparent">NO</bool>
1467+
</object>
13671468
</array>
1368-
<string key="NSFrameSize">{413, 81}</string>
1469+
<string key="NSFrameSize">{413, 137}</string>
13691470
<reference key="NSSuperview"/>
1471+
<reference key="NSWindow"/>
13701472
<reference key="NSNextKeyView" ref="753981213"/>
13711473
</object>
13721474
<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
@@ -2152,6 +2254,22 @@
21522254
</object>
21532255
<int key="connectionID">542</int>
21542256
</object>
2257+
<object class="IBConnectionRecord">
2258+
<object class="IBBindingConnection" key="connection">
2259+
<string key="label">value: values.TCNick</string>
2260+
<reference key="source" ref="214249930"/>
2261+
<reference key="destination" ref="361141709"/>
2262+
<object class="NSNibBindingConnector" key="connector">
2263+
<reference key="NSSource" ref="214249930"/>
2264+
<reference key="NSDestination" ref="361141709"/>
2265+
<string key="NSLabel">value: values.TCNick</string>
2266+
<string key="NSBinding">value</string>
2267+
<string key="NSKeyPath">values.TCNick</string>
2268+
<int key="NSNibBindingConnectorVersion">2</int>
2269+
</object>
2270+
</object>
2271+
<int key="connectionID">557</int>
2272+
</object>
21552273
</array>
21562274
<object class="IBMutableOrderedSet" key="objectRecords">
21572275
<array key="orderedObjects">
@@ -3152,6 +3270,9 @@
31523270
<array class="NSMutableArray" key="children">
31533271
<reference ref="753981213"/>
31543272
<reference ref="465448928"/>
3273+
<reference ref="687538451"/>
3274+
<reference ref="965720692"/>
3275+
<reference ref="214249930"/>
31553276
</array>
31563277
<reference key="parent" ref="972006081"/>
31573278
</object>
@@ -3211,6 +3332,37 @@
32113332
<reference key="object" ref="938935337"/>
32123333
<reference key="parent" ref="664800070"/>
32133334
</object>
3335+
<object class="IBObjectRecord">
3336+
<int key="objectID">552</int>
3337+
<reference key="object" ref="214249930"/>
3338+
<array class="NSMutableArray" key="children">
3339+
<reference ref="902112985"/>
3340+
</array>
3341+
<reference key="parent" ref="439893737"/>
3342+
</object>
3343+
<object class="IBObjectRecord">
3344+
<int key="objectID">553</int>
3345+
<reference key="object" ref="902112985"/>
3346+
<reference key="parent" ref="214249930"/>
3347+
</object>
3348+
<object class="IBObjectRecord">
3349+
<int key="objectID">554</int>
3350+
<reference key="object" ref="965720692"/>
3351+
<array class="NSMutableArray" key="children">
3352+
<reference ref="179032962"/>
3353+
</array>
3354+
<reference key="parent" ref="439893737"/>
3355+
</object>
3356+
<object class="IBObjectRecord">
3357+
<int key="objectID">555</int>
3358+
<reference key="object" ref="179032962"/>
3359+
<reference key="parent" ref="965720692"/>
3360+
</object>
3361+
<object class="IBObjectRecord">
3362+
<int key="objectID">556</int>
3363+
<reference key="object" ref="687538451"/>
3364+
<reference key="parent" ref="439893737"/>
3365+
</object>
32143366
</array>
32153367
</object>
32163368
<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -3363,6 +3515,11 @@
33633515
<string key="545.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
33643516
<string key="546.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
33653517
<string key="549.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
3518+
<string key="552.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
3519+
<string key="553.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
3520+
<string key="554.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
3521+
<string key="555.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
3522+
<string key="556.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
33663523
<string key="56.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
33673524
<string key="57.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
33683525
<string key="58.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -3382,9 +3539,86 @@
33823539
<nil key="activeLocalization"/>
33833540
<dictionary class="NSMutableDictionary" key="localizations"/>
33843541
<nil key="sourceID"/>
3385-
<int key="maxID">551</int>
3542+
<int key="maxID">557</int>
3543+
</object>
3544+
<object class="IBClassDescriber" key="IBDocument.Classes">
3545+
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
3546+
<object class="IBPartialClassDescription">
3547+
<string key="className">NSDocument</string>
3548+
<dictionary class="NSMutableDictionary" key="actions">
3549+
<string key="printDocument:">id</string>
3550+
<string key="revertDocumentToSaved:">id</string>
3551+
<string key="runPageLayout:">id</string>
3552+
<string key="saveDocument:">id</string>
3553+
<string key="saveDocumentAs:">id</string>
3554+
<string key="saveDocumentTo:">id</string>
3555+
</dictionary>
3556+
<dictionary class="NSMutableDictionary" key="actionInfosByName">
3557+
<object class="IBActionInfo" key="printDocument:">
3558+
<string key="name">printDocument:</string>
3559+
<string key="candidateClassName">id</string>
3560+
</object>
3561+
<object class="IBActionInfo" key="revertDocumentToSaved:">
3562+
<string key="name">revertDocumentToSaved:</string>
3563+
<string key="candidateClassName">id</string>
3564+
</object>
3565+
<object class="IBActionInfo" key="runPageLayout:">
3566+
<string key="name">runPageLayout:</string>
3567+
<string key="candidateClassName">id</string>
3568+
</object>
3569+
<object class="IBActionInfo" key="saveDocument:">
3570+
<string key="name">saveDocument:</string>
3571+
<string key="candidateClassName">id</string>
3572+
</object>
3573+
<object class="IBActionInfo" key="saveDocumentAs:">
3574+
<string key="name">saveDocumentAs:</string>
3575+
<string key="candidateClassName">id</string>
3576+
</object>
3577+
<object class="IBActionInfo" key="saveDocumentTo:">
3578+
<string key="name">saveDocumentTo:</string>
3579+
<string key="candidateClassName">id</string>
3580+
</object>
3581+
</dictionary>
3582+
<object class="IBClassDescriptionSource" key="sourceIdentifier">
3583+
<string key="majorKey">IBProjectSource</string>
3584+
<string key="minorKey">./Classes/NSDocument.h</string>
3585+
</object>
3586+
</object>
3587+
<object class="IBPartialClassDescription">
3588+
<string key="className">TCAppDelegate</string>
3589+
<string key="superclassName">NSObject</string>
3590+
<object class="NSMutableDictionary" key="actions">
3591+
<string key="NS.key.0">showPreferences:</string>
3592+
<string key="NS.object.0">id</string>
3593+
</object>
3594+
<object class="NSMutableDictionary" key="actionInfosByName">
3595+
<string key="NS.key.0">showPreferences:</string>
3596+
<object class="IBActionInfo" key="NS.object.0">
3597+
<string key="name">showPreferences:</string>
3598+
<string key="candidateClassName">id</string>
3599+
</object>
3600+
</object>
3601+
<dictionary class="NSMutableDictionary" key="outlets">
3602+
<string key="statusMenu">NSMenu</string>
3603+
<string key="window">NSWindow</string>
3604+
</dictionary>
3605+
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
3606+
<object class="IBToOneOutletInfo" key="statusMenu">
3607+
<string key="name">statusMenu</string>
3608+
<string key="candidateClassName">NSMenu</string>
3609+
</object>
3610+
<object class="IBToOneOutletInfo" key="window">
3611+
<string key="name">window</string>
3612+
<string key="candidateClassName">NSWindow</string>
3613+
</object>
3614+
</dictionary>
3615+
<object class="IBClassDescriptionSource" key="sourceIdentifier">
3616+
<string key="majorKey">IBProjectSource</string>
3617+
<string key="minorKey">./Classes/TCAppDelegate.h</string>
3618+
</object>
3619+
</object>
3620+
</array>
33863621
</object>
3387-
<object class="IBClassDescriber" key="IBDocument.Classes"/>
33883622
<int key="IBDocument.localizationMode">0</int>
33893623
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
33903624
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>

‎trollcode/trollcode-Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<key>CFBundlePackageType</key>
1818
<string>APPL</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>0.1</string>
20+
<string>0.2</string>
2121
<key>CFBundleSignature</key>
2222
<string>????</string>
2323
<key>CFBundleVersion</key>

0 commit comments

Comments
 (0)