adium 5171:efe581fbdd07: Renamed AIAccountSelectionView to AITop...
commits at adium.im
commits at adium.im
Mon Oct 22 14:56:36 UTC 2012
details: http://hg.adium.im/adium/rev/efe581fbdd07
revision: 5171:efe581fbdd07
branch: adium-1.6
author: Thijs Alkemade <thijsalkemade at gmail.com>
date: Mon Oct 22 16:56:21 2012 +0200
Renamed AIAccountSelectionView to AITopBarGradientView, as it had nothing account-selection specific anymore.
diffs (289 lines):
diff -r 99bc9893d113 -r efe581fbdd07 Adium.xcodeproj/project.pbxproj
--- a/Adium.xcodeproj/project.pbxproj Mon Oct 22 16:51:45 2012 +0200
+++ b/Adium.xcodeproj/project.pbxproj Mon Oct 22 16:56:21 2012 +0200
@@ -1019,7 +1019,7 @@
4BD6753606001E0F0049CAF7 /* AIMessageTabViewItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BACB70203C8CB5E00A8010A /* AIMessageTabViewItem.m */; };
4BD6753806001E100049CAF7 /* AIMessageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F570A5CE03704D3D01A8010A /* AIMessageViewController.m */; };
4BD6753A06001E110049CAF7 /* AIMessageWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = F5793982033E756E01A8010A /* AIMessageWindowController.m */; };
- 4BD6753E06001E140049CAF7 /* AIAccountSelectionView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B25494703F6A32700A8010A /* AIAccountSelectionView.m */; };
+ 4BD6753E06001E140049CAF7 /* AITopBarGradientView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B25494703F6A32700A8010A /* AITopBarGradientView.m */; };
4BD6755406001E1E0049CAF7 /* DualWindowDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 34D43504051ADC10003B2F21 /* DualWindowDefaults.plist */; };
4BD6756B06001E320049CAF7 /* EventSoundDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 4BA5325D050FC5E800A8010A /* EventSoundDefaults.plist */; };
4BD6758206001E430049CAF7 /* ErrorMessageHandlerPlugin.m in Sources */ = {isa = PBXBuildFile; fileRef = 40AC0EEC03B5BF1000A80202 /* ErrorMessageHandlerPlugin.m */; };
@@ -3691,8 +3691,8 @@
4B191D890611C10800E8A4E7 /* ReadMe.rtf */ = {isa = PBXFileReference; lastKnownFileType = text.rtf; path = ReadMe.rtf; sourceTree = "<group>"; };
4B22E15C085CAE2E001864DE /* AIAbstractListObjectMenu.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AIAbstractListObjectMenu.h; path = "Frameworks/Adium Framework/Source/AIAbstractListObjectMenu.h"; sourceTree = "<group>"; };
4B22E15D085CAE2F001864DE /* AIAbstractListObjectMenu.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = AIAbstractListObjectMenu.m; path = "Frameworks/Adium Framework/Source/AIAbstractListObjectMenu.m"; sourceTree = "<group>"; };
- 4B25494603F6A32700A8010A /* AIAccountSelectionView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AIAccountSelectionView.h; path = "Plugins/Dual Window Interface/AIAccountSelectionView.h"; sourceTree = "<group>"; };
- 4B25494703F6A32700A8010A /* AIAccountSelectionView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIAccountSelectionView.m; path = "Plugins/Dual Window Interface/AIAccountSelectionView.m"; sourceTree = "<group>"; };
+ 4B25494603F6A32700A8010A /* AITopBarGradientView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AITopBarGradientView.h; path = "Plugins/Dual Window Interface/AITopBarGradientView.h"; sourceTree = "<group>"; };
+ 4B25494703F6A32700A8010A /* AITopBarGradientView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AITopBarGradientView.m; path = "Plugins/Dual Window Interface/AITopBarGradientView.m"; sourceTree = "<group>"; };
4B28DDAB0599FED200343093 /* AIAccountViewController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AIAccountViewController.h; path = "Frameworks/Adium Framework/Source/AIAccountViewController.h"; sourceTree = "<group>"; };
4B28DDAC0599FED200343093 /* AIAccountViewController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = AIAccountViewController.m; path = "Frameworks/Adium Framework/Source/AIAccountViewController.m"; sourceTree = "<group>"; };
4B292D3007A9C8E100C5F882 /* AIStatusController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AIStatusController.h; path = Source/AIStatusController.h; sourceTree = "<group>"; };
@@ -7080,8 +7080,8 @@
4BCFEC5803F5718700A8010A /* Other */ = {
isa = PBXGroup;
children = (
- 4B25494603F6A32700A8010A /* AIAccountSelectionView.h */,
- 4B25494703F6A32700A8010A /* AIAccountSelectionView.m */,
+ 4B25494603F6A32700A8010A /* AITopBarGradientView.h */,
+ 4B25494703F6A32700A8010A /* AITopBarGradientView.m */,
76AA11091635585E00A6EC4B /* AIAccountSelectionTopBar.xib */,
76AA110A1635585E00A6EC4B /* AIAccountSelectionViewController.h */,
76AA110B1635585E00A6EC4B /* AIAccountSelectionViewController.m */,
@@ -10168,7 +10168,7 @@
4BD6753606001E0F0049CAF7 /* AIMessageTabViewItem.m in Sources */,
4BD6753806001E100049CAF7 /* AIMessageViewController.m in Sources */,
4BD6753A06001E110049CAF7 /* AIMessageWindowController.m in Sources */,
- 4BD6753E06001E140049CAF7 /* AIAccountSelectionView.m in Sources */,
+ 4BD6753E06001E140049CAF7 /* AITopBarGradientView.m in Sources */,
4BD6758206001E430049CAF7 /* ErrorMessageHandlerPlugin.m in Sources */,
4BD6758406001E440049CAF7 /* ErrorMessageWindowController.m in Sources */,
4BAA1B550632EF0000D8B92C /* ESPanelAlertDetailPane.m in Sources */,
diff -r 99bc9893d113 -r efe581fbdd07 Plugins/Dual Window Interface/AIAccountSelectionTopBar.xib
--- a/Plugins/Dual Window Interface/AIAccountSelectionTopBar.xib Mon Oct 22 16:51:45 2012 +0200
+++ b/Plugins/Dual Window Interface/AIAccountSelectionTopBar.xib Mon Oct 22 16:56:21 2012 +0200
@@ -51,6 +51,7 @@
<string key="NSFrame">{{50, 2}, {212, 26}}</string>
<reference key="NSSuperview" ref="1005"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="30296573">
@@ -257,7 +258,7 @@
<reference key="NSSuperview" ref="323709103"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="476591228"/>
- <string key="NSClassName">AIAccountSelectionView</string>
+ <string key="NSClassName">AITopBarGradientView</string>
</object>
</array>
<string key="NSFrameSize">{480, 60}</string>
@@ -524,14 +525,6 @@
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
<object class="IBPartialClassDescription">
- <string key="className">AIAccountSelectionView</string>
- <string key="superclassName">NSView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/AIAccountSelectionView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
<string key="className">AIAccountSelectionViewController</string>
<string key="superclassName">AIMessageViewTopBarController</string>
<dictionary class="NSMutableDictionary" key="outlets">
@@ -620,6 +613,14 @@
</object>
</object>
<object class="IBPartialClassDescription">
+ <string key="className">AITopBarGradientView</string>
+ <string key="superclassName">NSView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">./Classes/AITopBarGradientView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="NSMutableDictionary" key="actions">
<string key="NS.key.0">selectServiceType:</string>
diff -r 99bc9893d113 -r efe581fbdd07 Plugins/Dual Window Interface/AIAccountSelectionView.h
--- a/Plugins/Dual Window Interface/AIAccountSelectionView.h Mon Oct 22 16:51:45 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-/*
- * Adium is the legal property of its developers, whose names are listed in the copyright file included
- * with this source distribution.
- *
- * This program is free software; you can redistribute it and/or modify it under the terms of the GNU
- * General Public License as published by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
- * Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with this program; if not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#import <Adium/AIAccountMenu.h>
-#import <Adium/AIContactMenu.h>
-
- at class AIChat;
-
- at interface AIAccountSelectionView : NSView {
-
-}
-
- at end
diff -r 99bc9893d113 -r efe581fbdd07 Plugins/Dual Window Interface/AIAccountSelectionView.m
--- a/Plugins/Dual Window Interface/AIAccountSelectionView.m Mon Oct 22 16:51:45 2012 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-/*
- * Adium is the legal property of its developers, whose names are listed in the copyright file included
- * with this source distribution.
- *
- * This program is free software; you can redistribute it and/or modify it under the terms of the GNU
- * General Public License as published by the Free Software Foundation; either version 2 of the License,
- * or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
- * Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with this program; if not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-#import <PSMTabBarControl/NSBezierPath_AMShading.h>
-#import "AIAccountSelectionView.h"
-
- at implementation AIAccountSelectionView
-
--(void)drawRect:(NSRect)aRect
-{
- NSBezierPath *path = [NSBezierPath bezierPathWithRect:self.bounds];
- [path linearGradientFillWithStartColor:[NSColor colorWithCalibratedWhite:0.79f alpha:1.0f]
- endColor:[NSColor colorWithCalibratedWhite:0.91f alpha:1.0f]];
-
- path = [NSBezierPath bezierPath];
-
- [path setLineWidth:2.0f];
-
- [path moveToPoint:NSMakePoint(NSMinX(self.bounds), NSMinY(self.bounds))];
- [path lineToPoint:NSMakePoint(NSMaxX(self.bounds), NSMinY(self.bounds))];
-
- [[NSColor colorWithCalibratedWhite:0.45f alpha:1.0f] setStroke];
- [path stroke];
-}
-
- at end
diff -r 99bc9893d113 -r efe581fbdd07 Plugins/Dual Window Interface/AITopBarGradientView.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Plugins/Dual Window Interface/AITopBarGradientView.h Mon Oct 22 16:56:21 2012 +0200
@@ -0,0 +1,26 @@
+/*
+ * Adium is the legal property of its developers, whose names are listed in the copyright file included
+ * with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the GNU
+ * General Public License as published by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with this program; if not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#import <Adium/AIAccountMenu.h>
+#import <Adium/AIContactMenu.h>
+
+ at class AIChat;
+
+ at interface AITopBarGradientView : NSView {
+
+}
+
+ at end
diff -r 99bc9893d113 -r efe581fbdd07 Plugins/Dual Window Interface/AITopBarGradientView.m
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/Plugins/Dual Window Interface/AITopBarGradientView.m Mon Oct 22 16:56:21 2012 +0200
@@ -0,0 +1,39 @@
+/*
+ * Adium is the legal property of its developers, whose names are listed in the copyright file included
+ * with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify it under the terms of the GNU
+ * General Public License as published by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
+ * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with this program; if not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#import <PSMTabBarControl/NSBezierPath_AMShading.h>
+#import "AITopBarGradientView.h"
+
+ at implementation AITopBarGradientView
+
+-(void)drawRect:(NSRect)aRect
+{
+ NSBezierPath *path = [NSBezierPath bezierPathWithRect:self.bounds];
+ [path linearGradientFillWithStartColor:[NSColor colorWithCalibratedWhite:0.79f alpha:1.0f]
+ endColor:[NSColor colorWithCalibratedWhite:0.91f alpha:1.0f]];
+
+ path = [NSBezierPath bezierPath];
+
+ [path setLineWidth:2.0f];
+
+ [path moveToPoint:NSMakePoint(NSMinX(self.bounds), NSMinY(self.bounds))];
+ [path lineToPoint:NSMakePoint(NSMaxX(self.bounds), NSMinY(self.bounds))];
+
+ [[NSColor colorWithCalibratedWhite:0.45f alpha:1.0f] setStroke];
+ [path stroke];
+}
+
+ at end
diff -r 99bc9893d113 -r efe581fbdd07 Plugins/Dual Window Interface/en.lproj/AIRejoinGroupChatTopBar.xib
--- a/Plugins/Dual Window Interface/en.lproj/AIRejoinGroupChatTopBar.xib Mon Oct 22 16:51:45 2012 +0200
+++ b/Plugins/Dual Window Interface/en.lproj/AIRejoinGroupChatTopBar.xib Mon Oct 22 16:56:21 2012 +0200
@@ -49,6 +49,7 @@
<string key="NSFrame">{{422, 4}, {51, 19}}</string>
<reference key="NSSuperview" ref="1005"/>
<reference key="NSWindow"/>
+ <reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="16184171">
@@ -117,7 +118,7 @@
<reference key="NSSuperview" ref="323709103"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="476591228"/>
- <string key="NSClassName">AIAccountSelectionView</string>
+ <string key="NSClassName">AITopBarGradientView</string>
</object>
</array>
<string key="NSFrameSize">{480, 30}</string>
@@ -272,14 +273,6 @@
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
<object class="IBPartialClassDescription">
- <string key="className">AIAccountSelectionView</string>
- <string key="superclassName">NSView</string>
- <object class="IBClassDescriptionSource" key="sourceIdentifier">
- <string key="majorKey">IBProjectSource</string>
- <string key="minorKey">./Classes/AIAccountSelectionView.h</string>
- </object>
- </object>
- <object class="IBPartialClassDescription">
<string key="className">AILocalizationButton</string>
<string key="superclassName">NSButton</string>
<dictionary class="NSMutableDictionary" key="outlets">
@@ -396,6 +389,14 @@
</object>
</object>
<object class="IBPartialClassDescription">
+ <string key="className">AITopBarGradientView</string>
+ <string key="superclassName">NSView</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">./Classes/AITopBarGradientView.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
<string key="className">NSObject</string>
<object class="NSMutableDictionary" key="actions">
<string key="NS.key.0">selectServiceType:</string>
More information about the commits
mailing list