From 88bcecddd943d048ccc25fe7a5a2582b66929aa3 Mon Sep 17 00:00:00 2001 From: fedor Date: Sat, 6 Jul 2002 02:54:36 +0000 Subject: [PATCH] Image updates and doc. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@14065 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 17 ++++++++ Documentation/gsdoc/DefaultsSummary.gsdoc | 12 +++--- Images/common_ArrowDown.tiff | Bin 518 -> 542 bytes Images/common_ArrowDownH.tiff | Bin 678 -> 556 bytes Images/common_ArrowLeft.tiff | Bin 518 -> 528 bytes Images/common_ArrowLeftH.tiff | Bin 678 -> 556 bytes Images/common_ArrowRight.tiff | Bin 518 -> 546 bytes Images/common_ArrowRightH.tiff | Bin 678 -> 554 bytes Images/common_ArrowUp.tiff | Bin 518 -> 540 bytes Images/common_ArrowUpH.tiff | Bin 678 -> 554 bytes Source/NSFont.m | 49 ++++++++++++++++++++++ Source/NSImage.m | 4 ++ 12 files changed, 76 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6b882cf1d..3168caba2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +2002-07-05 Adam Fedor + + * Images/common_ArrowDown.tiff: Transparency fix. + * Images/common_ArrowDownH.tiff: Idem. + * Images/common_ArrowLeft.tiff: Idem. + * Images/common_ArrowLeftH.tiff: Idem. + * Images/common_ArrowRight.tiff: Idem. + * Images/common_ArrowRightH.tiff: Idem. + * Images/common_ArrowUp.tiff: Idem. + * Images/common_ArrowUpH.tiff: Idem. (From deek@d2dc.net.) + + * Source/NSFont.h: Add documentation. + * Source/NSImage.m (-compositeToPoint:fromRect:operation:): Log + exception. + (-dissolveToPoint:fromRect:fraction:): Idem. + * Documentation/gsdoc/DefaultsSummary.gsdoc: Update. + 2002-07-04 Fred Kiefer * Source/NSColor.m diff --git a/Documentation/gsdoc/DefaultsSummary.gsdoc b/Documentation/gsdoc/DefaultsSummary.gsdoc index 310d5f959..ce38a67ea 100644 --- a/Documentation/gsdoc/DefaultsSummary.gsdoc +++ b/Documentation/gsdoc/DefaultsSummary.gsdoc @@ -184,12 +184,12 @@ System Colors

- System colors may be set using the defaults system. System - colors are standard colors for drawing various GUI elements, - such as buttons, text, scroller, etc. The value is a - dictionary describing the color. The keys that can be - used for setting the system colors are described in the - documentation for NSColor. + System colors are standard colors for drawing various GUI elements, + such as buttons, text, scroller, etc. They can be set using + the normal user defaults system. An NSColorList called + "System" is stored in the users's private color list + directory. This color list can also be manipulated through the + NSColorList class (typically through a preferences module).

System Fonts diff --git a/Images/common_ArrowDown.tiff b/Images/common_ArrowDown.tiff index ee0120a41540a93b4da79b16ea497c6897d57742..de0c009299aad7cf0fa440e851d1f46f1f44f4c3 100644 GIT binary patch literal 542 zcmebD)MB{Bz`*d2f#E+9xPgG0hF^Hh`O5&5#brXnUxsg3^!@~iqU&k+$?yqD?N<;F zrl#R5!#kkdM+PB=e+(=Pj6lDE0V6Y*%?ac%BC(l(Y!;x{4xmD2s5ol_0|OhB%>3Nwg8*&uVpplk;qTO6wX5|Ay$$O?83 zAJ776C|eB3mO(N{1Ih-uAqYtv$YtPwLVch76K)rr7<`cr6!i7rYMwWmSiY|WTYy%d-?`|4E6wG IkSD-20Ip$)xBvhE literal 518 zcmaiuK?(vf6ho646%_ET?ulF?uN(Ndg|(*BU-KiV`n06YPB z{JSB9-cHJ6jJ=(dr`yF6L%m;rQl?q5N``tlOI|s}>SCy$Skju95vVO8CiXDX)k_b| zy|Q-S${e|_OfO)$?E+&i-A@}U`8;xs;k&~dHy_<{n=$tp^ZfN~&&YnJ_Y1I_!{-xV CsiDmP diff --git a/Images/common_ArrowDownH.tiff b/Images/common_ArrowDownH.tiff index 844ce468f9cefc3cd13a976e6b000c8e8973a569..536fc91a01e2dd1187baeac41106f847e9b40899 100644 GIT binary patch literal 556 zcmebD)M9wXz`$^o;THqL|9=GVUy!N>0;(GRGJL~h&QFjmE;AZ_GJL|K_bW&gT~EVT zhIdG6KZ1BLH4PsbUIFFag2;xq3_=Y57+4q>f&K&oMrJUZ8^~cqVlx5REI_d%K!wau zan=R~1~w?02`I)0|yl9`{XAl=IHxmCKV+XWu_ME z2c;J0mlh=hS)RFx=|CzuKQ}i&FW#}JD8Jk#zdX-FuOu@qje)_rC^fMpHASI3vm`?y UBqLS9-P1P!WV8nmgS-Kz0Xj{NMgRZ+ literal 678 zcmebD)M9wU$UqMG57a~mgUt;M4aKVtDv#_2eCmq0s1N<1rJa z57}&(7*-l)HW6mR^n=VM3g9x6mw|zinE@2p+(68T#AX7rS%6}FObiUnP;rntHYgh? z%pl0f0@lj`WQ#(@L3+fY;!l7Yq!?MjYNi1-NJH84fNU8gGc}OR3_=nI8pXf?g$;kW L7zETA7+^F2$=yUs diff --git a/Images/common_ArrowLeft.tiff b/Images/common_ArrowLeft.tiff index 46d16c8386dc72e9c57de52a9a0bad7d513b08b6..745a85d2080f65809c2e2f70c9114f5f64800d4b 100644 GIT binary patch literal 528 zcmebD)M7Zpz`*c`fuZ3a1H=DUP#VMr;ZJCMnD{Ro;xKt)XhLS-vK!rvFt-aa{9|BY zUcZgY)&AD5sA$NWU~OpRsj_igs;C+6t;WF{3Q7Gj$M4=a&{G16iKAiRnNpIX^cyKQG>~s3^bO rCpE1^uOu@qjlsDnHL)Z$MWH;iBts!2BUQoO(>DNQum=!>JOQQwElxEIYyME}*#&`GHYaBC(CO-}N8;XD zt1mDosw>eeNG`p=lxy`<$Hsh~xyAUy@WEZLTkhS=qnmmC`qC$p^~|3);IM?&7Y_!Z A%>V!Z diff --git a/Images/common_ArrowLeftH.tiff b/Images/common_ArrowLeftH.tiff index afd2e765dafc93087e6ef055d796394ab4b724c6..672809f56b6317879a2a24d9ac11ec07fc2039a2 100644 GIT binary patch literal 556 zcmaivy-Nc@5XIkKJ_v|{0V8OND=fsqtL+pEb8vzLdpXZNbKrTfIZ2y8&eGO4rKM%M zi@x2A`wMhPN|ec!CcA@0bD81@Kkb+>yO;tnk0r z<~jb(Jd=Mb?$*TuO(^c^j%qmGVxns7k(;c&vauoc))Z(9d(^g-hcm`E_Uw>*cBK8Q@cPDD K5BTgFE`9?+nvOXD literal 678 zcmebD)M9wU$Us#P8XEc^XdnpV1W0Ods>PxPLoFUPaJ59Jfvbf%mO>TXYe)%vW48a20pU!r2)eQ4RF^2 zeIf+3orQrB=sPfAWCpW2fgDC8HWQG|0u;9X?~|XLn4|BLnN*Zml$lzrACy|0Us{w5WO?Q$rUR+u{M_99 zym-f=qWtop%=C;By^_qdGzJFeqSVBa)D(sC%#sX+kc?CXcTe8{kkKAM4Dtq;1^|O6 Bi!=ZL literal 518 zcmb7%9GZnUiK+>(?DPZ=m-ZQi`F? diff --git a/Images/common_ArrowRightH.tiff b/Images/common_ArrowRightH.tiff index dcca7a2b2c6276606e33335845544fa835e5f567..3d1390943dbc33a14679f927886fe38598b32920 100644 GIT binary patch literal 554 zcmebD)M9wTz`$^o;THqL|9=b&4G&=~5DzT!5?ur?^AVQ}T*Xg9D&Q)i_QUw-bOTP4 z8ZcbZ0CzFaH&+>i82&M^Ffamr2?mVJU^X|9!-&LY0%!3s#90;=Hyvc-UG7NCS6BgA|TAYTZo9%P>=lnpXh49a!@vc;k5?*Q3SjI3by zNCC}}hO(7_Y#AhTG@xvd8-kF;fm{X-DAf1KPfpCy_sL8uN-WAuE!Gc8EzU13N(Qn# za}(2nRC0c9Zhl_8V^L9lc~EA0Mu~@BNoHCagL6@8Vo7R>LV0FMhC)b2s)D L4&_jqqNj(0Hv@B)0k;teQ2NId1(I79Y~G5M|ew49pMyC0q6eZJRM z%bBTqH>We0-G1vI`d{5nZE;c^f^V~*s99d55fu)|b!Lxjthu~V0t=1<)|N$ped-f? zR>*DgguE)g=QrtFuAed19hZmlijXK$tPIM**QCAMsgHB0tp4?DUmFMd2@=$9vytv;hvR)5IS|)|O4u@IM56}BD PJdRJ#%-9ni^8~A3WzLA* literal 518 zcmah@K?(vf5KDGdR1owaf_hhche!7!^gq6*kMrnBTxWD<9m}GWHkl+7+B7%-Jms9* zcmaIP(NmsMYBi%+dOoY~*R_b=;hDZJ_agr4@LcS2tq--U{70Gl=Xd!Tfm$YFA`b(v zUVI?xm9^;-=E!&@d;#%g7Z`JCx^Apo=aFj+-x=Px>G*@&(76wt=Z`LX(rjmXzW}>A F44(k!q0ImQ diff --git a/Images/common_ArrowUpH.tiff b/Images/common_ArrowUpH.tiff index 6e978836e7bc5a0a8f75de0cdb367ac23060cfa9..6acb068bbbd9e2fd8647452f0e5cf543ad52a127 100644 GIT binary patch literal 554 zcmZ{fu}i~16vp4BsT4%Pf)%Pma1sYIx+)GfP(g~$5@Tuu#*=HL>-}+#uC9(9gbEcZ zRA}{k=bZ*h6Yjp>_uiM6yC~YHArZY1=@IYWBYFqVL0Edsj>)Vsef;-aRZqC;+@DV9 zb200>ddgkr7IaEq%fEGLJ>!&fOLaysRHr%lBydmjh>GD=7*S#m?4$OCV8zy}nrOwc zhu)g-=n(ph%sRLM_R-i7zw>MGb(`n^ZCd8J4a-O1Et`J@H$~N)r-?b+mUqEBr8#?+ z`3#*>9hPeL4cjt_@4|L=tzwm>{jihv<)cbKQ6Aqy5}D`n{_0pMIkMrY?dxP`@+F!}>=osDY% literal 678 zcmebD)M9wU$bc1uhKByfDuG>)D78>C{}X98$V?cJOQnTf+}baSxr;bs%V;ALQ7WM%+GHa8G6BC(l(Y!;wc9}@!uGgKU;jt$BN z3Nr{YvViq+0NJ8YagZKysQ4401}R2Xu$pN=4bo8dJRn;J$xIC-GlP)CfkrWKKw-ll ME(QU01_l@n0ICi|N&o-= diff --git a/Source/NSFont.m b/Source/NSFont.m index 0c6e4d54c..c1096cbf1 100644 --- a/Source/NSFont.m +++ b/Source/NSFont.m @@ -50,6 +50,55 @@ static BOOL userFixedCacheNeedsRecomputing = NO; matrix: (const float*)fontMatrix; @end +/** + + NSFont + +

The NSFont class allows control of the fonts used for displaying + text anywhere on the screen. The primary methods for getting a + particular font are -fontWithName:matrix: and -fontWithName:size: which + take the name and size of a particular font and return the NSFont object + associated with that font. In addition there are several convenience + mathods which make it easier to get certain types of fonts.

+ +

In particular, there are several methods to get the standard fonts + used by the Application to display text for a partiuclar purpose. See + the class methods listed below for more information. These default + fonts can be set using the user defaults system. The default + font names available are: + + NSBoldFont Helvetica-Bold + NSControlContentFont Helvetica + NSFont Helvetica (System Font) + NSLabelFont Helvetica + NSMenuFont Helvetica + NSMessageFont Helvetica + NSPaletteFont Helvetica-Bold + NSTitleBarFont Helvetica-Bold + NSToolTipsFont Helvetica + NSUserFixedPitchFont Courier + NSUserFont Helvetica + + The defualt sizes are: + + NSBoldFontSize (none) + NSControlContentFontSize (none) + NSFontSize 12 (System Font Size) + NSLabelFontSize 12 + NSMenuFontSize (none) + NSMessageFontSize (none) + NSPaletteFontSize (none) + NSSmallFontSize 9 + NSTitleBarFontSize (none) + NSToolTipsFontSize (none) + NSUserFixedPitchFontSize (none) + NSUserFontSize (none) + + Font sizes list with (none) default to NSFontSize. +

+ + */ + @implementation NSFont /* Class variables*/ diff --git a/Source/NSImage.m b/Source/NSImage.m index 0348a3f0c..cd17694b1 100644 --- a/Source/NSImage.m +++ b/Source/NSImage.m @@ -699,6 +699,8 @@ repd_for_rep(NSArray *_reps, NSImageRep *rep) } NS_HANDLER { + NSLog(@"NSImage: composite failed due to %@: %@", + [exception name], [exception reason]); if ([_delegate respondsToSelector: @selector(imageDidNotDraw:inRect:)]) { NSImage *image = [_delegate imageDidNotDraw: self inRect: aRect]; @@ -778,6 +780,8 @@ repd_for_rep(NSArray *_reps, NSImageRep *rep) } NS_HANDLER { + NSLog(@"NSImage: dissolve failed due to %@: %@", + [exception name], [exception reason]); if ([_delegate respondsToSelector: @selector(imageDidNotDraw:inRect:)]) { NSImage *image = [_delegate imageDidNotDraw: self inRect: aRect];