Navigation

← Previous Changeset
Next Changeset →

Changeset 22498

Timestamp:

01/26/2008 05:36:58 PM (10 months ago)

Author:

evands

Message:

Set the area in which the window resize widget resides, in a vertical column, as needing display after the contact list scrolls when using the standard contact list. This is necessary because we use a small sized scroll bar which overlaps the resize widget. Fixes #9055

Files:

trunk/Adium.xcodeproj/project.pbxproj (modified) (4 diffs)
trunk/Resources/ContactListWindow.nib/classes.nib (modified) (2 diffs)
trunk/Resources/ContactListWindow.nib/info.nib (modified) (2 diffs)
trunk/Resources/ContactListWindow.nib/keyedobjects.nib (modified) (16 diffs)
trunk/Source/AIStandardListScrollView.h (added)
trunk/Source/AIStandardListScrollView.m (added)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/Adium.xcodeproj/project.pbxproj

r22492	r22498
534	534	3485DBCB09EBCE7400232CC4 /* ESPurpleRequestActionController.m in Sources / = {isa = PBXBuildFile; fileRef = 341E88690648FF1B00E0C828 / ESPurpleRequestActionController.m */; };
535	535	3485DBD009EBCE8200232CC4 /* Localizable.strings in Resources / = {isa = PBXBuildFile; fileRef = 3402E04D07CB0EB00044F818 / Localizable.strings */; };
	536	34891C140D4B75EE00AEF48C /* AIStandardListScrollView.m in Sources / = {isa = PBXBuildFile; fileRef = 34891C130D4B75EE00AEF48C / AIStandardListScrollView.m */; };
536	537	348B250D0A50A1C900B2B972 /* ESSourceListBackgroundView.m in Sources / = {isa = PBXBuildFile; fileRef = 348B250B0A50A1C900B2B972 / ESSourceListBackgroundView.m */; };
537	538	348C47170D3B20BE00FB6E7A /* AIMessageWindowOutgoingScrollView.m in Sources / = {isa = PBXBuildFile; fileRef = 348C47160D3B20BE00FB6E7A / AIMessageWindowOutgoingScrollView.m */; };
…	…
2705	2706	348862CD05645E94003C9627 /* ESFileTransfer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ESFileTransfer.h; path = "Frameworks/Adium Framework/Source/ESFileTransfer.h"; sourceTree = "<group>"; };
2706	2707	348862CE05645E95003C9627 /* ESFileTransfer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ESFileTransfer.m; path = "Frameworks/Adium Framework/Source/ESFileTransfer.m"; sourceTree = "<group>"; };
	2708	34891C120D4B75EE00AEF48C /* AIStandardListScrollView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AIStandardListScrollView.h; path = Source/AIStandardListScrollView.h; sourceTree = "<group>"; };
	2709	34891C130D4B75EE00AEF48C /* AIStandardListScrollView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AIStandardListScrollView.m; path = Source/AIStandardListScrollView.m; sourceTree = "<group>"; };
2707	2710	3489506A0CDE0CC5002FEB4D /* IKRecentPicture.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IKRecentPicture.h; path = Source/IKRecentPicture.h; sourceTree = "<group>"; };
2708	2711	348A8A190629A68C00FC6E03 /* en */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = en; path = "Plugins/Purple Service/en.lproj/ESPurpleJabberAccountView.nib"; sourceTree = "<group>"; };
…	…
6623	6626	34AE249B09BCCFA900A35B51 /* AIWindowDraggingView.h */,
6624	6627	34AE249C09BCCFA900A35B51 /* AIWindowDraggingView.m */,
	6628	34891C120D4B75EE00AEF48C /* AIStandardListScrollView.h */,
	6629	34891C130D4B75EE00AEF48C /* AIStandardListScrollView.m */,
6625	6630	);
6626	6631	name = "Standard Window";
…	…
9114	9119	0CFA98C90D35C18000A077C6 /* NSDataAdditions.m in Sources */,
9115	9120	348C47170D3B20BE00FB6E7A /* AIMessageWindowOutgoingScrollView.m in Sources */,
	9121	34891C140D4B75EE00AEF48C /* AIStandardListScrollView.m in Sources */,
9116	9122	);
9117	9123	runOnlyForDeploymentPostprocessing = 0;

trunk/Resources/ContactListWindow.nib/classes.nib

r20968	r22498
29	29	LANGUAGE = ObjC;
30	30	SUPERCLASS = NSTextField;
	31	},
	32	{
	33	CLASS = AIDockingPanel;
	34	LANGUAGE = ObjC;
	35	SUPERCLASS = NSPanel;
31	36	},
32	37	{
…	…
85	90	},
86	91	{
	92	CLASS = AIStandardListScrollView;
	93	LANGUAGE = ObjC;
	94	SUPERCLASS = AIAutoScrollView;
	95	},
	96	{
87	97	ACTIONS = {
88	98	activateFirstContact = id;

trunk/Resources/ContactListWindow.nib/info.nib

r20968	r22498
4	4	<dict>
5	5	<key>IBDocumentLocation</key>
6		<string>240 ~~60 356 240 0 0 1440 877~~ </string>
	6	<string>240 126 356 240 0 0 1440 878 </string>
7	7	<key>IBEditorPositions</key>
8	8	<dict>
9	9	<key>219</key>
10		<string>625 6~~06 190 78 0 0 1440 877~~ </string>
	10	<string>625 618 190 78 0 0 1440 878 </string>
11	11	</dict>
12	12	<key>IBFramework Version</key>
…	…
18	18	</array>
19	19	<key>IBSystem Version</key>
20		<string>9~~A527~~</string>
	20	<string>9B18</string>
21	21	<key>IBUsesTextArchiving</key>
22	22	<true/>

trunk/Resources/ContactListWindow.nib/keyedobjects.nib

r20968	r22498
272	272	</dict>
273	273	</dict>
274		<string>{{~~23, 12~~4}, {213, 411}}</string>
	274	<string>{{30, 354}, {213, 411}}</string>
275	275	<string></string>
276	276	<string>AIDockingWindow</string>
…	…
391	391	</dict>
392	392	<key>NSsFlags</key>
393		<integer>~~688~~</integer>
	393	<integer>560</integer>
394	394	<key>NSvFlags</key>
395	395	<integer>274</integer>
396	396	</dict>
397		<string>AI~~Auto~~ScrollView</string>
	397	<string>AIStandardListScrollView</string>
398	398	<string>NSScrollView</string>
399	399	<dict>
…	…
547	547	</dict>
548	548	<key>NSTvFlags</key>
549		<integer>4~~40401920~~</integer>
	549	<integer>438304768</integer>
550	550	<key>NSvFlags</key>
551	551	<integer>274</integer>
…	…
1036	1036	<integer>63</integer>
1037	1037	</dict>
1038		~~<key>NSEnabled</key>~~
1039		~~<true/>~~
1040	1038	<key>NSFrame</key>
1041	1039	<dict>
…	…
1078	1076	<string>NSView</string>
1079	1077	</dict>
1080		<string>{{0, 0}, {1440, 877}}</string>
	1078	<string>{{0, 0}, {1440, 878}}</string>
1081	1079	<string>{72, 62}</string>
1082	1080	<string>{3.40282e+38, 3.40282e+38}</string>
…	…
1794	1792	<dict>
1795	1793	<key>CF$UID</key>
	1794	<integer>85</integer>
	1795	</dict>
	1796	<dict>
	1797	<key>CF$UID</key>
	1798	<integer>10</integer>
	1799	</dict>
	1800	<dict>
	1801	<key>CF$UID</key>
	1802	<integer>104</integer>
	1803	</dict>
	1804	<dict>
	1805	<key>CF$UID</key>
	1806	<integer>102</integer>
	1807	</dict>
	1808	<dict>
	1809	<key>CF$UID</key>
1796	1810	<integer>16</integer>
1797	1811	</dict>
1798	1812	<dict>
1799	1813	<key>CF$UID</key>
1800		~~<integer>102</integer>~~
1801		~~</dict>~~
1802		~~<dict>~~
1803		~~<key>CF$UID</key>~~
1804		~~<integer>10</integer>~~
1805		~~</dict>~~
1806		~~<dict>~~
1807		~~<key>CF$UID</key>~~
1808		~~<integer>104</integer>~~
1809		~~</dict>~~
1810		~~<dict>~~
1811		~~<key>CF$UID</key>~~
1812	1814	<integer>18</integer>
1813	1815	</dict>
1814	1816	<dict>
1815	1817	<key>CF$UID</key>
1816		<integer>85</integer>
	1818	<integer>109</integer>
	1819	</dict>
	1820	<dict>
	1821	<key>CF$UID</key>
	1822	<integer>112</integer>
1817	1823	</dict>
1818	1824	<dict>
…	…
1823	1829	<key>CF$UID</key>
1824	1830	<integer>32</integer>
1825		~~</dict>~~
1826		~~<dict>~~
1827		~~<key>CF$UID</key>~~
1828		~~<integer>109</integer>~~
1829		~~</dict>~~
1830		~~<dict>~~
1831		~~<key>CF$UID</key>~~
1832		~~<integer>112</integer>~~
1833	1831	</dict>
1834	1832	</array>
…	…
1857	1855	<dict>
1858	1856	<key>CF$UID</key>
	1857	<integer>88</integer>
	1858	</dict>
	1859	<dict>
	1860	<key>CF$UID</key>
	1861	<integer>2</integer>
	1862	</dict>
	1863	<dict>
	1864	<key>CF$UID</key>
	1865	<integer>102</integer>
	1866	</dict>
	1867	<dict>
	1868	<key>CF$UID</key>
	1869	<integer>88</integer>
	1870	</dict>
	1871	<dict>
	1872	<key>CF$UID</key>
1859	1873	<integer>10</integer>
1860	1874	</dict>
1861	1875	<dict>
1862	1876	<key>CF$UID</key>
	1877	<integer>16</integer>
	1878	</dict>
	1879	<dict>
	1880	<key>CF$UID</key>
	1881	<integer>102</integer>
	1882	</dict>
	1883	<dict>
	1884	<key>CF$UID</key>
	1885	<integer>102</integer>
	1886	</dict>
	1887	<dict>
	1888	<key>CF$UID</key>
	1889	<integer>2</integer>
	1890	</dict>
	1891	<dict>
	1892	<key>CF$UID</key>
	1893	<integer>24</integer>
	1894	</dict>
	1895	</array>
	1896	</dict>
	1897	<dict>
	1898	<key>$class</key>
	1899	<dict>
	1900	<key>CF$UID</key>
	1901	<integer>133</integer>
	1902	</dict>
	1903	<key>NS.objects</key>
	1904	<array>
	1905	<dict>
	1906	<key>CF$UID</key>
	1907	<integer>24</integer>
	1908	</dict>
	1909	<dict>
	1910	<key>CF$UID</key>
	1911	<integer>2</integer>
	1912	</dict>
	1913	<dict>
	1914	<key>CF$UID</key>
	1915	<integer>10</integer>
	1916	</dict>
	1917	<dict>
	1918	<key>CF$UID</key>
	1919	<integer>104</integer>
	1920	</dict>
	1921	<dict>
	1922	<key>CF$UID</key>
	1923	<integer>102</integer>
	1924	</dict>
	1925	<dict>
	1926	<key>CF$UID</key>
	1927	<integer>18</integer>
	1928	</dict>
	1929	<dict>
	1930	<key>CF$UID</key>
	1931	<integer>109</integer>
	1932	</dict>
	1933	<dict>
	1934	<key>CF$UID</key>
1863	1935	<integer>88</integer>
1864	1936	</dict>
1865	1937	<dict>
1866	1938	<key>CF$UID</key>
1867		<integer>2</integer>
1868		</dict>
1869		<dict>
1870		<key>CF$UID</key>
1871		<integer>102</integer>
1872		</dict>
1873		<dict>
1874		<key>CF$UID</key>
1875		<integer>16</integer>
1876		</dict>
1877		<dict>
1878		<key>CF$UID</key>
1879		<integer>88</integer>
1880		</dict>
1881		<dict>
1882		<key>CF$UID</key>
1883		<integer>2</integer>
1884		</dict>
1885		<dict>
1886		<key>CF$UID</key>
1887		<integer>24</integer>
1888		</dict>
1889		<dict>
1890		<key>CF$UID</key>
1891		<integer>102</integer>
1892		</dict>
1893		<dict>
1894		<key>CF$UID</key>
1895		<integer>102</integer>
	1939	<integer>32</integer>
1896	1940	</dict>
1897	1941	</array>
…	…
1907	1951	<dict>
1908	1952	<key>CF$UID</key>
1909		~~<integer>88</integer>~~
1910		~~</dict>~~
1911		~~<dict>~~
1912		~~<key>CF$UID</key>~~
1913		~~<integer>24</integer>~~
1914		~~</dict>~~
1915		~~<dict>~~
1916		~~<key>CF$UID</key>~~
1917		~~<integer>32</integer>~~
1918		~~</dict>~~
1919		~~<dict>~~
1920		~~<key>CF$UID</key>~~
1921		~~<integer>102</integer>~~
1922		~~</dict>~~
1923		~~<dict>~~
1924		~~<key>CF$UID</key>~~
1925		~~<integer>2</integer>~~
1926		~~</dict>~~
1927		~~<dict>~~
1928		~~<key>CF$UID</key>~~
1929		~~<integer>10</integer>~~
1930		~~</dict>~~
1931		~~<dict>~~
1932		~~<key>CF$UID</key>~~
1933		~~<integer>104</integer>~~
1934		~~</dict>~~
1935		~~<dict>~~
1936		~~<key>CF$UID</key>~~
1937		~~<integer>109</integer>~~
1938		~~</dict>~~
1939		~~<dict>~~
1940		~~<key>CF$UID</key>~~
1941		~~<integer>18</integer>~~
1942		~~</dict>~~
1943		~~</array>~~
1944		~~</dict>~~
1945		~~<dict>~~
1946		~~<key>$class</key>~~
1947		~~<dict>~~
1948		~~<key>CF$UID</key>~~
1949		~~<integer>133</integer>~~
1950		~~</dict>~~
1951		~~<key>NS.objects</key>~~
1952		~~<array>~~
1953		~~<dict>~~
1954		~~<key>CF$UID</key>~~
1955	1953	<integer>137</integer>
1956	1954	</dict>
…	…
1969	1967	<dict>
1970	1968	<key>CF$UID</key>
	1969	<integer>140</integer>
	1970	</dict>
	1971	<dict>
	1972	<key>CF$UID</key>
1971	1973	<integer>141</integer>
1972	1974	</dict>
…	…
1977	1979	<dict>
1978	1980	<key>CF$UID</key>
1979		~~<integer>140</integer>~~
1980		~~</dict>~~
1981		~~<dict>~~
1982		~~<key>CF$UID</key>~~
1983	1981	<integer>143</integer>
1984	1982	</dict>
…	…
1989	1987	</array>
1990	1988	</dict>
1991		~~<string>Icon/Name/Status</string>~~
1992	1989	<string>NSTableView</string>
1993		~~<string>NSTableColumn1</string>~~
1994		~~<string>View</string>~~
1995	1990	<string>File's Owner</string>
1996	1991	<string>Contact List</string>
	1992	<string>View</string>
	1993	<string>NSScrollView3</string>
1997	1994	<string>View1</string>
1998		<string>NSScrollView3</string>
	1995	<string>Icon/Name/Status</string>
	1996	<string>NSTableColumn1</string>
1999	1997	<dict>
2000	1998	<key>$class</key>
…	…
2007	2005	<dict>
2008	2006	<key>CF$UID</key>
	2007	<integer>18</integer>
	2008	</dict>
	2009	<dict>
	2010	<key>CF$UID</key>
	2011	<integer>24</integer>
	2012	</dict>
	2013	<dict>
	2014	<key>CF$UID</key>
2009	2015	<integer>85</integer>
2010	2016	</dict>
	2017	</array>
	2018	</dict>
	2019	<dict>
	2020	<key>$class</key>
	2021	<dict>
	2022	<key>CF$UID</key>
	2023	<integer>133</integer>
	2024	</dict>
	2025	<key>NS.objects</key>
	2026	<array>
	2027	<dict>
	2028	<key>CF$UID</key>
	2029	<integer>19</integer>
	2030	</dict>
	2031	<dict>
	2032	<key>CF$UID</key>
	2033	<integer>25</integer>
	2034	</dict>
	2035	<dict>
	2036	<key>CF$UID</key>
	2037	<integer>86</integer>
	2038	</dict>
	2039	</array>
	2040	</dict>
	2041	<dict>
	2042	<key>$class</key>
	2043	<dict>
	2044	<key>CF$UID</key>
	2045	<integer>133</integer>
	2046	</dict>
	2047	<key>NS.objects</key>
	2048	<array>
	2049	<dict>
	2050	<key>CF$UID</key>
	2051	<integer>78</integer>
	2052	</dict>
	2053	<dict>
	2054	<key>CF$UID</key>
	2055	<integer>2</integer>
	2056	</dict>
	2057	<dict>
	2058	<key>CF$UID</key>
	2059	<integer>102</integer>
	2060	</dict>
	2061	<dict>
	2062	<key>CF$UID</key>
	2063	<integer>126</integer>
	2064	</dict>
	2065	<dict>
	2066	<key>CF$UID</key>
	2067	<integer>10</integer>
	2068	</dict>
	2069	<dict>
	2070	<key>CF$UID</key>
	2071	<integer>80</integer>
	2072	</dict>
	2073	<dict>
	2074	<key>CF$UID</key>
	2075	<integer>128</integer>
	2076	</dict>
	2077	<dict>
	2078	<key>CF$UID</key>
	2079	<integer>16</integer>
	2080	</dict>
	2081	<dict>
	2082	<key>CF$UID</key>
	2083	<integer>112</integer>
	2084	</dict>
	2085	<dict>
	2086	<key>CF$UID</key>
	2087	<integer>84</integer>
	2088	</dict>
	2089	<dict>
	2090	<key>CF$UID</key>
	2091	<integer>88</integer>
	2092	</dict>
	2093	<dict>
	2094	<key>CF$UID</key>
	2095	<integer>32</integer>
	2096	</dict>
	2097	<dict>
	2098	<key>CF$UID</key>
	2099	<integer>100</integer>
	2100	</dict>
	2101	<dict>
	2102	<key>CF$UID</key>
	2103	<integer>109</integer>
	2104	</dict>
	2105	<dict>
	2106	<key>CF$UID</key>
	2107	<integer>9</integer>
	2108	</dict>
	2109	<dict>
	2110	<key>CF$UID</key>
	2111	<integer>85</integer>
	2112	</dict>
	2113	<dict>
	2114	<key>CF$UID</key>
	2115	<integer>123</integer>
	2116	</dict>
	2117	<dict>
	2118	<key>CF$UID</key>
	2119	<integer>104</integer>
	2120	</dict>
	2121	<dict>
	2122	<key>CF$UID</key>
	2123	<integer>124</integer>
	2124	</dict>
2011	2125	<dict>
2012	2126	<key>CF$UID</key>
…	…
2015	2129	<dict>
2016	2130	<key>CF$UID</key>
	2131	<integer>76</integer>
	2132	</dict>
	2133	<dict>
	2134	<key>CF$UID</key>
	2135	<integer>82</integer>
	2136	</dict>
	2137	<dict>
	2138	<key>CF$UID</key>
	2139	<integer>130</integer>
	2140	</dict>
	2141	<dict>
	2142	<key>CF$UID</key>
2017	2143	<integer>24</integer>
2018	2144	</dict>
…	…
2029	2155	<dict>
2030	2156	<key>CF$UID</key>
2031		~~<integer>86</integer>~~
2032		~~</dict>~~
2033		~~<dict>~~
2034		~~<key>CF$UID</key>~~
2035		~~<integer>19</integer>~~
2036		~~</dict>~~
2037		~~<dict>~~
2038		~~<key>CF$UID</key>~~
2039		~~<integer>25</integer>~~
2040		~~</dict>~~
2041		~~</array>~~
2042		~~</dict>~~
2043		~~<dict>~~
2044		~~<key>$class</key>~~
2045		~~<dict>~~
2046		~~<key>CF$UID</key>~~
2047		~~<integer>133</integer>~~
2048		~~</dict>~~
2049		~~<key>NS.objects</key>~~
2050		~~<array>~~
2051		~~<dict>~~
2052		~~<key>CF$UID</key>~~
2053		~~<integer>24</integer>~~
2054		~~</dict>~~
2055		~~<dict>~~
2056		~~<key>CF$UID</key>~~
2057		~~<integer>10</integer>~~
2058		~~</dict>~~
2059		~~<dict>~~
2060		~~<key>CF$UID</key>~~
2061		~~<integer>104</integer>~~
2062		~~</dict>~~
2063		~~<dict>~~
2064		~~<key>CF$UID</key>~~
2065		~~<integer>80</integer>~~
2066		~~</dict>~~
2067		~~<dict>~~
2068		~~<key>CF$UID</key>~~
2069		~~<integer>100</integer>~~
2070		~~</dict>~~
2071		~~<dict>~~
2072		~~<key>CF$UID</key>~~
2073		~~<integer>124</integer>~~
2074		~~</dict>~~
2075		~~<dict>~~
2076		~~<key>CF$UID</key>~~
2077		~~<integer>85</integer>~~
2078		~~</dict>~~
2079		~~<dict>~~
2080		~~<key>CF$UID</key>~~
2081		~~<integer>9</integer>~~
2082		~~</dict>~~
2083		~~<dict>~~
2084		~~<key>CF$UID</key>~~
2085		~~<integer>88</integer>~~
2086		~~</dict>~~
2087		~~<dict>~~
2088		~~<key>CF$UID</key>~~
2089		~~<integer>76</integer>~~
2090		~~</dict>~~
2091		~~<dict>~~
2092		~~<key>CF$UID</key>~~
2093		~~<integer>82</integer>~~
2094		~~</dict>~~
2095		~~<dict>~~
2096		~~<key>CF$UID</key>~~
2097		~~&nbs~~