The original square box did not look like anything, by using an image that looks like a small window it is more clear to users what it represents.
The image was drawn as an XPM keeping a style consistent with everything else; it was then converted to TIFF using ImageMagick: convert -depth 8 -compress lzw xpm/smallwindow.xpm tiff/smallwindow.tiff Signed-off-by: Christophe CURIS <christophe.cu...@free.fr> --- WPrefs.app/WindowHandling.c | 26 +++++++- WPrefs.app/tiff/Makefile.am | 1 + WPrefs.app/tiff/smallwindow.tiff | Bin 0 -> 458 bytes WPrefs.app/xpm/Makefile.am | 1 + WPrefs.app/xpm/smallwindow.xpm | 135 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 161 insertions(+), 2 deletions(-) create mode 100644 WPrefs.app/tiff/smallwindow.tiff create mode 100644 WPrefs.app/xpm/smallwindow.xpm diff --git a/WPrefs.app/WindowHandling.c b/WPrefs.app/WindowHandling.c index 7f801f7..628278e 100644 --- a/WPrefs.app/WindowHandling.c +++ b/WPrefs.app/WindowHandling.c @@ -77,6 +77,8 @@ typedef struct _Panel { #define NON_OPAQUE_RESIZE_PIXMAP "noopaqueresize" +#define PLACEMENT_WINDOW_PIXMAP "smallwindow" + #define THUMB_SIZE 16 static const struct { @@ -354,9 +356,29 @@ static void createPanel(Panel * p) WMMoveWidget(panel->porigF, 9 + (204 - 13 - width) / 2, 45 + (109 - 13 - height) / 2); panel->porigW = WMCreateLabel(panel->porigF); - WMResizeWidget(panel->porigW, THUMB_SIZE, THUMB_SIZE); WMMoveWidget(panel->porigW, 2, 2); - WMSetLabelRelief(panel->porigW, WRRaised); + path = LocateImage(PLACEMENT_WINDOW_PIXMAP); + if (path) { + pixmap = WMCreatePixmapFromFile(scr, path); + if (pixmap) { + WMSize size; + + WMSetLabelImagePosition(panel->porigW, WIPImageOnly); + size = WMGetPixmapSize(pixmap); + WMSetLabelImage(panel->porigW, pixmap); + WMResizeWidget(panel->porigW, size.width, size.height); + WMReleasePixmap(pixmap); + } else { + wwarning(_("could not load icon %s"), path); + } + wfree(path); + if (!pixmap) + goto use_old_window_representation; + } else { + use_old_window_representation: + WMResizeWidget(panel->porigW, THUMB_SIZE, THUMB_SIZE); + WMSetLabelRelief(panel->porigW, WRRaised); + } panel->hsli = WMCreateSlider(panel->placF); WMResizeWidget(panel->hsli, width, 12); diff --git a/WPrefs.app/tiff/Makefile.am b/WPrefs.app/tiff/Makefile.am index 50c75ff..3a24385 100644 --- a/WPrefs.app/tiff/Makefile.am +++ b/WPrefs.app/tiff/Makefile.am @@ -38,6 +38,7 @@ dist_tiffdata_DATA = \ opaque.tiff \ opaqueresize.tiff \ paths.tiff \ + smallwindow.tiff \ smooth.tiff \ sound.tiff \ speed0.tiff \ diff --git a/WPrefs.app/tiff/smallwindow.tiff b/WPrefs.app/tiff/smallwindow.tiff new file mode 100644 index 0000000000000000000000000000000000000000..a4a86dda0dc7601f581fe0a8cce9c81b71635659 GIT binary patch literal 458 zcmebD)MD7dz`)SJApd|vMT}z(gQUWR9VuqAye&=(-+x`BGmW9+@Z-Q8Eov+b49A}s zXsn6zmgsj^4cu`?h+TQQYr@6KoOQW8J*S@py(qbsZ$HIl;pzxkre61^i<u%jcmJE} zv%)#0<W+B&WbpE<tG0GsE!!EpI{b~Ov}oVV)XhP<VzW%w-L&5x{p`B*lvOWFd+)v% z_<i-=QoS|z7f-(<BDK7AL7-y$0VbjEJ;##{i1?%!%TC?(^x*~pK?Vj!W(G!}%jJQX z5z3YZvYCKvCLqlLgv?NJRv@1Z$_DA-LShRtvVhIu0E!DCiHkznAhX1v>=qzf9IAc; zkS&9xUK7X$sRg=*!4^rc9V07Pd>7DSdmx()sG<wV4nk4`*2Z;x@qZv_cvuwzq8ZMf h@d4AbX3hlB4QXj=Ao_zw3_qAJ%^Lus86qsf>H!{ug<b#v literal 0 HcmV?d00001 diff --git a/WPrefs.app/xpm/Makefile.am b/WPrefs.app/xpm/Makefile.am index c491a7f..9064db6 100644 --- a/WPrefs.app/xpm/Makefile.am +++ b/WPrefs.app/xpm/Makefile.am @@ -37,6 +37,7 @@ dist_xpmdata_DATA = \ opaque.xpm \ opaqueresize.xpm \ paths.xpm \ + smallwindow.xpm \ smooth.xpm \ sound.xpm \ speed0.xpm \ diff --git a/WPrefs.app/xpm/smallwindow.xpm b/WPrefs.app/xpm/smallwindow.xpm new file mode 100644 index 0000000..9cfbb03 --- /dev/null +++ b/WPrefs.app/xpm/smallwindow.xpm @@ -0,0 +1,135 @@ +/* XPM */ +static char * image_name[] = { +"31 27 105 2", +" c None", +". c #000000000000", +"X c #9CE69CE69CE6", +"o c #B5ACB5ACB5AC", +"O c #FFFFFFFFFFFF", +"+ c #5AD65AD65AD6", +"@ c #108400000000", +"# c #39CE00000000", +"$ c #6B5A00000000", +"% c #739C00000000", +"& c #18C600000000", +"* c #B5AC00000000", +"= c #18C600000842", +"- c #4A5200000000", +"; c #4A52294A294A", +": c #318C00000000", +"> c #084208420842", +", c #9CE6318C318C", +"< c #E738318C318C", +"1 c #B5AC318C318C", +"2 c #421039CE4210", +"3 c #7BDE7BDE7BDE", +"4 c #39CE39CE39CE", +"5 c #A528A528A528", +"6 c #210800000000", +"7 c #5AD6294A294A", +"8 c #18C618C618C6", +"9 c #108410841084", +"0 c #B5AC4A524A52", +"q c #FFFF4A524A52", +"w c #842000000000", +"e c #318C318C318C", +"r c #210821082108", +"t c #9CE600000000", +"y c #8C6200000000", +"u c #4A524A524A52", +"i c #AD6A00000000", +"p c #294A00000000", +"a c #EF7A4A524A52", +"s c #C6304A524A52", +"d c #421000000000", +"f c #084200000000", +"g c #A52800000000", +"h c #421042104210", +"j c #8C628C628C62", +"k c #8420318C318C", +"l c #6B5A6B5A6B5A", +"z c #D6B4318C318C", +"x c #94A4318C318C", +"c c #4A52318C318C", +"v c #A528318C318C", +"b c #5294318C318C", +"n c #529452945294", +"m c #94A494A494A4", +"M c #6B5A63186B5A", +"N c #DEF6294A294A", +"B c #210818C62108", +"V c #108408421084", +"C c #529400000000", +"Z c #842084208420", +"A c #E7384A524A52", +"S c #631800000000", +"D c #9CE64A524A52", +"F c #5AD600000000", +"G c #8C62294A294A", +"H c #318C00000842", +"J c #C630C630C630", +"K c #318C08420842", +"L c #39CE294A294A", +"P c #DEF6DEF6DEF6", +"I c #39CE318C318C", +"U c #CE72318C318C", +"Y c #631863186318", +"T c #4210318C318C", +"R c #5AD652945AD6", +"E c #210818C618C6", +"W c #5AD64A524A52", +"Q c #63184A524A52", +"! c #AD6A4A524A52", +"~ c #D6B44A524A52", +"^ c #94A484208420", +"/ c #D6B4D6B4D6B4", +"( c #52944A524A52", +") c #CE724A524A52", +"_ c #6B5A52945294", +"` c #EF7AF7BCEF7A", +"' c #E738EF7AE738", +"] c #AD6AAD6AAD6A", +"[ c #7BDE4A524A52", +"{ c #F7BCFFFFF7BC", +"} c #EF7AEF7AEF7A", +"| c #739C739C739C", +" . c #8C6284208420", +".. c #E738E738E738", +"X. c #DEF64A524A52", +"o. c #A5284A524A52", +"O. c #CE72D6B4CE72", +"+. c #8C624A524A52", +"@. c #F7BC4A524A52", +"#. c #BDEE4A524A52", +"$. c #6B5A4A524A52", +"%. c #739C5AD65AD6", +"&. c #7BDE63186318", +"*. c #9CE663186318", +"=. c #CE72CE72CE72", +". . . . . X . . . . . . . . . . . . . . . . . . . X . . . . . ", +". o o o . X . . . . . . . . . . . . . . . . . . . X . O . O . ", +". o . o . X . . . . . . . . . . . . . . . . . . . X . . O . . ", +". o o o . X . . . . . . . . . . . . . . . . . . . X . O . O . ", +". . . . . X . . . . . . . . . . . . . . . . . . . X . . . . . ", +"o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o o ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +". O O O O O O O O O O O O O O O O O O O O O O O O O O O O O . ", +". O O O O O O O O O O O O O O O O O O O O O O O O O O O O O . ", +". O O O O O O O O O O O O O O O O O O O O O O O O O O O O O . ", +". O O O O O O O O O O O O O O O O O O O O O O O O O O O O O . ", +". O O O O O O O O O O O O O O O O O O O O O O O O O O O O O . ", +". O O O O O O O O O O O O O O O O O O O O O O O O O O O O O . ", +". O O O O O O O O O O O O O O O O O O O O O O O O O O O O O . ", +". O O O O O O O O O O O O O O O O O O O O O O O O O O O O O . ", +". O O O O O O O O O O O O O O O O O O O O O O O O O O O O O . ", +". O O O O O O O O O O O O O O O O O O O O O O O O O O O O O . ", +". O O O O O O O O O O O O O O O O O O O O O O O O O O O O O . ", +". O O O O O O O O O O O O O O O O O O O O O O O O O O O O O . ", +". O O O O O O O O O O O O O O O O O O O O O O O O O O O O O . ", +". O O O O O O O O O O O O O O O O O O O O O O O O O O O O O . ", +". O O O O O O O O O O O O O O O O O O O O O O O O O O O O O . ", +". O O O O O O O O O O O O O O O O O O O O O O O O O O O O O . ", +". O O O O O O O O O O O O O O O O O O O O O O O O O O O O O . ", +". . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . ", +"o o o o e o o o o o o o o o o o o o o o o o o o o e o o o o e ", +"o e e e e o e e e e e e e e e e e e e e e e e e e e o e e e e "}; -- 2.1.3 -- To unsubscribe, send mail to wmaker-dev-unsubscr...@lists.windowmaker.org.