From e11e63d79289d27dc13c4a7376fd3c382d6f9334 Mon Sep 17 00:00:00 2001 From: emsquared Date: Thu, 26 Jul 2012 18:38:34 -0400 Subject: [PATCH] Small change. --- Classes/Views/Channel View/TVCLogController.m | 4 +- .../project.pbxproj | 2 +- Resources/Info.plist | 4 +- .../English.lproj/TXCMainMenu.xib | 56 ++----------------- .../newMessagePostedWithSender.mustache | 2 +- 5 files changed, 12 insertions(+), 56 deletions(-) diff --git a/Classes/Views/Channel View/TVCLogController.m b/Classes/Views/Channel View/TVCLogController.m index 3256ba0a8c..daf5a01d26 100755 --- a/Classes/Views/Channel View/TVCLogController.m +++ b/Classes/Views/Channel View/TVCLogController.m @@ -785,7 +785,7 @@ - (BOOL)print:(TVCLogLine *)line withHTML:(BOOL)rawHTML @"imageURL" : imageUrl, @"anchorLink" : url, @"preferredMaximumWidth" : @([TPCPreferences inlineImagesMaxWidth]), - @"localizedHideTitle" : TXTLS(@"LogViewHideInlineImageMessage"), + @"localizedHideImageTitle" : TXTLS(@"LogViewHideInlineImageMessage"), }]; } @@ -898,7 +898,7 @@ - (void)writeLine:(id)line attributes:(NSMutableDictionary *)attrs [self setNeedsLimitNumberOfLines]; } - if ([attrs[@"highlight"] isEqualToString:@"true"]) { + if ([attrs[@"highlightAttributeRepresentation"] isEqualToString:@"true"]) { [self.highlightedLineNumbers safeAddObject:@(self.lineNumber)]; } diff --git a/Main Project (Textual).xcodeproj/project.pbxproj b/Main Project (Textual).xcodeproj/project.pbxproj index fffe0feb62..aa74553a3c 100644 --- a/Main Project (Textual).xcodeproj/project.pbxproj +++ b/Main Project (Textual).xcodeproj/project.pbxproj @@ -824,7 +824,7 @@ 4CCF2F161580481E006FFE21 /* FormattingColor_13.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FormattingColor_13.png; path = "Resources/Images/IRC Formatting Colors/FormattingColor_13.png"; sourceTree = SOURCE_ROOT; }; 4CCF2F171580481E006FFE21 /* FormattingColor_14.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FormattingColor_14.png; path = "Resources/Images/IRC Formatting Colors/FormattingColor_14.png"; sourceTree = SOURCE_ROOT; }; 4CCF2F181580481E006FFE21 /* FormattingColor_15.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = FormattingColor_15.png; path = "Resources/Images/IRC Formatting Colors/FormattingColor_15.png"; sourceTree = SOURCE_ROOT; }; - 4CCF2F5315804888006FFE21 /* core.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = core.js; path = Resources/Javascript/API/core.js; sourceTree = SOURCE_ROOT; }; + 4CCF2F5315804888006FFE21 /* core.js */ = {isa = PBXFileReference; explicitFileType = text; fileEncoding = 4; name = core.js; path = Resources/Javascript/API/core.js; sourceTree = SOURCE_ROOT; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ diff --git a/Resources/Info.plist b/Resources/Info.plist index 32cde08e54..c7584ca250 100755 --- a/Resources/Info.plist +++ b/Resources/Info.plist @@ -47,8 +47,8 @@ TXBundleBuildCodeName Turtle Soup TXBundleBuildNumber - 12099 + 12112 TXBundleBuildReference - 2.1.1-256-g0a72d38-debug,llvm4.0 + 2.1.1-257-g698aeb5-appstore,llvm4.0 diff --git a/Resources/Localization/English.lproj/TXCMainMenu.xib b/Resources/Localization/English.lproj/TXCMainMenu.xib index 4be3fd401e..9a9e87ad44 100755 --- a/Resources/Localization/English.lproj/TXCMainMenu.xib +++ b/Resources/Localization/English.lproj/TXCMainMenu.xib @@ -2,13 +2,13 @@ 1070 - 12A248 - 2541 - 1183 - 622.00 + 12A269 + 2549 + 1187 + 624.00 com.apple.InterfaceBuilder.CocoaPlugin - 2541 + 2549 NSBox @@ -617,8 +617,7 @@ Add Server… - + - 1048576 + 2147483647 @@ -3048,7 +3047,6 @@ 4352 {188, 513} - YES NO @@ -3155,7 +3153,6 @@ {188, 513} - @@ -3166,7 +3163,6 @@ -2147483392 {{173, 0}, {15, 514.82600000000002}} - NO @@ -3178,7 +3174,6 @@ -2147483392 {{-100, -100}, {223, 15}} - NO 1 @@ -3189,7 +3184,6 @@ {188, 513} - 133648 @@ -3213,13 +3207,11 @@ 274 {240, 513} - {240, 513} - YES {0, 0} @@ -3265,7 +3257,6 @@ 4353 {223, 513} - YES NO @@ -3329,7 +3320,6 @@ {223, 513} - @@ -3340,7 +3330,6 @@ -2147483392 {{212, 0}, {15, 517.93600000000004}} - NO @@ -3352,7 +3341,6 @@ -2147483392 {{-100, -100}, {224.64500000000001, 15}} - NO 1 @@ -3363,7 +3351,6 @@ {{-1, 0}, {223, 513}} - 133648 @@ -3377,14 +3364,12 @@ {{241, 0}, {222, 513}} - NSView {{189, 0}, {463, 513}} - YES 2 @@ -3392,7 +3377,6 @@ {{0, 37}, {652, 513}} - YES 2 @@ -3402,7 +3386,6 @@ 268 {{30, 284}, {101, 19}} - _NS:1534 YES @@ -3432,7 +3415,6 @@ {{144, 6}, {498, 23}} - _NS:9 TVCInputTextFieldBackground @@ -3448,28 +3430,8 @@ 2330 - - Apple HTML pasteboard type - Apple PDF pasteboard type - Apple PICT pasteboard type - Apple PNG pasteboard type - Apple URL pasteboard type - CorePasteboardFlavorType 0x6D6F6F76 - NSColor pasteboard type - NSFilenamesPboardType - NSStringPboardType - NeXT Encapsulated PostScript v1.2 pasteboard type - NeXT RTFD pasteboard type - NeXT Rich Text Format v1.0 pasteboard type - NeXT TIFF v4.0 pasteboard type - NeXT font pasteboard type - NeXT ruler pasteboard type - WebURLsWithTitlesPboardType - public.url - {498, 18} - _NS:3760 @@ -3529,7 +3491,6 @@ {498, 18} - _NS:3758 @@ -3565,7 +3526,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA -2147483392 {{481, 1}, {16, 13}} - _NS:3774 NO @@ -3577,7 +3537,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA -2147483392 {{-100, -100}, {87, 18}} - _NS:3762 NO @@ -3590,7 +3549,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA {{144, 9}, {498, 18}} - _NS:148 133648 @@ -3606,7 +3564,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA 260 {{10, 5}, {124, 25}} - _NS:9 YES @@ -3660,7 +3617,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA {652, 550} - {{0, 0}, {2560, 1418}} diff --git a/Resources/Styles/Style Default Templates/newMessagePostedWithSender.mustache b/Resources/Styles/Style Default Templates/newMessagePostedWithSender.mustache index 49fcb94981..2f5724ac29 100644 --- a/Resources/Styles/Style Default Templates/newMessagePostedWithSender.mustache +++ b/Resources/Styles/Style Default Templates/newMessagePostedWithSender.mustache @@ -25,7 +25,7 @@ {{#inlineMediaAvailable}} {{#inlineMediaArray}} - + {{/inlineMediaArray}} {{/inlineMediaAvailable}}