Commits

Anonymous committed f9a1e74

Properly fix disabling the preview, as I broke the displays preview accidently.

  • Participants
  • Parent commits f8cc95e
  • Branches default

Comments (0)

Files changed (4)

File Core/Resources/English.lproj/GrowlPref.nib/classes.nib

-{
-    IBClasses = (
-        {
-            CLASS = DisplayPluginsWithDefaultArrayController; 
-            LANGUAGE = ObjC; 
-            SUPERCLASS = NSArrayController; 
-        }, 
-        {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
-        {CLASS = GrowlNotificationTicket; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
-        {
-            CLASS = GrowlPositionPicker; 
-            LANGUAGE = ObjC; 
-            OUTLETS = {preferencePane = GrowlPreferencePane; }; 
-            SUPERCLASS = NSView; 
-        }, 
-        {
-            ACTIONS = {
-                checkVersion = id; 
-                deleteTicket = id; 
-                endDisabledDisplays = id; 
-                openGrowlDonate = id; 
-                openGrowlForum = id; 
-                openGrowlTrac = id; 
-                openGrowlWebSite = id; 
-                playSound = id; 
-                resolveService = id; 
-                showDisabledDisplays = id; 
-                showPreview = id; 
-                startStopGrowl = id; 
-            }; 
-            CLASS = GrowlPreferencePane; 
-            LANGUAGE = ObjC; 
-            OUTLETS = {
-                aboutBoxTextView = NSTextView; 
-                appPositionPicker = GrowlPositionPicker; 
-                applicationNameAndIconColumn = NSTableColumn; 
-                applicationsTab = NSTabView; 
-                configurationTab = NSTabView; 
-                customMenuButton = NSPopUpButton; 
-                disabledDisplaysList = NSTextView; 
-                disabledDisplaysSheet = NSWindow; 
-                displayAuthor = NSTextField; 
-                displayDefaultPrefView = NSView; 
-                displayMenuButton = NSPopUpButton; 
-                displayPluginsArrayController = NSArrayController; 
-                displayPluginsTable = NSTableView; 
-                displayPrefView = NSView; 
-                displayVersion = NSTextField; 
-                globalPositionPicker = GrowlPositionPicker; 
-                growlApplications = NSTableView; 
-                growlRunningProgress = NSProgressIndicator; 
-                growlRunningStatus = NSTextField; 
-                growlVersionProgress = NSProgressIndicator; 
-                logFileType = NSMatrix; 
-                networkTableView = NSTableView; 
-                notificationDisplayMenuButton = NSPopUpButton; 
-                notificationPriorityMenu = NSMenu; 
-                notificationsArrayController = NSArrayController; 
-                previewButton = NSButton; 
-                servicePasswordColumn = NSTableColumn; 
-                servicesArrayController = NSArrayController; 
-                soundMenuButton = NSPopUpButton; 
-                startStopGrowl = NSButton; 
-                ticketsArrayController = TicketsArrayController; 
-            }; 
-            SUPERCLASS = NSPreferencePane; 
-        }, 
-        {CLASS = NSDatePicker; LANGUAGE = ObjC; SUPERCLASS = NSControl; }, 
-        {CLASS = NSObject; LANGUAGE = ObjC; }, 
-        {
-            CLASS = NSPreferencePane; 
-            LANGUAGE = ObjC; 
-            OUTLETS = {
-                "_firstKeyView" = id; 
-                "_initialKeyView" = id; 
-                "_lastKeyView" = id; 
-                "_window" = id; 
-            }; 
-            SUPERCLASS = NSObject; 
-        }, 
-        {
-            CLASS = NotificationsArrayController; 
-            LANGUAGE = ObjC; 
-            SUPERCLASS = NSArrayController; 
-        }, 
-        {CLASS = RRTableView; LANGUAGE = ObjC; SUPERCLASS = NSTableView; }, 
-        {
-            ACTIONS = {search = id; }; 
-            CLASS = TicketsArrayController; 
-            LANGUAGE = ObjC; 
-            SUPERCLASS = NSArrayController; 
-        }
-    ); 
-    IBVersion = 1; 
-}
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IBClasses</key>
+	<array>
+		<dict>
+			<key>CLASS</key>
+			<string>NotificationsArrayController</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSArrayController</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
+			<string>NSObject</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+		</dict>
+		<dict>
+			<key>ACTIONS</key>
+			<dict>
+				<key>search</key>
+				<string>id</string>
+			</dict>
+			<key>CLASS</key>
+			<string>TicketsArrayController</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSArrayController</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
+			<string>GrowlPositionPicker</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>OUTLETS</key>
+			<dict>
+				<key>preferencePane</key>
+				<string>GrowlPreferencePane</string>
+			</dict>
+			<key>SUPERCLASS</key>
+			<string>NSView</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
+			<string>RRTableView</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSTableView</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
+			<string>NSWindow</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSResponder</string>
+		</dict>
+		<dict>
+			<key>ACTIONS</key>
+			<dict>
+				<key>checkVersion</key>
+				<string>id</string>
+				<key>deleteTicket</key>
+				<string>id</string>
+				<key>endDisabledDisplays</key>
+				<string>id</string>
+				<key>openGrowlDonate</key>
+				<string>id</string>
+				<key>openGrowlForum</key>
+				<string>id</string>
+				<key>openGrowlTrac</key>
+				<string>id</string>
+				<key>openGrowlWebSite</key>
+				<string>id</string>
+				<key>playSound</key>
+				<string>id</string>
+				<key>resolveService</key>
+				<string>id</string>
+				<key>showDisabledDisplays</key>
+				<string>id</string>
+				<key>showPreview</key>
+				<string>id</string>
+				<key>startStopGrowl</key>
+				<string>id</string>
+			</dict>
+			<key>CLASS</key>
+			<string>GrowlPreferencePane</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>OUTLETS</key>
+			<dict>
+				<key>aboutBoxTextView</key>
+				<string>NSTextView</string>
+				<key>appPositionPicker</key>
+				<string>GrowlPositionPicker</string>
+				<key>applicationNameAndIconColumn</key>
+				<string>NSTableColumn</string>
+				<key>applicationsTab</key>
+				<string>NSTabView</string>
+				<key>configurationTab</key>
+				<string>NSTabView</string>
+				<key>customMenuButton</key>
+				<string>NSPopUpButton</string>
+				<key>disabledDisplaysList</key>
+				<string>NSTextView</string>
+				<key>disabledDisplaysSheet</key>
+				<string>NSWindow</string>
+				<key>displayAuthor</key>
+				<string>NSTextField</string>
+				<key>displayDefaultPrefView</key>
+				<string>NSView</string>
+				<key>displayMenuButton</key>
+				<string>NSPopUpButton</string>
+				<key>displayPluginsArrayController</key>
+				<string>NSArrayController</string>
+				<key>displayPluginsTable</key>
+				<string>NSTableView</string>
+				<key>displayPrefView</key>
+				<string>NSView</string>
+				<key>displayVersion</key>
+				<string>NSTextField</string>
+				<key>globalPositionPicker</key>
+				<string>GrowlPositionPicker</string>
+				<key>growlApplications</key>
+				<string>NSTableView</string>
+				<key>growlRunningProgress</key>
+				<string>NSProgressIndicator</string>
+				<key>growlRunningStatus</key>
+				<string>NSTextField</string>
+				<key>growlVersionProgress</key>
+				<string>NSProgressIndicator</string>
+				<key>logFileType</key>
+				<string>NSMatrix</string>
+				<key>networkTableView</key>
+				<string>NSTableView</string>
+				<key>notificationDisplayMenuButton</key>
+				<string>NSPopUpButton</string>
+				<key>notificationPriorityMenu</key>
+				<string>NSMenu</string>
+				<key>notificationsArrayController</key>
+				<string>NSArrayController</string>
+				<key>previewButton</key>
+				<string>NSButton</string>
+				<key>servicePasswordColumn</key>
+				<string>NSTableColumn</string>
+				<key>servicesArrayController</key>
+				<string>NSArrayController</string>
+				<key>soundMenuButton</key>
+				<string>NSPopUpButton</string>
+				<key>startStopGrowl</key>
+				<string>NSButton</string>
+				<key>ticketsArrayController</key>
+				<string>TicketsArrayController</string>
+			</dict>
+			<key>SUPERCLASS</key>
+			<string>NSPreferencePane</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
+			<string>NSView</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSResponder</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
+			<string>DisplayPluginsWithDefaultArrayController</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSArrayController</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
+			<string>FirstResponder</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>SUPERCLASS</key>
+			<string>NSObject</string>
+		</dict>
+		<dict>
+			<key>CLASS</key>
+			<string>NSPreferencePane</string>
+			<key>LANGUAGE</key>
+			<string>ObjC</string>
+			<key>OUTLETS</key>
+			<dict>
+				<key>_firstKeyView</key>
+				<string>id</string>
+				<key>_initialKeyView</key>
+				<string>id</string>
+				<key>_lastKeyView</key>
+				<string>id</string>
+				<key>_window</key>
+				<string>id</string>
+			</dict>
+			<key>SUPERCLASS</key>
+			<string>NSObject</string>
+		</dict>
+	</array>
+	<key>IBVersion</key>
+	<string>1</string>
+</dict>
+</plist>

File Core/Resources/English.lproj/GrowlPref.nib/info.nib

 <?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">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>IBDocumentLocation</key>
-	<string>56 297 480 292 0 0 1280 778 </string>
-	<key>IBEditorPositions</key>
-	<dict>
-		<key>234</key>
-		<string>653 536 374 331 0 0 1680 1028 </string>
-		<key>333</key>
-		<string>554 483 110 156 0 0 1440 878 </string>
-	</dict>
 	<key>IBFramework Version</key>
-	<string>446.1</string>
-	<key>IBLockedTabItems</key>
-	<array>
-		<integer>101</integer>
-		<integer>602</integer>
-	</array>
+	<string>629</string>
+	<key>IBLastKnownRelativeProjectPath</key>
+	<string>../../../../Growl.xcodeproj</string>
 	<key>IBOldestOS</key>
-	<integer>3</integer>
+	<integer>5</integer>
 	<key>IBOpenObjects</key>
 	<array>
-		<integer>12</integer>
+		<integer>100</integer>
 	</array>
 	<key>IBSystem Version</key>
-	<string>8R2218</string>
-	<key>IBUserGuides</key>
-	<dict>
-		<key>12</key>
-		<dict>
-			<key>guideLocations</key>
-			<array>
-				<string>Horizontal:266.000000</string>
-				<string>Vertical:286.000000</string>
-			</array>
-			<key>guidesLocked</key>
-			<false/>
-		</dict>
-	</dict>
+	<string>9A581</string>
+	<key>targetFramework</key>
+	<string>IBCocoaFramework</string>
 </dict>
 </plist>

File Core/Resources/English.lproj/GrowlPref.nib/keyedobjects.nib

Binary file modified.

File Core/Source/GrowlPreferencePane.m

 
 // Popup buttons that post preview notifications support suppressing the preview with the Option key
 - (IBAction) showPreview:(id)sender {
-	/*
 	if(([sender isKindOfClass:[NSPopUpButton class]]) && (GetCurrentKeyModifiers() & optionKey))
 		return;
 	
 		pluginToUse = [ticketsArrayController valueForKey: [[displayPluginsArrayController content] objectAtIndex:[(NSPopUpButton *)sender indexOfSelectedItem]]];
 			
 	[[NSDistributedNotificationCenter defaultCenter] postNotificationName:GrowlPreview
-																   object:[pluginToUse objectForKey:(NSString *)kCFBundleNameKey]]; */
+																   object:[pluginToUse objectForKey:(NSString *)kCFBundleNameKey]];
 }
 
 - (void) loadViewForDisplay:(NSString *)displayName {