From 0d9bebe650be6ed50759802ebd0eb1fee111c448 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 15 Jan 2006 04:33:30 +0000 Subject: [PATCH] Register RTL versions of the indent and unindent icons. (#326857, Itai 2006-01-14 Matthias Clasen * gtk/gtkiconfactory.c (get_default_icons): Register RTL versions of the indent and unindent icons. (#326857, Itai Bar-Haim) * gtk/Makefile.am (STOCK_ICONS): And add them here. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ gtk/Makefile.am | 12 ++++++++---- gtk/gtkiconfactory.c | 10 ++++++++-- .../16/{gtk-indent.png => gtk-indent-ltr.png} | Bin gtk/stock-icons/16/gtk-indent-rtl.png | Bin 0 -> 453 bytes .../16/{gtk-unindent.png => gtk-unindent-ltr.png} | Bin gtk/stock-icons/16/gtk-unindent-rtl.png | Bin 0 -> 461 bytes .../24/{gtk-indent.png => gtk-indent-ltr.png} | Bin gtk/stock-icons/24/gtk-indent-rtl.png | Bin 0 -> 629 bytes .../24/{gtk-unindent.png => gtk-unindent-ltr.png} | Bin gtk/stock-icons/24/gtk-unindent-rtl.png | Bin 0 -> 640 bytes 12 files changed, 28 insertions(+), 6 deletions(-) rename gtk/stock-icons/16/{gtk-indent.png => gtk-indent-ltr.png} (100%) create mode 100644 gtk/stock-icons/16/gtk-indent-rtl.png rename gtk/stock-icons/16/{gtk-unindent.png => gtk-unindent-ltr.png} (100%) create mode 100644 gtk/stock-icons/16/gtk-unindent-rtl.png rename gtk/stock-icons/24/{gtk-indent.png => gtk-indent-ltr.png} (100%) create mode 100644 gtk/stock-icons/24/gtk-indent-rtl.png rename gtk/stock-icons/24/{gtk-unindent.png => gtk-unindent-ltr.png} (100%) create mode 100644 gtk/stock-icons/24/gtk-unindent-rtl.png diff --git a/ChangeLog b/ChangeLog index 4df4e94f4e..b09f825453 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2006-01-14 Matthias Clasen + * gtk/gtkiconfactory.c (get_default_icons): Register RTL + versions of the indent and unindent icons. (#326857, + Itai Bar-Haim) + + * gtk/Makefile.am (STOCK_ICONS): And add them here. + Fix a crash with combo boxes in RESIZE_IMMEDIATE containers. (#326806, Sebastian Bacher) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 4df4e94f4e..b09f825453 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,11 @@ 2006-01-14 Matthias Clasen + * gtk/gtkiconfactory.c (get_default_icons): Register RTL + versions of the indent and unindent icons. (#326857, + Itai Bar-Haim) + + * gtk/Makefile.am (STOCK_ICONS): And add them here. + Fix a crash with combo boxes in RESIZE_IMMEDIATE containers. (#326806, Sebastian Bacher) diff --git a/gtk/Makefile.am b/gtk/Makefile.am index eb5e7b9166..cd87e4b8ff 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -778,7 +778,8 @@ STOCK_ICONS = \ stock-icons/16/gtk-harddisk.png \ stock-icons/16/gtk-help.png \ stock-icons/16/gtk-home.png \ - stock-icons/16/gtk-indent.png \ + stock-icons/16/gtk-indent-ltr.png \ + stock-icons/16/gtk-indent-rtl.png \ stock-icons/16/gtk-index.png \ stock-icons/16/gtk-info.png \ stock-icons/16/gtk-jump-to-ltr.png \ @@ -827,7 +828,8 @@ STOCK_ICONS = \ stock-icons/16/gtk-underline.png \ stock-icons/16/gtk-undo-ltr.png \ stock-icons/16/gtk-undo-rtl.png \ - stock-icons/16/gtk-unindent.png \ + stock-icons/16/gtk-unindent-ltr.png \ + stock-icons/16/gtk-unindent-rtl.png \ stock-icons/16/gtk-zoom-100.png \ stock-icons/16/gtk-zoom-fit.png \ stock-icons/16/gtk-zoom-in.png \ @@ -870,7 +872,8 @@ STOCK_ICONS = \ stock-icons/24/gtk-harddisk.png \ stock-icons/24/gtk-help.png \ stock-icons/24/gtk-home.png \ - stock-icons/24/gtk-indent.png \ + stock-icons/24/gtk-indent-ltr.png \ + stock-icons/24/gtk-indent-rtl.png \ stock-icons/24/gtk-index.png \ stock-icons/24/gtk-info.png \ stock-icons/24/gtk-italic.png \ @@ -922,7 +925,8 @@ STOCK_ICONS = \ stock-icons/24/gtk-underline.png \ stock-icons/24/gtk-undo-ltr.png \ stock-icons/24/gtk-undo-rtl.png \ - stock-icons/24/gtk-unindent.png \ + stock-icons/24/gtk-unindent-ltr.png \ + stock-icons/24/gtk-unindent-rtl.png \ stock-icons/24/gtk-zoom-100.png \ stock-icons/24/gtk-zoom-fit.png \ stock-icons/24/gtk-zoom-in.png \ diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c index b38d82c423..cc8911de42 100644 --- a/gtk/gtkiconfactory.c +++ b/gtk/gtkiconfactory.c @@ -482,8 +482,14 @@ get_default_icons (GtkIconFactory *factory) register_stock_icon (factory, GTK_STOCK_ITALIC); register_stock_icon (factory, GTK_STOCK_STRIKETHROUGH); register_stock_icon (factory, GTK_STOCK_UNDERLINE); - register_stock_icon (factory, GTK_STOCK_INDENT); - register_stock_icon (factory, GTK_STOCK_UNINDENT); + register_bidi_stock_icon (factory, + GTK_STOCK_INDENT, + GTK_STOCK_INDENT "-ltr", + GTK_STOCK_INDENT "-rtl"); + register_bidi_stock_icon (factory, + GTK_STOCK_UNINDENT, + GTK_STOCK_UNINDENT "-ltr", + GTK_STOCK_UNINDENT "-rtl"); register_stock_icon (factory, GTK_STOCK_GOTO_TOP); register_stock_icon (factory, GTK_STOCK_DELETE); register_bidi_stock_icon (factory, diff --git a/gtk/stock-icons/16/gtk-indent.png b/gtk/stock-icons/16/gtk-indent-ltr.png similarity index 100% rename from gtk/stock-icons/16/gtk-indent.png rename to gtk/stock-icons/16/gtk-indent-ltr.png diff --git a/gtk/stock-icons/16/gtk-indent-rtl.png b/gtk/stock-icons/16/gtk-indent-rtl.png new file mode 100644 index 0000000000000000000000000000000000000000..824a9216d36ab07757f4e9374ec64783fe799540 GIT binary patch literal 453 zcmV;$0XqJPP)>d6H9ARleJ{4N@SE&(Z^)UxQK+PCv8w1x(I^f$x%Fq6JyWPTKv4FBHC1)7M-N9pV6h$2eVHkqzx{&92 ze}}M!9}p;tV$=>Gr|bIF0TS!=x~DEzdf*)RzJGVXk0ve3?+F-bno{wQ6HU_qtG;l7 vhAdMZMLwQjiBOgzVCBimZk93d9hgV0!2}<+wCx&PB|f0S1C9ik33j)s-!pHiGaGMX$sr6 zVHieRL9=VqlY;ShT&2Qs9BjASS^*mqPN&n;ZypQ=yg=7=gki`hqiI^LpqcD>UQ5Ap zxfD6nndFPlq#U*&$g-^01SmEf4sQx55XbSu{KcQ{*n|0eUMpa$30kJ#9mv+}HBatR zqN*w=>ua;wbV?@wS25Kv`=rN&E=A9qSl(+U_^WY@{S6CbonGa)cJ1zz49hvjm=imaDYX7XcDTs5K;(1Vdv0 z32+ID=gi5Rdw(kmlYH5|?A$l=?au510GuFngt;Z$BF+$d2t^_CUaxl@i9|p&#adc# z&f{{qgu!3{$z<{YKW`9kv|^6OV<51z8)TtS$eOoWEy!lGfxgq}6cUL9EuSM^LgLRs z5Z7ho1XWd8;1Ob973Fq19mmgpMDDE-=b21K+`?VTT@@YE>2x4*P@teSHiv?B34Zel z44~_}H8)MucHp@!@fpn~=-pY+u7LARdp?r-pcTD5%wH z(#&}*m&-PJu~>xJZ00EdhXQgS6|z0`%bdvFHXIHi7K_;m905pyEORzi&}cNEP$*d2 z!ims48jX4bu*||aIO=wjbSV`=Sn+jAWUk^1>)nkMgLzO2?&BI{r_>qHidh4hLRNvJga{Mh>a zzDL1bx7)p<+NBn!S4p-tsZ`3Ydw15O(TD>)A(rs{gu*G}9=7);KO!y>7l;U@K#%hw z;uyYPA$3*0|FsVU-8-*{p|T>Q*XLjrY-a;k& P00000NkvXXu0mjfy`m6L literal 0 HcmV?d00001 diff --git a/gtk/stock-icons/24/gtk-unindent.png b/gtk/stock-icons/24/gtk-unindent-ltr.png similarity index 100% rename from gtk/stock-icons/24/gtk-unindent.png rename to gtk/stock-icons/24/gtk-unindent-ltr.png diff --git a/gtk/stock-icons/24/gtk-unindent-rtl.png b/gtk/stock-icons/24/gtk-unindent-rtl.png new file mode 100644 index 0000000000000000000000000000000000000000..a95a4e2642fa6ce1ac78b1dbaa8d701d8cf35d86 GIT binary patch literal 640 zcmV-`0)PF9P) zGo63u^Eq_8T?mCjkNEQz@j)v_zuyM}H(m#c%jIHvya91bBE4ASxi;?*T? zc7nJrb52lIl@mNh9I7JSX0vJ9Z0BhGXhc00i-||LPr0k2VKf?bbnFz!X^o4C!KMy= zvvCZd>pIg7!&n(`UHs;9IcYFcHPRls`N3ddshCYz5Nfp=B$G*|PbL!x1Ol`*fp{@7 zD3wam%=tH;&zk~dvsoyY%aBT?>=}$kBUZn%GhP4B>-ECAR4NsSL?Yn#`>hN}h=D9~ zF2sNm;=$Z*H*=m&r`ZwNG9di7YO2*LWHK41kH=$Jj-4L{GN;92(Q+?^LcwIio%61@ zFd$kKdD{l#Rpjw_?5k)OU2NNEoLZyNu#96Tr*<}pL_*%ld|3UZ$(%Zv3%il&bSfRu zq7&*`J3B6&PRGLFzSU}7`+Ppu;`A!XjwT!qvx~ILy4UOR0MCdyES^v}Lp;Fl-sC65 z72*=1Q3~`pQ{SJ!;uTVt<@;axM9|!ML%b_XXY~3UEracC;hf|PF+