Merge latest changes from upstream.

Geoff Nixon · Geoff Nixon · commit 16cad41b5c6b · 2013-10-10T00:49:29.000-07:00
diff --git a/Classes/Controllers/TXMasterController.m b/Classes/Controllers/TXMasterController.m
@@ -358,6 +358,11 @@ - (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sende
 	}
 }
 
+- (NSMenu *)applicationDockMenu:(NSApplication *)sender
+{
+	return self.dockMenu;
+}
+
 - (void)applicationWillTerminate:(NSNotification *)note
 {
 	[RZWorkspaceNotificationCenter() removeObserver:self];
diff --git a/Classes/Controllers/TXMenuController.m b/Classes/Controllers/TXMenuController.m
@@ -2234,31 +2234,37 @@ - (void)exportPreferences:(id)sender
 - (void)toggleMuteOnNotificationSounds:(id)sender
 {
 	NSMenu *fileMenu = [[[NSApp mainMenu] itemWithTag:2] submenu];
+	NSMenu *dockMenu =  [[NSApp delegate] applicationDockMenu:NSApp];
 
     if ([self.worldController isSoundMuted]) {
         self.worldController.isSoundMuted = NO;
 		
 		[[fileMenu itemWithTag:6666] setState:NSOffState];
+		[[dockMenu itemWithTag:6666] setState:NSOffState];
     } else {
 		self.worldController.isSoundMuted = YES;
 
 		[[fileMenu itemWithTag:6666] setState:NSOnState];
+		[[dockMenu itemWithTag:6666] setState:NSOnState];
     }
 }
 
 - (void)toggleMuteOnAllNotifcations:(id)sender
 {
 	/* Dig for the menu. */
 	NSMenu *fileMenu = [[[NSApp mainMenu] itemWithTag:2] submenu];
+	NSMenu *dockMenu =  [[NSApp delegate] applicationDockMenu:NSApp];
 
 	if ([self.worldController areNotificationsDisabled]) {
 		self.worldController.areNotificationsDisabled = NO;
 
 		[[fileMenu itemWithTag:6667] setState:NSOffState];
+		[[dockMenu itemWithTag:6667] setState:NSOffState];
 	} else {
 		self.worldController.areNotificationsDisabled = YES;
 
 		[[fileMenu itemWithTag:6667] setState:NSOnState];
+		[[dockMenu itemWithTag:6667] setState:NSOnState];
 	}
 }
 
diff --git a/Classes/Headers/TPCPreferences.h b/Classes/Headers/TPCPreferences.h
@@ -129,6 +129,8 @@ typedef enum TXMainTextBoxFontSize : NSInteger {
 
 + (BOOL)automaticallyDetectHighlightSpam;
 
++ (BOOL)rememberServerListQueryStates;
+
 + (TXMainTextBoxFontSize)mainTextBoxFontSize;
 
 + (BOOL)logTranscript;
diff --git a/Classes/Headers/TXMasterController.h b/Classes/Headers/TXMasterController.h
@@ -45,6 +45,7 @@
 @property (nonatomic, assign) BOOL applicationIsChangingActiveState;
 @property (nonatomic, assign) BOOL applicationIsRunningInHighResMode;
 @property (nonatomic, nweak) NSBox *channelViewBox;
+@property (nonatomic, nweak) NSMenu *dockMenu;
 @property (nonatomic, nweak) NSMenu *addServerMenu;
 @property (nonatomic, nweak) NSMenu *channelViewMenu;
 @property (nonatomic, nweak) NSMenu *tcopyURLMenu;
diff --git a/Classes/IRC/IRCChannelConfig.m b/Classes/IRC/IRCChannelConfig.m
@@ -225,18 +225,23 @@ - (NSMutableDictionary *)dictionaryValue
 	NSMutableDictionary *dic = [NSMutableDictionary dictionary];
 	
 	[dic setInteger:self.type forKey:@"channelType"];
-	
-	[dic setBool:self.autoJoin				forKey:@"joinOnConnect"];
-	[dic setBool:self.pushNotifications		forKey:@"enableNotifications"];
-    [dic setBool:self.ignoreHighlights		forKey:@"ignoreHighlights"];
-    [dic setBool:self.ignoreInlineImages	forKey:@"disableInlineMedia"];
-    [dic setBool:self.ignoreJPQActivity		forKey:@"ignoreJPQActivity"];
-	[dic setBool:self.showTreeBadgeCount	forKey:@"enableTreeBadgeCountDrawing"];
+
+	if (self.type == IRCChannelNormalType) {
+		[dic setBool:self.autoJoin				forKey:@"joinOnConnect"];
+		[dic setBool:self.pushNotifications		forKey:@"enableNotifications"];
+		[dic setBool:self.ignoreHighlights		forKey:@"ignoreHighlights"];
+		[dic setBool:self.ignoreInlineImages	forKey:@"disableInlineMedia"];
+		[dic setBool:self.ignoreJPQActivity		forKey:@"ignoreJPQActivity"];
+		[dic setBool:self.showTreeBadgeCount	forKey:@"enableTreeBadgeCountDrawing"];
+	}
 
 	[dic safeSetObject:self.itemUUID			forKey:@"uniqueIdentifier"];
 	[dic safeSetObject:self.channelName			forKey:@"channelName"];
-	[dic safeSetObject:self.defaultModes		forKey:@"defaultMode"];
-	[dic safeSetObject:self.defaultTopic		forKey:@"defaultTopic"];
+
+	if (self.type == IRCChannelNormalType) {
+		[dic safeSetObject:self.defaultModes		forKey:@"defaultMode"];
+		[dic safeSetObject:self.defaultTopic		forKey:@"defaultTopic"];
+	}
 	
 	return [dic sortedDictionary];
 }
diff --git a/Classes/IRC/IRCClient.m b/Classes/IRC/IRCClient.m
@@ -276,7 +276,7 @@ - (NSMutableDictionary *)dictionaryValue
 	NSMutableArray *ary = [NSMutableArray array];
 
 	for (IRCChannel *c in self.channels) {
-		if (c.isChannel) {
+		if (c.isChannel || [TPCPreferences rememberServerListQueryStates]) {
 			[ary safeAddObject:[c dictionaryValue]];
 		}
 	}
diff --git a/Classes/Preferences/TPCPreferences.m b/Classes/Preferences/TPCPreferences.m
@@ -706,6 +706,11 @@ + (BOOL)confirmQuit
 	return [RZUserDefaults() boolForKey:@"ConfirmApplicationQuit"];
 }
 
++ (BOOL)rememberServerListQueryStates
+{
+	return [RZUserDefaults() boolForKey:@"ServerListRetainsQueriesBetweenRestarts"];
+}
+
 + (BOOL)rejoinOnKick
 {
 	return [RZUserDefaults() boolForKey:@"RejoinChannelOnLocalKick"];
@@ -1388,6 +1393,7 @@ + (void)initPreferences
 	d[@"LogHighlights"]									= @(YES);
 	d[@"AutomaticallyDetectHighlightSpam"]				= @(YES);
 	d[@"LogTranscriptInBatches"]						= @(YES);
+	d[@"ReloadScrollbackOnLaunch"]						= @(YES);
 	d[@"ReplyUnignoredExternalCTCPRequests"]			= @(YES);
 	d[@"TrackNicknameHighlightsOfLocalUser"]			= @(YES);
 	d[@"WebKitDeveloperExtras"]							= @(YES);
diff --git a/Classes/Views/Channel View/TVCLogController.m b/Classes/Views/Channel View/TVCLogController.m
@@ -154,7 +154,7 @@ - (void)openHistoricLog
 
         [self.historicLogFile reset];
     } else {
-		if (self.historyLoaded == NO && (self.channel && self.channel.isPrivateMessage == NO)) {
+		if (self.historyLoaded == NO && (self.channel && (self.channel.isPrivateMessage == NO || [TPCPreferences rememberServerListQueryStates]))) {
 			[self reloadHistory];
 		}
 	}
@@ -173,7 +173,7 @@ - (void)closeHistoricLog
 	 then we call a save before terminating. Or, we just erase the file from the
 	 path that it is written to entirely. */
 
-	if ([TPCPreferences reloadScrollbackOnLaunch] && (self.channel.isChannel && self.channel)) {
+	if ([TPCPreferences reloadScrollbackOnLaunch] && ((self.channel.isChannel || [TPCPreferences rememberServerListQueryStates]) && self.channel)) {
 		[self.historicLogFile updateCache];
 	} else {
 		[self.historicLogFile reset];
diff --git a/Resources/Info.plist b/Resources/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.2.2</string>
+	<string>3.2.3</string>
 	<key>CFBundleURLTypes</key>
 	<array>
 		<dict>
@@ -34,7 +34,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>3.2.2</string>
+	<string>3.2.3</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.social-networking</string>
 	<key>LSMinimumSystemVersion</key>
@@ -46,6 +46,6 @@
 	<key>NSPrincipalClass</key>
 	<string>NSApplication</string>
 	<key>TXBundleBuildCodeName</key>
-	<string>Turtle Truffles</string>
+	<string>Purple Plums</string>
 </dict>
 </plist>
diff --git a/Resources/Localization/English.lproj/TDCPreferences.xib b/Resources/Localization/English.lproj/TDCPreferences.xib
@@ -2885,7 +2885,7 @@
                                         </connections>
                                     </button>
                                     <button id="7255">
-                                        <rect key="frame" x="10" y="174" width="201" height="18"/>
+                                        <rect key="frame" x="10" y="142" width="201" height="18"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                         <buttonCell key="cell" type="check" title="Darken main window colors." bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="7256">
                                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -2917,7 +2917,7 @@
                                         <font key="titleFont" metaFont="system"/>
                                     </box>
                                     <button id="7503">
-                                        <rect key="frame" x="10" y="202" width="284" height="18"/>
+                                        <rect key="frame" x="10" y="172" width="284" height="18"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                         <buttonCell key="cell" type="check" title="Use large font for the server list and user list." bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="7504">
                                             <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -2941,7 +2941,7 @@
                                         </connections>
                                     </button>
                                     <textField verticalHuggingPriority="750" id="kL4-Js-8e7">
-                                        <rect key="frame" x="46" y="123" width="134" height="16"/>
+                                        <rect key="frame" x="46" y="91" width="134" height="16"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Window Transparency:" id="bNd-e3-dZf">
                                             <font key="font" metaFont="cellTitle"/>
@@ -2950,7 +2950,7 @@
                                         </textFieldCell>
                                     </textField>
                                     <slider verticalHuggingPriority="750" id="D0f-oB-97t">
-                                        <rect key="frame" x="213" y="122" width="197" height="15"/>
+                                       <rect key="frame" x="185" y="96" width="25" height="11"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                         <sliderCell key="cell" controlSize="small" continuous="YES" state="on" alignment="left" minValue="0.20000000000000001" maxValue="1" doubleValue="1" tickMarkPosition="above" sliderType="linear" id="f75-2j-XO9"/>
                                         <connections>
@@ -2978,12 +2978,24 @@
                                         </textFieldCell>
                                     </textField>
                                     <box autoresizesSubviews="NO" verticalHuggingPriority="750" alphaValue="0.5" title="Box" boxType="separator" titlePosition="noTitle" id="SKs-oC-6WA">
-                                        <rect key="frame" x="29" y="155" width="442" height="5"/>
+                                        <rect key="frame" x="29" y="123" width="442" height="5"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                         <color key="borderColor" white="0.0" alpha="0.41999999999999998" colorSpace="calibratedWhite"/>
                                         <color key="fillColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                         <font key="titleFont" metaFont="system"/>
                                     </box>
+                                    <button id="891-QM-5Ov">
+                                        <rect key="frame" x="10" y="202" width="357" height="18"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                        <buttonCell key="cell" type="check" title="Save the state of queries between restarts." bezelStyle="regularSquare" imagePosition="left" alignment="left" state="on" inset="2" id="8az-P4-nKq">
+                                            <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                                            <font key="font" metaFont="titleBar" size="12"/>
+                                        </buttonCell>
+                                        <connections>
+                                            <action selector="onChangedUserListModeSortOrder:" target="-2" id="abL-CQ-nFE"/>
+                                            <binding destination="1247" name="value" keyPath="values.ServerListRetainsQueriesBetweenRestarts" id="p2W-nH-beb"/>
+                                        </connections>
+                                    </button>
                                 </subviews>
                             </view>
                         </tabViewItem>
diff --git a/Resources/Localization/English.lproj/TXCMainMenu.xib b/Resources/Localization/English.lproj/TXCMainMenu.xib
@@ -781,6 +781,7 @@ CQ
                 <outlet property="channelViewBox" destination="2806" id="2925"/>
                 <outlet property="channelViewMenu" destination="374" id="2942"/>
                 <outlet property="closeWindowMenuItem" destination="1770" id="2944"/>
+                <outlet property="dockMenu" destination="Q9Y-E0-gAT" id="aZo-Dh-Uts"/>
                 <outlet property="formattingMenu" destination="1930" id="2936"/>
                 <outlet property="inputTextField" destination="2871" id="2931"/>
                 <outlet property="joinChannelMenu" destination="963" id="2940"/>
@@ -2618,6 +2619,24 @@ CA
             </subviews>
         </customView>
         <userDefaultsController id="3106"/>
+        <menuItem title="File" tag="2" id="DYg-n3-mPQ" userLabel="Menu Item - Dock Menu">
+            <modifierMask key="keyEquivalentModifierMask"/>
+            <menu key="submenu" title="File" id="Q9Y-E0-gAT" userLabel="Menu - Dock Menu">
+                <items>
+                    <menuItem title="Disable All Notifications" tag="6667" id="dnc-ku-aQ3">
+                        <modifierMask key="keyEquivalentModifierMask"/>
+                        <connections>
+                            <action selector="toggleMuteOnAllNotifcations:" target="267" id="rEq-5t-bJ0"/>
+                        </connections>
+                    </menuItem>
+                    <menuItem title="Disable All Notification Sounds" tag="6666" keyEquivalent="M" id="5jG-1t-WG4">
+                        <connections>
+                            <action selector="toggleMuteOnNotificationSounds:" target="267" id="rBT-LB-lUy"/>
+                        </connections>
+                    </menuItem>
+                </items>
+            </menu>
+        </menuItem>
     </objects>
     <resources>
         <image name="FormattingColor_0" width="16" height="16"/>
diff --git a/Resources/Plugins/System Profiler/MacintoshModels.plist b/Resources/Plugins/System Profiler/MacintoshModels.plist
@@ -132,6 +132,10 @@
 	<string>iMac (21.5-inch Late 2012)</string>
 	<key>iMac13,2</key>
 	<string>iMac (27-inch Late 2012)</string>
+	<key>iMac14,2</key>
+	<string>iMac (27-inch Late 2013)</string>
+	<key>iMac14,1</key>
+	<string>iMac (21.5-inch Late 2013)</string>
 	<key>iMac4,1</key>
 	<string>iMac (Early 2006)</string>
 	<key>iMac4,2</key>

Original file line number	Diff line number	Diff line change
`@@ -358,6 +358,11 @@ - (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sende`
`358`	`358`	`}`
`359`	`359`	`}`
`360`	`360`
	`361`	`+- (NSMenu )applicationDockMenu:(NSApplication )sender`
	`362`	`+{`
	`363`	`+ return self.dockMenu;`
	`364`	`+}`
	`365`	`+`
`361`	`366`	`- (void)applicationWillTerminate:(NSNotification *)note`
`362`	`367`	`{`
`363`	`368`	`[RZWorkspaceNotificationCenter() removeObserver:self];`
Original file line number	Diff line number	Diff line change
`@@ -2234,31 +2234,37 @@ - (void)exportPreferences:(id)sender`
`2234`	`2234`	`- (void)toggleMuteOnNotificationSounds:(id)sender`
`2235`	`2235`	`{`
`2236`	`2236`	`NSMenu *fileMenu = [[[NSApp mainMenu] itemWithTag:2] submenu];`
	`2237`	`+ NSMenu *dockMenu = [[NSApp delegate] applicationDockMenu:NSApp];`
`2237`	`2238`
`2238`	`2239`	`if ([self.worldController isSoundMuted]) {`
`2239`	`2240`	`self.worldController.isSoundMuted = NO;`
`2240`	`2241`
`2241`	`2242`	`[[fileMenu itemWithTag:6666] setState:NSOffState];`
	`2243`	`+ [[dockMenu itemWithTag:6666] setState:NSOffState];`
`2242`	`2244`	`} else {`
`2243`	`2245`	`self.worldController.isSoundMuted = YES;`
`2244`	`2246`
`2245`	`2247`	`[[fileMenu itemWithTag:6666] setState:NSOnState];`
	`2248`	`+ [[dockMenu itemWithTag:6666] setState:NSOnState];`
`2246`	`2249`	`}`
`2247`	`2250`	`}`
`2248`	`2251`
`2249`	`2252`	`- (void)toggleMuteOnAllNotifcations:(id)sender`
`2250`	`2253`	`{`
`2251`	`2254`	`/* Dig for the menu. */`
`2252`	`2255`	`NSMenu *fileMenu = [[[NSApp mainMenu] itemWithTag:2] submenu];`
	`2256`	`+ NSMenu *dockMenu = [[NSApp delegate] applicationDockMenu:NSApp];`
`2253`	`2257`
`2254`	`2258`	`if ([self.worldController areNotificationsDisabled]) {`
`2255`	`2259`	`self.worldController.areNotificationsDisabled = NO;`
`2256`	`2260`
`2257`	`2261`	`[[fileMenu itemWithTag:6667] setState:NSOffState];`
	`2262`	`+ [[dockMenu itemWithTag:6667] setState:NSOffState];`
`2258`	`2263`	`} else {`
`2259`	`2264`	`self.worldController.areNotificationsDisabled = YES;`
`2260`	`2265`
`2261`	`2266`	`[[fileMenu itemWithTag:6667] setState:NSOnState];`
	`2267`	`+ [[dockMenu itemWithTag:6667] setState:NSOnState];`
`2262`	`2268`	`}`
`2263`	`2269`	`}`
`2264`	`2270`
Original file line number	Diff line number	Diff line change
`@@ -276,7 +276,7 @@ - (NSMutableDictionary *)dictionaryValue`
`276`	`276`	`NSMutableArray *ary = [NSMutableArray array];`
`277`	`277`
`278`	`278`	`for (IRCChannel *c in self.channels) {`
`279`		`- if (c.isChannel) {`
	`279`	`+ if (c.isChannel \|\| [TPCPreferences rememberServerListQueryStates]) {`
`280`	`280`	`[ary safeAddObject:[c dictionaryValue]];`
`281`	`281`	`}`
`282`	`282`	`}`